[tz] Housekeeping