diff --git a/.eslintrc.js b/.eslintrc.js
index a22b302a72e..06b427f2674 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -140,6 +140,9 @@ See https://handbook.sourcegraph.com/community/faq#is-all-of-sourcegraph-open-so
           'Consider using useTemporarySetting instead of useLocalStorage so settings are synced when users log in elsewhere. More info at https://docs.sourcegraph.com/dev/background-information/web/temporary_settings',
       },
     ],
+    // https://reactjs.org/blog/2020/09/22/introducing-the-new-jsx-transform.html#eslint
+    'react/jsx-uses-react': 'off',
+    'react/react-in-jsx-scope': 'off',
   },
   overrides: [
     {
diff --git a/babel.config.js b/babel.config.js
index 78aac1f79e8..93c1d6904a4 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -48,7 +48,12 @@ module.exports = api => {
         },
       ],
       '@babel/preset-typescript',
-      '@babel/preset-react',
+      [
+        '@babel/preset-react',
+        {
+          runtime: 'automatic',
+        },
+      ],
     ],
     plugins: [['@babel/plugin-transform-typescript', { isTSX: true }], 'babel-plugin-lodash'],
     // Required for d3-array v1.2 (dependency of recharts). See https://github.com/babel/babel/issues/11038
diff --git a/client/branded/src/components/LoaderInput.story.tsx b/client/branded/src/components/LoaderInput.story.tsx
index 8cd3d354886..f1ea11a452d 100644
--- a/client/branded/src/components/LoaderInput.story.tsx
+++ b/client/branded/src/components/LoaderInput.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean } from '@storybook/addon-knobs'
 import { DecoratorFn, Meta, Story } from '@storybook/react'
 
diff --git a/client/branded/src/components/LoaderInput.test.tsx b/client/branded/src/components/LoaderInput.test.tsx
index 0ea859014a2..559c21b17c2 100644
--- a/client/branded/src/components/LoaderInput.test.tsx
+++ b/client/branded/src/components/LoaderInput.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { LoaderInput } from './LoaderInput'
diff --git a/client/branded/src/components/Toggle.story.tsx b/client/branded/src/components/Toggle.story.tsx
index 6f591d25a86..ee077ed0d5d 100644
--- a/client/branded/src/components/Toggle.story.tsx
+++ b/client/branded/src/components/Toggle.story.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import { useState } from 'react'
 
 import { action } from '@storybook/addon-actions'
 import { DecoratorFn, Meta, Story } from '@storybook/react'
diff --git a/client/branded/src/components/Toggle.test.tsx b/client/branded/src/components/Toggle.test.tsx
index 4307d670a3a..5b3737cded6 100644
--- a/client/branded/src/components/Toggle.test.tsx
+++ b/client/branded/src/components/Toggle.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import sinon from 'sinon'
diff --git a/client/branded/src/components/ToggleBig.story.tsx b/client/branded/src/components/ToggleBig.story.tsx
index 157c68fad96..4e61b102fef 100644
--- a/client/branded/src/components/ToggleBig.story.tsx
+++ b/client/branded/src/components/ToggleBig.story.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import { useState } from 'react'
 
 import { action } from '@storybook/addon-actions'
 import { DecoratorFn, Meta, Story } from '@storybook/react'
diff --git a/client/branded/src/components/ToggleBig.test.tsx b/client/branded/src/components/ToggleBig.test.tsx
index 854a5fae123..37739a3617a 100644
--- a/client/branded/src/components/ToggleBig.test.tsx
+++ b/client/branded/src/components/ToggleBig.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import sinon from 'sinon'
diff --git a/client/branded/src/components/alerts.test.tsx b/client/branded/src/components/alerts.test.tsx
index 962e1db5947..44b0d44f60a 100644
--- a/client/branded/src/components/alerts.test.tsx
+++ b/client/branded/src/components/alerts.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { ErrorAlert } from './alerts'
diff --git a/client/branded/src/components/panel/TabbedPanelContent.story.tsx b/client/branded/src/components/panel/TabbedPanelContent.story.tsx
index a8407b78453..826992ce431 100644
--- a/client/branded/src/components/panel/TabbedPanelContent.story.tsx
+++ b/client/branded/src/components/panel/TabbedPanelContent.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { DecoratorFn, Meta, Story } from '@storybook/react'
 import { noop } from 'lodash'
 import { EMPTY, of } from 'rxjs'
diff --git a/client/branded/src/components/panel/TabbedPanelContent.test.tsx b/client/branded/src/components/panel/TabbedPanelContent.test.tsx
index 12cf5b572e4..48acc05484a 100644
--- a/client/branded/src/components/panel/TabbedPanelContent.test.tsx
+++ b/client/branded/src/components/panel/TabbedPanelContent.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { cleanup, fireEvent } from '@testing-library/react'
 
 import { renderWithBrandedContext } from '@sourcegraph/shared/src/testing'
diff --git a/client/branded/src/components/panel/views/HierarchicalLocationsView.story.tsx b/client/branded/src/components/panel/views/HierarchicalLocationsView.story.tsx
index 893ff8baec3..36a092f5be9 100644
--- a/client/branded/src/components/panel/views/HierarchicalLocationsView.story.tsx
+++ b/client/branded/src/components/panel/views/HierarchicalLocationsView.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { DecoratorFn, Meta, Story } from '@storybook/react'
 import * as H from 'history'
 import { of } from 'rxjs'
diff --git a/client/branded/src/components/panel/views/HierarchicalLocationsView.test.tsx b/client/branded/src/components/panel/views/HierarchicalLocationsView.test.tsx
index cbdc25a6415..ecb9d34a1d9 100644
--- a/client/branded/src/components/panel/views/HierarchicalLocationsView.test.tsx
+++ b/client/branded/src/components/panel/views/HierarchicalLocationsView.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 import * as H from 'history'
 import { noop } from 'lodash'
diff --git a/client/branded/src/global-styles/GlobalStylesStory/GlobalStyles.story.tsx b/client/branded/src/global-styles/GlobalStylesStory/GlobalStyles.story.tsx
index f8352904fdb..123a0d8116c 100644
--- a/client/branded/src/global-styles/GlobalStylesStory/GlobalStyles.story.tsx
+++ b/client/branded/src/global-styles/GlobalStylesStory/GlobalStyles.story.tsx
@@ -2,7 +2,7 @@
 // documentation of all the Bootstrap classes we have available in our app, please see refer to the Bootstrap
 // documentation for that. Its primary purpose is to show what Bootstrap's componenents look like with our styling
 // customizations.
-import React, { useState } from 'react'
+import { useState } from 'react'
 
 import { action } from '@storybook/addon-actions'
 import { number } from '@storybook/addon-knobs'
diff --git a/client/branded/tsconfig.json b/client/branded/tsconfig.json
index 5a2a58e541a..b408c072821 100644
--- a/client/branded/tsconfig.json
+++ b/client/branded/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "jsx": "react",
+    "jsx": "react-jsx",
     "module": "esnext",
     "sourceRoot": "src",
     "baseUrl": ".",
diff --git a/client/browser/src/browser-extension/ThemeWrapper.tsx b/client/browser/src/browser-extension/ThemeWrapper.tsx
index bda3c5ddf12..6957b6efe2b 100644
--- a/client/browser/src/browser-extension/ThemeWrapper.tsx
+++ b/client/browser/src/browser-extension/ThemeWrapper.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from 'react'
+import { useEffect, useMemo, useState } from 'react'
 
 import { ThemeProps } from '@sourcegraph/shared/src/theme'
 
diff --git a/client/browser/src/browser-extension/after-install-page/AfterInstallPageContent.story.tsx b/client/browser/src/browser-extension/after-install-page/AfterInstallPageContent.story.tsx
index a16350a80b2..2af2d85d1a3 100644
--- a/client/browser/src/browser-extension/after-install-page/AfterInstallPageContent.story.tsx
+++ b/client/browser/src/browser-extension/after-install-page/AfterInstallPageContent.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 
 import { BrandedStory } from '@sourcegraph/branded/src/components/BrandedStory'
diff --git a/client/browser/src/shared/code-hosts/github/codeHost.tsx b/client/browser/src/shared/code-hosts/github/codeHost.tsx
index 4282b3afb3c..410f8f2a3de 100644
--- a/client/browser/src/shared/code-hosts/github/codeHost.tsx
+++ b/client/browser/src/shared/code-hosts/github/codeHost.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import classNames from 'classnames'
 import { trimStart } from 'lodash'
 import { render } from 'react-dom'
diff --git a/client/browser/src/shared/code-hosts/shared/ViewOnSourcegraphButton.test.tsx b/client/browser/src/shared/code-hosts/shared/ViewOnSourcegraphButton.test.tsx
index 21547562f2f..2cc38a12883 100644
--- a/client/browser/src/shared/code-hosts/shared/ViewOnSourcegraphButton.test.tsx
+++ b/client/browser/src/shared/code-hosts/shared/ViewOnSourcegraphButton.test.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react'
-
 import { render } from '@testing-library/react'
 import { noop } from 'lodash'
 
diff --git a/client/browser/src/shared/code-hosts/shared/extensions.tsx b/client/browser/src/shared/code-hosts/shared/extensions.tsx
index ac16ee65c3b..8414232e8ae 100644
--- a/client/browser/src/shared/code-hosts/shared/extensions.tsx
+++ b/client/browser/src/shared/code-hosts/shared/extensions.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react'
-
 import classNames from 'classnames'
 import * as H from 'history'
 import { isEqual } from 'lodash'
diff --git a/client/browser/tsconfig.json b/client/browser/tsconfig.json
index 99fd9c3c28c..4581e6dfd23 100644
--- a/client/browser/tsconfig.json
+++ b/client/browser/tsconfig.json
@@ -15,7 +15,7 @@
     "paths": {
       "*": ["src/types/*", "../shared/src/types/*", "../common/src/types/*", "*"],
     },
-    "jsx": "react",
+    "jsx": "react-jsx",
     "resolveJsonModule": true,
     "rootDir": ".",
     "outDir": "out",
diff --git a/client/client-api/tsconfig.json b/client/client-api/tsconfig.json
index 56ed00118ad..65efcdd9206 100644
--- a/client/client-api/tsconfig.json
+++ b/client/client-api/tsconfig.json
@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "references": [{ "path": "../common" }],
   "compilerOptions": {
-    "jsx": "react",
+    "jsx": "react-jsx",
     "module": "commonjs",
     "sourceRoot": "src",
     "rootDir": ".",
diff --git a/client/search-ui/src/components/SyntaxHighlightedSearchQuery.story.tsx b/client/search-ui/src/components/SyntaxHighlightedSearchQuery.story.tsx
index 63e57d3c8a7..005a0a93169 100644
--- a/client/search-ui/src/components/SyntaxHighlightedSearchQuery.story.tsx
+++ b/client/search-ui/src/components/SyntaxHighlightedSearchQuery.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { BrandedStory } from '@sourcegraph/branded/src/components/BrandedStory'
diff --git a/client/search-ui/src/components/SyntaxHighlightedSearchQuery.test.tsx b/client/search-ui/src/components/SyntaxHighlightedSearchQuery.test.tsx
index e12a038c5c8..4efa992549e 100644
--- a/client/search-ui/src/components/SyntaxHighlightedSearchQuery.test.tsx
+++ b/client/search-ui/src/components/SyntaxHighlightedSearchQuery.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { SyntaxHighlightedSearchQuery } from './SyntaxHighlightedSearchQuery'
diff --git a/client/search-ui/src/input/LazyMonacoQueryInput.test.tsx b/client/search-ui/src/input/LazyMonacoQueryInput.test.tsx
index 841a0214672..fbb64eb3361 100644
--- a/client/search-ui/src/input/LazyMonacoQueryInput.test.tsx
+++ b/client/search-ui/src/input/LazyMonacoQueryInput.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 import { noop } from 'lodash'
 
diff --git a/client/search-ui/src/input/MonacoQueryInput.story.tsx b/client/search-ui/src/input/MonacoQueryInput.story.tsx
index 8cb2bbaf0db..8583979ef70 100644
--- a/client/search-ui/src/input/MonacoQueryInput.story.tsx
+++ b/client/search-ui/src/input/MonacoQueryInput.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { BrandedStory } from '@sourcegraph/branded/src/components/BrandedStory'
diff --git a/client/search-ui/src/input/SearchBox.story.tsx b/client/search-ui/src/input/SearchBox.story.tsx
index 1cc467d9f65..b4bae965b82 100644
--- a/client/search-ui/src/input/SearchBox.story.tsx
+++ b/client/search-ui/src/input/SearchBox.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { BrandedStory } from '@sourcegraph/branded/src/components/BrandedStory'
diff --git a/client/search-ui/src/input/SearchContextCtaPrompt.story.tsx b/client/search-ui/src/input/SearchContextCtaPrompt.story.tsx
index 62be03b8aa3..5a950c742ac 100644
--- a/client/search-ui/src/input/SearchContextCtaPrompt.story.tsx
+++ b/client/search-ui/src/input/SearchContextCtaPrompt.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { BrandedStory } from '@sourcegraph/branded/src/components/BrandedStory'
diff --git a/client/search-ui/src/input/SearchContextDropdown.test.tsx b/client/search-ui/src/input/SearchContextDropdown.test.tsx
index 464d081a530..09c219856bd 100644
--- a/client/search-ui/src/input/SearchContextDropdown.test.tsx
+++ b/client/search-ui/src/input/SearchContextDropdown.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { act } from 'react-dom/test-utils'
diff --git a/client/search-ui/src/input/SearchContextMenu.story.tsx b/client/search-ui/src/input/SearchContextMenu.story.tsx
index 451dbe4f99a..24a9e1f6e59 100644
--- a/client/search-ui/src/input/SearchContextMenu.story.tsx
+++ b/client/search-ui/src/input/SearchContextMenu.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { Observable, of } from 'rxjs'
 
diff --git a/client/search-ui/src/input/SearchContextMenu.test.tsx b/client/search-ui/src/input/SearchContextMenu.test.tsx
index a75c64a1565..46006c505b9 100644
--- a/client/search-ui/src/input/SearchContextMenu.test.tsx
+++ b/client/search-ui/src/input/SearchContextMenu.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { act } from 'react-dom/test-utils'
diff --git a/client/search-ui/src/input/SearchContextMenuItem.story.tsx b/client/search-ui/src/input/SearchContextMenuItem.story.tsx
index 57d8a8146a2..1b47c331ffe 100644
--- a/client/search-ui/src/input/SearchContextMenuItem.story.tsx
+++ b/client/search-ui/src/input/SearchContextMenuItem.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
 
diff --git a/client/search-ui/src/input/toggles/Toggles.test.tsx b/client/search-ui/src/input/toggles/Toggles.test.tsx
index 74fca304618..b6befec832e 100644
--- a/client/search-ui/src/input/toggles/Toggles.test.tsx
+++ b/client/search-ui/src/input/toggles/Toggles.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { screen } from '@testing-library/react'
 
 import { SearchPatternType } from '@sourcegraph/shared/src/schema'
diff --git a/client/search-ui/src/results/progress/StreamingProgress.story.tsx b/client/search-ui/src/results/progress/StreamingProgress.story.tsx
index 51de0c84116..bbedf2adec1 100644
--- a/client/search-ui/src/results/progress/StreamingProgress.story.tsx
+++ b/client/search-ui/src/results/progress/StreamingProgress.story.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import sinon from 'sinon'
 
diff --git a/client/search-ui/src/results/progress/StreamingProgressCount.test.tsx b/client/search-ui/src/results/progress/StreamingProgressCount.test.tsx
index ab0e5bc8d34..8ebe1b80d41 100644
--- a/client/search-ui/src/results/progress/StreamingProgressCount.test.tsx
+++ b/client/search-ui/src/results/progress/StreamingProgressCount.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { Progress } from '@sourcegraph/shared/src/search/stream'
diff --git a/client/search-ui/src/results/progress/StreamingProgressSkippedButton.test.tsx b/client/search-ui/src/results/progress/StreamingProgressSkippedButton.test.tsx
index ba0207cea44..8b15c48002f 100644
--- a/client/search-ui/src/results/progress/StreamingProgressSkippedButton.test.tsx
+++ b/client/search-ui/src/results/progress/StreamingProgressSkippedButton.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import sinon from 'sinon'
diff --git a/client/search-ui/src/results/progress/StreamingProgressSkippedPopover.story.tsx b/client/search-ui/src/results/progress/StreamingProgressSkippedPopover.story.tsx
index eb99ad20cfa..7452943efb0 100644
--- a/client/search-ui/src/results/progress/StreamingProgressSkippedPopover.story.tsx
+++ b/client/search-ui/src/results/progress/StreamingProgressSkippedPopover.story.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { BrandedStory } from '@sourcegraph/branded/src/components/BrandedStory'
diff --git a/client/search-ui/src/results/progress/StreamingProgressSkippedPopover.test.tsx b/client/search-ui/src/results/progress/StreamingProgressSkippedPopover.test.tsx
index 8e63c719f33..1028dc89671 100644
--- a/client/search-ui/src/results/progress/StreamingProgressSkippedPopover.test.tsx
+++ b/client/search-ui/src/results/progress/StreamingProgressSkippedPopover.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { screen, within } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import sinon from 'sinon'
diff --git a/client/search-ui/src/results/sidebar/FilterLink.test.tsx b/client/search-ui/src/results/sidebar/FilterLink.test.tsx
index 1d3aac075d4..245ed8a11a7 100644
--- a/client/search-ui/src/results/sidebar/FilterLink.test.tsx
+++ b/client/search-ui/src/results/sidebar/FilterLink.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import sinon from 'sinon'
diff --git a/client/search-ui/src/results/sidebar/QuickLink.test.tsx b/client/search-ui/src/results/sidebar/QuickLink.test.tsx
index a4b0a774240..215535ac907 100644
--- a/client/search-ui/src/results/sidebar/QuickLink.test.tsx
+++ b/client/search-ui/src/results/sidebar/QuickLink.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { QuickLink } from '@sourcegraph/shared/src/schema/settings.schema'
 import { renderWithBrandedContext } from '@sourcegraph/shared/src/testing'
 
diff --git a/client/search-ui/src/results/sidebar/SearchSidebar.story.tsx b/client/search-ui/src/results/sidebar/SearchSidebar.story.tsx
index 60526c13c84..89f37a8adb3 100644
--- a/client/search-ui/src/results/sidebar/SearchSidebar.story.tsx
+++ b/client/search-ui/src/results/sidebar/SearchSidebar.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 // We need to import `create` to make a mock store just for this story.
 // eslint-disable-next-line no-restricted-imports
diff --git a/client/search-ui/src/results/sidebar/SearchSidebarSection.test.tsx b/client/search-ui/src/results/sidebar/SearchSidebarSection.test.tsx
index 11c9cb779c6..19dc946ebab 100644
--- a/client/search-ui/src/results/sidebar/SearchSidebarSection.test.tsx
+++ b/client/search-ui/src/results/sidebar/SearchSidebarSection.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import sinon from 'sinon'
diff --git a/client/search-ui/tsconfig.json b/client/search-ui/tsconfig.json
index f8c1968e8d9..a16431c3ba3 100644
--- a/client/search-ui/tsconfig.json
+++ b/client/search-ui/tsconfig.json
@@ -6,7 +6,7 @@
     "rootDir": ".",
     "outDir": "./out",
     "baseUrl": "./src",
-    "jsx": "react",
+    "jsx": "react-jsx",
   },
   "include": ["./src/**/*", "./*.ts"],
   "exclude": ["../../node_modules", "./node_modules", "./out"],
diff --git a/client/search/tsconfig.json b/client/search/tsconfig.json
index 3c21fd91c25..7485d1825a1 100644
--- a/client/search/tsconfig.json
+++ b/client/search/tsconfig.json
@@ -6,7 +6,7 @@
     "rootDir": ".",
     "outDir": "./out",
     "baseUrl": "./src",
-    "jsx": "react",
+    "jsx": "react-jsx",
   },
   "include": ["./src/**/*", "./*.ts"],
   "exclude": ["../../node_modules", "./node_modules", "./out"],
diff --git a/client/shared/src/actions/ActionItem.story.tsx b/client/shared/src/actions/ActionItem.story.tsx
index f32790d06f0..f78f9f67766 100644
--- a/client/shared/src/actions/ActionItem.story.tsx
+++ b/client/shared/src/actions/ActionItem.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { action } from '@storybook/addon-actions'
 import { DecoratorFn, Meta, Story } from '@storybook/react'
 import * as H from 'history'
diff --git a/client/shared/src/actions/ActionItem.test.tsx b/client/shared/src/actions/ActionItem.test.tsx
index e5284db246f..ba9b9373d42 100644
--- a/client/shared/src/actions/ActionItem.test.tsx
+++ b/client/shared/src/actions/ActionItem.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import * as H from 'history'
diff --git a/client/shared/src/actions/ActionsNavItems.test.tsx b/client/shared/src/actions/ActionsNavItems.test.tsx
index 599dbaee1fe..d1681a7f4ab 100644
--- a/client/shared/src/actions/ActionsNavItems.test.tsx
+++ b/client/shared/src/actions/ActionsNavItems.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, act, RenderResult } from '@testing-library/react'
 import * as H from 'history'
 import { of, NEVER } from 'rxjs'
diff --git a/client/shared/src/components/CtaAlert.story.tsx b/client/shared/src/components/CtaAlert.story.tsx
index 9e241d55973..344db761b18 100644
--- a/client/shared/src/components/CtaAlert.story.tsx
+++ b/client/shared/src/components/CtaAlert.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { DecoratorFn, Meta, Story } from '@storybook/react'
 
 // eslint-disable-next-line no-restricted-imports
diff --git a/client/shared/src/components/FileMatch.test.tsx b/client/shared/src/components/FileMatch.test.tsx
index 65059d653df..a42cf1f612c 100644
--- a/client/shared/src/components/FileMatch.test.tsx
+++ b/client/shared/src/components/FileMatch.test.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react'
-
 import { cleanup, getAllByTestId, getByTestId } from '@testing-library/react'
 import { createBrowserHistory } from 'history'
 import FileIcon from 'mdi-react/FileIcon'
diff --git a/client/shared/src/components/FileMatchChildren.test.tsx b/client/shared/src/components/FileMatchChildren.test.tsx
index 79ab802911a..42d1963feaf 100644
--- a/client/shared/src/components/FileMatchChildren.test.tsx
+++ b/client/shared/src/components/FileMatchChildren.test.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react'
-
 import { cleanup } from '@testing-library/react'
 import * as H from 'history'
 import _VisibilitySensor from 'react-visibility-sensor'
diff --git a/client/shared/src/components/HighlightedMatches.test.tsx b/client/shared/src/components/HighlightedMatches.test.tsx
index c9808a30057..334c4c5ed9e 100644
--- a/client/shared/src/components/HighlightedMatches.test.tsx
+++ b/client/shared/src/components/HighlightedMatches.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { fuzzyMatches, HighlightedMatches, Span } from './HighlightedMatches'
diff --git a/client/shared/src/components/LinkOrSpan.test.tsx b/client/shared/src/components/LinkOrSpan.test.tsx
index 32f899a2882..e93675a6118 100644
--- a/client/shared/src/components/LinkOrSpan.test.tsx
+++ b/client/shared/src/components/LinkOrSpan.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { LinkOrSpan } from './LinkOrSpan'
diff --git a/client/shared/src/components/Markdown.test.tsx b/client/shared/src/components/Markdown.test.tsx
index 19129bafa98..e86f7c9b18b 100644
--- a/client/shared/src/components/Markdown.test.tsx
+++ b/client/shared/src/components/Markdown.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { Markdown } from './Markdown'
diff --git a/client/shared/src/components/Path.test.tsx b/client/shared/src/components/Path.test.tsx
index 35859d585c8..53880691085 100644
--- a/client/shared/src/components/Path.test.tsx
+++ b/client/shared/src/components/Path.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { Path } from './Path'
diff --git a/client/shared/src/components/RepoFileLink.test.tsx b/client/shared/src/components/RepoFileLink.test.tsx
index 4e5094eb868..e657069996c 100644
--- a/client/shared/src/components/RepoFileLink.test.tsx
+++ b/client/shared/src/components/RepoFileLink.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { renderWithBrandedContext } from '../testing'
 
 import { RepoFileLink } from './RepoFileLink'
diff --git a/client/shared/src/components/RepoLink.test.tsx b/client/shared/src/components/RepoLink.test.tsx
index bb381b75c3e..0b32e0be719 100644
--- a/client/shared/src/components/RepoLink.test.tsx
+++ b/client/shared/src/components/RepoLink.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { RepoLink } from './RepoLink'
diff --git a/client/shared/src/components/ResultContainer.test.tsx b/client/shared/src/components/ResultContainer.test.tsx
index 0e86315823f..cb64851e797 100644
--- a/client/shared/src/components/ResultContainer.test.tsx
+++ b/client/shared/src/components/ResultContainer.test.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react'
-
 import { cleanup, fireEvent, getByTestId, getByText } from '@testing-library/react'
 import * as H from 'history'
 import FileIcon from 'mdi-react/FileIcon'
diff --git a/client/shared/src/components/activation/ActivationChecklist.test.tsx b/client/shared/src/components/activation/ActivationChecklist.test.tsx
index 9be24a06670..97a5eb43e73 100644
--- a/client/shared/src/components/activation/ActivationChecklist.test.tsx
+++ b/client/shared/src/components/activation/ActivationChecklist.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { renderWithBrandedContext } from '../../testing'
 
 import { ActivationChecklist } from './ActivationChecklist'
diff --git a/client/shared/src/components/utils/linkClickHandler.test.tsx b/client/shared/src/components/utils/linkClickHandler.test.tsx
index b13ae64eedc..0cd9fa719a0 100644
--- a/client/shared/src/components/utils/linkClickHandler.test.tsx
+++ b/client/shared/src/components/utils/linkClickHandler.test.tsx
@@ -1,7 +1,5 @@
 import assert from 'assert'
 
-import React from 'react'
-
 import { createMemoryHistory } from 'history'
 import ReactDOM from 'react-dom'
 import * as sinon from 'sinon'
diff --git a/client/shared/src/hover/HoverOverlay.story.tsx b/client/shared/src/hover/HoverOverlay.story.tsx
index 21679cf3745..662fc2c71fa 100644
--- a/client/shared/src/hover/HoverOverlay.story.tsx
+++ b/client/shared/src/hover/HoverOverlay.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import bitbucketStyles from '@atlassian/aui/dist/aui/css/aui.css'
 import { DecoratorFn, Meta, Story } from '@storybook/react'
 import classNames from 'classnames'
diff --git a/client/shared/src/hover/HoverOverlay.test.tsx b/client/shared/src/hover/HoverOverlay.test.tsx
index 1e3a56a924e..0c796bbb01d 100644
--- a/client/shared/src/hover/HoverOverlay.test.tsx
+++ b/client/shared/src/hover/HoverOverlay.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 import * as H from 'history'
 import { NEVER } from 'rxjs'
diff --git a/client/shared/src/keyboardShortcuts/KeyboardShortcutsHelp.test.tsx b/client/shared/src/keyboardShortcuts/KeyboardShortcutsHelp.test.tsx
index bb3eaa9140b..80837eb2fc6 100644
--- a/client/shared/src/keyboardShortcuts/KeyboardShortcutsHelp.test.tsx
+++ b/client/shared/src/keyboardShortcuts/KeyboardShortcutsHelp.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { ShortcutProvider } from '@slimsag/react-shortcuts'
 import { fireEvent, waitFor, screen } from '@testing-library/react'
 
diff --git a/client/shared/src/notifications/NotificationItem.story.tsx b/client/shared/src/notifications/NotificationItem.story.tsx
index 0310e99a82a..be960797196 100644
--- a/client/shared/src/notifications/NotificationItem.story.tsx
+++ b/client/shared/src/notifications/NotificationItem.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { action } from '@storybook/addon-actions'
 import { number, select, text } from '@storybook/addon-knobs'
 import { DecoratorFn, Meta, Story } from '@storybook/react'
