PEP-8 Fix for travis

Attempt to fix build script complaints about PEP-8 long lines and unused imports

- Removed imports
- Removed unused variables that didn't change method signatures
- Refactored long lines
One more PEP-8 refactor
merged