Housekeep

companion to cyclus/cyclus#652