Remove some unused structs and fields Upstream-commit: 106793dcbe49aedd96d74b0c4b0e32a972032d06 Component: engine