Remove some more stuff that I don't use