make scrubbing collection-aware