Merging the clean-ups