A whole bunch of cleanup