Housekeeping

Stuff that should have been cleaned up long ago