Some cleanup and housekeeping.