removed most redundant imports
Merge pull request #382 from cpelley/flakeall

Removed most redundant imports