Work on #332. Remove unused imports.