Cleaning the mess up