Large clean-up.