(Maint) Remove unused variables
Merge pull request #1671 from dalen/unused_variables

(Maint) Remove unused variables