Fix unused variable warnings
Merge branch 'fix-unused-variable-warnings'

* fix-unused-variable-warnings:
  Fix unused variable warnings