Removed obsolete code