Merge change 1812

* changes:
  Remove an unused variable found by FindBugs.