am 4a647f23: Remove a bunch of unused variables.

* commit '4a647f2340fb16fce88923dda3202099f72569b2':
  Remove a bunch of unused variables.