Remove dead code and redundant build tags Upstream-commit: c492e76d13a61b13815475d1a6393ab1da1db5c8 Component: engine