Removed an unused field and one unused function