Remove a couple of unused variables

Change-Id: I45e0b6e7c2ae8e2235ff8f85c95c657e0e05fc9e
Merge "Remove a couple of unused variables"