Removed obsolete code that was causing warnings