Cleaning up a whole bunch of stuff