Remove variables that are no longer used
Merge pull request #259 from jcollins1991/remove_unused_variables

Remove variables that are no longer used