Removed unused variable/code