Housekeeping in the User branch