Improved proximity cleanup.