Remove unused local variables

Change-Id: I1e8be3d8b55464a5190ecc0821171072cd584fdd