Some resource clean ups in archive Upstream-commit: dfbb291c4005bbf6fec8b5cd9c95ebec58cdf3b1 Component: engine