Fixing CARBON-14914, removing unused imports.