Cleaning up the mess