Removed more obsolete code