Remove some more broken code.