Some basic cleanup.