Clean up (in more than one sense)