Clean up (again)