Remove unused variable.
Merge branch 'ari-4061' into qa