VE-1477: Removed unused variables