VE-1336 Fixes from CR - removed unused variable