diff --git a/client/shared/src/settings/temporary/useTemporarySetting.test.tsx b/client/shared/src/settings/temporary/useTemporarySetting.test.tsx
index 009bd80aabc..c40bb9f3611 100644
--- a/client/shared/src/settings/temporary/useTemporarySetting.test.tsx
+++ b/client/shared/src/settings/temporary/useTemporarySetting.test.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react'
+import { useEffect } from 'react'
 
 import { gql } from '@apollo/client'
 import { createMockClient } from '@apollo/client/testing'
diff --git a/client/shared/src/testing/render-with-branded-context.tsx b/client/shared/src/testing/render-with-branded-context.tsx
index 1a20b1a968e..fc788d9a982 100644
--- a/client/shared/src/testing/render-with-branded-context.tsx
+++ b/client/shared/src/testing/render-with-branded-context.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react'
+import { ReactNode } from 'react'
 
 import { RenderResult, render } from '@testing-library/react'
 import { MemoryHistory, createMemoryHistory } from 'history'
diff --git a/client/shared/tsconfig.json b/client/shared/tsconfig.json
index b3dac3a9f88..118db7c9360 100644
--- a/client/shared/tsconfig.json
+++ b/client/shared/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "jsx": "react",
+    "jsx": "react-jsx",
     "module": "esnext",
     "sourceRoot": "src",
     "baseUrl": ".",
diff --git a/client/storybook/tsconfig.json b/client/storybook/tsconfig.json
index d20d27cb6f1..d737498a401 100644
--- a/client/storybook/tsconfig.json
+++ b/client/storybook/tsconfig.json
@@ -6,7 +6,7 @@
     "rootDir": ".",
     "outDir": "./out",
     "baseUrl": "./src",
-    "jsx": "react",
+    "jsx": "react-jsx",
   },
   "references": [{ "path": "../shared" }, { "path": "../build-config" }, { "path": "../http-client" }],
   "include": ["./src/**/*", "./*.ts"],
diff --git a/client/vscode/tsconfig.json b/client/vscode/tsconfig.json
index a0f6dd9dffb..f4abecd9e22 100644
--- a/client/vscode/tsconfig.json
+++ b/client/vscode/tsconfig.json
@@ -13,7 +13,7 @@
     "esModuleInterop": true,
     "resolveJsonModule": true,
     "strict": true,
-    "jsx": "react",
+    "jsx": "react-jsx",
   },
   "references": [
     { "path": "../shared" },
diff --git a/client/web/src/IdeExtensionTracker.test.tsx b/client/web/src/IdeExtensionTracker.test.tsx
index 8c32597b4bf..dc55da97ca2 100644
--- a/client/web/src/IdeExtensionTracker.test.tsx
+++ b/client/web/src/IdeExtensionTracker.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { cleanup, render } from '@testing-library/react'
 import { MemoryRouter } from 'react-router-dom'
 
diff --git a/client/web/src/Layout.test.tsx b/client/web/src/Layout.test.tsx
index af4fd501992..73cadff5bce 100644
--- a/client/web/src/Layout.test.tsx
+++ b/client/web/src/Layout.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 import { createBrowserHistory } from 'history'
 import { BrowserRouter } from 'react-router-dom'
diff --git a/client/web/src/auth/CloudSignUpPage.story.tsx b/client/web/src/auth/CloudSignUpPage.story.tsx
index f2856ce6f84..47fb72edc00 100644
--- a/client/web/src/auth/CloudSignUpPage.story.tsx
+++ b/client/web/src/auth/CloudSignUpPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import sinon from 'sinon'
 
diff --git a/client/web/src/auth/OrDivider.story.tsx b/client/web/src/auth/OrDivider.story.tsx
index 6d3d734d503..229a5548d4f 100644
--- a/client/web/src/auth/OrDivider.story.tsx
+++ b/client/web/src/auth/OrDivider.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { Card } from '@sourcegraph/wildcard'
diff --git a/client/web/src/auth/SignInPage.test.tsx b/client/web/src/auth/SignInPage.test.tsx
index 203da88ab7a..6a15c1cd075 100644
--- a/client/web/src/auth/SignInPage.test.tsx
+++ b/client/web/src/auth/SignInPage.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { createMemoryHistory, createLocation } from 'history'
 import { MemoryRouter } from 'react-router'
 
diff --git a/client/web/src/auth/SignUpPage.test.tsx b/client/web/src/auth/SignUpPage.test.tsx
index e7ef0c776ec..8f1d756524c 100644
--- a/client/web/src/auth/SignUpPage.test.tsx
+++ b/client/web/src/auth/SignUpPage.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { createMemoryHistory, createLocation } from 'history'
 import { MemoryRouter } from 'react-router'
 
diff --git a/client/web/src/auth/Steps/Steps.story.tsx b/client/web/src/auth/Steps/Steps.story.tsx
index b11792b46b1..669b9ef05e8 100644
--- a/client/web/src/auth/Steps/Steps.story.tsx
+++ b/client/web/src/auth/Steps/Steps.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 
 import { BrandedStory } from '@sourcegraph/branded/src/components/BrandedStory'
diff --git a/client/web/src/auth/Steps/Steps.test.tsx b/client/web/src/auth/Steps/Steps.test.tsx
index f817971de72..5ce6127d27a 100644
--- a/client/web/src/auth/Steps/Steps.test.tsx
+++ b/client/web/src/auth/Steps/Steps.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, RenderResult, cleanup } from '@testing-library/react'
 import sinon from 'sinon'
 
diff --git a/client/web/src/auth/TosConsentModal.story.tsx b/client/web/src/auth/TosConsentModal.story.tsx
index 31b97951a24..c629b5e7d2b 100644
--- a/client/web/src/auth/TosConsentModal.story.tsx
+++ b/client/web/src/auth/TosConsentModal.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { WebStory } from '../components/WebStory'
diff --git a/client/web/src/auth/TosConsentModal.test.tsx b/client/web/src/auth/TosConsentModal.test.tsx
index be4b0711754..a87806609a5 100644
--- a/client/web/src/auth/TosConsentModal.test.tsx
+++ b/client/web/src/auth/TosConsentModal.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { MockedProvider } from '@apollo/client/testing'
 import { fireEvent, render } from '@testing-library/react'
 import * as sinon from 'sinon'
diff --git a/client/web/src/batches/RepoBatchChangesButton.story.tsx b/client/web/src/batches/RepoBatchChangesButton.story.tsx
index 21cbbea6f39..b4ce67dcc18 100644
--- a/client/web/src/batches/RepoBatchChangesButton.story.tsx
+++ b/client/web/src/batches/RepoBatchChangesButton.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { number } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
 import { of } from 'rxjs'
diff --git a/client/web/src/batches/RepoBatchChangesButton.tsx b/client/web/src/batches/RepoBatchChangesButton.tsx
index 5fd4c1d6752..92d58a9a751 100644
--- a/client/web/src/batches/RepoBatchChangesButton.tsx
+++ b/client/web/src/batches/RepoBatchChangesButton.tsx
@@ -1,4 +1,4 @@
-import React, { FC, useMemo } from 'react'
+import { FC, useMemo } from 'react'
 
 import { encodeURIPathComponent } from '@sourcegraph/common'
 import { Badge, useObservable, Button, Link, Icon } from '@sourcegraph/wildcard'
diff --git a/client/web/src/charts/components/line-chart/LineChart.story.tsx b/client/web/src/charts/components/line-chart/LineChart.story.tsx
index 32af5e5da42..28442a4ad61 100644
--- a/client/web/src/charts/components/line-chart/LineChart.story.tsx
+++ b/client/web/src/charts/components/line-chart/LineChart.story.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import { useState } from 'react'
 
 import { Meta, Story } from '@storybook/react'
 import { ParentSize } from '@visx/responsive'
diff --git a/client/web/src/charts/components/line-chart/LineChart.tsx b/client/web/src/charts/components/line-chart/LineChart.tsx
index c276f2449ea..522b4fb4209 100644
--- a/client/web/src/charts/components/line-chart/LineChart.tsx
+++ b/client/web/src/charts/components/line-chart/LineChart.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement, useMemo, useState, SVGProps } from 'react'
+import { ReactElement, useMemo, useState, SVGProps } from 'react'
 
 import { curveLinear } from '@visx/curve'
 import { Group } from '@visx/group'
diff --git a/client/web/src/charts/components/line-chart/components/axis/Axis.tsx b/client/web/src/charts/components/line-chart/components/axis/Axis.tsx
index b1e22765a51..4f329a5e49d 100644
--- a/client/web/src/charts/components/line-chart/components/axis/Axis.tsx
+++ b/client/web/src/charts/components/line-chart/components/axis/Axis.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef, memo } from 'react'
+import { forwardRef, memo } from 'react'
 
 import { AxisLeft as VisxAxisLeft, AxisBottom as VisxAsixBottom } from '@visx/axis'
 import { AxisScale } from '@visx/axis/lib/types'
diff --git a/client/web/src/charts/components/line-chart/components/tooltip/TooltipContent.story.tsx b/client/web/src/charts/components/line-chart/components/tooltip/TooltipContent.story.tsx
index 7b17aff80d6..f53c77f77d2 100644
--- a/client/web/src/charts/components/line-chart/components/tooltip/TooltipContent.story.tsx
+++ b/client/web/src/charts/components/line-chart/components/tooltip/TooltipContent.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 
 import { WebStory } from '../../../../../components/WebStory'
diff --git a/client/web/src/charts/components/line-chart/components/tooltip/TooltipContent.tsx b/client/web/src/charts/components/line-chart/components/tooltip/TooltipContent.tsx
index 019fd95a64b..1207c90e97d 100644
--- a/client/web/src/charts/components/line-chart/components/tooltip/TooltipContent.tsx
+++ b/client/web/src/charts/components/line-chart/components/tooltip/TooltipContent.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement, useMemo } from 'react'
+import { ReactElement, useMemo } from 'react'
 
 import { isDefined } from '@sourcegraph/common'
 
diff --git a/client/web/src/charts/components/pie-chart/PieChart.story.tsx b/client/web/src/charts/components/pie-chart/PieChart.story.tsx
index e0484bf6a60..93387cf48f4 100644
--- a/client/web/src/charts/components/pie-chart/PieChart.story.tsx
+++ b/client/web/src/charts/components/pie-chart/PieChart.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 
 import { WebStory } from '../../../components/WebStory'
diff --git a/client/web/src/charts/components/pie-chart/PieChart.tsx b/client/web/src/charts/components/pie-chart/PieChart.tsx
index 5828e70e5bb..0c299f514a8 100644
--- a/client/web/src/charts/components/pie-chart/PieChart.tsx
+++ b/client/web/src/charts/components/pie-chart/PieChart.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement, SVGProps, useMemo, useState } from 'react'
+import { ReactElement, SVGProps, useMemo, useState } from 'react'
 
 import { Group } from '@visx/group'
 import Pie, { PieArcDatum } from '@visx/shape/lib/shapes/Pie'
diff --git a/client/web/src/charts/components/pie-chart/components/PieArc.tsx b/client/web/src/charts/components/pie-chart/components/PieArc.tsx
index 4ed06c66c75..02f37aaae6f 100644
--- a/client/web/src/charts/components/pie-chart/components/PieArc.tsx
+++ b/client/web/src/charts/components/pie-chart/components/PieArc.tsx
@@ -1,4 +1,4 @@
-import React, { PointerEventHandler, ReactElement } from 'react'
+import { PointerEventHandler, ReactElement } from 'react'
 
 import { Annotation, HtmlLabel, Connector } from '@visx/annotation'
 import { Group } from '@visx/group'
diff --git a/client/web/src/codeintel/RepositoryMenu.story.tsx b/client/web/src/codeintel/RepositoryMenu.story.tsx
index 5f130221251..36edbf48080 100644
--- a/client/web/src/codeintel/RepositoryMenu.story.tsx
+++ b/client/web/src/codeintel/RepositoryMenu.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { WebStory } from '../components/WebStory'
diff --git a/client/web/src/communitySearchContexts/CommunitySearchContextPage.story.tsx b/client/web/src/communitySearchContexts/CommunitySearchContextPage.story.tsx
index 7bde893d38b..8b32517ea3d 100644
--- a/client/web/src/communitySearchContexts/CommunitySearchContextPage.story.tsx
+++ b/client/web/src/communitySearchContexts/CommunitySearchContextPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { action } from '@storybook/addon-actions'
 import { storiesOf } from '@storybook/react'
 import { subDays } from 'date-fns'
diff --git a/client/web/src/communitySearchContexts/routes.tsx b/client/web/src/communitySearchContexts/routes.tsx
index 030fb898ce3..a97741d50bf 100644
--- a/client/web/src/communitySearchContexts/routes.tsx
+++ b/client/web/src/communitySearchContexts/routes.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react'
-
 import { lazyComponent } from '@sourcegraph/shared/src/util/lazyComponent'
 
 import { LayoutRouteProps } from '../routes'
diff --git a/client/web/src/components/ActivationDropdown/ActivationDropdown.story.tsx b/client/web/src/components/ActivationDropdown/ActivationDropdown.story.tsx
index 967d51fcc0f..bbb850a3e68 100644
--- a/client/web/src/components/ActivationDropdown/ActivationDropdown.story.tsx
+++ b/client/web/src/components/ActivationDropdown/ActivationDropdown.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { action } from '@storybook/addon-actions'
 import { boolean } from '@storybook/addon-knobs'
 import { DecoratorFn, Meta, Story } from '@storybook/react'
diff --git a/client/web/src/components/ActivationDropdown/ActivationDropdown.test.tsx b/client/web/src/components/ActivationDropdown/ActivationDropdown.test.tsx
index ee76ba88b38..42d81e3f869 100644
--- a/client/web/src/components/ActivationDropdown/ActivationDropdown.test.tsx
+++ b/client/web/src/components/ActivationDropdown/ActivationDropdown.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 import * as H from 'history'
 import sinon from 'sinon'
diff --git a/client/web/src/components/Breadcrumbs.story.tsx b/client/web/src/components/Breadcrumbs.story.tsx
index 06b32756b0b..51fa9bc71e0 100644
--- a/client/web/src/components/Breadcrumbs.story.tsx
+++ b/client/web/src/components/Breadcrumbs.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { Link } from '@sourcegraph/wildcard'
diff --git a/client/web/src/components/DismissibleAlert/DismissibleAlert.story.tsx b/client/web/src/components/DismissibleAlert/DismissibleAlert.story.tsx
index e4be7258a23..61a87d66b92 100644
--- a/client/web/src/components/DismissibleAlert/DismissibleAlert.story.tsx
+++ b/client/web/src/components/DismissibleAlert/DismissibleAlert.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { Link } from '@sourcegraph/wildcard'
diff --git a/client/web/src/components/FilteredConnection/FilteredConnection.test.tsx b/client/web/src/components/FilteredConnection/FilteredConnection.test.tsx
index b95287190f0..18695761b73 100644
--- a/client/web/src/components/FilteredConnection/FilteredConnection.test.tsx
+++ b/client/web/src/components/FilteredConnection/FilteredConnection.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { createLocation } from 'history'
 import sinon from 'sinon'
diff --git a/client/web/src/components/FilteredConnection/hooks/useConnection.test.tsx b/client/web/src/components/FilteredConnection/hooks/useConnection.test.tsx
index c009e014451..b03a53b04c6 100644
--- a/client/web/src/components/FilteredConnection/hooks/useConnection.test.tsx
+++ b/client/web/src/components/FilteredConnection/hooks/useConnection.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { MockedResponse } from '@apollo/client/testing'
 import { fireEvent } from '@testing-library/react'
 
diff --git a/client/web/src/components/FilteredConnection/ui/ConnectionSummary.tsx b/client/web/src/components/FilteredConnection/ui/ConnectionSummary.tsx
index 6aae6c95a41..8482c6be487 100644
--- a/client/web/src/components/FilteredConnection/ui/ConnectionSummary.tsx
+++ b/client/web/src/components/FilteredConnection/ui/ConnectionSummary.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react'
-
 import classNames from 'classnames'
 
 import { pluralize } from '@sourcegraph/common'
diff --git a/client/web/src/components/LoaderButton.story.tsx b/client/web/src/components/LoaderButton.story.tsx
index 8a17ff628da..1dede715d44 100644
--- a/client/web/src/components/LoaderButton.story.tsx
+++ b/client/web/src/components/LoaderButton.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { LoaderButton } from './LoaderButton'
diff --git a/client/web/src/components/LoaderButton.test.tsx b/client/web/src/components/LoaderButton.test.tsx
index 4a6f2d5e63e..de0833cdb85 100644
--- a/client/web/src/components/LoaderButton.test.tsx
+++ b/client/web/src/components/LoaderButton.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { renderWithBrandedContext } from '@sourcegraph/shared/src/testing'
 
 import { LoaderButton } from './LoaderButton'
diff --git a/client/web/src/components/MarketingBlock/MarketingBlock.story.tsx b/client/web/src/components/MarketingBlock/MarketingBlock.story.tsx
index 4a340a35a9e..c3e7f05a0fe 100644
--- a/client/web/src/components/MarketingBlock/MarketingBlock.story.tsx
+++ b/client/web/src/components/MarketingBlock/MarketingBlock.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { DecoratorFn, Meta } from '@storybook/react'
 import ArrowRightIcon from 'mdi-react/ArrowRightIcon'
 
diff --git a/client/web/src/components/SelfHostedCtaLink/SelfHostedCtaLink.story.tsx b/client/web/src/components/SelfHostedCtaLink/SelfHostedCtaLink.story.tsx
index 894a8466049..d85b92f9691 100644
--- a/client/web/src/components/SelfHostedCtaLink/SelfHostedCtaLink.story.tsx
+++ b/client/web/src/components/SelfHostedCtaLink/SelfHostedCtaLink.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { DecoratorFn, Meta } from '@storybook/react'
 
 import { NOOP_TELEMETRY_SERVICE } from '@sourcegraph/shared/src/telemetry/telemetryService'
diff --git a/client/web/src/components/Timeline.story.tsx b/client/web/src/components/Timeline.story.tsx
index 451a114fc0a..722cd9a01d5 100644
--- a/client/web/src/components/Timeline.story.tsx
+++ b/client/web/src/components/Timeline.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { parseISO } from 'date-fns'
 import AlertCircleIcon from 'mdi-react/AlertCircleIcon'
diff --git a/client/web/src/components/Timeline.tsx b/client/web/src/components/Timeline.tsx
index ad517fe22e8..ef663e7b4c6 100644
--- a/client/web/src/components/Timeline.tsx
+++ b/client/web/src/components/Timeline.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, ReactNode } from 'react'
+import { FunctionComponent, ReactNode } from 'react'
 
 import classNames from 'classnames'
 import { formatDistance } from 'date-fns/esm'
diff --git a/client/web/src/components/WebHoverOverlay/WebHoverOverlay.story.tsx b/client/web/src/components/WebHoverOverlay/WebHoverOverlay.story.tsx
index 8599b356212..da906302f7e 100644
--- a/client/web/src/components/WebHoverOverlay/WebHoverOverlay.story.tsx
+++ b/client/web/src/components/WebHoverOverlay/WebHoverOverlay.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { action } from '@storybook/addon-actions'
 import { storiesOf } from '@storybook/react'
 
diff --git a/client/web/src/components/branding/BrandLogo.test.tsx b/client/web/src/components/branding/BrandLogo.test.tsx
index 6f367818bfd..b737e956c92 100644
--- a/client/web/src/components/branding/BrandLogo.test.tsx
+++ b/client/web/src/components/branding/BrandLogo.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { BrandLogo } from './BrandLogo'
diff --git a/client/web/src/components/diff/DiffHunk.test.tsx b/client/web/src/components/diff/DiffHunk.test.tsx
index 4d4d1832fc2..d75e41e3523 100644
--- a/client/web/src/components/diff/DiffHunk.test.tsx
+++ b/client/web/src/components/diff/DiffHunk.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 import { createMemoryHistory } from 'history'
 import { Router } from 'react-router-dom'
diff --git a/client/web/src/components/diff/DiffSplitHunk.test.tsx b/client/web/src/components/diff/DiffSplitHunk.test.tsx
index 1504b3de141..7564d7534c3 100644
--- a/client/web/src/components/diff/DiffSplitHunk.test.tsx
+++ b/client/web/src/components/diff/DiffSplitHunk.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { cleanup, fireEvent, render, RenderResult } from '@testing-library/react'
 import { createMemoryHistory } from 'history'
 import { Router } from 'react-router'
diff --git a/client/web/src/components/diff/DiffStat.story.tsx b/client/web/src/components/diff/DiffStat.story.tsx
index 79c3f1d93c5..5fb1255de8a 100644
--- a/client/web/src/components/diff/DiffStat.story.tsx
+++ b/client/web/src/components/diff/DiffStat.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { number } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
 
diff --git a/client/web/src/components/diff/DiffStat.test.tsx b/client/web/src/components/diff/DiffStat.test.tsx
index 7425f29845a..876a02b24df 100644
--- a/client/web/src/components/diff/DiffStat.test.tsx
+++ b/client/web/src/components/diff/DiffStat.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { DiffStat, DiffStatSquares, DiffStatStack } from './DiffStat'
diff --git a/client/web/src/components/diff/FileDiffHunks.story.tsx b/client/web/src/components/diff/FileDiffHunks.story.tsx
index 21b0af9f378..bcd0dd309d5 100644
--- a/client/web/src/components/diff/FileDiffHunks.story.tsx
+++ b/client/web/src/components/diff/FileDiffHunks.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
 
diff --git a/client/web/src/components/diff/FileDiffNode.story.tsx b/client/web/src/components/diff/FileDiffNode.story.tsx
index 3c8e8784498..28ad1d5af37 100644
--- a/client/web/src/components/diff/FileDiffNode.story.tsx
+++ b/client/web/src/components/diff/FileDiffNode.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
 
diff --git a/client/web/src/components/externalServices/AddExternalServicesPage.story.tsx b/client/web/src/components/externalServices/AddExternalServicesPage.story.tsx
index 46b7ce1f2d7..4d2ef4b28a7 100644
--- a/client/web/src/components/externalServices/AddExternalServicesPage.story.tsx
+++ b/client/web/src/components/externalServices/AddExternalServicesPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { NOOP_TELEMETRY_SERVICE } from '@sourcegraph/shared/src/telemetry/telemetryService'
diff --git a/client/web/src/components/externalServices/ExternalServiceForm.test.tsx b/client/web/src/components/externalServices/ExternalServiceForm.test.tsx
index 559c612b164..2a89f3a5dc8 100644
--- a/client/web/src/components/externalServices/ExternalServiceForm.test.tsx
+++ b/client/web/src/components/externalServices/ExternalServiceForm.test.tsx
@@ -2,8 +2,6 @@ jest.mock('../../settings/DynamicallyImportedMonacoSettingsEditor', () => ({
     DynamicallyImportedMonacoSettingsEditor: () => 'DynamicallyImportedMonacoSettingsEditor',
 }))
 
-import React from 'react'
-
 import * as H from 'history'
 import { noop } from 'rxjs'
 
diff --git a/client/web/src/components/externalServices/ExternalServicePage.story.tsx b/client/web/src/components/externalServices/ExternalServicePage.story.tsx
index 5067d64f385..d58f1889ea8 100644
--- a/client/web/src/components/externalServices/ExternalServicePage.story.tsx
+++ b/client/web/src/components/externalServices/ExternalServicePage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { of } from 'rxjs'
 
diff --git a/client/web/src/components/externalServices/ExternalServiceWebhook.story.tsx b/client/web/src/components/externalServices/ExternalServiceWebhook.story.tsx
index 1b973db8498..8ee55eb6b2a 100644
--- a/client/web/src/components/externalServices/ExternalServiceWebhook.story.tsx
+++ b/client/web/src/components/externalServices/ExternalServiceWebhook.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { ExternalServiceKind } from '../../graphql-operations'
diff --git a/client/web/src/components/externalServices/ExternalServicesPage.story.tsx b/client/web/src/components/externalServices/ExternalServicesPage.story.tsx
index 1b18299b008..c1bb404b16a 100644
--- a/client/web/src/components/externalServices/ExternalServicesPage.story.tsx
+++ b/client/web/src/components/externalServices/ExternalServicesPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { of } from 'rxjs'
 
diff --git a/client/web/src/components/fuzzyFinder/FuzzyModal.story.tsx b/client/web/src/components/fuzzyFinder/FuzzyModal.story.tsx
index 16d3fc61d3b..30924744f84 100644
--- a/client/web/src/components/fuzzyFinder/FuzzyModal.story.tsx
+++ b/client/web/src/components/fuzzyFinder/FuzzyModal.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { CaseInsensitiveFuzzySearch } from '../../fuzzyFinder/CaseInsensitiveFuzzySearch'
diff --git a/client/web/src/components/time/Timestamp.test.tsx b/client/web/src/components/time/Timestamp.test.tsx
index 0a82997e2ec..c18ea1a89fa 100644
--- a/client/web/src/components/time/Timestamp.test.tsx
+++ b/client/web/src/components/time/Timestamp.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { Timestamp } from './Timestamp'
diff --git a/client/web/src/enterprise/batches/BatchSpecNode.story.tsx b/client/web/src/enterprise/batches/BatchSpecNode.story.tsx
index 5c323ac62b8..48170698004 100644
--- a/client/web/src/enterprise/batches/BatchSpecNode.story.tsx
+++ b/client/web/src/enterprise/batches/BatchSpecNode.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import classNames from 'classnames'
 import { addDays } from 'date-fns'
diff --git a/client/web/src/enterprise/batches/BatchSpecsPage.story.tsx b/client/web/src/enterprise/batches/BatchSpecsPage.story.tsx
index 74064c14120..e2c0c6715d0 100644
--- a/client/web/src/enterprise/batches/BatchSpecsPage.story.tsx
+++ b/client/web/src/enterprise/batches/BatchSpecsPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { addDays } from 'date-fns'
 import { of } from 'rxjs'
diff --git a/client/web/src/enterprise/batches/Branch.story.tsx b/client/web/src/enterprise/batches/Branch.story.tsx
index 1af057b71a6..dab072af029 100644
--- a/client/web/src/enterprise/batches/Branch.story.tsx
+++ b/client/web/src/enterprise/batches/Branch.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { WebStory } from '../../components/WebStory'
diff --git a/client/web/src/enterprise/batches/Description.story.tsx b/client/web/src/enterprise/batches/Description.story.tsx
index 1561c8c5044..3713e74f483 100644
--- a/client/web/src/enterprise/batches/Description.story.tsx
+++ b/client/web/src/enterprise/batches/Description.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { WebStory } from '../../components/WebStory'
diff --git a/client/web/src/enterprise/batches/DropdownButton.story.tsx b/client/web/src/enterprise/batches/DropdownButton.story.tsx
index 606ec5932fa..571a62c84a2 100644
--- a/client/web/src/enterprise/batches/DropdownButton.story.tsx
+++ b/client/web/src/enterprise/batches/DropdownButton.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean, select } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
 
diff --git a/client/web/src/enterprise/batches/close/BatchChangeCloseAlert.story.tsx b/client/web/src/enterprise/batches/close/BatchChangeCloseAlert.story.tsx
index 8f7d92ead3b..cfff8a3a757 100644
--- a/client/web/src/enterprise/batches/close/BatchChangeCloseAlert.story.tsx
+++ b/client/web/src/enterprise/batches/close/BatchChangeCloseAlert.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean, number } from '@storybook/addon-knobs'
 import { useState } from '@storybook/addons'
 import { storiesOf } from '@storybook/react'
diff --git a/client/web/src/enterprise/batches/close/BatchChangeClosePage.story.tsx b/client/web/src/enterprise/batches/close/BatchChangeClosePage.story.tsx
index d13c7f4ffc2..881164713c8 100644
--- a/client/web/src/enterprise/batches/close/BatchChangeClosePage.story.tsx
+++ b/client/web/src/enterprise/batches/close/BatchChangeClosePage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean } from '@storybook/addon-knobs'
 import { useMemo, useCallback } from '@storybook/addons'
 import { storiesOf } from '@storybook/react'
