Cleaning the mess :D