Cleaning more of the mess