diff --git a/client/web/src/enterprise/batches/create/CreateBatchChangePage.story.tsx b/client/web/src/enterprise/batches/create/CreateBatchChangePage.story.tsx
index 6807afaa1a7..74ed669acd9 100644
--- a/client/web/src/enterprise/batches/create/CreateBatchChangePage.story.tsx
+++ b/client/web/src/enterprise/batches/create/CreateBatchChangePage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import {
diff --git a/client/web/src/enterprise/batches/create/DownloadSpecModal.story.tsx b/client/web/src/enterprise/batches/create/DownloadSpecModal.story.tsx
index 2f253108756..8c68acf7d41 100644
--- a/client/web/src/enterprise/batches/create/DownloadSpecModal.story.tsx
+++ b/client/web/src/enterprise/batches/create/DownloadSpecModal.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { WebStory } from '../../../components/WebStory'
diff --git a/client/web/src/enterprise/batches/create/workspaces-preview/WorkspacesPreview.story.tsx b/client/web/src/enterprise/batches/create/workspaces-preview/WorkspacesPreview.story.tsx
index f03ee5f8134..3e9faa01de4 100644
--- a/client/web/src/enterprise/batches/create/workspaces-preview/WorkspacesPreview.story.tsx
+++ b/client/web/src/enterprise/batches/create/workspaces-preview/WorkspacesPreview.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean, select } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
diff --git a/client/web/src/enterprise/batches/create/workspaces-preview/WorkspacesPreviewListItem.story.tsx b/client/web/src/enterprise/batches/create/workspaces-preview/WorkspacesPreviewListItem.story.tsx
index 43e6837c97f..8080a8ec083 100644
--- a/client/web/src/enterprise/batches/create/workspaces-preview/WorkspacesPreviewListItem.story.tsx
+++ b/client/web/src/enterprise/batches/create/workspaces-preview/WorkspacesPreviewListItem.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
 
diff --git a/client/web/src/enterprise/batches/detail/ActiveExecutionNotice.story.tsx b/client/web/src/enterprise/batches/detail/ActiveExecutionNotice.story.tsx
index 2842cfbdec3..4196e8902f6 100644
--- a/client/web/src/enterprise/batches/detail/ActiveExecutionNotice.story.tsx
+++ b/client/web/src/enterprise/batches/detail/ActiveExecutionNotice.story.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react'
+import { useMemo } from 'react'
 
 import { number } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
diff --git a/client/web/src/enterprise/batches/detail/BatchChangeBurndownChart.story.tsx b/client/web/src/enterprise/batches/detail/BatchChangeBurndownChart.story.tsx
index 6171a19cd6a..301cce261a0 100644
--- a/client/web/src/enterprise/batches/detail/BatchChangeBurndownChart.story.tsx
+++ b/client/web/src/enterprise/batches/detail/BatchChangeBurndownChart.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { useMemo } from '@storybook/addons'
 import { storiesOf } from '@storybook/react'
 import { addSeconds, isBefore } from 'date-fns'
diff --git a/client/web/src/enterprise/batches/detail/BatchChangeDetailsPage.story.tsx b/client/web/src/enterprise/batches/detail/BatchChangeDetailsPage.story.tsx
index 8e70ec9de08..129adb2a55e 100644
--- a/client/web/src/enterprise/batches/detail/BatchChangeDetailsPage.story.tsx
+++ b/client/web/src/enterprise/batches/detail/BatchChangeDetailsPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean } from '@storybook/addon-knobs'
 import { useMemo } from '@storybook/addons'
 import { storiesOf } from '@storybook/react'
diff --git a/client/web/src/enterprise/batches/detail/BatchChangeInfoByline.story.tsx b/client/web/src/enterprise/batches/detail/BatchChangeInfoByline.story.tsx
index d4107d98a43..adf197cc5ed 100644
--- a/client/web/src/enterprise/batches/detail/BatchChangeInfoByline.story.tsx
+++ b/client/web/src/enterprise/batches/detail/BatchChangeInfoByline.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { subDays } from 'date-fns'
 
diff --git a/client/web/src/enterprise/batches/detail/BatchChangeStatsCard.story.tsx b/client/web/src/enterprise/batches/detail/BatchChangeStatsCard.story.tsx
index 27ef16732cc..a1a287fa38e 100644
--- a/client/web/src/enterprise/batches/detail/BatchChangeStatsCard.story.tsx
+++ b/client/web/src/enterprise/batches/detail/BatchChangeStatsCard.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { WebStory } from '../../../components/WebStory'
diff --git a/client/web/src/enterprise/batches/detail/BulkOperationsAlerts.story.tsx b/client/web/src/enterprise/batches/detail/BulkOperationsAlerts.story.tsx
index 7041a96a0f7..a96d5de6763 100644
--- a/client/web/src/enterprise/batches/detail/BulkOperationsAlerts.story.tsx
+++ b/client/web/src/enterprise/batches/detail/BulkOperationsAlerts.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { useMemo } from '@storybook/addons'
 import { storiesOf } from '@storybook/react'
 
diff --git a/client/web/src/enterprise/batches/detail/ClosedNotice.story.tsx b/client/web/src/enterprise/batches/detail/ClosedNotice.story.tsx
index 5b950d0f8cb..f5bed50ec09 100644
--- a/client/web/src/enterprise/batches/detail/ClosedNotice.story.tsx
+++ b/client/web/src/enterprise/batches/detail/ClosedNotice.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { WebStory } from '../../../components/WebStory'
diff --git a/client/web/src/enterprise/batches/detail/SupersedingBatchSpecAlert.story.tsx b/client/web/src/enterprise/batches/detail/SupersedingBatchSpecAlert.story.tsx
index adf3b741c49..c4b9301c633 100644
--- a/client/web/src/enterprise/batches/detail/SupersedingBatchSpecAlert.story.tsx
+++ b/client/web/src/enterprise/batches/detail/SupersedingBatchSpecAlert.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { subDays } from 'date-fns'
 
diff --git a/client/web/src/enterprise/batches/detail/UnpublishedNotice.story.tsx b/client/web/src/enterprise/batches/detail/UnpublishedNotice.story.tsx
index 58efd889712..fb132b2470b 100644
--- a/client/web/src/enterprise/batches/detail/UnpublishedNotice.story.tsx
+++ b/client/web/src/enterprise/batches/detail/UnpublishedNotice.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { WebStory } from '../../../components/WebStory'
diff --git a/client/web/src/enterprise/batches/detail/WebhookAlert.story.tsx b/client/web/src/enterprise/batches/detail/WebhookAlert.story.tsx
index 4c9aeab4426..ca501278eef 100644
--- a/client/web/src/enterprise/batches/detail/WebhookAlert.story.tsx
+++ b/client/web/src/enterprise/batches/detail/WebhookAlert.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { ExternalServiceKind } from '@sourcegraph/shared/src/graphql-operations'
diff --git a/client/web/src/enterprise/batches/detail/changesets/BatchChangeChangesets.story.tsx b/client/web/src/enterprise/batches/detail/changesets/BatchChangeChangesets.story.tsx
index 54329456409..540c5e9856c 100644
--- a/client/web/src/enterprise/batches/detail/changesets/BatchChangeChangesets.story.tsx
+++ b/client/web/src/enterprise/batches/detail/changesets/BatchChangeChangesets.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean, select } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
diff --git a/client/web/src/enterprise/batches/detail/changesets/ChangesetCheckStatusCell.story.tsx b/client/web/src/enterprise/batches/detail/changesets/ChangesetCheckStatusCell.story.tsx
index ec71a126ecf..ec2be996593 100644
--- a/client/web/src/enterprise/batches/detail/changesets/ChangesetCheckStatusCell.story.tsx
+++ b/client/web/src/enterprise/batches/detail/changesets/ChangesetCheckStatusCell.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { capitalize } from 'lodash'
 
diff --git a/client/web/src/enterprise/batches/detail/changesets/ChangesetLabel.story.tsx b/client/web/src/enterprise/batches/detail/changesets/ChangesetLabel.story.tsx
index f27358566b1..2c5ebbc6882 100644
--- a/client/web/src/enterprise/batches/detail/changesets/ChangesetLabel.story.tsx
+++ b/client/web/src/enterprise/batches/detail/changesets/ChangesetLabel.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { WebStory } from '../../../../components/WebStory'
diff --git a/client/web/src/enterprise/batches/detail/changesets/ChangesetReviewStatusCell.story.tsx b/client/web/src/enterprise/batches/detail/changesets/ChangesetReviewStatusCell.story.tsx
index cf23ca2d42c..262e976cf36 100644
--- a/client/web/src/enterprise/batches/detail/changesets/ChangesetReviewStatusCell.story.tsx
+++ b/client/web/src/enterprise/batches/detail/changesets/ChangesetReviewStatusCell.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { capitalize } from 'lodash'
 
diff --git a/client/web/src/enterprise/batches/detail/changesets/ChangesetSelectRow.story.tsx b/client/web/src/enterprise/batches/detail/changesets/ChangesetSelectRow.story.tsx
index d176ac69230..032aefefce5 100644
--- a/client/web/src/enterprise/batches/detail/changesets/ChangesetSelectRow.story.tsx
+++ b/client/web/src/enterprise/batches/detail/changesets/ChangesetSelectRow.story.tsx
@@ -1,10 +1,9 @@
-import React from 'react'
-
 import { number } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
 import { of } from 'rxjs'
 
-import { BulkOperationType } from '../../../../../../shared/src/graphql-operations'
+import { BulkOperationType } from '@sourcegraph/shared/src/graphql-operations'
+
 import { WebStory } from '../../../../components/WebStory'
 import { MultiSelectContextProvider } from '../../MultiSelectContext'
 import {
diff --git a/client/web/src/enterprise/batches/detail/changesets/ChangesetStatusCell.story.tsx b/client/web/src/enterprise/batches/detail/changesets/ChangesetStatusCell.story.tsx
index 76a3a79a490..215b4579617 100644
--- a/client/web/src/enterprise/batches/detail/changesets/ChangesetStatusCell.story.tsx
+++ b/client/web/src/enterprise/batches/detail/changesets/ChangesetStatusCell.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { capitalize } from 'lodash'
 
diff --git a/client/web/src/enterprise/batches/detail/changesets/CloseChangesetsModal.story.tsx b/client/web/src/enterprise/batches/detail/changesets/CloseChangesetsModal.story.tsx
index 88f5cb5704c..72f52b234dc 100644
--- a/client/web/src/enterprise/batches/detail/changesets/CloseChangesetsModal.story.tsx
+++ b/client/web/src/enterprise/batches/detail/changesets/CloseChangesetsModal.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { action } from '@storybook/addon-actions'
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
diff --git a/client/web/src/enterprise/batches/detail/changesets/CreateCommentModal.story.tsx b/client/web/src/enterprise/batches/detail/changesets/CreateCommentModal.story.tsx
index d449da252b8..fd97032995d 100644
--- a/client/web/src/enterprise/batches/detail/changesets/CreateCommentModal.story.tsx
+++ b/client/web/src/enterprise/batches/detail/changesets/CreateCommentModal.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { action } from '@storybook/addon-actions'
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
diff --git a/client/web/src/enterprise/batches/detail/changesets/DetachChangesetsModal.story.tsx b/client/web/src/enterprise/batches/detail/changesets/DetachChangesetsModal.story.tsx
index 8435c3f4250..0d4233eb556 100644
--- a/client/web/src/enterprise/batches/detail/changesets/DetachChangesetsModal.story.tsx
+++ b/client/web/src/enterprise/batches/detail/changesets/DetachChangesetsModal.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { action } from '@storybook/addon-actions'
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
diff --git a/client/web/src/enterprise/batches/detail/changesets/ExternalChangesetNode.story.tsx b/client/web/src/enterprise/batches/detail/changesets/ExternalChangesetNode.story.tsx
index 82d23106fa7..50bc5eb5d9e 100644
--- a/client/web/src/enterprise/batches/detail/changesets/ExternalChangesetNode.story.tsx
+++ b/client/web/src/enterprise/batches/detail/changesets/ExternalChangesetNode.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
 import classNames from 'classnames'
diff --git a/client/web/src/enterprise/batches/detail/changesets/HiddenExternalChangesetNode.story.tsx b/client/web/src/enterprise/batches/detail/changesets/HiddenExternalChangesetNode.story.tsx
index 7cb2f1bbe0f..bf3811f5506 100644
--- a/client/web/src/enterprise/batches/detail/changesets/HiddenExternalChangesetNode.story.tsx
+++ b/client/web/src/enterprise/batches/detail/changesets/HiddenExternalChangesetNode.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import classNames from 'classnames'
 import { addHours } from 'date-fns'
diff --git a/client/web/src/enterprise/batches/detail/changesets/MergeChangesetsModal.story.tsx b/client/web/src/enterprise/batches/detail/changesets/MergeChangesetsModal.story.tsx
index 117ee662114..45519b6649b 100644
--- a/client/web/src/enterprise/batches/detail/changesets/MergeChangesetsModal.story.tsx
+++ b/client/web/src/enterprise/batches/detail/changesets/MergeChangesetsModal.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { action } from '@storybook/addon-actions'
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
diff --git a/client/web/src/enterprise/batches/detail/changesets/PublishChangesetsModal.story.tsx b/client/web/src/enterprise/batches/detail/changesets/PublishChangesetsModal.story.tsx
index 67c0a8c7570..88604317181 100644
--- a/client/web/src/enterprise/batches/detail/changesets/PublishChangesetsModal.story.tsx
+++ b/client/web/src/enterprise/batches/detail/changesets/PublishChangesetsModal.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { action } from '@storybook/addon-actions'
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
diff --git a/client/web/src/enterprise/batches/detail/changesets/ReenqueueChangesetsModal.story.tsx b/client/web/src/enterprise/batches/detail/changesets/ReenqueueChangesetsModal.story.tsx
index b69110e95b8..10fd05e803a 100644
--- a/client/web/src/enterprise/batches/detail/changesets/ReenqueueChangesetsModal.story.tsx
+++ b/client/web/src/enterprise/batches/detail/changesets/ReenqueueChangesetsModal.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { action } from '@storybook/addon-actions'
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
diff --git a/client/web/src/enterprise/batches/execution/WorkspaceDetails.story.tsx b/client/web/src/enterprise/batches/execution/WorkspaceDetails.story.tsx
index 55b7a343cd2..ba0056751a2 100644
--- a/client/web/src/enterprise/batches/execution/WorkspaceDetails.story.tsx
+++ b/client/web/src/enterprise/batches/execution/WorkspaceDetails.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { subMinutes } from 'date-fns/esm'
 import { noop } from 'lodash'
diff --git a/client/web/src/enterprise/batches/execution/workspaces/WorkspacesListItem.story.tsx b/client/web/src/enterprise/batches/execution/workspaces/WorkspacesListItem.story.tsx
index 2d7ff941b41..47107b604e1 100644
--- a/client/web/src/enterprise/batches/execution/workspaces/WorkspacesListItem.story.tsx
+++ b/client/web/src/enterprise/batches/execution/workspaces/WorkspacesListItem.story.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import { useState } from 'react'
 
 import { storiesOf } from '@storybook/react'
 
diff --git a/client/web/src/enterprise/batches/global/DotcomGettingStartedPage.story.tsx b/client/web/src/enterprise/batches/global/DotcomGettingStartedPage.story.tsx
index e45fd81c036..3aa847a15de 100644
--- a/client/web/src/enterprise/batches/global/DotcomGettingStartedPage.story.tsx
+++ b/client/web/src/enterprise/batches/global/DotcomGettingStartedPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { WebStory } from '../../../components/WebStory'
diff --git a/client/web/src/enterprise/batches/list/BatchChangeListPage.story.tsx b/client/web/src/enterprise/batches/list/BatchChangeListPage.story.tsx
index 768b431e3c3..da3200cffd6 100644
--- a/client/web/src/enterprise/batches/list/BatchChangeListPage.story.tsx
+++ b/client/web/src/enterprise/batches/list/BatchChangeListPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
 import { WildcardMockLink, MATCH_ANY_PARAMETERS } from 'wildcard-mock-link'
diff --git a/client/web/src/enterprise/batches/list/BatchChangeNode.story.tsx b/client/web/src/enterprise/batches/list/BatchChangeNode.story.tsx
index 5747548f593..2eddcd9f4e8 100644
--- a/client/web/src/enterprise/batches/list/BatchChangeNode.story.tsx
+++ b/client/web/src/enterprise/batches/list/BatchChangeNode.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
 import isChromatic from 'chromatic/isChromatic'
diff --git a/client/web/src/enterprise/batches/list/BatchChangesChangelogAlert.story.tsx b/client/web/src/enterprise/batches/list/BatchChangesChangelogAlert.story.tsx
index b65eb1ab7bc..1be03ece2d1 100644
--- a/client/web/src/enterprise/batches/list/BatchChangesChangelogAlert.story.tsx
+++ b/client/web/src/enterprise/batches/list/BatchChangesChangelogAlert.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { WebStory } from '../../../components/WebStory'
diff --git a/client/web/src/enterprise/batches/list/BatchChangesListIntro.story.tsx b/client/web/src/enterprise/batches/list/BatchChangesListIntro.story.tsx
index 889b09c33d0..163de633c08 100644
--- a/client/web/src/enterprise/batches/list/BatchChangesListIntro.story.tsx
+++ b/client/web/src/enterprise/batches/list/BatchChangesListIntro.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { radios } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
 
diff --git a/client/web/src/enterprise/batches/preview/BatchChangePreviewPage.story.tsx b/client/web/src/enterprise/batches/preview/BatchChangePreviewPage.story.tsx
index 127c76bc729..f92f8951dc9 100644
--- a/client/web/src/enterprise/batches/preview/BatchChangePreviewPage.story.tsx
+++ b/client/web/src/enterprise/batches/preview/BatchChangePreviewPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean } from '@storybook/addon-knobs'
 import { useMemo } from '@storybook/addons'
 import { storiesOf } from '@storybook/react'
diff --git a/client/web/src/enterprise/batches/preview/BatchSpecInfoByline.story.tsx b/client/web/src/enterprise/batches/preview/BatchSpecInfoByline.story.tsx
index c2d58ea1f3b..a482ed951eb 100644
--- a/client/web/src/enterprise/batches/preview/BatchSpecInfoByline.story.tsx
+++ b/client/web/src/enterprise/batches/preview/BatchSpecInfoByline.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { subDays } from 'date-fns'
 
diff --git a/client/web/src/enterprise/batches/preview/CreateUpdateBatchChangeAlert.story.tsx b/client/web/src/enterprise/batches/preview/CreateUpdateBatchChangeAlert.story.tsx
index 16d7f6041ea..2d6e86584c4 100644
--- a/client/web/src/enterprise/batches/preview/CreateUpdateBatchChangeAlert.story.tsx
+++ b/client/web/src/enterprise/batches/preview/CreateUpdateBatchChangeAlert.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
 
diff --git a/client/web/src/enterprise/batches/preview/list/ChangesetApplyPreviewNode.story.tsx b/client/web/src/enterprise/batches/preview/list/ChangesetApplyPreviewNode.story.tsx
index d7361edb2d4..ae9dd3d9297 100644
--- a/client/web/src/enterprise/batches/preview/list/ChangesetApplyPreviewNode.story.tsx
+++ b/client/web/src/enterprise/batches/preview/list/ChangesetApplyPreviewNode.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import classNames from 'classnames'
 import { of } from 'rxjs'
diff --git a/client/web/src/enterprise/batches/preview/list/HiddenChangesetApplyPreviewNode.story.tsx b/client/web/src/enterprise/batches/preview/list/HiddenChangesetApplyPreviewNode.story.tsx
index f959eba891a..d81c758866b 100644
--- a/client/web/src/enterprise/batches/preview/list/HiddenChangesetApplyPreviewNode.story.tsx
+++ b/client/web/src/enterprise/batches/preview/list/HiddenChangesetApplyPreviewNode.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import classNames from 'classnames'
 
diff --git a/client/web/src/enterprise/batches/preview/list/PreviewList.story.tsx b/client/web/src/enterprise/batches/preview/list/PreviewList.story.tsx
index c795b1e6c93..5ffa0786005 100644
--- a/client/web/src/enterprise/batches/preview/list/PreviewList.story.tsx
+++ b/client/web/src/enterprise/batches/preview/list/PreviewList.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
 import { of, Observable } from 'rxjs'
diff --git a/client/web/src/enterprise/batches/preview/list/VisibleChangesetApplyPreviewNode.story.tsx b/client/web/src/enterprise/batches/preview/list/VisibleChangesetApplyPreviewNode.story.tsx
index 9d44f4c2451..6dfd39a3daa 100644
--- a/client/web/src/enterprise/batches/preview/list/VisibleChangesetApplyPreviewNode.story.tsx
+++ b/client/web/src/enterprise/batches/preview/list/VisibleChangesetApplyPreviewNode.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import classNames from 'classnames'
 import { of } from 'rxjs'
diff --git a/client/web/src/enterprise/batches/repo/BatchChangeRepoPage.story.tsx b/client/web/src/enterprise/batches/repo/BatchChangeRepoPage.story.tsx
index a0041e148e7..2f270f193b8 100644
--- a/client/web/src/enterprise/batches/repo/BatchChangeRepoPage.story.tsx
+++ b/client/web/src/enterprise/batches/repo/BatchChangeRepoPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { of } from 'rxjs'
 
diff --git a/client/web/src/enterprise/batches/settings/AddCredentialModal.story.tsx b/client/web/src/enterprise/batches/settings/AddCredentialModal.story.tsx
index 73280e2f42e..bffcf7742dd 100644
--- a/client/web/src/enterprise/batches/settings/AddCredentialModal.story.tsx
+++ b/client/web/src/enterprise/batches/settings/AddCredentialModal.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { select } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
diff --git a/client/web/src/enterprise/batches/settings/BatchChangesSettingsArea.story.tsx b/client/web/src/enterprise/batches/settings/BatchChangesSettingsArea.story.tsx
index 9a45410b123..e86b0576ded 100644
--- a/client/web/src/enterprise/batches/settings/BatchChangesSettingsArea.story.tsx
+++ b/client/web/src/enterprise/batches/settings/BatchChangesSettingsArea.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { getDocumentNode } from '@sourcegraph/http-client'
diff --git a/client/web/src/enterprise/batches/settings/BatchChangesSiteConfigSettingsArea.story.tsx b/client/web/src/enterprise/batches/settings/BatchChangesSiteConfigSettingsArea.story.tsx
index 6469cf64971..fbe90a8ddf4 100644
--- a/client/web/src/enterprise/batches/settings/BatchChangesSiteConfigSettingsArea.story.tsx
+++ b/client/web/src/enterprise/batches/settings/BatchChangesSiteConfigSettingsArea.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { MockedResponse } from '@apollo/client/testing'
 import { storiesOf } from '@storybook/react'
 
diff --git a/client/web/src/enterprise/batches/settings/RemoveCredentialModal.story.tsx b/client/web/src/enterprise/batches/settings/RemoveCredentialModal.story.tsx
index 6e9ceaed80f..8a6ae3ae632 100644
--- a/client/web/src/enterprise/batches/settings/RemoveCredentialModal.story.tsx
+++ b/client/web/src/enterprise/batches/settings/RemoveCredentialModal.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
 
diff --git a/client/web/src/enterprise/batches/settings/ViewCredentialModal.story.tsx b/client/web/src/enterprise/batches/settings/ViewCredentialModal.story.tsx
index f345f4f44d3..48cb327cf0f 100644
--- a/client/web/src/enterprise/batches/settings/ViewCredentialModal.story.tsx
+++ b/client/web/src/enterprise/batches/settings/ViewCredentialModal.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
 
diff --git a/client/web/src/enterprise/batches/workspaces-list/Descriptor.tsx b/client/web/src/enterprise/batches/workspaces-list/Descriptor.tsx
index 21689ec2ee4..22b293f2810 100644
--- a/client/web/src/enterprise/batches/workspaces-list/Descriptor.tsx
+++ b/client/web/src/enterprise/batches/workspaces-list/Descriptor.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement } from 'react'
+import { ReactElement } from 'react'
 
 import SourceBranchIcon from 'mdi-react/SourceBranchIcon'
 
diff --git a/client/web/src/enterprise/code-monitoring/CodeMonitoringLogs.story.tsx b/client/web/src/enterprise/code-monitoring/CodeMonitoringLogs.story.tsx
index 95d64a17e1e..505317f06a0 100644
--- a/client/web/src/enterprise/code-monitoring/CodeMonitoringLogs.story.tsx
+++ b/client/web/src/enterprise/code-monitoring/CodeMonitoringLogs.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { MockedResponse } from '@apollo/client/testing'
 import { storiesOf } from '@storybook/react'
 import { parseISO } from 'date-fns'
diff --git a/client/web/src/enterprise/code-monitoring/CodeMonitoringPage.story.tsx b/client/web/src/enterprise/code-monitoring/CodeMonitoringPage.story.tsx
index c35060f5304..1328be5edef 100644
--- a/client/web/src/enterprise/code-monitoring/CodeMonitoringPage.story.tsx
+++ b/client/web/src/enterprise/code-monitoring/CodeMonitoringPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { NEVER, of } from 'rxjs'
 import sinon from 'sinon'
diff --git a/client/web/src/enterprise/code-monitoring/CodeMonitoringPage.test.tsx b/client/web/src/enterprise/code-monitoring/CodeMonitoringPage.test.tsx
index b1f407aed48..086afa0233a 100644
--- a/client/web/src/enterprise/code-monitoring/CodeMonitoringPage.test.tsx
+++ b/client/web/src/enterprise/code-monitoring/CodeMonitoringPage.test.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react'
-
 import { render, fireEvent } from '@testing-library/react'
 import { MemoryRouter } from 'react-router'
 import { of } from 'rxjs'
diff --git a/client/web/src/enterprise/code-monitoring/CreateCodeMonitorPage.story.tsx b/client/web/src/enterprise/code-monitoring/CreateCodeMonitorPage.story.tsx
index 7cba89b018c..1b2117577ec 100644
--- a/client/web/src/enterprise/code-monitoring/CreateCodeMonitorPage.story.tsx
+++ b/client/web/src/enterprise/code-monitoring/CreateCodeMonitorPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import sinon from 'sinon'
 
