Removed unnecessary/unused variables.

Change-Id: Iec406d69e17aece1f97748449cb84565d1e5b142