The rest of the clean-up