Removed unused variable and associated accessor functions