Did some housekeeping