removed obsolete code
removed obsolete code