Cleaning the mess 2