Lots of cleanup, mostly nothing important