am 1d09b45d: am 4a647f23: Remove a bunch of unused variables.

* commit '1d09b45d971e527e66ed3d02d4b2e19aa2edb695':
  Remove a bunch of unused variables.