Cleaning up messes and making new ones