doing some housekeeping