Fix incorrect comment and unnecessary variable.

Change-Id: If7ebafa464795e10a996cd152651247ed0f0955d