Clean up the mess...