Did some housekeeping stuff