Comment housekeeping