Clean up *after* you make the mess