fix: housekeeping