Clean up imports
Merge pull request #110 from kurtisnelson/upstream-dev

Clean up imports