More import cleanup
Merge pull request #1148 from rhyolight/optimize-imports

More import cleanup