Remove unused imports (and in the process kick the build to get a perf run)