Remove some other pointless things