Added proximity-cleaning