diff --git a/client/web/src/enterprise/code-monitoring/CreateCodeMonitorPage.test.tsx b/client/web/src/enterprise/code-monitoring/CreateCodeMonitorPage.test.tsx
index 414481e68b0..f7f68364c9e 100644
--- a/client/web/src/enterprise/code-monitoring/CreateCodeMonitorPage.test.tsx
+++ b/client/web/src/enterprise/code-monitoring/CreateCodeMonitorPage.test.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react'
-
 import { getByRole, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import * as H from 'history'
diff --git a/client/web/src/enterprise/code-monitoring/ManageCodeMonitorPage.story.tsx b/client/web/src/enterprise/code-monitoring/ManageCodeMonitorPage.story.tsx
index bceb1f32fe8..2674865bd3a 100644
--- a/client/web/src/enterprise/code-monitoring/ManageCodeMonitorPage.story.tsx
+++ b/client/web/src/enterprise/code-monitoring/ManageCodeMonitorPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { NEVER, of } from 'rxjs'
 import sinon from 'sinon'
diff --git a/client/web/src/enterprise/code-monitoring/ManageCodeMonitorPage.test.tsx b/client/web/src/enterprise/code-monitoring/ManageCodeMonitorPage.test.tsx
index 22a0db7e550..143e472461a 100644
--- a/client/web/src/enterprise/code-monitoring/ManageCodeMonitorPage.test.tsx
+++ b/client/web/src/enterprise/code-monitoring/ManageCodeMonitorPage.test.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react'
-
 import { screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import * as H from 'history'
diff --git a/client/web/src/enterprise/code-monitoring/components/CodeMonitorForm.test.tsx b/client/web/src/enterprise/code-monitoring/components/CodeMonitorForm.test.tsx
index 69e1c17d87a..fc630ec5bed 100644
--- a/client/web/src/enterprise/code-monitoring/components/CodeMonitorForm.test.tsx
+++ b/client/web/src/enterprise/code-monitoring/components/CodeMonitorForm.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { fireEvent, getByRole, screen } from '@testing-library/react'
 import { createMemoryHistory, createLocation } from 'history'
 import { NEVER } from 'rxjs'
diff --git a/client/web/src/enterprise/code-monitoring/components/DeleteMonitorModal.story.tsx b/client/web/src/enterprise/code-monitoring/components/DeleteMonitorModal.story.tsx
index 44130bb2232..0f8e2013183 100644
--- a/client/web/src/enterprise/code-monitoring/components/DeleteMonitorModal.story.tsx
+++ b/client/web/src/enterprise/code-monitoring/components/DeleteMonitorModal.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { NEVER } from 'rxjs'
 import sinon from 'sinon'
diff --git a/client/web/src/enterprise/code-monitoring/components/FormActionArea.test.tsx b/client/web/src/enterprise/code-monitoring/components/FormActionArea.test.tsx
index 02cf12c657e..6fa4e807792 100644
--- a/client/web/src/enterprise/code-monitoring/components/FormActionArea.test.tsx
+++ b/client/web/src/enterprise/code-monitoring/components/FormActionArea.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import sinon from 'sinon'
diff --git a/client/web/src/enterprise/code-monitoring/components/FormTriggerArea.story.tsx b/client/web/src/enterprise/code-monitoring/components/FormTriggerArea.story.tsx
index 132fe3938cd..355b3bf2e68 100644
--- a/client/web/src/enterprise/code-monitoring/components/FormTriggerArea.story.tsx
+++ b/client/web/src/enterprise/code-monitoring/components/FormTriggerArea.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import sinon from 'sinon'
 
diff --git a/client/web/src/enterprise/code-monitoring/components/FormTriggerArea.test.tsx b/client/web/src/enterprise/code-monitoring/components/FormTriggerArea.test.tsx
index b7806648865..1553df5812e 100644
--- a/client/web/src/enterprise/code-monitoring/components/FormTriggerArea.test.tsx
+++ b/client/web/src/enterprise/code-monitoring/components/FormTriggerArea.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { act } from 'react-dom/test-utils'
diff --git a/client/web/src/enterprise/code-monitoring/components/actions/ActionEditor.test.tsx b/client/web/src/enterprise/code-monitoring/components/actions/ActionEditor.test.tsx
index a2d7f3b14dc..38827b27d09 100644
--- a/client/web/src/enterprise/code-monitoring/components/actions/ActionEditor.test.tsx
+++ b/client/web/src/enterprise/code-monitoring/components/actions/ActionEditor.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import sinon from 'sinon'
diff --git a/client/web/src/enterprise/code-monitoring/components/actions/EmailAction.story.tsx b/client/web/src/enterprise/code-monitoring/components/actions/EmailAction.story.tsx
index ffac6c2c6e9..2683ceac2b1 100644
--- a/client/web/src/enterprise/code-monitoring/components/actions/EmailAction.story.tsx
+++ b/client/web/src/enterprise/code-monitoring/components/actions/EmailAction.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import sinon from 'sinon'
 
diff --git a/client/web/src/enterprise/code-monitoring/components/actions/EmailAction.test.tsx b/client/web/src/enterprise/code-monitoring/components/actions/EmailAction.test.tsx
index fae60a12b77..cc433ed179d 100644
--- a/client/web/src/enterprise/code-monitoring/components/actions/EmailAction.test.tsx
+++ b/client/web/src/enterprise/code-monitoring/components/actions/EmailAction.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { MockedResponse } from '@apollo/client/testing'
 import { render } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
diff --git a/client/web/src/enterprise/code-monitoring/components/actions/SlackWebhookAction.story.tsx b/client/web/src/enterprise/code-monitoring/components/actions/SlackWebhookAction.story.tsx
index ccb7dc802fa..6fbd8015f57 100644
--- a/client/web/src/enterprise/code-monitoring/components/actions/SlackWebhookAction.story.tsx
+++ b/client/web/src/enterprise/code-monitoring/components/actions/SlackWebhookAction.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import sinon from 'sinon'
 
diff --git a/client/web/src/enterprise/code-monitoring/components/actions/SlackWebhookAction.test.tsx b/client/web/src/enterprise/code-monitoring/components/actions/SlackWebhookAction.test.tsx
index f5801ae9799..660456cc9d1 100644
--- a/client/web/src/enterprise/code-monitoring/components/actions/SlackWebhookAction.test.tsx
+++ b/client/web/src/enterprise/code-monitoring/components/actions/SlackWebhookAction.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { MockedResponse } from '@apollo/client/testing'
 import { render } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
diff --git a/client/web/src/enterprise/code-monitoring/components/actions/WebhookAction.story.tsx b/client/web/src/enterprise/code-monitoring/components/actions/WebhookAction.story.tsx
index bb86d13362a..3d6f6178078 100644
--- a/client/web/src/enterprise/code-monitoring/components/actions/WebhookAction.story.tsx
+++ b/client/web/src/enterprise/code-monitoring/components/actions/WebhookAction.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import sinon from 'sinon'
 
diff --git a/client/web/src/enterprise/code-monitoring/components/actions/WebhookAction.test.tsx b/client/web/src/enterprise/code-monitoring/components/actions/WebhookAction.test.tsx
index f0e5cb14d29..ccb991e85fc 100644
--- a/client/web/src/enterprise/code-monitoring/components/actions/WebhookAction.test.tsx
+++ b/client/web/src/enterprise/code-monitoring/components/actions/WebhookAction.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { MockedResponse } from '@apollo/client/testing'
 import { render } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
diff --git a/client/web/src/enterprise/codeintel/RepositoryMenu.story.tsx b/client/web/src/enterprise/codeintel/RepositoryMenu.story.tsx
index 0cb233ea1dc..61e518700a9 100644
--- a/client/web/src/enterprise/codeintel/RepositoryMenu.story.tsx
+++ b/client/web/src/enterprise/codeintel/RepositoryMenu.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { RepositoryMenu } from '../../codeintel/RepositoryMenu'
diff --git a/client/web/src/enterprise/codeintel/configuration/components/BranchTargetSettings.tsx b/client/web/src/enterprise/codeintel/configuration/components/BranchTargetSettings.tsx
index 56f9c997763..28fbe43a547 100644
--- a/client/web/src/enterprise/codeintel/configuration/components/BranchTargetSettings.tsx
+++ b/client/web/src/enterprise/codeintel/configuration/components/BranchTargetSettings.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import { GitObjectType } from '@sourcegraph/shared/src/graphql-operations'
 
diff --git a/client/web/src/enterprise/codeintel/configuration/components/ConfigurationEditor.tsx b/client/web/src/enterprise/codeintel/configuration/components/ConfigurationEditor.tsx
index 49448102efc..e724fe6a166 100644
--- a/client/web/src/enterprise/codeintel/configuration/components/ConfigurationEditor.tsx
+++ b/client/web/src/enterprise/codeintel/configuration/components/ConfigurationEditor.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useCallback, useMemo, useState } from 'react'
+import { FunctionComponent, useCallback, useMemo, useState } from 'react'
 
 import * as H from 'history'
 import { editor } from 'monaco-editor'
diff --git a/client/web/src/enterprise/codeintel/configuration/components/DurationSelect.tsx b/client/web/src/enterprise/codeintel/configuration/components/DurationSelect.tsx
index dcb0bd43397..52d00e7adf2 100644
--- a/client/web/src/enterprise/codeintel/configuration/components/DurationSelect.tsx
+++ b/client/web/src/enterprise/codeintel/configuration/components/DurationSelect.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useState } from 'react'
+import { FunctionComponent, useState } from 'react'
 
 import classNames from 'classnames'
 
diff --git a/client/web/src/enterprise/codeintel/configuration/components/GitObjectPreview.tsx b/client/web/src/enterprise/codeintel/configuration/components/GitObjectPreview.tsx
index 6d28f7ef556..8d0c68ebcd5 100644
--- a/client/web/src/enterprise/codeintel/configuration/components/GitObjectPreview.tsx
+++ b/client/web/src/enterprise/codeintel/configuration/components/GitObjectPreview.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import { ApolloError } from '@apollo/client'
 import classNames from 'classnames'
diff --git a/client/web/src/enterprise/codeintel/configuration/components/GitObjectTargetDescription.tsx b/client/web/src/enterprise/codeintel/configuration/components/GitObjectTargetDescription.tsx
index 710c1bedca9..e3b9c191732 100644
--- a/client/web/src/enterprise/codeintel/configuration/components/GitObjectTargetDescription.tsx
+++ b/client/web/src/enterprise/codeintel/configuration/components/GitObjectTargetDescription.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import { GitObjectType } from '@sourcegraph/shared/src/schema'
 
diff --git a/client/web/src/enterprise/codeintel/configuration/components/GitTypeSelector.tsx b/client/web/src/enterprise/codeintel/configuration/components/GitTypeSelector.tsx
index aeeac243bdf..a6b89f93f6c 100644
--- a/client/web/src/enterprise/codeintel/configuration/components/GitTypeSelector.tsx
+++ b/client/web/src/enterprise/codeintel/configuration/components/GitTypeSelector.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import { Select } from '@sourcegraph/wildcard'
 
diff --git a/client/web/src/enterprise/codeintel/configuration/components/IndexingPolicyDescription.tsx b/client/web/src/enterprise/codeintel/configuration/components/IndexingPolicyDescription.tsx
index a0f99bef733..3da725c6cde 100644
--- a/client/web/src/enterprise/codeintel/configuration/components/IndexingPolicyDescription.tsx
+++ b/client/web/src/enterprise/codeintel/configuration/components/IndexingPolicyDescription.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import { CodeIntelligenceConfigurationPolicyFields } from '../../../../graphql-operations'
 import { formatDurationValue } from '../shared'
diff --git a/client/web/src/enterprise/codeintel/configuration/components/ObjectsMatchingGitPattern.tsx b/client/web/src/enterprise/codeintel/configuration/components/ObjectsMatchingGitPattern.tsx
index 72dc4bd9e70..1c4703aa476 100644
--- a/client/web/src/enterprise/codeintel/configuration/components/ObjectsMatchingGitPattern.tsx
+++ b/client/web/src/enterprise/codeintel/configuration/components/ObjectsMatchingGitPattern.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useEffect, useMemo, useState } from 'react'
+import { FunctionComponent, useEffect, useMemo, useState } from 'react'
 
 import { debounce } from 'lodash'
 
diff --git a/client/web/src/enterprise/codeintel/configuration/components/PolicyListActions.tsx b/client/web/src/enterprise/codeintel/configuration/components/PolicyListActions.tsx
index 7f3300277de..caa8648fd9b 100644
--- a/client/web/src/enterprise/codeintel/configuration/components/PolicyListActions.tsx
+++ b/client/web/src/enterprise/codeintel/configuration/components/PolicyListActions.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import * as H from 'history'
 
diff --git a/client/web/src/enterprise/codeintel/configuration/components/ReposMatchingPattern.tsx b/client/web/src/enterprise/codeintel/configuration/components/ReposMatchingPattern.tsx
index 941e45ca35c..e9389ffe14b 100644
--- a/client/web/src/enterprise/codeintel/configuration/components/ReposMatchingPattern.tsx
+++ b/client/web/src/enterprise/codeintel/configuration/components/ReposMatchingPattern.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useEffect, useMemo, useState } from 'react'
+import { FunctionComponent, useEffect, useMemo, useState } from 'react'
 
 import classNames from 'classnames'
 import { debounce } from 'lodash'
diff --git a/client/web/src/enterprise/codeintel/configuration/components/ReposMatchingPatternList.tsx b/client/web/src/enterprise/codeintel/configuration/components/ReposMatchingPatternList.tsx
index 62969393445..f3f872afa94 100644
--- a/client/web/src/enterprise/codeintel/configuration/components/ReposMatchingPatternList.tsx
+++ b/client/web/src/enterprise/codeintel/configuration/components/ReposMatchingPatternList.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import classNames from 'classnames'
 
diff --git a/client/web/src/enterprise/codeintel/configuration/components/RepositoryPreview.tsx b/client/web/src/enterprise/codeintel/configuration/components/RepositoryPreview.tsx
index 7df1078b1fb..1c3a78f49d8 100644
--- a/client/web/src/enterprise/codeintel/configuration/components/RepositoryPreview.tsx
+++ b/client/web/src/enterprise/codeintel/configuration/components/RepositoryPreview.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import classNames from 'classnames'
 
diff --git a/client/web/src/enterprise/codeintel/configuration/components/RetentionPolicyDescription.tsx b/client/web/src/enterprise/codeintel/configuration/components/RetentionPolicyDescription.tsx
index d8c1e37ca6c..582ceb33680 100644
--- a/client/web/src/enterprise/codeintel/configuration/components/RetentionPolicyDescription.tsx
+++ b/client/web/src/enterprise/codeintel/configuration/components/RetentionPolicyDescription.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import { CodeIntelligenceConfigurationPolicyFields } from '../../../../graphql-operations'
 import { formatDurationValue } from '../shared'
diff --git a/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelConfigurationPage.story.tsx b/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelConfigurationPage.story.tsx
index 1a61f7b7d99..d18c7141fba 100644
--- a/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelConfigurationPage.story.tsx
+++ b/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelConfigurationPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { MockedResponse } from '@apollo/client/testing'
 import { boolean, withKnobs } from '@storybook/addon-knobs'
 import { Meta, Story } from '@storybook/react'
diff --git a/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelConfigurationPolicyPage.story.tsx b/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelConfigurationPolicyPage.story.tsx
index c63c8129aeb..e5b4d6d9baa 100644
--- a/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelConfigurationPolicyPage.story.tsx
+++ b/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelConfigurationPolicyPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean, withKnobs } from '@storybook/addon-knobs'
 import { Meta, Story } from '@storybook/react'
 
diff --git a/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelConfigurationPolicyPage.tsx b/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelConfigurationPolicyPage.tsx
index 5be66c62517..6c59d6b828e 100644
--- a/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelConfigurationPolicyPage.tsx
+++ b/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelConfigurationPolicyPage.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useCallback, useEffect, useState } from 'react'
+import { FunctionComponent, useCallback, useEffect, useState } from 'react'
 
 import { ApolloError } from '@apollo/client'
 import * as H from 'history'
diff --git a/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelRepositoryIndexConfigurationPage.story.tsx b/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelRepositoryIndexConfigurationPage.story.tsx
index 5e40792f182..3363b73fc79 100644
--- a/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelRepositoryIndexConfigurationPage.story.tsx
+++ b/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelRepositoryIndexConfigurationPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { withKnobs } from '@storybook/addon-knobs'
 import { Meta, Story } from '@storybook/react'
 
diff --git a/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelRepositoryIndexConfigurationPage.tsx b/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelRepositoryIndexConfigurationPage.tsx
index 41e9d5750d1..2f1397e0029 100644
--- a/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelRepositoryIndexConfigurationPage.tsx
+++ b/client/web/src/enterprise/codeintel/configuration/pages/CodeIntelRepositoryIndexConfigurationPage.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useEffect } from 'react'
+import { FunctionComponent, useEffect } from 'react'
 
 import * as H from 'history'
 
diff --git a/client/web/src/enterprise/codeintel/indexes/components/CodeIntelAssociatedUpload.tsx b/client/web/src/enterprise/codeintel/indexes/components/CodeIntelAssociatedUpload.tsx
index d2d0ca705ac..0dd2f33a9d6 100644
--- a/client/web/src/enterprise/codeintel/indexes/components/CodeIntelAssociatedUpload.tsx
+++ b/client/web/src/enterprise/codeintel/indexes/components/CodeIntelAssociatedUpload.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import classNames from 'classnames'
 import ChevronRightIcon from 'mdi-react/ChevronRightIcon'
diff --git a/client/web/src/enterprise/codeintel/indexes/components/CodeIntelDeleteIndex.tsx b/client/web/src/enterprise/codeintel/indexes/components/CodeIntelDeleteIndex.tsx
index cdca59b7ad0..df31f921828 100644
--- a/client/web/src/enterprise/codeintel/indexes/components/CodeIntelDeleteIndex.tsx
+++ b/client/web/src/enterprise/codeintel/indexes/components/CodeIntelDeleteIndex.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import DeleteIcon from 'mdi-react/DeleteIcon'
 
diff --git a/client/web/src/enterprise/codeintel/indexes/components/CodeIntelIndexMeta.tsx b/client/web/src/enterprise/codeintel/indexes/components/CodeIntelIndexMeta.tsx
index 2f61fbb1fbf..02265797c08 100644
--- a/client/web/src/enterprise/codeintel/indexes/components/CodeIntelIndexMeta.tsx
+++ b/client/web/src/enterprise/codeintel/indexes/components/CodeIntelIndexMeta.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import { CardSubtitle, CardText, CardTitle, CardBody, Card } from '@sourcegraph/wildcard'
 
diff --git a/client/web/src/enterprise/codeintel/indexes/components/CodeIntelIndexNode.tsx b/client/web/src/enterprise/codeintel/indexes/components/CodeIntelIndexNode.tsx
index 5d1aa88355f..3b25a4e4577 100644
--- a/client/web/src/enterprise/codeintel/indexes/components/CodeIntelIndexNode.tsx
+++ b/client/web/src/enterprise/codeintel/indexes/components/CodeIntelIndexNode.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import classNames from 'classnames'
 import ChevronRightIcon from 'mdi-react/ChevronRightIcon'
diff --git a/client/web/src/enterprise/codeintel/indexes/components/CodeIntelIndexTimeline.tsx b/client/web/src/enterprise/codeintel/indexes/components/CodeIntelIndexTimeline.tsx
index 5c2a27efc3a..389d1bfb8db 100644
--- a/client/web/src/enterprise/codeintel/indexes/components/CodeIntelIndexTimeline.tsx
+++ b/client/web/src/enterprise/codeintel/indexes/components/CodeIntelIndexTimeline.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useMemo } from 'react'
+import { FunctionComponent, useMemo } from 'react'
 
 import AlertCircleIcon from 'mdi-react/AlertCircleIcon'
 import CheckIcon from 'mdi-react/CheckIcon'
diff --git a/client/web/src/enterprise/codeintel/indexes/components/EnqueueForm.tsx b/client/web/src/enterprise/codeintel/indexes/components/EnqueueForm.tsx
index 70ac7b83608..505bc4d0337 100644
--- a/client/web/src/enterprise/codeintel/indexes/components/EnqueueForm.tsx
+++ b/client/web/src/enterprise/codeintel/indexes/components/EnqueueForm.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useCallback, useState } from 'react'
+import { FunctionComponent, useCallback, useState } from 'react'
 
 import { Subject } from 'rxjs'
 
diff --git a/client/web/src/enterprise/codeintel/indexes/pages/CodeIntelIndexPage.story.tsx b/client/web/src/enterprise/codeintel/indexes/pages/CodeIntelIndexPage.story.tsx
index fb8403d791a..0b7d62b22f7 100644
--- a/client/web/src/enterprise/codeintel/indexes/pages/CodeIntelIndexPage.story.tsx
+++ b/client/web/src/enterprise/codeintel/indexes/pages/CodeIntelIndexPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 import { of } from 'rxjs'
 
diff --git a/client/web/src/enterprise/codeintel/indexes/pages/CodeIntelIndexPage.tsx b/client/web/src/enterprise/codeintel/indexes/pages/CodeIntelIndexPage.tsx
index 7a1853e9412..cd249a718e5 100644
--- a/client/web/src/enterprise/codeintel/indexes/pages/CodeIntelIndexPage.tsx
+++ b/client/web/src/enterprise/codeintel/indexes/pages/CodeIntelIndexPage.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useCallback, useEffect, useMemo, useState } from 'react'
+import { FunctionComponent, useCallback, useEffect, useMemo, useState } from 'react'
 
 import { useApolloClient } from '@apollo/client'
 import { Redirect, RouteComponentProps } from 'react-router'
diff --git a/client/web/src/enterprise/codeintel/indexes/pages/CodeIntelIndexesPage.story.tsx b/client/web/src/enterprise/codeintel/indexes/pages/CodeIntelIndexesPage.story.tsx
index f36872e66b9..2195d4a8923 100644
--- a/client/web/src/enterprise/codeintel/indexes/pages/CodeIntelIndexesPage.story.tsx
+++ b/client/web/src/enterprise/codeintel/indexes/pages/CodeIntelIndexesPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 import { of } from 'rxjs'
 
diff --git a/client/web/src/enterprise/codeintel/indexes/pages/CodeIntelIndexesPage.tsx b/client/web/src/enterprise/codeintel/indexes/pages/CodeIntelIndexesPage.tsx
index a7dfbc2b20b..8903979e50c 100644
--- a/client/web/src/enterprise/codeintel/indexes/pages/CodeIntelIndexesPage.tsx
+++ b/client/web/src/enterprise/codeintel/indexes/pages/CodeIntelIndexesPage.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useCallback, useEffect, useMemo } from 'react'
+import { FunctionComponent, useCallback, useEffect, useMemo } from 'react'
 
 import { useApolloClient } from '@apollo/client'
 import classNames from 'classnames'
diff --git a/client/web/src/enterprise/codeintel/shared/components/CodeIntelIndexer.tsx b/client/web/src/enterprise/codeintel/shared/components/CodeIntelIndexer.tsx
index aa9a52fa0f9..1428d1aad95 100644
--- a/client/web/src/enterprise/codeintel/shared/components/CodeIntelIndexer.tsx
+++ b/client/web/src/enterprise/codeintel/shared/components/CodeIntelIndexer.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import { Link } from '@sourcegraph/wildcard'
 
diff --git a/client/web/src/enterprise/codeintel/shared/components/CodeIntelStateBanner.tsx b/client/web/src/enterprise/codeintel/shared/components/CodeIntelStateBanner.tsx
index 2809136ad2a..8d9ee4a927a 100644
--- a/client/web/src/enterprise/codeintel/shared/components/CodeIntelStateBanner.tsx
+++ b/client/web/src/enterprise/codeintel/shared/components/CodeIntelStateBanner.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import { Alert, AlertProps } from '@sourcegraph/wildcard'
 
diff --git a/client/web/src/enterprise/codeintel/shared/components/CodeIntelStateDescription.tsx b/client/web/src/enterprise/codeintel/shared/components/CodeIntelStateDescription.tsx
index c335c47268a..78774b1b5a0 100644
--- a/client/web/src/enterprise/codeintel/shared/components/CodeIntelStateDescription.tsx
+++ b/client/web/src/enterprise/codeintel/shared/components/CodeIntelStateDescription.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import { upperFirst } from 'lodash'
 
diff --git a/client/web/src/enterprise/codeintel/shared/components/CodeIntelStateIcon.tsx b/client/web/src/enterprise/codeintel/shared/components/CodeIntelStateIcon.tsx
index ae5523f03b4..bd3a5ed8bfd 100644
--- a/client/web/src/enterprise/codeintel/shared/components/CodeIntelStateIcon.tsx
+++ b/client/web/src/enterprise/codeintel/shared/components/CodeIntelStateIcon.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import classNames from 'classnames'
 import AlertCircleIcon from 'mdi-react/AlertCircleIcon'
diff --git a/client/web/src/enterprise/codeintel/shared/components/CodeIntelStateLabel.tsx b/client/web/src/enterprise/codeintel/shared/components/CodeIntelStateLabel.tsx
index eb38d832490..ebb0131ce9f 100644
--- a/client/web/src/enterprise/codeintel/shared/components/CodeIntelStateLabel.tsx
+++ b/client/web/src/enterprise/codeintel/shared/components/CodeIntelStateLabel.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import classNames from 'classnames'
 
diff --git a/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexCommit.tsx b/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexCommit.tsx
index c075ac99c3d..2831a4a83b9 100644
--- a/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexCommit.tsx
+++ b/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexCommit.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import { Link } from '@sourcegraph/wildcard'
 
diff --git a/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexIndexer.tsx b/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexIndexer.tsx
index fe54133d39a..951c53a16b4 100644
--- a/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexIndexer.tsx
+++ b/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexIndexer.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import { LsifIndexFields } from '../../../../graphql-operations'
 
diff --git a/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexLastActivity.tsx b/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexLastActivity.tsx
index 17c4ce0a723..c44e4b63941 100644
--- a/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexLastActivity.tsx
+++ b/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexLastActivity.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import { Timestamp } from '../../../../components/time/Timestamp'
 import { LsifIndexFields, LsifUploadFields } from '../../../../graphql-operations'
diff --git a/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexRoot.tsx b/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexRoot.tsx
index 2d72ae2fde2..fc4b47d8422 100644
--- a/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexRoot.tsx
+++ b/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexRoot.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import { Link } from '@sourcegraph/wildcard'
 
diff --git a/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexerRepository.tsx b/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexerRepository.tsx
index c00c79d1068..905d1ecd6e3 100644
--- a/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexerRepository.tsx
+++ b/client/web/src/enterprise/codeintel/shared/components/CodeIntelUploadOrIndexerRepository.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import { Link } from '@sourcegraph/wildcard'
 
diff --git a/client/web/src/enterprise/codeintel/uploads/components/CodeIntelAssociatedIndex.tsx b/client/web/src/enterprise/codeintel/uploads/components/CodeIntelAssociatedIndex.tsx
index 374c83a893b..14fcb5ca63d 100644
--- a/client/web/src/enterprise/codeintel/uploads/components/CodeIntelAssociatedIndex.tsx
+++ b/client/web/src/enterprise/codeintel/uploads/components/CodeIntelAssociatedIndex.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import classNames from 'classnames'
 import ChevronRightIcon from 'mdi-react/ChevronRightIcon'
diff --git a/client/web/src/enterprise/codeintel/uploads/components/CodeIntelDeleteUpload.tsx b/client/web/src/enterprise/codeintel/uploads/components/CodeIntelDeleteUpload.tsx
index c25618a3eaa..a5a8d5adbbc 100644
--- a/client/web/src/enterprise/codeintel/uploads/components/CodeIntelDeleteUpload.tsx
+++ b/client/web/src/enterprise/codeintel/uploads/components/CodeIntelDeleteUpload.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import DeleteIcon from 'mdi-react/DeleteIcon'
 
diff --git a/client/web/src/enterprise/codeintel/uploads/components/CodeIntelUploadMeta.tsx b/client/web/src/enterprise/codeintel/uploads/components/CodeIntelUploadMeta.tsx
index 1d2be81d4d9..48fd7eedd48 100644
--- a/client/web/src/enterprise/codeintel/uploads/components/CodeIntelUploadMeta.tsx
+++ b/client/web/src/enterprise/codeintel/uploads/components/CodeIntelUploadMeta.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import { CardSubtitle, CardText, CardTitle, CardBody, Card } from '@sourcegraph/wildcard'
 
diff --git a/client/web/src/enterprise/codeintel/uploads/components/CodeIntelUploadNode.tsx b/client/web/src/enterprise/codeintel/uploads/components/CodeIntelUploadNode.tsx
index 84c237f6133..21c78b42d78 100644
--- a/client/web/src/enterprise/codeintel/uploads/components/CodeIntelUploadNode.tsx
+++ b/client/web/src/enterprise/codeintel/uploads/components/CodeIntelUploadNode.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import classNames from 'classnames'
 import ChevronRightIcon from 'mdi-react/ChevronRightIcon'
diff --git a/client/web/src/enterprise/codeintel/uploads/components/CodeIntelUploadTimeline.tsx b/client/web/src/enterprise/codeintel/uploads/components/CodeIntelUploadTimeline.tsx
index 2e2bf712458..2cc50b54e2f 100644
--- a/client/web/src/enterprise/codeintel/uploads/components/CodeIntelUploadTimeline.tsx
+++ b/client/web/src/enterprise/codeintel/uploads/components/CodeIntelUploadTimeline.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useMemo } from 'react'
+import { FunctionComponent, useMemo } from 'react'
 
 import AlertCircleIcon from 'mdi-react/AlertCircleIcon'
 import CheckIcon from 'mdi-react/CheckIcon'
diff --git a/client/web/src/enterprise/codeintel/uploads/components/CommitGraphMetadata.tsx b/client/web/src/enterprise/codeintel/uploads/components/CommitGraphMetadata.tsx
index c4062eb6fff..823f0c83e20 100644
--- a/client/web/src/enterprise/codeintel/uploads/components/CommitGraphMetadata.tsx
+++ b/client/web/src/enterprise/codeintel/uploads/components/CommitGraphMetadata.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import { Alert } from '@sourcegraph/wildcard'
 
