removed some more obsolete code