Remove unused variable, and other minor flake8 warnings
Merge pull request #1014 from hugovk/unused_var

Remove unused variable, and other minor flake8 warnings