Housekeeping: A little bit of cleanup