Removed unused variable and its getter/setter