a few more bits of cleanup