#89 housekeeping