Remove unused variables
Merge pull request #222 from grahamc/debt/unused-variables

Remove unused variables