Remove some more obsolete code