More basic cleanup