Removed unused-obsolete code