Cleanup import statements
Merge pull request #254 from massie/optimize-imports

Cleanup import statements