Cleaned up some unused imports. Commit for v0.9dev