diff --git a/client/web/src/enterprise/codeintel/uploads/components/DependencyOrDependentNode.tsx b/client/web/src/enterprise/codeintel/uploads/components/DependencyOrDependentNode.tsx
index 0f3fb604982..1ef394e4e00 100644
--- a/client/web/src/enterprise/codeintel/uploads/components/DependencyOrDependentNode.tsx
+++ b/client/web/src/enterprise/codeintel/uploads/components/DependencyOrDependentNode.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import classNames from 'classnames'
 import ChevronRightIcon from 'mdi-react/ChevronRightIcon'
diff --git a/client/web/src/enterprise/codeintel/uploads/components/UploadRetentionStatusNode.tsx b/client/web/src/enterprise/codeintel/uploads/components/UploadRetentionStatusNode.tsx
index 443807a4694..71d36d61991 100644
--- a/client/web/src/enterprise/codeintel/uploads/components/UploadRetentionStatusNode.tsx
+++ b/client/web/src/enterprise/codeintel/uploads/components/UploadRetentionStatusNode.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import classNames from 'classnames'
 import InformationOutlineIcon from 'mdi-react/InformationOutlineIcon'
diff --git a/client/web/src/enterprise/codeintel/uploads/pages/CodeIntelUploadPage.story.tsx b/client/web/src/enterprise/codeintel/uploads/pages/CodeIntelUploadPage.story.tsx
index 878024a59ae..ff108810f2f 100644
--- a/client/web/src/enterprise/codeintel/uploads/pages/CodeIntelUploadPage.story.tsx
+++ b/client/web/src/enterprise/codeintel/uploads/pages/CodeIntelUploadPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 import { of } from 'rxjs'
 
diff --git a/client/web/src/enterprise/codeintel/uploads/pages/CodeIntelUploadPage.tsx b/client/web/src/enterprise/codeintel/uploads/pages/CodeIntelUploadPage.tsx
index 331ae21f6b6..ea27a9fb199 100644
--- a/client/web/src/enterprise/codeintel/uploads/pages/CodeIntelUploadPage.tsx
+++ b/client/web/src/enterprise/codeintel/uploads/pages/CodeIntelUploadPage.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useCallback, useEffect, useMemo, useState } from 'react'
+import { FunctionComponent, useCallback, useEffect, useMemo, useState } from 'react'
 
 import { useApolloClient } from '@apollo/client'
 import classNames from 'classnames'
diff --git a/client/web/src/enterprise/codeintel/uploads/pages/CodeIntelUploadsPage.story.tsx b/client/web/src/enterprise/codeintel/uploads/pages/CodeIntelUploadsPage.story.tsx
index 1643db77422..2955a76376b 100644
--- a/client/web/src/enterprise/codeintel/uploads/pages/CodeIntelUploadsPage.story.tsx
+++ b/client/web/src/enterprise/codeintel/uploads/pages/CodeIntelUploadsPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean } from '@storybook/addon-knobs'
 import { Meta, Story } from '@storybook/react'
 import { of } from 'rxjs'
diff --git a/client/web/src/enterprise/codeintel/uploads/pages/CodeIntelUploadsPage.tsx b/client/web/src/enterprise/codeintel/uploads/pages/CodeIntelUploadsPage.tsx
index be7c1d4a1f0..e72b8db7a6c 100644
--- a/client/web/src/enterprise/codeintel/uploads/pages/CodeIntelUploadsPage.tsx
+++ b/client/web/src/enterprise/codeintel/uploads/pages/CodeIntelUploadsPage.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useCallback, useEffect, useMemo, useState } from 'react'
+import { FunctionComponent, useCallback, useEffect, useMemo, useState } from 'react'
 
 import { useApolloClient } from '@apollo/client'
 import classNames from 'classnames'
diff --git a/client/web/src/enterprise/dotcom/productPlans/ProductPlanFormControl.test.tsx b/client/web/src/enterprise/dotcom/productPlans/ProductPlanFormControl.test.tsx
index c1d104dfe85..69d2949cc95 100644
--- a/client/web/src/enterprise/dotcom/productPlans/ProductPlanFormControl.test.tsx
+++ b/client/web/src/enterprise/dotcom/productPlans/ProductPlanFormControl.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, act } from '@testing-library/react'
 import { of } from 'rxjs'
 
diff --git a/client/web/src/enterprise/dotcom/productPlans/ProductPlanPrice.test.tsx b/client/web/src/enterprise/dotcom/productPlans/ProductPlanPrice.test.tsx
index 23dbec6ae29..c06efd6eb96 100644
--- a/client/web/src/enterprise/dotcom/productPlans/ProductPlanPrice.test.tsx
+++ b/client/web/src/enterprise/dotcom/productPlans/ProductPlanPrice.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { ProductPlanPrice } from './ProductPlanPrice'
diff --git a/client/web/src/enterprise/dotcom/productPlans/ProductPlanTiered.test.tsx b/client/web/src/enterprise/dotcom/productPlans/ProductPlanTiered.test.tsx
index e5b3035b82c..69a0e86d9d2 100644
--- a/client/web/src/enterprise/dotcom/productPlans/ProductPlanTiered.test.tsx
+++ b/client/web/src/enterprise/dotcom/productPlans/ProductPlanTiered.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { ProductPlanTiered } from './ProductPlanTiered'
diff --git a/client/web/src/enterprise/dotcom/productPlans/ProductSubscriptionUserCountFormControl.test.tsx b/client/web/src/enterprise/dotcom/productPlans/ProductSubscriptionUserCountFormControl.test.tsx
index 3c33dee1711..fe8360e142d 100644
--- a/client/web/src/enterprise/dotcom/productPlans/ProductSubscriptionUserCountFormControl.test.tsx
+++ b/client/web/src/enterprise/dotcom/productPlans/ProductSubscriptionUserCountFormControl.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { ProductSubscriptionUserCountFormControl } from './ProductSubscriptionUserCountFormControl'
diff --git a/client/web/src/enterprise/embed/main.tsx b/client/web/src/enterprise/embed/main.tsx
index f7cb2a42fab..e497eb89f8b 100644
--- a/client/web/src/enterprise/embed/main.tsx
+++ b/client/web/src/enterprise/embed/main.tsx
@@ -1,7 +1,5 @@
 import '@sourcegraph/shared/src/polyfills'
 
-import React from 'react'
-
 import { render } from 'react-dom'
 
 import { EmbeddedWebApp } from './EmbeddedWebApp'
diff --git a/client/web/src/enterprise/insights/components/creation-ui-kit/code-insight-time-step-picker/CodeInsightTimeStepPicker.tsx b/client/web/src/enterprise/insights/components/creation-ui-kit/code-insight-time-step-picker/CodeInsightTimeStepPicker.tsx
index 2412a17eec5..6e82fdf30b3 100644
--- a/client/web/src/enterprise/insights/components/creation-ui-kit/code-insight-time-step-picker/CodeInsightTimeStepPicker.tsx
+++ b/client/web/src/enterprise/insights/components/creation-ui-kit/code-insight-time-step-picker/CodeInsightTimeStepPicker.tsx
@@ -1,4 +1,4 @@
-import React, { ChangeEvent, FocusEventHandler, forwardRef } from 'react'
+import { ChangeEvent, FocusEventHandler, forwardRef } from 'react'
 
 import classNames from 'classnames'
 
diff --git a/client/web/src/enterprise/insights/components/creation-ui-kit/code-insight-time-step-picker/get-interval-descrtiption-text/get-interval-description-text.tsx b/client/web/src/enterprise/insights/components/creation-ui-kit/code-insight-time-step-picker/get-interval-descrtiption-text/get-interval-description-text.tsx
index a4a26cfb617..6d22286936c 100644
--- a/client/web/src/enterprise/insights/components/creation-ui-kit/code-insight-time-step-picker/get-interval-descrtiption-text/get-interval-description-text.tsx
+++ b/client/web/src/enterprise/insights/components/creation-ui-kit/code-insight-time-step-picker/get-interval-descrtiption-text/get-interval-description-text.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react'
+import { ReactNode } from 'react'
 
 import { InsightStep } from '../../../../pages/insights/creation/search-insight/types'
 
diff --git a/client/web/src/enterprise/insights/components/form/monaco-field/MonacoField.story.tsx b/client/web/src/enterprise/insights/components/form/monaco-field/MonacoField.story.tsx
index 9cef5499476..0ed62d618a7 100644
--- a/client/web/src/enterprise/insights/components/form/monaco-field/MonacoField.story.tsx
+++ b/client/web/src/enterprise/insights/components/form/monaco-field/MonacoField.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta } from '@storybook/react'
 import RegexIcon from 'mdi-react/RegexIcon'
 
diff --git a/client/web/src/enterprise/insights/components/form/monaco-field/MonacoField.tsx b/client/web/src/enterprise/insights/components/form/monaco-field/MonacoField.tsx
index c3b10ba703c..cd58e0e38c2 100644
--- a/client/web/src/enterprise/insights/components/form/monaco-field/MonacoField.tsx
+++ b/client/web/src/enterprise/insights/components/form/monaco-field/MonacoField.tsx
@@ -1,4 +1,4 @@
-import React, { createContext, forwardRef, InputHTMLAttributes, useContext, useImperativeHandle, useMemo } from 'react'
+import { createContext, forwardRef, InputHTMLAttributes, useContext, useImperativeHandle, useMemo } from 'react'
 
 import classNames from 'classnames'
 import { noop } from 'lodash'
diff --git a/client/web/src/enterprise/insights/components/form/query-input/InsightQueryInput.tsx b/client/web/src/enterprise/insights/components/form/query-input/InsightQueryInput.tsx
index e20a9bbbbd0..c3081b0dc2d 100644
--- a/client/web/src/enterprise/insights/components/form/query-input/InsightQueryInput.tsx
+++ b/client/web/src/enterprise/insights/components/form/query-input/InsightQueryInput.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef } from 'react'
+import { forwardRef } from 'react'
 
 import classNames from 'classnames'
 
diff --git a/client/web/src/enterprise/insights/components/form/repositories-field/RepositoriesField.tsx b/client/web/src/enterprise/insights/components/form/repositories-field/RepositoriesField.tsx
index ca065d7da85..db3063b6938 100644
--- a/client/web/src/enterprise/insights/components/form/repositories-field/RepositoriesField.tsx
+++ b/client/web/src/enterprise/insights/components/form/repositories-field/RepositoriesField.tsx
@@ -1,13 +1,4 @@
-import React, {
-    ChangeEvent,
-    FocusEvent,
-    forwardRef,
-    MouseEvent,
-    Ref,
-    useImperativeHandle,
-    useRef,
-    useState,
-} from 'react'
+import { ChangeEvent, FocusEvent, forwardRef, MouseEvent, Ref, useImperativeHandle, useRef, useState } from 'react'
 
 import { Combobox, ComboboxInput, ComboboxPopover } from '@reach/combobox'
 
diff --git a/client/web/src/enterprise/insights/components/form/repositories-field/RepositoryField.tsx b/client/web/src/enterprise/insights/components/form/repositories-field/RepositoryField.tsx
index 0c6518af830..e4dcd276e44 100644
--- a/client/web/src/enterprise/insights/components/form/repositories-field/RepositoryField.tsx
+++ b/client/web/src/enterprise/insights/components/form/repositories-field/RepositoryField.tsx
@@ -1,4 +1,4 @@
-import React, { ChangeEvent, forwardRef, Ref, useImperativeHandle, useRef } from 'react'
+import { ChangeEvent, forwardRef, Ref, useImperativeHandle, useRef } from 'react'
 
 import { Combobox, ComboboxInput, ComboboxPopover } from '@reach/combobox'
 
diff --git a/client/web/src/enterprise/insights/components/insights-view-grid/SmartInsightsViewGrid.story.tsx b/client/web/src/enterprise/insights/components/insights-view-grid/SmartInsightsViewGrid.story.tsx
index 12ec9bb5aa1..da1084f3f5a 100644
--- a/client/web/src/enterprise/insights/components/insights-view-grid/SmartInsightsViewGrid.story.tsx
+++ b/client/web/src/enterprise/insights/components/insights-view-grid/SmartInsightsViewGrid.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta } from '@storybook/react'
 import { Observable, of } from 'rxjs'
 
diff --git a/client/web/src/enterprise/insights/components/insights-view-grid/components/backend-insight/components/drill-down-filters-panel/DrillDownFiltersPanel.story.tsx b/client/web/src/enterprise/insights/components/insights-view-grid/components/backend-insight/components/drill-down-filters-panel/DrillDownFiltersPanel.story.tsx
index d8f5b7bdddb..be1b060261e 100644
--- a/client/web/src/enterprise/insights/components/insights-view-grid/components/backend-insight/components/drill-down-filters-panel/DrillDownFiltersPanel.story.tsx
+++ b/client/web/src/enterprise/insights/components/insights-view-grid/components/backend-insight/components/drill-down-filters-panel/DrillDownFiltersPanel.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 import delay from 'delay'
 import { of } from 'rxjs'
diff --git a/client/web/src/enterprise/insights/components/views/card/InsightCard.story.tsx b/client/web/src/enterprise/insights/components/views/card/InsightCard.story.tsx
index a9061d29f48..506517170eb 100644
--- a/client/web/src/enterprise/insights/components/views/card/InsightCard.story.tsx
+++ b/client/web/src/enterprise/insights/components/views/card/InsightCard.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 import { noop } from 'lodash'
 import DotsVerticalIcon from 'mdi-react/DotsVerticalIcon'
diff --git a/client/web/src/enterprise/insights/components/views/chart/categorical/CategoricalChart.story.tsx b/client/web/src/enterprise/insights/components/views/chart/categorical/CategoricalChart.story.tsx
index e1a94e8d7a0..b0021746553 100644
--- a/client/web/src/enterprise/insights/components/views/chart/categorical/CategoricalChart.story.tsx
+++ b/client/web/src/enterprise/insights/components/views/chart/categorical/CategoricalChart.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 
 import { WebStory } from '../../../../../../components/WebStory'
diff --git a/client/web/src/enterprise/insights/components/views/chart/series/SeriesChart.story.tsx b/client/web/src/enterprise/insights/components/views/chart/series/SeriesChart.story.tsx
index a208f1c5f07..d81235c4b97 100644
--- a/client/web/src/enterprise/insights/components/views/chart/series/SeriesChart.story.tsx
+++ b/client/web/src/enterprise/insights/components/views/chart/series/SeriesChart.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 
 import { Series } from '../../../../../../charts'
diff --git a/client/web/src/enterprise/insights/pages/dashboards/creation/InsightsDashboardCreationPage.story.tsx b/client/web/src/enterprise/insights/pages/dashboards/creation/InsightsDashboardCreationPage.story.tsx
index 643f3b4b66c..75a104e4007 100644
--- a/client/web/src/enterprise/insights/pages/dashboards/creation/InsightsDashboardCreationPage.story.tsx
+++ b/client/web/src/enterprise/insights/pages/dashboards/creation/InsightsDashboardCreationPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 import { of } from 'rxjs'
 
diff --git a/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/components/add-insight-modal/AddInsightModal.story.tsx b/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/components/add-insight-modal/AddInsightModal.story.tsx
index 4480550aae7..b6f6c096ff4 100644
--- a/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/components/add-insight-modal/AddInsightModal.story.tsx
+++ b/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/components/add-insight-modal/AddInsightModal.story.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import { useState } from 'react'
 
 import { storiesOf } from '@storybook/react'
 import { of } from 'rxjs'
diff --git a/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/components/dashboard-select/DashboardSelect.story.tsx b/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/components/dashboard-select/DashboardSelect.story.tsx
index f22f72890e3..a1759d801c2 100644
--- a/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/components/dashboard-select/DashboardSelect.story.tsx
+++ b/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/components/dashboard-select/DashboardSelect.story.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import { useState } from 'react'
 
 import { storiesOf } from '@storybook/react'
 
diff --git a/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/components/dashboards-content/components/empty-insight-dashboard/EmptyInsightDashboard.story.tsx b/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/components/dashboards-content/components/empty-insight-dashboard/EmptyInsightDashboard.story.tsx
index fdab8cf92d3..c779f7722c8 100644
--- a/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/components/dashboards-content/components/empty-insight-dashboard/EmptyInsightDashboard.story.tsx
+++ b/client/web/src/enterprise/insights/pages/dashboards/dashboard-page/components/dashboards-content/components/empty-insight-dashboard/EmptyInsightDashboard.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
 
diff --git a/client/web/src/enterprise/insights/pages/insights/creation/capture-group/CaptureGroupCreationPage.story.tsx b/client/web/src/enterprise/insights/pages/insights/creation/capture-group/CaptureGroupCreationPage.story.tsx
index ec6a17cf80b..bfccdde22af 100644
--- a/client/web/src/enterprise/insights/pages/insights/creation/capture-group/CaptureGroupCreationPage.story.tsx
+++ b/client/web/src/enterprise/insights/pages/insights/creation/capture-group/CaptureGroupCreationPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 import { noop } from 'lodash'
 
diff --git a/client/web/src/enterprise/insights/pages/insights/creation/capture-group/components/query-input/CaptureGroupQueryInput.tsx b/client/web/src/enterprise/insights/pages/insights/creation/capture-group/components/query-input/CaptureGroupQueryInput.tsx
index 633ec53347b..e6f48c62d24 100644
--- a/client/web/src/enterprise/insights/pages/insights/creation/capture-group/components/query-input/CaptureGroupQueryInput.tsx
+++ b/client/web/src/enterprise/insights/pages/insights/creation/capture-group/components/query-input/CaptureGroupQueryInput.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef } from 'react'
+import { forwardRef } from 'react'
 
 import RegexIcon from 'mdi-react/RegexIcon'
 
diff --git a/client/web/src/enterprise/insights/pages/insights/creation/intro/IntroCreationPage.story.tsx b/client/web/src/enterprise/insights/pages/insights/creation/intro/IntroCreationPage.story.tsx
index fed0b84cd74..542ab7c0223 100644
--- a/client/web/src/enterprise/insights/pages/insights/creation/intro/IntroCreationPage.story.tsx
+++ b/client/web/src/enterprise/insights/pages/insights/creation/intro/IntroCreationPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 
 import { NOOP_TELEMETRY_SERVICE } from '@sourcegraph/shared/src/telemetry/telemetryService'
diff --git a/client/web/src/enterprise/insights/pages/insights/creation/intro/cards/InsightCards.story.tsx b/client/web/src/enterprise/insights/pages/insights/creation/intro/cards/InsightCards.story.tsx
index 89f6e89d278..b55a63ee376 100644
--- a/client/web/src/enterprise/insights/pages/insights/creation/intro/cards/InsightCards.story.tsx
+++ b/client/web/src/enterprise/insights/pages/insights/creation/intro/cards/InsightCards.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 
 import { WebStory } from '../../../../../../../components/WebStory'
diff --git a/client/web/src/enterprise/insights/pages/insights/creation/lang-stats/LangStatsInsightCreationPage.story.tsx b/client/web/src/enterprise/insights/pages/insights/creation/lang-stats/LangStatsInsightCreationPage.story.tsx
index 161392bdea1..07ff25c2c15 100644
--- a/client/web/src/enterprise/insights/pages/insights/creation/lang-stats/LangStatsInsightCreationPage.story.tsx
+++ b/client/web/src/enterprise/insights/pages/insights/creation/lang-stats/LangStatsInsightCreationPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 import delay from 'delay'
 import { noop } from 'lodash'
diff --git a/client/web/src/enterprise/insights/pages/insights/creation/search-insight/SearchInsightCreationPage.story.tsx b/client/web/src/enterprise/insights/pages/insights/creation/search-insight/SearchInsightCreationPage.story.tsx
index c56a1708bc9..36fa8b28600 100644
--- a/client/web/src/enterprise/insights/pages/insights/creation/search-insight/SearchInsightCreationPage.story.tsx
+++ b/client/web/src/enterprise/insights/pages/insights/creation/search-insight/SearchInsightCreationPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 import delay from 'delay'
 import { noop, random } from 'lodash'
diff --git a/client/web/src/enterprise/insights/pages/insights/creation/search-insight/components/form-series/components/series-card/SeriesCard.tsx b/client/web/src/enterprise/insights/pages/insights/creation/search-insight/components/form-series/components/series-card/SeriesCard.tsx
index 6731184ac04..e5ad8613fab 100644
--- a/client/web/src/enterprise/insights/pages/insights/creation/search-insight/components/form-series/components/series-card/SeriesCard.tsx
+++ b/client/web/src/enterprise/insights/pages/insights/creation/search-insight/components/form-series/components/series-card/SeriesCard.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement } from 'react'
+import { ReactElement } from 'react'
 
 import classNames from 'classnames'
 
diff --git a/client/web/src/enterprise/insights/pages/landing/dot-com-get-started/CodeInsightsDotComGetStarted.story.tsx b/client/web/src/enterprise/insights/pages/landing/dot-com-get-started/CodeInsightsDotComGetStarted.story.tsx
index 152056e0f9e..77c6836d636 100644
--- a/client/web/src/enterprise/insights/pages/landing/dot-com-get-started/CodeInsightsDotComGetStarted.story.tsx
+++ b/client/web/src/enterprise/insights/pages/landing/dot-com-get-started/CodeInsightsDotComGetStarted.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta } from '@storybook/react'
 
 import { NOOP_TELEMETRY_SERVICE } from '@sourcegraph/shared/src/telemetry/telemetryService'
diff --git a/client/web/src/enterprise/insights/pages/landing/dot-com-get-started/components/code-insights-examples-picker/code-insights-examples-slider/CodeInsightsExamplesSlider.story.tsx b/client/web/src/enterprise/insights/pages/landing/dot-com-get-started/components/code-insights-examples-picker/code-insights-examples-slider/CodeInsightsExamplesSlider.story.tsx
index 6d64788a4b9..1b574351436 100644
--- a/client/web/src/enterprise/insights/pages/landing/dot-com-get-started/components/code-insights-examples-picker/code-insights-examples-slider/CodeInsightsExamplesSlider.story.tsx
+++ b/client/web/src/enterprise/insights/pages/landing/dot-com-get-started/components/code-insights-examples-picker/code-insights-examples-slider/CodeInsightsExamplesSlider.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta } from '@storybook/react'
 
 import { NOOP_TELEMETRY_SERVICE } from '@sourcegraph/shared/src/telemetry/telemetryService'
diff --git a/client/web/src/enterprise/insights/pages/landing/getting-started/components/code-insights-examples/CodeInsightsExamples.story.tsx b/client/web/src/enterprise/insights/pages/landing/getting-started/components/code-insights-examples/CodeInsightsExamples.story.tsx
index 524ccef2a37..759e76bc032 100644
--- a/client/web/src/enterprise/insights/pages/landing/getting-started/components/code-insights-examples/CodeInsightsExamples.story.tsx
+++ b/client/web/src/enterprise/insights/pages/landing/getting-started/components/code-insights-examples/CodeInsightsExamples.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta } from '@storybook/react'
 
 import { NOOP_TELEMETRY_SERVICE } from '@sourcegraph/shared/src/telemetry/telemetryService'
diff --git a/client/web/src/enterprise/insights/pages/landing/getting-started/components/code-insights-query-block/CodeInsightsQueryBlock.tsx b/client/web/src/enterprise/insights/pages/landing/getting-started/components/code-insights-query-block/CodeInsightsQueryBlock.tsx
index 592b79808b8..34a45ddd9c2 100644
--- a/client/web/src/enterprise/insights/pages/landing/getting-started/components/code-insights-query-block/CodeInsightsQueryBlock.tsx
+++ b/client/web/src/enterprise/insights/pages/landing/getting-started/components/code-insights-query-block/CodeInsightsQueryBlock.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef } from 'react'
+import { forwardRef } from 'react'
 
 import classNames from 'classnames'
 
diff --git a/client/web/src/enterprise/main.tsx b/client/web/src/enterprise/main.tsx
index 11ff924b022..ea6da0f098b 100644
--- a/client/web/src/enterprise/main.tsx
+++ b/client/web/src/enterprise/main.tsx
@@ -7,8 +7,6 @@ import '@sourcegraph/shared/src/polyfills'
 
 import '../monitoring/initMonitoring'
 
-import React from 'react'
-
 import { render } from 'react-dom'
 
 import { EnterpriseWebApp } from './EnterpriseWebApp'
diff --git a/client/web/src/enterprise/organizations/EarlyAccessOrgsCodeForm.tsx b/client/web/src/enterprise/organizations/EarlyAccessOrgsCodeForm.tsx
index 8593856b5f7..d3ff39536f3 100644
--- a/client/web/src/enterprise/organizations/EarlyAccessOrgsCodeForm.tsx
+++ b/client/web/src/enterprise/organizations/EarlyAccessOrgsCodeForm.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useCallback, useState } from 'react'
+import { FunctionComponent, useCallback, useState } from 'react'
 
 import { Form } from '@sourcegraph/branded/src/components/Form'
 import { gql, useLazyQuery, useMutation } from '@sourcegraph/http-client'
diff --git a/client/web/src/enterprise/organizations/routes.tsx b/client/web/src/enterprise/organizations/routes.tsx
index ab9fedfed8d..426f4312347 100644
--- a/client/web/src/enterprise/organizations/routes.tsx
+++ b/client/web/src/enterprise/organizations/routes.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { RouteComponentProps } from 'react-router'
 
 import { lazyComponent } from '@sourcegraph/shared/src/util/lazyComponent'
diff --git a/client/web/src/enterprise/repo/routes.tsx b/client/web/src/enterprise/repo/routes.tsx
index 752332d8c10..dac19852bf5 100644
--- a/client/web/src/enterprise/repo/routes.tsx
+++ b/client/web/src/enterprise/repo/routes.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { lazyComponent } from '@sourcegraph/shared/src/util/lazyComponent'
 
 import { RepoContainerRoute } from '../../repo/RepoContainer'
diff --git a/client/web/src/enterprise/repo/settings/routes.tsx b/client/web/src/enterprise/repo/settings/routes.tsx
index 48963f51ea2..d5548e4bdc9 100644
--- a/client/web/src/enterprise/repo/settings/routes.tsx
+++ b/client/web/src/enterprise/repo/settings/routes.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react'
-
 import { Redirect, RouteComponentProps } from 'react-router'
 
 import { lazyComponent } from '@sourcegraph/shared/src/util/lazyComponent'
diff --git a/client/web/src/enterprise/routes.tsx b/client/web/src/enterprise/routes.tsx
index 90f9366bd8c..642b8d349d5 100644
--- a/client/web/src/enterprise/routes.tsx
+++ b/client/web/src/enterprise/routes.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Redirect } from 'react-router'
 
 import { isErrorLike } from '@sourcegraph/common'
diff --git a/client/web/src/enterprise/search/stats/SearchStatsLanguages.test.tsx b/client/web/src/enterprise/search/stats/SearchStatsLanguages.test.tsx
index 7861e3ae373..20648de1bf8 100644
--- a/client/web/src/enterprise/search/stats/SearchStatsLanguages.test.tsx
+++ b/client/web/src/enterprise/search/stats/SearchStatsLanguages.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 import { MemoryRouter } from 'react-router'
 
diff --git a/client/web/src/enterprise/search/stats/SearchStatsPage.test.tsx b/client/web/src/enterprise/search/stats/SearchStatsPage.test.tsx
index 4a0a7170e91..12db2394ff6 100644
--- a/client/web/src/enterprise/search/stats/SearchStatsPage.test.tsx
+++ b/client/web/src/enterprise/search/stats/SearchStatsPage.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, act } from '@testing-library/react'
 import * as H from 'history'
 import { MemoryRouter } from 'react-router'
diff --git a/client/web/src/enterprise/searchContexts/DeleteSearchContextModal.story.tsx b/client/web/src/enterprise/searchContexts/DeleteSearchContextModal.story.tsx
index 193fe6965e0..a9b935b80a3 100644
--- a/client/web/src/enterprise/searchContexts/DeleteSearchContextModal.story.tsx
+++ b/client/web/src/enterprise/searchContexts/DeleteSearchContextModal.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { NEVER } from 'rxjs'
 import sinon from 'sinon'
diff --git a/client/web/src/enterprise/searchContexts/SearchContextForm.story.tsx b/client/web/src/enterprise/searchContexts/SearchContextForm.story.tsx
index bc9943ab8d1..ed5d1013a90 100644
--- a/client/web/src/enterprise/searchContexts/SearchContextForm.story.tsx
+++ b/client/web/src/enterprise/searchContexts/SearchContextForm.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { subDays } from 'date-fns'
 import { NEVER, Observable, of } from 'rxjs'
