Remove some more pointless things