Cleaning up the mess...