Cleaning up the mess!