Two more unneeded classes