removing some more obsolete code