diff --git a/client/web/src/enterprise/searchContexts/SearchContextPage.story.tsx b/client/web/src/enterprise/searchContexts/SearchContextPage.story.tsx
index 59a07405289..1e0de93e255 100644
--- a/client/web/src/enterprise/searchContexts/SearchContextPage.story.tsx
+++ b/client/web/src/enterprise/searchContexts/SearchContextPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { subDays } from 'date-fns'
 import { NEVER, Observable, of, throwError } from 'rxjs'
diff --git a/client/web/src/enterprise/searchContexts/SearchContextsListTab.story.tsx b/client/web/src/enterprise/searchContexts/SearchContextsListTab.story.tsx
index 6c877959ff8..925f9927947 100644
--- a/client/web/src/enterprise/searchContexts/SearchContextsListTab.story.tsx
+++ b/client/web/src/enterprise/searchContexts/SearchContextsListTab.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { subDays } from 'date-fns'
 import { Observable, of } from 'rxjs'
diff --git a/client/web/src/enterprise/site-admin/SiteAdminLsifUploadPage.tsx b/client/web/src/enterprise/site-admin/SiteAdminLsifUploadPage.tsx
index dee5724db30..1187901febe 100644
--- a/client/web/src/enterprise/site-admin/SiteAdminLsifUploadPage.tsx
+++ b/client/web/src/enterprise/site-admin/SiteAdminLsifUploadPage.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useEffect, useMemo } from 'react'
+import { FunctionComponent, useEffect, useMemo } from 'react'
 
 import { RouteComponentProps, Redirect } from 'react-router'
 import { catchError } from 'rxjs/operators'
diff --git a/client/web/src/enterprise/site-admin/dotcom/customers/SiteAdminCustomerBillingLink.test.tsx b/client/web/src/enterprise/site-admin/dotcom/customers/SiteAdminCustomerBillingLink.test.tsx
index e2f12bed588..f962b0565a7 100644
--- a/client/web/src/enterprise/site-admin/dotcom/customers/SiteAdminCustomerBillingLink.test.tsx
+++ b/client/web/src/enterprise/site-admin/dotcom/customers/SiteAdminCustomerBillingLink.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { renderWithBrandedContext } from '@sourcegraph/shared/src/testing'
 
 import { SiteAdminCustomerBillingLink } from './SiteAdminCustomerBillingLink'
diff --git a/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminGenerateProductLicenseForSubscriptionForm.test.tsx b/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminGenerateProductLicenseForSubscriptionForm.test.tsx
index 1a93dda1924..df4821753f7 100644
--- a/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminGenerateProductLicenseForSubscriptionForm.test.tsx
+++ b/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminGenerateProductLicenseForSubscriptionForm.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { renderWithBrandedContext } from '@sourcegraph/shared/src/testing'
 
 import { SiteAdminGenerateProductLicenseForSubscriptionForm } from './SiteAdminGenerateProductLicenseForSubscriptionForm'
diff --git a/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminProductLicenseNode.test.tsx b/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminProductLicenseNode.test.tsx
index c0b4dad8669..294697f59bb 100644
--- a/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminProductLicenseNode.test.tsx
+++ b/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminProductLicenseNode.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import * as GQL from '@sourcegraph/shared/src/schema'
 import { renderWithBrandedContext } from '@sourcegraph/shared/src/testing'
 
diff --git a/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminProductSubscriptionBillingLink.test.tsx b/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminProductSubscriptionBillingLink.test.tsx
index 110e4f68385..81fbeb16d17 100644
--- a/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminProductSubscriptionBillingLink.test.tsx
+++ b/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminProductSubscriptionBillingLink.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { renderWithBrandedContext } from '@sourcegraph/shared/src/testing'
 
 import { SiteAdminProductSubscriptionBillingLink } from './SiteAdminProductSubscriptionBillingLink'
diff --git a/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminProductSubscriptionPage.test.tsx b/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminProductSubscriptionPage.test.tsx
index ca36b2ed903..512a50e895f 100644
--- a/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminProductSubscriptionPage.test.tsx
+++ b/client/web/src/enterprise/site-admin/dotcom/productSubscriptions/SiteAdminProductSubscriptionPage.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { act } from '@testing-library/react'
 import * as H from 'history'
 import { of } from 'rxjs'
diff --git a/client/web/src/enterprise/user/productSubscriptions/NewProductSubscriptionPaymentSection.test.tsx b/client/web/src/enterprise/user/productSubscriptions/NewProductSubscriptionPaymentSection.test.tsx
index 4a011e10648..5e7b8b5768e 100644
--- a/client/web/src/enterprise/user/productSubscriptions/NewProductSubscriptionPaymentSection.test.tsx
+++ b/client/web/src/enterprise/user/productSubscriptions/NewProductSubscriptionPaymentSection.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, act } from '@testing-library/react'
 import { of } from 'rxjs'
 
diff --git a/client/web/src/enterprise/user/productSubscriptions/UserProductSubscriptionStatus.test.tsx b/client/web/src/enterprise/user/productSubscriptions/UserProductSubscriptionStatus.test.tsx
index dbc70d5e199..4cc67c309cd 100644
--- a/client/web/src/enterprise/user/productSubscriptions/UserProductSubscriptionStatus.test.tsx
+++ b/client/web/src/enterprise/user/productSubscriptions/UserProductSubscriptionStatus.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 
diff --git a/client/web/src/enterprise/user/productSubscriptions/UserSubscriptionsEditProductSubscriptionPage.test.tsx b/client/web/src/enterprise/user/productSubscriptions/UserSubscriptionsEditProductSubscriptionPage.test.tsx
index c27854df022..9bb76f11a87 100644
--- a/client/web/src/enterprise/user/productSubscriptions/UserSubscriptionsEditProductSubscriptionPage.test.tsx
+++ b/client/web/src/enterprise/user/productSubscriptions/UserSubscriptionsEditProductSubscriptionPage.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { act } from '@testing-library/react'
 import * as H from 'history'
 import { of } from 'rxjs'
diff --git a/client/web/src/enterprise/user/productSubscriptions/UserSubscriptionsProductSubscriptionPage.test.tsx b/client/web/src/enterprise/user/productSubscriptions/UserSubscriptionsProductSubscriptionPage.test.tsx
index 5991f7821b0..9c8ac42eaa1 100644
--- a/client/web/src/enterprise/user/productSubscriptions/UserSubscriptionsProductSubscriptionPage.test.tsx
+++ b/client/web/src/enterprise/user/productSubscriptions/UserSubscriptionsProductSubscriptionPage.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { act } from '@testing-library/react'
 import { createMemoryHistory } from 'history'
 import { of } from 'rxjs'
diff --git a/client/web/src/enterprise/user/routes.tsx b/client/web/src/enterprise/user/routes.tsx
index 5a291a85f67..9f93c6bd538 100644
--- a/client/web/src/enterprise/user/routes.tsx
+++ b/client/web/src/enterprise/user/routes.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Redirect, RouteComponentProps } from 'react-router'
 
 import { lazyComponent } from '@sourcegraph/shared/src/util/lazyComponent'
diff --git a/client/web/src/extensions/ExtensionBanner.story.tsx b/client/web/src/extensions/ExtensionBanner.story.tsx
index 8c12e58c30f..3e4c7c93727 100644
--- a/client/web/src/extensions/ExtensionBanner.story.tsx
+++ b/client/web/src/extensions/ExtensionBanner.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { WebStory } from '../components/WebStory'
diff --git a/client/web/src/extensions/ExtensionCard.test.tsx b/client/web/src/extensions/ExtensionCard.test.tsx
index ba0d9278fc4..14236282613 100644
--- a/client/web/src/extensions/ExtensionCard.test.tsx
+++ b/client/web/src/extensions/ExtensionCard.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 import { MemoryRouter } from 'react-router'
 
diff --git a/client/web/src/extensions/ExtensionPermissionModal.test.tsx b/client/web/src/extensions/ExtensionPermissionModal.test.tsx
index e25aabffd96..0e3b9de6090 100644
--- a/client/web/src/extensions/ExtensionPermissionModal.test.tsx
+++ b/client/web/src/extensions/ExtensionPermissionModal.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { ExtensionPermissionModal } from './ExtensionPermissionModal'
diff --git a/client/web/src/extensions/ExtensionRegistrySidenav.test.tsx b/client/web/src/extensions/ExtensionRegistrySidenav.test.tsx
index a86cd9e05ef..e713c47ff8a 100644
--- a/client/web/src/extensions/ExtensionRegistrySidenav.test.tsx
+++ b/client/web/src/extensions/ExtensionRegistrySidenav.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { renderWithBrandedContext } from '@sourcegraph/shared/src/testing'
 
 import { ExtensionRegistrySidenav } from './ExtensionRegistrySidenav'
diff --git a/client/web/src/extensions/ExtensionToggle.test.tsx b/client/web/src/extensions/ExtensionToggle.test.tsx
index b087603fd1b..1364358bcdc 100644
--- a/client/web/src/extensions/ExtensionToggle.test.tsx
+++ b/client/web/src/extensions/ExtensionToggle.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { ConfiguredRegistryExtension } from '@sourcegraph/shared/src/extensions/extension'
diff --git a/client/web/src/extensions/components/StatusBar.story.tsx b/client/web/src/extensions/components/StatusBar.story.tsx
index 88883ba3e0a..f7b1f4480fd 100644
--- a/client/web/src/extensions/components/StatusBar.story.tsx
+++ b/client/web/src/extensions/components/StatusBar.story.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react'
+import { useCallback } from 'react'
 
 import { storiesOf } from '@storybook/react'
 import * as H from 'history'
diff --git a/client/web/src/extensions/components/StatusBar.test.tsx b/client/web/src/extensions/components/StatusBar.test.tsx
index 4164dcbc063..af15c2369b5 100644
--- a/client/web/src/extensions/components/StatusBar.test.tsx
+++ b/client/web/src/extensions/components/StatusBar.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 import * as H from 'history'
 import { BehaviorSubject } from 'rxjs'
diff --git a/client/web/src/extensions/extension/RegistryExtensionOverviewPage.test.tsx b/client/web/src/extensions/extension/RegistryExtensionOverviewPage.test.tsx
index e259467bd78..522a39853d8 100644
--- a/client/web/src/extensions/extension/RegistryExtensionOverviewPage.test.tsx
+++ b/client/web/src/extensions/extension/RegistryExtensionOverviewPage.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { createMemoryHistory } from 'history'
 
 import { NOOP_TELEMETRY_SERVICE } from '@sourcegraph/shared/src/telemetry/telemetryService'
diff --git a/client/web/src/extensions/routes.tsx b/client/web/src/extensions/routes.tsx
index 0ad77cd1db2..2041c644a7c 100644
--- a/client/web/src/extensions/routes.tsx
+++ b/client/web/src/extensions/routes.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { lazyComponent } from '@sourcegraph/shared/src/util/lazyComponent'
 
 import { ExtensionsAreaRoute } from './ExtensionsArea'
diff --git a/client/web/src/global/GlobalAlert.story.tsx b/client/web/src/global/GlobalAlert.story.tsx
index 8cc33e037f3..79aa9d50087 100644
--- a/client/web/src/global/GlobalAlert.story.tsx
+++ b/client/web/src/global/GlobalAlert.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 
 import { BrandedStory } from '@sourcegraph/branded/src/components/BrandedStory'
diff --git a/client/web/src/global/Notices.test.tsx b/client/web/src/global/Notices.test.tsx
index 1b81cd1bde8..a6cea9b273a 100644
--- a/client/web/src/global/Notices.test.tsx
+++ b/client/web/src/global/Notices.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { renderWithBrandedContext } from '@sourcegraph/shared/src/testing'
 
 import { Notices } from './Notices'
diff --git a/client/web/src/main.tsx b/client/web/src/main.tsx
index dccb64154f9..398a72f7a89 100644
--- a/client/web/src/main.tsx
+++ b/client/web/src/main.tsx
@@ -7,8 +7,6 @@ import '@sourcegraph/shared/src/polyfills'
 
 import './monitoring/initMonitoring'
 
-import React from 'react'
-
 import { render } from 'react-dom'
 
 import { OpenSourceWebApp } from './OpenSourceWebApp'
diff --git a/client/web/src/marketing/SurveyPage.story.tsx b/client/web/src/marketing/SurveyPage.story.tsx
index 50dc3542732..4fde17af343 100644
--- a/client/web/src/marketing/SurveyPage.story.tsx
+++ b/client/web/src/marketing/SurveyPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { DecoratorFn, Meta, Story } from '@storybook/react'
 
 import { MockedStoryProvider } from '@sourcegraph/storybook'
diff --git a/client/web/src/marketing/SurveyPage.test.tsx b/client/web/src/marketing/SurveyPage.test.tsx
index 7761eac36c3..1f98f50bd90 100644
--- a/client/web/src/marketing/SurveyPage.test.tsx
+++ b/client/web/src/marketing/SurveyPage.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { MockedProviderProps } from '@apollo/client/testing'
 import { cleanup, fireEvent, within, waitFor } from '@testing-library/react'
 import { createMemoryHistory } from 'history'
diff --git a/client/web/src/marketing/SurveyToast.test.tsx b/client/web/src/marketing/SurveyToast.test.tsx
index 69044f7a927..470ea495630 100644
--- a/client/web/src/marketing/SurveyToast.test.tsx
+++ b/client/web/src/marketing/SurveyToast.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { gql } from '@apollo/client'
 import { createMockClient } from '@apollo/client/testing'
 import { cleanup, within, fireEvent } from '@testing-library/react'
diff --git a/client/web/src/nav/MenuNavItem.test.tsx b/client/web/src/nav/MenuNavItem.test.tsx
index 32fb80e77ca..4dbab34b9f5 100644
--- a/client/web/src/nav/MenuNavItem.test.tsx
+++ b/client/web/src/nav/MenuNavItem.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { MenuNavItem } from './MenuNavItem'
diff --git a/client/web/src/nav/StatusMessagesNavItem.test.tsx b/client/web/src/nav/StatusMessagesNavItem.test.tsx
index 9f3c6788a36..b38cab028f0 100644
--- a/client/web/src/nav/StatusMessagesNavItem.test.tsx
+++ b/client/web/src/nav/StatusMessagesNavItem.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { createMemoryHistory } from 'history'
 import { of, Observable } from 'rxjs'
 
diff --git a/client/web/src/nav/UserNavItem.test.tsx b/client/web/src/nav/UserNavItem.test.tsx
index c56ae067b39..437bde09d89 100644
--- a/client/web/src/nav/UserNavItem.test.tsx
+++ b/client/web/src/nav/UserNavItem.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import * as H from 'history'
diff --git a/client/web/src/notebooks/blocks/compute/NotebookComputeBlock.story.tsx b/client/web/src/notebooks/blocks/compute/NotebookComputeBlock.story.tsx
index f146794ae22..cac39c5ebc2 100644
--- a/client/web/src/notebooks/blocks/compute/NotebookComputeBlock.story.tsx
+++ b/client/web/src/notebooks/blocks/compute/NotebookComputeBlock.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
 
diff --git a/client/web/src/notebooks/blocks/file/NotebookFileBlock.story.tsx b/client/web/src/notebooks/blocks/file/NotebookFileBlock.story.tsx
index f5e1be24670..e024cb880b1 100644
--- a/client/web/src/notebooks/blocks/file/NotebookFileBlock.story.tsx
+++ b/client/web/src/notebooks/blocks/file/NotebookFileBlock.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
 import { of } from 'rxjs'
diff --git a/client/web/src/notebooks/blocks/file/NotebookFileBlockInputs.story.tsx b/client/web/src/notebooks/blocks/file/NotebookFileBlockInputs.story.tsx
index d5184d4ec29..d3df9a15449 100644
--- a/client/web/src/notebooks/blocks/file/NotebookFileBlockInputs.story.tsx
+++ b/client/web/src/notebooks/blocks/file/NotebookFileBlockInputs.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
 
diff --git a/client/web/src/notebooks/blocks/menu/useCommonBlockMenuActions.tsx b/client/web/src/notebooks/blocks/menu/useCommonBlockMenuActions.tsx
index 8270703f5ed..e9e752020dc 100644
--- a/client/web/src/notebooks/blocks/menu/useCommonBlockMenuActions.tsx
+++ b/client/web/src/notebooks/blocks/menu/useCommonBlockMenuActions.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react'
+import { useMemo } from 'react'
 
 import ArrowDownIcon from 'mdi-react/ArrowDownIcon'
 import ArrowUpIcon from 'mdi-react/ArrowUpIcon'
diff --git a/client/web/src/notebooks/blocks/query/NotebookQueryBlock.story.tsx b/client/web/src/notebooks/blocks/query/NotebookQueryBlock.story.tsx
index ff893ed7b14..2e42add305d 100644
--- a/client/web/src/notebooks/blocks/query/NotebookQueryBlock.story.tsx
+++ b/client/web/src/notebooks/blocks/query/NotebookQueryBlock.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
 import { of } from 'rxjs'
diff --git a/client/web/src/notebooks/blocks/suggestions/SearchTypeSuggestionsInput.tsx b/client/web/src/notebooks/blocks/suggestions/SearchTypeSuggestionsInput.tsx
index b90e3f71e05..826ef0fcc38 100644
--- a/client/web/src/notebooks/blocks/suggestions/SearchTypeSuggestionsInput.tsx
+++ b/client/web/src/notebooks/blocks/suggestions/SearchTypeSuggestionsInput.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement, useCallback, useMemo } from 'react'
+import { ReactElement, useCallback, useMemo } from 'react'
 
 import classNames from 'classnames'
 import { noop } from 'lodash'
diff --git a/client/web/src/notebooks/listPage/NotebooksListPage.story.tsx b/client/web/src/notebooks/listPage/NotebooksListPage.story.tsx
index df8bfe0be2e..8e62344f3bd 100644
--- a/client/web/src/notebooks/listPage/NotebooksListPage.story.tsx
+++ b/client/web/src/notebooks/listPage/NotebooksListPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { subDays } from 'date-fns'
 import { Observable, of } from 'rxjs'
diff --git a/client/web/src/notebooks/notebook/NotebookComponent.story.tsx b/client/web/src/notebooks/notebook/NotebookComponent.story.tsx
index 698b77cbb31..58d57b10f60 100644
--- a/client/web/src/notebooks/notebook/NotebookComponent.story.tsx
+++ b/client/web/src/notebooks/notebook/NotebookComponent.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { NEVER, of } from 'rxjs'
 
diff --git a/client/web/src/notebooks/notebook/useCommandPaletteOptions.tsx b/client/web/src/notebooks/notebook/useCommandPaletteOptions.tsx
index 66bd036ab03..baafe29079b 100644
--- a/client/web/src/notebooks/notebook/useCommandPaletteOptions.tsx
+++ b/client/web/src/notebooks/notebook/useCommandPaletteOptions.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement, useMemo } from 'react'
+import { ReactElement, useMemo } from 'react'
 
 import CodeTagsIcon from 'mdi-react/CodeTagsIcon'
 import FunctionIcon from 'mdi-react/FunctionIcon'
diff --git a/client/web/src/org/area/routes.tsx b/client/web/src/org/area/routes.tsx
index 648ba57b168..b5ed005361e 100644
--- a/client/web/src/org/area/routes.tsx
+++ b/client/web/src/org/area/routes.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Redirect } from 'react-router'
 
 import { lazyComponent } from '@sourcegraph/shared/src/util/lazyComponent'
diff --git a/client/web/src/person/PersonLink.test.tsx b/client/web/src/person/PersonLink.test.tsx
index d8dbd7327f4..0ff11d005a7 100644
--- a/client/web/src/person/PersonLink.test.tsx
+++ b/client/web/src/person/PersonLink.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 import { MemoryRouter } from 'react-router'
 
diff --git a/client/web/src/repo/RepoRevisionSidebarSymbols.test.tsx b/client/web/src/repo/RepoRevisionSidebarSymbols.test.tsx
index b00805135b0..4fcbb243776 100644
--- a/client/web/src/repo/RepoRevisionSidebarSymbols.test.tsx
+++ b/client/web/src/repo/RepoRevisionSidebarSymbols.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { MockedResponse } from '@apollo/client/testing'
 import { cleanup, fireEvent } from '@testing-library/react'
 import { escapeRegExp } from 'lodash'
diff --git a/client/web/src/repo/RepositoriesPopover/RepositoriesPopover.story.tsx b/client/web/src/repo/RepositoriesPopover/RepositoriesPopover.story.tsx
index 6304b370478..a7526189ded 100644
--- a/client/web/src/repo/RepositoriesPopover/RepositoriesPopover.story.tsx
+++ b/client/web/src/repo/RepositoriesPopover/RepositoriesPopover.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta } from '@storybook/react'
 
 import { NOOP_TELEMETRY_SERVICE } from '@sourcegraph/shared/src/telemetry/telemetryService'
diff --git a/client/web/src/repo/RepositoriesPopover/RepositoriesPopover.test.tsx b/client/web/src/repo/RepositoriesPopover/RepositoriesPopover.test.tsx
index e4341c30b9a..9fd775e9982 100644
--- a/client/web/src/repo/RepositoriesPopover/RepositoriesPopover.test.tsx
+++ b/client/web/src/repo/RepositoriesPopover/RepositoriesPopover.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { cleanup, fireEvent, act } from '@testing-library/react'
 
 import { NOOP_TELEMETRY_SERVICE } from '@sourcegraph/shared/src/telemetry/telemetryService'
diff --git a/client/web/src/repo/RevisionsPopover/RevisionsPopover.story.tsx b/client/web/src/repo/RevisionsPopover/RevisionsPopover.story.tsx
index c5c87bfb1f5..173a0c1d0dd 100644
--- a/client/web/src/repo/RevisionsPopover/RevisionsPopover.story.tsx
+++ b/client/web/src/repo/RevisionsPopover/RevisionsPopover.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta } from '@storybook/react'
 
 import { WebStory } from '../../components/WebStory'
diff --git a/client/web/src/repo/RevisionsPopover/RevisionsPopover.test.tsx b/client/web/src/repo/RevisionsPopover/RevisionsPopover.test.tsx
index 1b3ad66a6fb..8d7a92b4d81 100644
--- a/client/web/src/repo/RevisionsPopover/RevisionsPopover.test.tsx
+++ b/client/web/src/repo/RevisionsPopover/RevisionsPopover.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { cleanup, within, fireEvent, act } from '@testing-library/react'
 
 import { renderWithBrandedContext, RenderWithBrandedContextResult } from '@sourcegraph/shared/src/testing'
diff --git a/client/web/src/repo/actions/BrowserExtensionAlert.story.tsx b/client/web/src/repo/actions/BrowserExtensionAlert.story.tsx
index 6b3905e5330..d5ba76dbf85 100644
--- a/client/web/src/repo/actions/BrowserExtensionAlert.story.tsx
+++ b/client/web/src/repo/actions/BrowserExtensionAlert.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { action } from '@storybook/addon-actions'
 import { DecoratorFn, Meta, Story } from '@storybook/react'
 
diff --git a/client/web/src/repo/actions/GoToCodeHostAction.story.tsx b/client/web/src/repo/actions/GoToCodeHostAction.story.tsx
index df9abbb5608..2c1f94de88f 100644
--- a/client/web/src/repo/actions/GoToCodeHostAction.story.tsx
+++ b/client/web/src/repo/actions/GoToCodeHostAction.story.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import { useEffect, useState } from 'react'
 
 import { action } from '@storybook/addon-actions'
 import { storiesOf } from '@storybook/react'
diff --git a/client/web/src/repo/actions/IdeExtensionAlert.story.tsx b/client/web/src/repo/actions/IdeExtensionAlert.story.tsx
index 8acc1dcf72c..b51bdb12c2a 100644
--- a/client/web/src/repo/actions/IdeExtensionAlert.story.tsx
+++ b/client/web/src/repo/actions/IdeExtensionAlert.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { action } from '@storybook/addon-actions'
 import { DecoratorFn, Meta, Story } from '@storybook/react'
 
diff --git a/client/web/src/repo/blob/LineDecorator.test.tsx b/client/web/src/repo/blob/LineDecorator.test.tsx
index 13f19ab5ace..411151220b7 100644
--- a/client/web/src/repo/blob/LineDecorator.test.tsx
+++ b/client/web/src/repo/blob/LineDecorator.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, within, waitFor } from '@testing-library/react'
 import { ReplaySubject } from 'rxjs'
 import { TextDocumentDecoration, ThemableDecorationStyle } from 'sourcegraph'
diff --git a/client/web/src/repo/blob/actions/ToggleRenderedFileMode.test.tsx b/client/web/src/repo/blob/actions/ToggleRenderedFileMode.test.tsx
index d1dc2b4ef87..92d0d247d2d 100644
--- a/client/web/src/repo/blob/actions/ToggleRenderedFileMode.test.tsx
+++ b/client/web/src/repo/blob/actions/ToggleRenderedFileMode.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { renderWithBrandedContext } from '@sourcegraph/shared/src/testing'
 
 import { ToggleRenderedFileMode } from './ToggleRenderedFileMode'
diff --git a/client/web/src/repo/blob/panel/BlobPanel.tsx b/client/web/src/repo/blob/panel/BlobPanel.tsx
index 5dec98d62da..ad579b42398 100644
--- a/client/web/src/repo/blob/panel/BlobPanel.tsx
+++ b/client/web/src/repo/blob/panel/BlobPanel.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useRef } from 'react'
+import { useCallback, useEffect, useMemo, useRef } from 'react'
 
 import * as H from 'history'
 import { from, Observable, ReplaySubject, Subscription } from 'rxjs'
diff --git a/client/web/src/repo/commits/GitCommitNode.story.tsx b/client/web/src/repo/commits/GitCommitNode.story.tsx
index 93727a49af7..cc36566c325 100644
--- a/client/web/src/repo/commits/GitCommitNode.story.tsx
+++ b/client/web/src/repo/commits/GitCommitNode.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
 import { subDays } from 'date-fns'
diff --git a/client/web/src/repo/commits/GitCommitNodeByline.test.tsx b/client/web/src/repo/commits/GitCommitNodeByline.test.tsx
index 10d1d91cd6a..96886b8fffd 100644
--- a/client/web/src/repo/commits/GitCommitNodeByline.test.tsx
+++ b/client/web/src/repo/commits/GitCommitNodeByline.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { SignatureFields } from '../../graphql-operations'
diff --git a/client/web/src/repo/releases/RepositoryReleasesTagsPage.test.tsx b/client/web/src/repo/releases/RepositoryReleasesTagsPage.test.tsx
index dd1582c773b..067b35eeff8 100644
--- a/client/web/src/repo/releases/RepositoryReleasesTagsPage.test.tsx
+++ b/client/web/src/repo/releases/RepositoryReleasesTagsPage.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 import * as H from 'history'
 import { of } from 'rxjs'
diff --git a/client/web/src/repo/tree/TreeEntriesSection.test.tsx b/client/web/src/repo/tree/TreeEntriesSection.test.tsx
index 26057f61f8d..ea0f3c3e295 100644
--- a/client/web/src/repo/tree/TreeEntriesSection.test.tsx
+++ b/client/web/src/repo/tree/TreeEntriesSection.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { renderWithBrandedContext } from '@sourcegraph/shared/src/testing'
 
 import { TreeEntriesSection } from './TreeEntriesSection'
