Fix flake8 warnings
Remove unused code
Merge pull request #56 from chromano/master

Fix flake8 warnings