Clean up the mess