Clarifications: rename one var, delete another

Change-Id: I6fa1671b5b4ea44affb6d18bd5964eb795e17fc4