some more basic cleanup