postCollection cleanup
More performance/memory-related refactoring