Cleaning: take 2