cleaned up unused variables. closes #252. closes #251.
Merge pull request #256 from DemiReticent/codefix

cleaned up unused variables. closes #252. closes #251.