Cleanup and Pod update