Cleanup: remove some useless code Upstream-commit: a63c7c7be678880fb5c11f3c9cb7b3029d132b7f Component: engine