#1016 - housekeeping