cleaning up more stuff in vendor Upstream-commit: 34e4c5c59fc2d8168cb846cb26c649804d29db1d Component: engine