Remove some more stuff that isn't playing nice