Lots of general, trivial cleanup