Remove unused variables

Change-Id: Ia67b3f2c0f067093bb60c9641482b3cf32a1d4a5