Remove unused valiables
Merge pull request #2414 from tricknotes/remove-unused

Remove unused valiables