Directory housekeeping