Removed some unused variables.

Change-Id: I5926c0c414f97af7d8c7f205c53b4441a203f31c