Housekeeping with a bit of extra