Lots of cleanup and slimming down