Remove a redundant funtion and fix some typos Upstream-commit: b00f1c8623722e45eba420e6d091a24135b0bc0c Component: engine