removed obsolete codes