diff --git a/client/web/src/savedSearches/SavedSearchForm.story.tsx b/client/web/src/savedSearches/SavedSearchForm.story.tsx
index 14969276057..287c8ef3e53 100644
--- a/client/web/src/savedSearches/SavedSearchForm.story.tsx
+++ b/client/web/src/savedSearches/SavedSearchForm.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { WebStory } from '../components/WebStory'
diff --git a/client/web/src/search/Notepad.test.tsx b/client/web/src/search/Notepad.test.tsx
index 9befd029b09..ce487e1404d 100644
--- a/client/web/src/search/Notepad.test.tsx
+++ b/client/web/src/search/Notepad.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { act, cleanup, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { noop } from 'lodash'
diff --git a/client/web/src/search/home/SearchPage.story.tsx b/client/web/src/search/home/SearchPage.story.tsx
index c671704a9d8..2985300aede 100644
--- a/client/web/src/search/home/SearchPage.story.tsx
+++ b/client/web/src/search/home/SearchPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { parseISO } from 'date-fns'
 import { createMemoryHistory } from 'history'
diff --git a/client/web/src/search/home/SearchPage.test.tsx b/client/web/src/search/home/SearchPage.test.tsx
index 371c47c2b18..7fd6b06ba90 100644
--- a/client/web/src/search/home/SearchPage.test.tsx
+++ b/client/web/src/search/home/SearchPage.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { cleanup } from '@testing-library/react'
 import { createMemoryHistory } from 'history'
 
diff --git a/client/web/src/search/input/SearchOnboardingTour.tsx b/client/web/src/search/input/SearchOnboardingTour.tsx
index 51d234a2d74..7af6d473d74 100644
--- a/client/web/src/search/input/SearchOnboardingTour.tsx
+++ b/client/web/src/search/input/SearchOnboardingTour.tsx
@@ -1,7 +1,7 @@
 /**
  * This file contains utility functions for the search onboarding tour.
  */
-import React, { useCallback, useEffect, useMemo, useState } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 
 import classNames from 'classnames'
 import * as H from 'history'
diff --git a/client/web/src/search/panels/CollaboratorsPanel.story.tsx b/client/web/src/search/panels/CollaboratorsPanel.story.tsx
index f45c1118d42..b37ddd59ff7 100644
--- a/client/web/src/search/panels/CollaboratorsPanel.story.tsx
+++ b/client/web/src/search/panels/CollaboratorsPanel.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { NOOP_TELEMETRY_SERVICE } from '@sourcegraph/shared/src/telemetry/telemetryService'
diff --git a/client/web/src/search/panels/CommunitySearchContextPanel.story.tsx b/client/web/src/search/panels/CommunitySearchContextPanel.story.tsx
index c5dc95fd338..b76636bf5a6 100644
--- a/client/web/src/search/panels/CommunitySearchContextPanel.story.tsx
+++ b/client/web/src/search/panels/CommunitySearchContextPanel.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { NOOP_TELEMETRY_SERVICE } from '@sourcegraph/shared/src/telemetry/telemetryService'
diff --git a/client/web/src/search/panels/CommunitySearchContextPanel.test.tsx b/client/web/src/search/panels/CommunitySearchContextPanel.test.tsx
index 988313a154c..4c5d0216d2b 100644
--- a/client/web/src/search/panels/CommunitySearchContextPanel.test.tsx
+++ b/client/web/src/search/panels/CommunitySearchContextPanel.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { NOOP_TELEMETRY_SERVICE } from '@sourcegraph/shared/src/telemetry/telemetryService'
 import { renderWithBrandedContext } from '@sourcegraph/shared/src/testing'
 
diff --git a/client/web/src/search/panels/PanelContainer.test.tsx b/client/web/src/search/panels/PanelContainer.test.tsx
index 39366e5a307..1819a2f747b 100644
--- a/client/web/src/search/panels/PanelContainer.test.tsx
+++ b/client/web/src/search/panels/PanelContainer.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { PanelContainer } from './PanelContainer'
diff --git a/client/web/src/search/panels/RecentFilesPanel.story.tsx b/client/web/src/search/panels/RecentFilesPanel.story.tsx
index 3ea953be7d4..eac883c9cc3 100644
--- a/client/web/src/search/panels/RecentFilesPanel.story.tsx
+++ b/client/web/src/search/panels/RecentFilesPanel.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
 
diff --git a/client/web/src/search/panels/RecentFilesPanel.test.tsx b/client/web/src/search/panels/RecentFilesPanel.test.tsx
index ac89206f92a..f245771a7a5 100644
--- a/client/web/src/search/panels/RecentFilesPanel.test.tsx
+++ b/client/web/src/search/panels/RecentFilesPanel.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { screen } from '@testing-library/react'
 import { noop } from 'rxjs'
 
diff --git a/client/web/src/search/panels/RecentSearchesPanel.story.tsx b/client/web/src/search/panels/RecentSearchesPanel.story.tsx
index 64b3f797389..7fd72547bb6 100644
--- a/client/web/src/search/panels/RecentSearchesPanel.story.tsx
+++ b/client/web/src/search/panels/RecentSearchesPanel.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { parseISO } from 'date-fns'
 import { noop } from 'lodash'
diff --git a/client/web/src/search/panels/RecentSearchesPanel.test.tsx b/client/web/src/search/panels/RecentSearchesPanel.test.tsx
index 23f912761f7..d19fed2872a 100644
--- a/client/web/src/search/panels/RecentSearchesPanel.test.tsx
+++ b/client/web/src/search/panels/RecentSearchesPanel.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { noop } from 'rxjs'
diff --git a/client/web/src/search/panels/RepositoriesPanel.story.tsx b/client/web/src/search/panels/RepositoriesPanel.story.tsx
index fe070c3f025..8ba75716031 100644
--- a/client/web/src/search/panels/RepositoriesPanel.story.tsx
+++ b/client/web/src/search/panels/RepositoriesPanel.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { noop } from 'lodash'
 
diff --git a/client/web/src/search/panels/RepositoriesPanel.test.tsx b/client/web/src/search/panels/RepositoriesPanel.test.tsx
index d639729217a..d64a8bdc1fd 100644
--- a/client/web/src/search/panels/RepositoriesPanel.test.tsx
+++ b/client/web/src/search/panels/RepositoriesPanel.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { noop } from 'rxjs'
diff --git a/client/web/src/search/panels/SavedSearchesPanel.story.tsx b/client/web/src/search/panels/SavedSearchesPanel.story.tsx
index a41fbd34a40..0247d836dd4 100644
--- a/client/web/src/search/panels/SavedSearchesPanel.story.tsx
+++ b/client/web/src/search/panels/SavedSearchesPanel.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { SearchPatternType } from '@sourcegraph/shared/src/schema'
diff --git a/client/web/src/search/panels/SavedSearchesPanel.test.tsx b/client/web/src/search/panels/SavedSearchesPanel.test.tsx
index 6575b1298b2..ac9bb39e46f 100644
--- a/client/web/src/search/panels/SavedSearchesPanel.test.tsx
+++ b/client/web/src/search/panels/SavedSearchesPanel.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { cleanup, fireEvent } from '@testing-library/react'
 
 import { NOOP_TELEMETRY_SERVICE } from '@sourcegraph/shared/src/telemetry/telemetryService'
diff --git a/client/web/src/search/results/SearchResultsInfoBar.test.tsx b/client/web/src/search/results/SearchResultsInfoBar.test.tsx
index 3148ee673c4..b625647037e 100644
--- a/client/web/src/search/results/SearchResultsInfoBar.test.tsx
+++ b/client/web/src/search/results/SearchResultsInfoBar.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { createMemoryHistory, createLocation } from 'history'
 import { noop } from 'lodash'
 import { NEVER } from 'rxjs'
diff --git a/client/web/src/search/results/StreamingSearchResults.story.tsx b/client/web/src/search/results/StreamingSearchResults.story.tsx
index 315f00de661..b0d911da414 100644
--- a/client/web/src/search/results/StreamingSearchResults.story.tsx
+++ b/client/web/src/search/results/StreamingSearchResults.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { createBrowserHistory } from 'history'
 import { EMPTY, NEVER, of } from 'rxjs'
diff --git a/client/web/src/search/results/sidebar/Revisions.story.tsx b/client/web/src/search/results/sidebar/Revisions.story.tsx
index 64f7142bf91..25de9641b31 100644
--- a/client/web/src/search/results/sidebar/Revisions.story.tsx
+++ b/client/web/src/search/results/sidebar/Revisions.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { MockedProviderProps } from '@apollo/client/testing'
 import { Meta } from '@storybook/react'
 
diff --git a/client/web/src/search/results/sidebar/Revisions.test.tsx b/client/web/src/search/results/sidebar/Revisions.test.tsx
index c2522e21c43..faec58e7688 100644
--- a/client/web/src/search/results/sidebar/Revisions.test.tsx
+++ b/client/web/src/search/results/sidebar/Revisions.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { cleanup, within, fireEvent } from '@testing-library/react'
 
 import { RevisionsProps } from '@sourcegraph/search-ui'
diff --git a/client/web/src/site-admin/SiteAdminMigrationsPage.story.tsx b/client/web/src/site-admin/SiteAdminMigrationsPage.story.tsx
index 85cb72ae89e..daf5fa8aeac 100644
--- a/client/web/src/site-admin/SiteAdminMigrationsPage.story.tsx
+++ b/client/web/src/site-admin/SiteAdminMigrationsPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import * as H from 'history'
 import { Observable, of } from 'rxjs'
diff --git a/client/web/src/site-admin/SiteAdminSidebar.story.tsx b/client/web/src/site-admin/SiteAdminSidebar.story.tsx
index a020f71a086..a81ddb5d024 100644
--- a/client/web/src/site-admin/SiteAdminSidebar.story.tsx
+++ b/client/web/src/site-admin/SiteAdminSidebar.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { WebStory } from '../components/WebStory'
diff --git a/client/web/src/site-admin/init/SiteInitPage.test.tsx b/client/web/src/site-admin/init/SiteInitPage.test.tsx
index 69bcfb304e3..a321d883eec 100644
--- a/client/web/src/site-admin/init/SiteInitPage.test.tsx
+++ b/client/web/src/site-admin/init/SiteInitPage.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { createMemoryHistory } from 'history'
 
 import { renderWithBrandedContext } from '@sourcegraph/shared/src/testing'
diff --git a/client/web/src/site-admin/overview/SiteAdminOverviewPage.test.tsx b/client/web/src/site-admin/overview/SiteAdminOverviewPage.test.tsx
index 4ceddb9e8af..a712ede4daa 100644
--- a/client/web/src/site-admin/overview/SiteAdminOverviewPage.test.tsx
+++ b/client/web/src/site-admin/overview/SiteAdminOverviewPage.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { waitFor } from '@testing-library/react'
 import * as H from 'history'
 import { of } from 'rxjs'
diff --git a/client/web/src/site-admin/routes.tsx b/client/web/src/site-admin/routes.tsx
index 55297bcceaf..8dbba740b61 100644
--- a/client/web/src/site-admin/routes.tsx
+++ b/client/web/src/site-admin/routes.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Redirect, RouteComponentProps } from 'react-router'
 
 import { lazyComponent } from '@sourcegraph/shared/src/util/lazyComponent'
diff --git a/client/web/src/site-admin/webhooks/MessagePanel.story.tsx b/client/web/src/site-admin/webhooks/MessagePanel.story.tsx
index c01358ccbbe..5759dd8dc23 100644
--- a/client/web/src/site-admin/webhooks/MessagePanel.story.tsx
+++ b/client/web/src/site-admin/webhooks/MessagePanel.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { number } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
 
diff --git a/client/web/src/site-admin/webhooks/PerformanceGauge.story.tsx b/client/web/src/site-admin/webhooks/PerformanceGauge.story.tsx
index b5d31142164..2b8c0820060 100644
--- a/client/web/src/site-admin/webhooks/PerformanceGauge.story.tsx
+++ b/client/web/src/site-admin/webhooks/PerformanceGauge.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 
 import { WebStory } from '../../components/WebStory'
diff --git a/client/web/src/site-admin/webhooks/StatusCode.story.tsx b/client/web/src/site-admin/webhooks/StatusCode.story.tsx
index 313007efada..774957d385d 100644
--- a/client/web/src/site-admin/webhooks/StatusCode.story.tsx
+++ b/client/web/src/site-admin/webhooks/StatusCode.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { number } from '@storybook/addon-knobs'
 import { storiesOf } from '@storybook/react'
 
diff --git a/client/web/src/site-admin/webhooks/WebhookLogNode.story.tsx b/client/web/src/site-admin/webhooks/WebhookLogNode.story.tsx
index 28bd4472f17..85845b223ce 100644
--- a/client/web/src/site-admin/webhooks/WebhookLogNode.story.tsx
+++ b/client/web/src/site-admin/webhooks/WebhookLogNode.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import classNames from 'classnames'
 
diff --git a/client/web/src/site-admin/webhooks/WebhookLogPage.story.tsx b/client/web/src/site-admin/webhooks/WebhookLogPage.story.tsx
index 80bdc50499b..41ac3e687d0 100644
--- a/client/web/src/site-admin/webhooks/WebhookLogPage.story.tsx
+++ b/client/web/src/site-admin/webhooks/WebhookLogPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import { addMinutes, formatRFC3339 } from 'date-fns'
 import { of } from 'rxjs'
diff --git a/client/web/src/site/CodeHostScopeAlerts/CodeHostScopeAlerts.tsx b/client/web/src/site/CodeHostScopeAlerts/CodeHostScopeAlerts.tsx
index 7cb2f0d892b..1f4dc2793a1 100644
--- a/client/web/src/site/CodeHostScopeAlerts/CodeHostScopeAlerts.tsx
+++ b/client/web/src/site/CodeHostScopeAlerts/CodeHostScopeAlerts.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react'
+import { FunctionComponent } from 'react'
 
 import { Link } from '@sourcegraph/wildcard'
 
diff --git a/client/web/src/site/LicenseExpirationAlert.test.tsx b/client/web/src/site/LicenseExpirationAlert.test.tsx
index 01224da0544..e656d6087a8 100644
--- a/client/web/src/site/LicenseExpirationAlert.test.tsx
+++ b/client/web/src/site/LicenseExpirationAlert.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { subMonths, addDays } from 'date-fns'
 
 import { renderWithBrandedContext } from '@sourcegraph/shared/src/testing'
diff --git a/client/web/src/tour/GettingStartedTour.tsx b/client/web/src/tour/GettingStartedTour.tsx
index 3894cd8c302..b2a6568dea5 100644
--- a/client/web/src/tour/GettingStartedTour.tsx
+++ b/client/web/src/tour/GettingStartedTour.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { FeatureFlagProps } from '../featureFlags/featureFlags'
 
 import { Tour, TourProps } from './components/Tour/Tour'
diff --git a/client/web/src/tour/components/Tour/Tour.test.tsx b/client/web/src/tour/components/Tour/Tour.test.tsx
index 9e8db4409db..42d13817bdf 100644
--- a/client/web/src/tour/components/Tour/Tour.test.tsx
+++ b/client/web/src/tour/components/Tour/Tour.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, cleanup, RenderResult, fireEvent, act } from '@testing-library/react'
 import { renderHook, RenderHookResult } from '@testing-library/react-hooks'
 import { MemoryRouter } from 'react-router'
diff --git a/client/web/src/tour/data/index.tsx b/client/web/src/tour/data/index.tsx
index 4b329c955fb..2295a41dbd5 100644
--- a/client/web/src/tour/data/index.tsx
+++ b/client/web/src/tour/data/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import CheckCircleIcon from 'mdi-react/CheckCircleIcon'
 import CursorPointerIcon from 'mdi-react/CursorPointerIcon'
 import MagnifyIcon from 'mdi-react/MagnifyIcon'
diff --git a/client/web/src/tree/FileDecorator.test.tsx b/client/web/src/tree/FileDecorator.test.tsx
index 03433f818df..8f55533e7cd 100644
--- a/client/web/src/tree/FileDecorator.test.tsx
+++ b/client/web/src/tree/FileDecorator.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { FileDecorator } from './FileDecorator'
diff --git a/client/web/src/user/UserAvatar.test.tsx b/client/web/src/user/UserAvatar.test.tsx
index 693a21b5227..01707162185 100644
--- a/client/web/src/user/UserAvatar.test.tsx
+++ b/client/web/src/user/UserAvatar.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { UserAvatar } from './UserAvatar'
diff --git a/client/web/src/user/area/routes.tsx b/client/web/src/user/area/routes.tsx
index 5287dbfa49a..30456cf7297 100644
--- a/client/web/src/user/area/routes.tsx
+++ b/client/web/src/user/area/routes.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Redirect } from 'react-router'
 
 import { lazyComponent } from '@sourcegraph/shared/src/util/lazyComponent'
diff --git a/client/web/src/user/settings/RedirectToUserPage.tsx b/client/web/src/user/settings/RedirectToUserPage.tsx
index 259ae20d4e3..b528ab1228a 100644
--- a/client/web/src/user/settings/RedirectToUserPage.tsx
+++ b/client/web/src/user/settings/RedirectToUserPage.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react'
-
 import * as H from 'history'
 import { Redirect } from 'react-router'
 
diff --git a/client/web/src/user/settings/RedirectToUserSettings.tsx b/client/web/src/user/settings/RedirectToUserSettings.tsx
index 20337e85141..47cc23845d5 100644
--- a/client/web/src/user/settings/RedirectToUserSettings.tsx
+++ b/client/web/src/user/settings/RedirectToUserSettings.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react'
-
 import * as H from 'history'
 import { Redirect } from 'react-router'
 
diff --git a/client/web/src/user/settings/aboutOrganization/AboutOrganizationPage.story.tsx b/client/web/src/user/settings/aboutOrganization/AboutOrganizationPage.story.tsx
index 9965e18d891..8aa4998b744 100644
--- a/client/web/src/user/settings/aboutOrganization/AboutOrganizationPage.story.tsx
+++ b/client/web/src/user/settings/aboutOrganization/AboutOrganizationPage.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { DecoratorFn, Meta } from '@storybook/react'
 
 import { NOOP_TELEMETRY_SERVICE } from '@sourcegraph/shared/src/telemetry/telemetryService'
diff --git a/client/web/src/user/settings/emails/UserEmail.tsx b/client/web/src/user/settings/emails/UserEmail.tsx
index dbf07efc03b..b3532115ebd 100644
--- a/client/web/src/user/settings/emails/UserEmail.tsx
+++ b/client/web/src/user/settings/emails/UserEmail.tsx
@@ -1,4 +1,4 @@
-import React, { useState, FunctionComponent } from 'react'
+import { useState, FunctionComponent } from 'react'
 
 import { asError, ErrorLike } from '@sourcegraph/common'
 import { dataOrThrowErrors, gql } from '@sourcegraph/http-client'
diff --git a/client/web/src/user/settings/emails/UserSettingsEmailsPage.tsx b/client/web/src/user/settings/emails/UserSettingsEmailsPage.tsx
index cc33b00e583..aa0dd75359a 100644
--- a/client/web/src/user/settings/emails/UserSettingsEmailsPage.tsx
+++ b/client/web/src/user/settings/emails/UserSettingsEmailsPage.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useEffect, useState, useCallback } from 'react'
+import { FunctionComponent, useEffect, useState, useCallback } from 'react'
 
 import classNames from 'classnames'
 
diff --git a/client/web/src/user/settings/profile/UserSettingsProfilePage.test.tsx b/client/web/src/user/settings/profile/UserSettingsProfilePage.test.tsx
index 4700854d37a..4a152a995fc 100644
--- a/client/web/src/user/settings/profile/UserSettingsProfilePage.test.tsx
+++ b/client/web/src/user/settings/profile/UserSettingsProfilePage.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { MockedResponse } from '@apollo/client/testing'
 import { fireEvent, render, RenderResult, act } from '@testing-library/react'
 import { MemoryRouter } from 'react-router'
diff --git a/client/web/src/user/settings/research/ProductResearch.test.tsx b/client/web/src/user/settings/research/ProductResearch.test.tsx
index 37acb5bdba2..a11acf834ba 100644
--- a/client/web/src/user/settings/research/ProductResearch.test.tsx
+++ b/client/web/src/user/settings/research/ProductResearch.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, RenderResult } from '@testing-library/react'
 
 import { NOOP_TELEMETRY_SERVICE } from '@sourcegraph/shared/src/telemetry/telemetryService'
diff --git a/client/web/src/user/settings/routes.tsx b/client/web/src/user/settings/routes.tsx
index 676dff5f2bc..de5e71c9d6e 100644
--- a/client/web/src/user/settings/routes.tsx
+++ b/client/web/src/user/settings/routes.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { RouteComponentProps } from 'react-router'
 
 import { lazyComponent } from '@sourcegraph/shared/src/util/lazyComponent'
diff --git a/client/web/src/util/getReactElements.test.tsx b/client/web/src/util/getReactElements.test.tsx
index bc35f1d7a69..e7a1ea9c13a 100644
--- a/client/web/src/util/getReactElements.test.tsx
+++ b/client/web/src/util/getReactElements.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { getReactElements } from './getReactElements'
 
 describe('util/getReactElements', () => {
diff --git a/client/web/src/views/components/view-grid/ViewGrid.story.tsx b/client/web/src/views/components/view-grid/ViewGrid.story.tsx
index 0b725d41cfa..8515b169526 100644
--- a/client/web/src/views/components/view-grid/ViewGrid.story.tsx
+++ b/client/web/src/views/components/view-grid/ViewGrid.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 import { noop } from 'lodash'
 import DotsVerticalIcon from 'mdi-react/DotsVerticalIcon'
diff --git a/client/web/src/views/components/view/View.story.tsx b/client/web/src/views/components/view/View.story.tsx
index 9b14adeb461..8f8b3e5f2c5 100644
--- a/client/web/src/views/components/view/View.story.tsx
+++ b/client/web/src/views/components/view/View.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 import { noop } from 'lodash'
 import DotsVerticalIcon from 'mdi-react/DotsVerticalIcon'
diff --git a/client/web/src/views/components/view/content/chart-view-content/ChartViewContent.story.tsx b/client/web/src/views/components/view/content/chart-view-content/ChartViewContent.story.tsx
index afaed2b46fe..780fc9bf596 100644
--- a/client/web/src/views/components/view/content/chart-view-content/ChartViewContent.story.tsx
+++ b/client/web/src/views/components/view/content/chart-view-content/ChartViewContent.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { storiesOf } from '@storybook/react'
 import isChromatic from 'chromatic/isChromatic'
 import { createMemoryHistory } from 'history'
diff --git a/client/web/src/views/components/view/content/chart-view-content/ChartViewContent.tsx b/client/web/src/views/components/view/content/chart-view-content/ChartViewContent.tsx
index 075ea622b02..ac3b4b6ba8c 100644
--- a/client/web/src/views/components/view/content/chart-view-content/ChartViewContent.tsx
+++ b/client/web/src/views/components/view/content/chart-view-content/ChartViewContent.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useCallback } from 'react'
+import { FunctionComponent, useCallback } from 'react'
 
 import { ParentSize } from '@visx/responsive'
 import classNames from 'classnames'
diff --git a/client/web/src/views/components/view/content/chart-view-content/charts/line/components/GlyphContent.tsx b/client/web/src/views/components/view/content/chart-view-content/charts/line/components/GlyphContent.tsx
index 59436fbca62..0d04c975637 100644
--- a/client/web/src/views/components/view/content/chart-view-content/charts/line/components/GlyphContent.tsx
+++ b/client/web/src/views/components/view/content/chart-view-content/charts/line/components/GlyphContent.tsx
@@ -1,4 +1,4 @@
-import React, { MouseEventHandler, PointerEventHandler, ReactElement } from 'react'
+import { MouseEventHandler, PointerEventHandler, ReactElement } from 'react'
 
 import { GlyphDot as Glyph } from '@visx/glyph'
 import { EventHandlerParams, GlyphProps } from '@visx/xychart/lib/types'
diff --git a/client/web/src/views/components/view/content/chart-view-content/charts/line/components/NonActiveBackground.tsx b/client/web/src/views/components/view/content/chart-view-content/charts/line/components/NonActiveBackground.tsx
index 41e21a9e453..f9a0d5febab 100644
--- a/client/web/src/views/components/view/content/chart-view-content/charts/line/components/NonActiveBackground.tsx
+++ b/client/web/src/views/components/view/content/chart-view-content/charts/line/components/NonActiveBackground.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement, useContext, useMemo } from 'react'
+import { ReactElement, useContext, useMemo } from 'react'
 
 import { PatternLines } from '@visx/pattern'
 import { DataContext } from '@visx/xychart'
diff --git a/client/web/src/views/components/view/content/chart-view-content/charts/line/components/scroll-box/ScrollBox.story.tsx b/client/web/src/views/components/view/content/chart-view-content/charts/line/components/scroll-box/ScrollBox.story.tsx
index 956964595b4..ec48d2a36da 100644
--- a/client/web/src/views/components/view/content/chart-view-content/charts/line/components/scroll-box/ScrollBox.story.tsx
+++ b/client/web/src/views/components/view/content/chart-view-content/charts/line/components/scroll-box/ScrollBox.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta } from '@storybook/react'
 
 import { WebStory } from '../../../../../../../../../components/WebStory'
diff --git a/client/web/src/views/components/view/content/chart-view-content/charts/line/components/tooltip-content/TooltipContent.tsx b/client/web/src/views/components/view/content/chart-view-content/charts/line/components/tooltip-content/TooltipContent.tsx
index 35dba2c3813..c49dc3da5fc 100644
--- a/client/web/src/views/components/view/content/chart-view-content/charts/line/components/tooltip-content/TooltipContent.tsx
+++ b/client/web/src/views/components/view/content/chart-view-content/charts/line/components/tooltip-content/TooltipContent.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement, useMemo } from 'react'
+import { ReactElement, useMemo } from 'react'
 
 import { RenderTooltipParams } from '@visx/xychart/lib/components/Tooltip'
 
diff --git a/client/web/src/views/components/view/content/chart-view-content/charts/pie/components/PieArc.tsx b/client/web/src/views/components/view/content/chart-view-content/charts/pie/components/PieArc.tsx
index 63916af2851..73316656e86 100644
--- a/client/web/src/views/components/view/content/chart-view-content/charts/pie/components/PieArc.tsx
+++ b/client/web/src/views/components/view/content/chart-view-content/charts/pie/components/PieArc.tsx
@@ -1,4 +1,4 @@
-import React, { PointerEventHandler, ReactElement } from 'react'
+import { PointerEventHandler, ReactElement } from 'react'
 
 import { Annotation, Connector } from '@visx/annotation'
 import { Group } from '@visx/group'
diff --git a/client/web/tsconfig.json b/client/web/tsconfig.json
index 929bc390890..f89d79259a1 100644
--- a/client/web/tsconfig.json
+++ b/client/web/tsconfig.json
@@ -6,7 +6,7 @@
     "paths": {
       "*": ["src/types/*", "../shared/src/types/*", "../common/src/types/*", "*"],
     },
-    "jsx": "react",
+    "jsx": "react-jsx",
     "rootDir": ".",
     "outDir": "out",
   },
diff --git a/client/wildcard/src/components/Alert/Alert.test.tsx b/client/wildcard/src/components/Alert/Alert.test.tsx
index 7acc721054c..c722a05eebc 100644
--- a/client/wildcard/src/components/Alert/Alert.test.tsx
+++ b/client/wildcard/src/components/Alert/Alert.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { Alert } from './Alert'
diff --git a/client/wildcard/src/components/Badge/Badge.story.tsx b/client/wildcard/src/components/Badge/Badge.story.tsx
index 86c4e64d6bc..08715f24ce9 100644
--- a/client/wildcard/src/components/Badge/Badge.story.tsx
+++ b/client/wildcard/src/components/Badge/Badge.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta } from '@storybook/react'
 
 import { BrandedStory } from '@sourcegraph/branded/src/components/BrandedStory'
diff --git a/client/wildcard/src/components/Badge/ProductStatusBadge.story.tsx b/client/wildcard/src/components/Badge/ProductStatusBadge.story.tsx
index c3d37f3fc06..c163cfd66ef 100644
--- a/client/wildcard/src/components/Badge/ProductStatusBadge.story.tsx
+++ b/client/wildcard/src/components/Badge/ProductStatusBadge.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta } from '@storybook/react'
 
 import { BrandedStory } from '@sourcegraph/branded/src/components/BrandedStory'
diff --git a/client/wildcard/src/components/Button/Button.test.tsx b/client/wildcard/src/components/Button/Button.test.tsx
index a362171e3ca..9b3c4649e95 100644
--- a/client/wildcard/src/components/Button/Button.test.tsx
+++ b/client/wildcard/src/components/Button/Button.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { renderWithBrandedContext } from '@sourcegraph/shared/src/testing'
 
 import { Button } from './Button'
