re: Two more janitorial tasks