Merge "Cleanup class resources for large-ops scenario"