Cleaning the mess :)