cleanup some unused variable references
Merge pull request #1 from CodeFridge/feature/variable_cleanup

cleanup some unused variable references