Removed more obsolete codes