Removed obsolete code
Removed obsolete code