Cleanup imports
Merge pull request #26 from simark/cleanup

Cleanup imports