Update
Two more cleanup