Removed some more obsolete code