Removed more obsolete code.