clean up imports
Merge pull request #358 from wraithan/master

Clean up imports