Remove some more unneeded things