Remove some more code