diff --git a/client/wildcard/src/components/Button/story/Button.story.tsx b/client/wildcard/src/components/Button/story/Button.story.tsx
index 2649332356d..58fb6584020 100644
--- a/client/wildcard/src/components/Button/story/Button.story.tsx
+++ b/client/wildcard/src/components/Button/story/Button.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean, select } from '@storybook/addon-knobs'
 import { Meta, Story } from '@storybook/react'
 import SearchIcon from 'mdi-react/SearchIcon'
diff --git a/client/wildcard/src/components/ButtonLink/ButtonLink.story.tsx b/client/wildcard/src/components/ButtonLink/ButtonLink.story.tsx
index 2814b6647c4..9186c8634f5 100644
--- a/client/wildcard/src/components/ButtonLink/ButtonLink.story.tsx
+++ b/client/wildcard/src/components/ButtonLink/ButtonLink.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 import { startCase } from 'lodash'
 import SearchIcon from 'mdi-react/SearchIcon'
diff --git a/client/wildcard/src/components/ButtonLink/ButtonLink.test.tsx b/client/wildcard/src/components/ButtonLink/ButtonLink.test.tsx
index 593f67ad952..bf194f64968 100644
--- a/client/wildcard/src/components/ButtonLink/ButtonLink.test.tsx
+++ b/client/wildcard/src/components/ButtonLink/ButtonLink.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import sinon from 'sinon'
diff --git a/client/wildcard/src/components/Card/Card.story.tsx b/client/wildcard/src/components/Card/Card.story.tsx
index 309a93809ba..0875ca8811e 100644
--- a/client/wildcard/src/components/Card/Card.story.tsx
+++ b/client/wildcard/src/components/Card/Card.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 
 import { BrandedStory } from '@sourcegraph/branded/src/components/BrandedStory'
diff --git a/client/wildcard/src/components/Card/Card.test.tsx b/client/wildcard/src/components/Card/Card.test.tsx
index 43ac429655b..b467fa5675d 100644
--- a/client/wildcard/src/components/Card/Card.test.tsx
+++ b/client/wildcard/src/components/Card/Card.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, screen } from '@testing-library/react'
 
 import { Card, CardBody, CardHeader, CardSubtitle, CardText, CardTitle } from '.'
diff --git a/client/wildcard/src/components/Collapse/Collapse.story.tsx b/client/wildcard/src/components/Collapse/Collapse.story.tsx
index fdb970fbf85..1bfbe29c8ff 100644
--- a/client/wildcard/src/components/Collapse/Collapse.story.tsx
+++ b/client/wildcard/src/components/Collapse/Collapse.story.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react'
+import { useCallback, useState } from 'react'
 
 import { DecoratorFn, Meta, Story } from '@storybook/react'
 import ChevronDownIcon from 'mdi-react/ChevronDownIcon'
diff --git a/client/wildcard/src/components/Collapse/Collapse.test.tsx b/client/wildcard/src/components/Collapse/Collapse.test.tsx
index d63003f7c48..3bdb6383c2b 100644
--- a/client/wildcard/src/components/Collapse/Collapse.test.tsx
+++ b/client/wildcard/src/components/Collapse/Collapse.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import sinon from 'sinon'
diff --git a/client/wildcard/src/components/Container/Container.story.tsx b/client/wildcard/src/components/Container/Container.story.tsx
index 5804d8209dd..0c5685e32a0 100644
--- a/client/wildcard/src/components/Container/Container.story.tsx
+++ b/client/wildcard/src/components/Container/Container.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { DecoratorFn, Meta, Story } from '@storybook/react'
 
 import { BrandedStory } from '@sourcegraph/branded/src/components/BrandedStory'
diff --git a/client/wildcard/src/components/Feedback/FeedbackBadge/FeedbackBadge.story.tsx b/client/wildcard/src/components/Feedback/FeedbackBadge/FeedbackBadge.story.tsx
index 0d2a412bbd6..86ac37daa4e 100644
--- a/client/wildcard/src/components/Feedback/FeedbackBadge/FeedbackBadge.story.tsx
+++ b/client/wildcard/src/components/Feedback/FeedbackBadge/FeedbackBadge.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 
 import { BrandedStory } from '@sourcegraph/branded/src/components/BrandedStory'
diff --git a/client/wildcard/src/components/Feedback/FeedbackBadge/FeedbackBadge.test.tsx b/client/wildcard/src/components/Feedback/FeedbackBadge/FeedbackBadge.test.tsx
index ab95abaa826..99de3101598 100644
--- a/client/wildcard/src/components/Feedback/FeedbackBadge/FeedbackBadge.test.tsx
+++ b/client/wildcard/src/components/Feedback/FeedbackBadge/FeedbackBadge.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { FEEDBACK_BADGES_STATUS } from './constant'
diff --git a/client/wildcard/src/components/Feedback/FeedbackPrompt/FeedbackPrompt.story.tsx b/client/wildcard/src/components/Feedback/FeedbackPrompt/FeedbackPrompt.story.tsx
index 7fc9a0db61e..bc23ad97a84 100644
--- a/client/wildcard/src/components/Feedback/FeedbackPrompt/FeedbackPrompt.story.tsx
+++ b/client/wildcard/src/components/Feedback/FeedbackPrompt/FeedbackPrompt.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 
 import { BrandedStory } from '@sourcegraph/branded/src/components/BrandedStory'
diff --git a/client/wildcard/src/components/Feedback/FeedbackPrompt/FeedbackPrompt.test.tsx b/client/wildcard/src/components/Feedback/FeedbackPrompt/FeedbackPrompt.test.tsx
index ba9d2519e35..97c71e5c709 100644
--- a/client/wildcard/src/components/Feedback/FeedbackPrompt/FeedbackPrompt.test.tsx
+++ b/client/wildcard/src/components/Feedback/FeedbackPrompt/FeedbackPrompt.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { cleanup, fireEvent, render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import sinon from 'sinon'
diff --git a/client/wildcard/src/components/Feedback/FeedbackText/FeedbackText.story.tsx b/client/wildcard/src/components/Feedback/FeedbackText/FeedbackText.story.tsx
index 4febc71f5c3..f585f717ec9 100644
--- a/client/wildcard/src/components/Feedback/FeedbackText/FeedbackText.story.tsx
+++ b/client/wildcard/src/components/Feedback/FeedbackText/FeedbackText.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 
 import { BrandedStory } from '@sourcegraph/branded/src/components/BrandedStory'
diff --git a/client/wildcard/src/components/Feedback/FeedbackText/FeedbackText.test.tsx b/client/wildcard/src/components/Feedback/FeedbackText/FeedbackText.test.tsx
index 2e1a4ba7c48..80d95ce6936 100644
--- a/client/wildcard/src/components/Feedback/FeedbackText/FeedbackText.test.tsx
+++ b/client/wildcard/src/components/Feedback/FeedbackText/FeedbackText.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { FeedbackText } from './FeedbackText'
diff --git a/client/wildcard/src/components/Form/FlexTextArea/FlexTextArea.tsx b/client/wildcard/src/components/Form/FlexTextArea/FlexTextArea.tsx
index 7118084043c..013a0b1db5c 100644
--- a/client/wildcard/src/components/Form/FlexTextArea/FlexTextArea.tsx
+++ b/client/wildcard/src/components/Form/FlexTextArea/FlexTextArea.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef, InputHTMLAttributes, Ref, useEffect, useImperativeHandle, useRef, useState } from 'react'
+import { forwardRef, InputHTMLAttributes, Ref, useEffect, useImperativeHandle, useRef, useState } from 'react'
 
 import classNames from 'classnames'
 
diff --git a/client/wildcard/src/components/Form/Input/Input.test.tsx b/client/wildcard/src/components/Form/Input/Input.test.tsx
index d57b994e981..952d7e2d8fa 100644
--- a/client/wildcard/src/components/Form/Input/Input.test.tsx
+++ b/client/wildcard/src/components/Form/Input/Input.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { Input } from './Input'
diff --git a/client/wildcard/src/components/Form/Input/Input.tsx b/client/wildcard/src/components/Form/Input/Input.tsx
index 1ae0c6f99f9..8a0409cf8f4 100644
--- a/client/wildcard/src/components/Form/Input/Input.tsx
+++ b/client/wildcard/src/components/Form/Input/Input.tsx
@@ -1,4 +1,4 @@
-import React, { useRef, forwardRef, InputHTMLAttributes, ReactNode } from 'react'
+import { useRef, forwardRef, InputHTMLAttributes, ReactNode } from 'react'
 
 import classNames from 'classnames'
 import { useMergeRefs } from 'use-callback-ref'
diff --git a/client/wildcard/src/components/Form/MultiSelect/ClearIndicator.tsx b/client/wildcard/src/components/Form/MultiSelect/ClearIndicator.tsx
index de0679ef3b8..d565e19cc9b 100644
--- a/client/wildcard/src/components/Form/MultiSelect/ClearIndicator.tsx
+++ b/client/wildcard/src/components/Form/MultiSelect/ClearIndicator.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement } from 'react'
+import { ReactElement } from 'react'
 
 import CloseIcon from 'mdi-react/CloseIcon'
 import { components, ClearIndicatorProps } from 'react-select'
diff --git a/client/wildcard/src/components/Form/MultiSelect/DropdownIndicator.tsx b/client/wildcard/src/components/Form/MultiSelect/DropdownIndicator.tsx
index a2c4190edd3..cd16a87af62 100644
--- a/client/wildcard/src/components/Form/MultiSelect/DropdownIndicator.tsx
+++ b/client/wildcard/src/components/Form/MultiSelect/DropdownIndicator.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement } from 'react'
+import { ReactElement } from 'react'
 
 import ChevronDownIcon from 'mdi-react/ChevronDownIcon'
 import { components, DropdownIndicatorProps } from 'react-select'
diff --git a/client/wildcard/src/components/Form/MultiSelect/MultiSelect.story.tsx b/client/wildcard/src/components/Form/MultiSelect/MultiSelect.story.tsx
index 6ead7e355a2..638c07cda21 100644
--- a/client/wildcard/src/components/Form/MultiSelect/MultiSelect.story.tsx
+++ b/client/wildcard/src/components/Form/MultiSelect/MultiSelect.story.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import { useState } from 'react'
 
 import { Meta, Story } from '@storybook/react'
 
diff --git a/client/wildcard/src/components/Form/MultiSelect/MultiSelect.tsx b/client/wildcard/src/components/Form/MultiSelect/MultiSelect.tsx
index ffc95f5f270..5a7118586ed 100644
--- a/client/wildcard/src/components/Form/MultiSelect/MultiSelect.tsx
+++ b/client/wildcard/src/components/Form/MultiSelect/MultiSelect.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement } from 'react'
+import { ReactElement } from 'react'
 
 import classNames from 'classnames'
 import Select, { Props as SelectProps, StylesConfig, GroupBase } from 'react-select'
diff --git a/client/wildcard/src/components/Form/MultiSelect/MultiValueContainer.tsx b/client/wildcard/src/components/Form/MultiSelect/MultiValueContainer.tsx
index 73eba5e443c..2fc57a73f63 100644
--- a/client/wildcard/src/components/Form/MultiSelect/MultiValueContainer.tsx
+++ b/client/wildcard/src/components/Form/MultiSelect/MultiValueContainer.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement } from 'react'
+import { ReactElement } from 'react'
 
 import { MultiValueGenericProps } from 'react-select'
 
diff --git a/client/wildcard/src/components/Form/MultiSelect/MultiValueLabel.tsx b/client/wildcard/src/components/Form/MultiSelect/MultiValueLabel.tsx
index 62711d1babb..0992a35f7e8 100644
--- a/client/wildcard/src/components/Form/MultiSelect/MultiValueLabel.tsx
+++ b/client/wildcard/src/components/Form/MultiSelect/MultiValueLabel.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement } from 'react'
+import { ReactElement } from 'react'
 
 import { MultiValueGenericProps } from 'react-select'
 
diff --git a/client/wildcard/src/components/Form/MultiSelect/MultiValueRemove.tsx b/client/wildcard/src/components/Form/MultiSelect/MultiValueRemove.tsx
index ebb3ec333d4..7ab83589d07 100644
--- a/client/wildcard/src/components/Form/MultiSelect/MultiValueRemove.tsx
+++ b/client/wildcard/src/components/Form/MultiSelect/MultiValueRemove.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement } from 'react'
+import { ReactElement } from 'react'
 
 import CloseIcon from 'mdi-react/CloseIcon'
 import { components, MultiValueRemoveProps } from 'react-select'
diff --git a/client/wildcard/src/components/Form/Select/Select.test.tsx b/client/wildcard/src/components/Form/Select/Select.test.tsx
index 23510d4de41..e1e79d9a282 100644
--- a/client/wildcard/src/components/Form/Select/Select.test.tsx
+++ b/client/wildcard/src/components/Form/Select/Select.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { Select, SelectProps } from './Select'
diff --git a/client/wildcard/src/components/Form/TextArea/TextArea.test.tsx b/client/wildcard/src/components/Form/TextArea/TextArea.test.tsx
index 13be861a5ec..6d6cd0c85e4 100644
--- a/client/wildcard/src/components/Form/TextArea/TextArea.test.tsx
+++ b/client/wildcard/src/components/Form/TextArea/TextArea.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { TextArea } from './TextArea'
diff --git a/client/wildcard/src/components/Form/TextArea/TextArea.tsx b/client/wildcard/src/components/Form/TextArea/TextArea.tsx
index 363ca0641a6..347dd3247b9 100644
--- a/client/wildcard/src/components/Form/TextArea/TextArea.tsx
+++ b/client/wildcard/src/components/Form/TextArea/TextArea.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef, ForwardRefExoticComponent, ReactNode, RefAttributes, TextareaHTMLAttributes } from 'react'
+import { forwardRef, ForwardRefExoticComponent, ReactNode, RefAttributes, TextareaHTMLAttributes } from 'react'
 
 import classNames from 'classnames'
 
diff --git a/client/wildcard/src/components/Form/internal/BaseControlInput.test.tsx b/client/wildcard/src/components/Form/internal/BaseControlInput.test.tsx
index ac5d4efff77..63de6172b7a 100644
--- a/client/wildcard/src/components/Form/internal/BaseControlInput.test.tsx
+++ b/client/wildcard/src/components/Form/internal/BaseControlInput.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { BaseControlInput, BASE_CONTROL_TYPES } from './BaseControlInput'
diff --git a/client/wildcard/src/components/Form/internal/FormFieldLabel.tsx b/client/wildcard/src/components/Form/internal/FormFieldLabel.tsx
index 2ac3f913674..de67c364564 100644
--- a/client/wildcard/src/components/Form/internal/FormFieldLabel.tsx
+++ b/client/wildcard/src/components/Form/internal/FormFieldLabel.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef } from 'react'
+import { forwardRef } from 'react'
 
 import { ForwardReferenceComponent } from '../../../types'
 import { Label } from '../../Typography/Label'
diff --git a/client/wildcard/src/components/Grid/Grid.story.tsx b/client/wildcard/src/components/Grid/Grid.story.tsx
index 9b2a8cd5c62..cf770c4acf6 100644
--- a/client/wildcard/src/components/Grid/Grid.story.tsx
+++ b/client/wildcard/src/components/Grid/Grid.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 
 import { Grid, GridProps } from './Grid'
diff --git a/client/wildcard/src/components/Icon/Icon.story.tsx b/client/wildcard/src/components/Icon/Icon.story.tsx
index ef6b5d37665..7a6220c0792 100644
--- a/client/wildcard/src/components/Icon/Icon.story.tsx
+++ b/client/wildcard/src/components/Icon/Icon.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Story, Meta } from '@storybook/react'
 
 import { BrandedStory } from '@sourcegraph/branded/src/components/BrandedStory'
diff --git a/client/wildcard/src/components/Icon/Icon.test.tsx b/client/wildcard/src/components/Icon/Icon.test.tsx
index 3105cb55eee..e696fc892f2 100644
--- a/client/wildcard/src/components/Icon/Icon.test.tsx
+++ b/client/wildcard/src/components/Icon/Icon.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { SourcegraphIcon } from '../SourcegraphIcon'
diff --git a/client/wildcard/src/components/Link/AnchorLink/AnchorLink.test.tsx b/client/wildcard/src/components/Link/AnchorLink/AnchorLink.test.tsx
index 1d3ba8dec85..fe70593dd21 100644
--- a/client/wildcard/src/components/Link/AnchorLink/AnchorLink.test.tsx
+++ b/client/wildcard/src/components/Link/AnchorLink/AnchorLink.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { AnchorLink } from './AnchorLink'
diff --git a/client/wildcard/src/components/Link/Link/Link.story.tsx b/client/wildcard/src/components/Link/Link/Link.story.tsx
index 3969d4475c5..a18d1113fe1 100644
--- a/client/wildcard/src/components/Link/Link/Link.story.tsx
+++ b/client/wildcard/src/components/Link/Link/Link.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { DecoratorFn, Meta, Story } from '@storybook/react'
 
 import { BrandedStory } from '@sourcegraph/branded/src/components/BrandedStory'
diff --git a/client/wildcard/src/components/Link/RouterLink/RouterLink.test.tsx b/client/wildcard/src/components/Link/RouterLink/RouterLink.test.tsx
index d8132a9fe72..ec722641606 100644
--- a/client/wildcard/src/components/Link/RouterLink/RouterLink.test.tsx
+++ b/client/wildcard/src/components/Link/RouterLink/RouterLink.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { renderWithBrandedContext } from '@sourcegraph/shared/src/testing'
diff --git a/client/wildcard/src/components/LoadingSpinner/LoadingSpinner.story.tsx b/client/wildcard/src/components/LoadingSpinner/LoadingSpinner.story.tsx
index 6698dd50da0..098b1048668 100644
--- a/client/wildcard/src/components/LoadingSpinner/LoadingSpinner.story.tsx
+++ b/client/wildcard/src/components/LoadingSpinner/LoadingSpinner.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { boolean } from '@storybook/addon-knobs'
 import { Meta, Story } from '@storybook/react'
 
diff --git a/client/wildcard/src/components/Menu/Menu.story.tsx b/client/wildcard/src/components/Menu/Menu.story.tsx
index af809575585..e11766a81a4 100644
--- a/client/wildcard/src/components/Menu/Menu.story.tsx
+++ b/client/wildcard/src/components/Menu/Menu.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 import { noop } from 'lodash'
 
diff --git a/client/wildcard/src/components/Menu/Menu.tsx b/client/wildcard/src/components/Menu/Menu.tsx
index 0e581df9fae..e8e72334837 100644
--- a/client/wildcard/src/components/Menu/Menu.tsx
+++ b/client/wildcard/src/components/Menu/Menu.tsx
@@ -1,4 +1,4 @@
-import React, { ComponentType, forwardRef, useMemo } from 'react'
+import { ComponentType, forwardRef, useMemo } from 'react'
 
 import { Menu as ReachMenu, MenuProps as ReachMenuProps } from '@reach/menu-button'
 import { isFunction, noop, uniqueId } from 'lodash'
diff --git a/client/wildcard/src/components/Modal/Modal.story.tsx b/client/wildcard/src/components/Modal/Modal.story.tsx
index 55b3011d7fe..47122216708 100644
--- a/client/wildcard/src/components/Modal/Modal.story.tsx
+++ b/client/wildcard/src/components/Modal/Modal.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 
 import { BrandedStory } from '@sourcegraph/branded/src/components/BrandedStory'
diff --git a/client/wildcard/src/components/NavMenu/NavMenu.story.tsx b/client/wildcard/src/components/NavMenu/NavMenu.story.tsx
index e2df0af529f..c78e4311b5d 100644
--- a/client/wildcard/src/components/NavMenu/NavMenu.story.tsx
+++ b/client/wildcard/src/components/NavMenu/NavMenu.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 import { noop } from 'lodash'
 import AntennaIcon from 'mdi-react/AntennaIcon'
diff --git a/client/wildcard/src/components/NavMenu/NavMenu.test.tsx b/client/wildcard/src/components/NavMenu/NavMenu.test.tsx
index 5afd63b1032..0580c8258b4 100644
--- a/client/wildcard/src/components/NavMenu/NavMenu.test.tsx
+++ b/client/wildcard/src/components/NavMenu/NavMenu.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import sinon from 'sinon'
diff --git a/client/wildcard/src/components/PageHeader/PageHeader.story.tsx b/client/wildcard/src/components/PageHeader/PageHeader.story.tsx
index f0c3fa5f1c3..60ff796324c 100644
--- a/client/wildcard/src/components/PageHeader/PageHeader.story.tsx
+++ b/client/wildcard/src/components/PageHeader/PageHeader.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { DecoratorFn, Meta, Story } from '@storybook/react'
 import PlusIcon from 'mdi-react/PlusIcon'
 import PuzzleOutlineIcon from 'mdi-react/PuzzleOutlineIcon'
diff --git a/client/wildcard/src/components/PageHeader/PageHeader.test.tsx b/client/wildcard/src/components/PageHeader/PageHeader.test.tsx
index fd806d37110..42976b829ea 100644
--- a/client/wildcard/src/components/PageHeader/PageHeader.test.tsx
+++ b/client/wildcard/src/components/PageHeader/PageHeader.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { RenderResult } from '@testing-library/react'
 import PuzzleOutlineIcon from 'mdi-react/PuzzleOutlineIcon'
 
diff --git a/client/wildcard/src/components/PageSelector/PageSelector.story.tsx b/client/wildcard/src/components/PageSelector/PageSelector.story.tsx
index 83572b4c6dd..02665b8bf45 100644
--- a/client/wildcard/src/components/PageSelector/PageSelector.story.tsx
+++ b/client/wildcard/src/components/PageSelector/PageSelector.story.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import { useState } from 'react'
 
 import { number } from '@storybook/addon-knobs'
 import { DecoratorFn, Meta, Story } from '@storybook/react'
diff --git a/client/wildcard/src/components/PageSelector/PageSelector.test.tsx b/client/wildcard/src/components/PageSelector/PageSelector.test.tsx
index d9335b0415f..49266c2b44e 100644
--- a/client/wildcard/src/components/PageSelector/PageSelector.test.tsx
+++ b/client/wildcard/src/components/PageSelector/PageSelector.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, RenderResult, cleanup, fireEvent } from '@testing-library/react'
 import sinon from 'sinon'
 
diff --git a/client/wildcard/src/components/Panel/Panel.test.tsx b/client/wildcard/src/components/Panel/Panel.test.tsx
index 76a97353a6d..e9f999957d6 100644
--- a/client/wildcard/src/components/Panel/Panel.test.tsx
+++ b/client/wildcard/src/components/Panel/Panel.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { Panel } from './Panel'
diff --git a/client/wildcard/src/components/Tabs/Tabs.story.tsx b/client/wildcard/src/components/Tabs/Tabs.story.tsx
index 0a0d508ec95..9d0c7d6538f 100644
--- a/client/wildcard/src/components/Tabs/Tabs.story.tsx
+++ b/client/wildcard/src/components/Tabs/Tabs.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Meta, Story } from '@storybook/react'
 
 import brandedStyles from '@sourcegraph/branded/src/global-styles/index.scss'
diff --git a/client/wildcard/src/components/Tabs/Tabs.test.tsx b/client/wildcard/src/components/Tabs/Tabs.test.tsx
index 87617cdaef4..ee3fe830204 100644
--- a/client/wildcard/src/components/Tabs/Tabs.test.tsx
+++ b/client/wildcard/src/components/Tabs/Tabs.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, RenderResult, cleanup, fireEvent } from '@testing-library/react'
 
 import { Tab, TabList, TabPanel, TabPanels, Tabs, TabsProps } from './Tabs'
diff --git a/client/wildcard/src/components/Tooltip/Tooltip.test.tsx b/client/wildcard/src/components/Tooltip/Tooltip.test.tsx
index 92787909f58..25c1c8b4aeb 100644
--- a/client/wildcard/src/components/Tooltip/Tooltip.test.tsx
+++ b/client/wildcard/src/components/Tooltip/Tooltip.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render, RenderResult, cleanup, fireEvent, waitFor, screen } from '@testing-library/react'
 
 import { Tooltip } from './Tooltip'
diff --git a/client/wildcard/src/components/Typography/Code/Code.test.tsx b/client/wildcard/src/components/Typography/Code/Code.test.tsx
index 80c74e9ba59..8f9faf1349b 100644
--- a/client/wildcard/src/components/Typography/Code/Code.test.tsx
+++ b/client/wildcard/src/components/Typography/Code/Code.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { Code } from './Code'
diff --git a/client/wildcard/src/components/Typography/Heading/H1.test.tsx b/client/wildcard/src/components/Typography/Heading/H1.test.tsx
index 218b10826fd..b37ba421334 100644
--- a/client/wildcard/src/components/Typography/Heading/H1.test.tsx
+++ b/client/wildcard/src/components/Typography/Heading/H1.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { H1 } from './H1'
diff --git a/client/wildcard/src/components/Typography/Heading/H2.test.tsx b/client/wildcard/src/components/Typography/Heading/H2.test.tsx
index 0bb7be75b91..cd04397287c 100644
--- a/client/wildcard/src/components/Typography/Heading/H2.test.tsx
+++ b/client/wildcard/src/components/Typography/Heading/H2.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { H2 } from './H2'
diff --git a/client/wildcard/src/components/Typography/Heading/H3.test.tsx b/client/wildcard/src/components/Typography/Heading/H3.test.tsx
index 9d04f7ec3f0..addc864b3f9 100644
--- a/client/wildcard/src/components/Typography/Heading/H3.test.tsx
+++ b/client/wildcard/src/components/Typography/Heading/H3.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { H3 } from './H3'
diff --git a/client/wildcard/src/components/Typography/Heading/H4.test.tsx b/client/wildcard/src/components/Typography/Heading/H4.test.tsx
index 98cd9827dea..d45a33d3c25 100644
--- a/client/wildcard/src/components/Typography/Heading/H4.test.tsx
+++ b/client/wildcard/src/components/Typography/Heading/H4.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { H4 } from './H4'
diff --git a/client/wildcard/src/components/Typography/Heading/H5.test.tsx b/client/wildcard/src/components/Typography/Heading/H5.test.tsx
index 4ca94da6cf7..ed30d464884 100644
--- a/client/wildcard/src/components/Typography/Heading/H5.test.tsx
+++ b/client/wildcard/src/components/Typography/Heading/H5.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { H5 } from './H5'
diff --git a/client/wildcard/src/components/Typography/Heading/H6.test.tsx b/client/wildcard/src/components/Typography/Heading/H6.test.tsx
index 46877e5dee3..38ea1c3d13e 100644
--- a/client/wildcard/src/components/Typography/Heading/H6.test.tsx
+++ b/client/wildcard/src/components/Typography/Heading/H6.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { H6 } from './H6'
diff --git a/client/wildcard/src/components/Typography/Label/Label.test.tsx b/client/wildcard/src/components/Typography/Label/Label.test.tsx
index 0c09130899a..b68869a718b 100644
--- a/client/wildcard/src/components/Typography/Label/Label.test.tsx
+++ b/client/wildcard/src/components/Typography/Label/Label.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { Label } from './Label'
diff --git a/client/wildcard/src/components/Typography/Text/Text.test.tsx b/client/wildcard/src/components/Typography/Text/Text.test.tsx
index da7e77a52c2..d9d2b2c1c34 100644
--- a/client/wildcard/src/components/Typography/Text/Text.test.tsx
+++ b/client/wildcard/src/components/Typography/Text/Text.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { render } from '@testing-library/react'
 
 import { Text } from './Text'
diff --git a/client/wildcard/src/components/Typography/Typography.story.tsx b/client/wildcard/src/components/Typography/Typography.story.tsx
index 69977e87448..92196206698 100644
--- a/client/wildcard/src/components/Typography/Typography.story.tsx
+++ b/client/wildcard/src/components/Typography/Typography.story.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { select } from '@storybook/addon-knobs'
 import { DecoratorFn, Meta, Story } from '@storybook/react'
 
diff --git a/client/wildcard/tsconfig.json b/client/wildcard/tsconfig.json
index dee1e080b40..5ff1c29e6b2 100644
--- a/client/wildcard/tsconfig.json
+++ b/client/wildcard/tsconfig.json
@@ -6,7 +6,7 @@
     "rootDir": ".",
     "outDir": "./out",
     "baseUrl": "./src",
-    "jsx": "react",
+    "jsx": "react-jsx",
   },
   "references": [
     { "path": "../shared" },