Clean up: remove unused variables (identified by pychecker and pyflakes)
Merge pull request #145 from eriknw/unused_variables

Clean up: remove unused variables (identified by pychecker and pyflakes)