diff --git a/root/account/Donation.js b/root/account/Donation.js
index aa52956b062..21cdeaa15d8 100644
--- a/root/account/Donation.js
+++ b/root/account/Donation.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import UserAccountLayout, {
   sanitizedAccountLayoutUser,
 } from '../components/UserAccountLayout.js';
@@ -27,7 +25,7 @@ const Donation = ({
   days,
   nag,
   user,
-}: Props): React.Element<typeof UserAccountLayout> => (
+}: Props): React$Element<typeof UserAccountLayout> => (
   <UserAccountLayout
     entity={sanitizedAccountLayoutUser(user)}
     page="donation"
diff --git a/root/account/EditProfile.js b/root/account/EditProfile.js
index 5f3b2eb8a8b..fea08bc5a31 100644
--- a/root/account/EditProfile.js
+++ b/root/account/EditProfile.js
@@ -21,7 +21,7 @@ import EditProfileForm
 
 const EditProfile = (
   props: EditProfileFormPropsT,
-): React.Element<typeof UserAccountLayout> | null => {
+): React$Element<typeof UserAccountLayout> | null => {
   const $c = React.useContext(CatalystContext);
   const user = $c.user;
   if (!user) {
diff --git a/root/account/EmailVerificationStatus.js b/root/account/EmailVerificationStatus.js
index b37f9ae8d0c..c871f0c189c 100644
--- a/root/account/EmailVerificationStatus.js
+++ b/root/account/EmailVerificationStatus.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import StatusPage from '../components/StatusPage.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const EmailVerificationStatus = ({
   message,
-}: Props): React.Element<typeof StatusPage> => (
+}: Props): React$Element<typeof StatusPage> => (
   <StatusPage title={l('Email Verification')}>
     <p>
       {nonEmpty(message)
diff --git a/root/account/LostPassword.js b/root/account/LostPassword.js
index 346165240fa..cc933180ab0 100644
--- a/root/account/LostPassword.js
+++ b/root/account/LostPassword.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import FormCsrfToken
   from '../static/scripts/edit/components/FormCsrfToken.js';
@@ -27,7 +25,7 @@ type Props = {
   +form: LostPasswordFormT,
 };
 
-const LostPassword = (props: Props): React.Element<typeof Layout> => (
+const LostPassword = (props: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Lost Password')}>
     <h1>{l('Lost Password')}</h1>
     <p>
diff --git a/root/account/LostPasswordSent.js b/root/account/LostPasswordSent.js
index 5c9f61d17ae..5de6c0385f9 100644
--- a/root/account/LostPasswordSent.js
+++ b/root/account/LostPasswordSent.js
@@ -7,12 +7,10 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import StatusPage from '../components/StatusPage.js';
 import {CONTACT_URL} from '../constants.js';
 
-const LostPasswordSent = (): React.Element<typeof StatusPage> => (
+const LostPasswordSent = (): React$Element<typeof StatusPage> => (
   <StatusPage title={hyphenateTitle(l('Lost Password'), l('Email Sent!'))}>
     <p>
       {exp.l(
diff --git a/root/account/LostUsername.js b/root/account/LostUsername.js
index 4611e80a0f5..f59d22aa5d9 100644
--- a/root/account/LostUsername.js
+++ b/root/account/LostUsername.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import FormCsrfToken
   from '../static/scripts/edit/components/FormCsrfToken.js';
@@ -25,7 +23,7 @@ type Props = {
   +form: LostUsernameFormT,
 };
 
-const LostUsername = (props: Props): React.Element<typeof Layout> => (
+const LostUsername = (props: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Lost Username')}>
     <h1>{l('Lost Username')}</h1>
     <p>
diff --git a/root/account/LostUsernameSent.js b/root/account/LostUsernameSent.js
index 0488e3eaaf0..1296f15e432 100644
--- a/root/account/LostUsernameSent.js
+++ b/root/account/LostUsernameSent.js
@@ -7,12 +7,10 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import StatusPage from '../components/StatusPage.js';
 import {CONTACT_URL} from '../constants.js';
 
-const LostUsernameSent = (): React.Element<typeof StatusPage> => (
+const LostUsernameSent = (): React$Element<typeof StatusPage> => (
   <StatusPage title={hyphenateTitle(l('Lost Username'), l('Email Sent!'))}>
     <p>
       {exp.l(
diff --git a/root/account/Preferences.js b/root/account/Preferences.js
index d9b38b5a475..56d083f3e14 100644
--- a/root/account/Preferences.js
+++ b/root/account/Preferences.js
@@ -21,7 +21,7 @@ import PreferencesForm
 
 const Preferences = (
   props: PreferencesFormPropsT,
-): React.Element<typeof UserAccountLayout> | null => {
+): React$Element<typeof UserAccountLayout> | null => {
   const $c = React.useContext(CatalystContext);
   const user = $c.user;
   if (!user) {
diff --git a/root/account/PreferencesSaved.js b/root/account/PreferencesSaved.js
index 1c14bd86c74..efcfaa24c13 100644
--- a/root/account/PreferencesSaved.js
+++ b/root/account/PreferencesSaved.js
@@ -12,7 +12,7 @@ import * as React from 'react';
 import StatusPage from '../components/StatusPage.js';
 import {SanitizedCatalystContext} from '../context.mjs';
 
-const PreferencesSaved = (): React.Element<typeof StatusPage> => {
+const PreferencesSaved = (): React$Element<typeof StatusPage> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <StatusPage title={l('Preferences')}>
diff --git a/root/account/ResetPasswordStatus.js b/root/account/ResetPasswordStatus.js
index 7e43977278f..d56e49dcda5 100644
--- a/root/account/ResetPasswordStatus.js
+++ b/root/account/ResetPasswordStatus.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import StatusPage from '../components/StatusPage.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const ResetPasswordStatus = ({
   message,
-}: Props): React.Element<typeof StatusPage> => (
+}: Props): React$Element<typeof StatusPage> => (
   <StatusPage title={l('Reset Password')}>
     <p>{message}</p>
   </StatusPage>
diff --git a/root/account/applications/Edit.js b/root/account/applications/Edit.js
index b662ae24588..6b04313f292 100644
--- a/root/account/applications/Edit.js
+++ b/root/account/applications/Edit.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 import type {ApplicationFormT}
   from '../../static/scripts/account/components/ApplicationForm.js';
@@ -19,7 +17,7 @@ type Props = {
   +form: ApplicationFormT,
 };
 
-const EditApplication = (props: Props): React.Element<typeof Layout> => (
+const EditApplication = (props: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Edit Application')}>
     <h1>{l('Edit Application')}</h1>
     <ApplicationForm
diff --git a/root/account/applications/Index.js b/root/account/applications/Index.js
index d03f185a386..dadbc9f95de 100644
--- a/root/account/applications/Index.js
+++ b/root/account/applications/Index.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import PaginatedResults from '../../components/PaginatedResults.js';
 import {ACCESS_SCOPE_PERMISSIONS} from '../../constants.js';
 import Layout from '../../layout/index.js';
@@ -80,7 +78,7 @@ const Index = ({
   appsPager,
   tokens,
   tokensPager,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Applications')}>
     <h1>{l('Applications')}</h1>
 
diff --git a/root/account/applications/Register.js b/root/account/applications/Register.js
index 6c2af3ad275..425ab5f3006 100644
--- a/root/account/applications/Register.js
+++ b/root/account/applications/Register.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 import * as manifest from '../../static/manifest.mjs';
 import type {ApplicationFormT}
@@ -20,7 +18,7 @@ type Props = {
   +form: ApplicationFormT,
 };
 
-const RegisterApplication = (props: Props): React.Element<typeof Layout> => (
+const RegisterApplication = (props: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Register Application')}>
     <h1>{l('Register Application')}</h1>
     <ApplicationForm
diff --git a/root/account/applications/Remove.js b/root/account/applications/Remove.js
index f1658490399..00cf904d94a 100644
--- a/root/account/applications/Remove.js
+++ b/root/account/applications/Remove.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ConfirmLayout from '../../components/ConfirmLayout.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const RemoveApplication = ({
   form,
-}: Props): React.Element<typeof ConfirmLayout> => (
+}: Props): React$Element<typeof ConfirmLayout> => (
   <ConfirmLayout
     form={form}
     question={l('Are you sure you want to remove this application?')}
diff --git a/root/account/applications/RevokeAccess.js b/root/account/applications/RevokeAccess.js
index 5a6fa8677e0..4aa4edcdb05 100644
--- a/root/account/applications/RevokeAccess.js
+++ b/root/account/applications/RevokeAccess.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ConfirmLayout from '../../components/ConfirmLayout.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const RevokeApplicationAccess = ({
   form,
-}: Props): React.Element<typeof ConfirmLayout> => (
+}: Props): React$Element<typeof ConfirmLayout> => (
   <ConfirmLayout
     form={form}
     question={l(
diff --git a/root/account/sso/DiscourseRegistered.js b/root/account/sso/DiscourseRegistered.js
index bf88c10a758..a7ca43b782b 100644
--- a/root/account/sso/DiscourseRegistered.js
+++ b/root/account/sso/DiscourseRegistered.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const DiscourseRegistered = ({
   emailAddress,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Account Created')}>
     <h2>{l('Account Created')}</h2>
     <p style={{fontSize: '1.2em'}}>
diff --git a/root/account/sso/DiscourseUnconfirmedEmailAddress.js b/root/account/sso/DiscourseUnconfirmedEmailAddress.js
index 2bb02b12251..744d41a11ff 100644
--- a/root/account/sso/DiscourseUnconfirmedEmailAddress.js
+++ b/root/account/sso/DiscourseUnconfirmedEmailAddress.js
@@ -7,11 +7,9 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 
-const DiscourseUnconfirmedEmailAddress = (): React.Element<typeof Layout> => (
+const DiscourseUnconfirmedEmailAddress = (): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Unverified Email Address')}>
     <h2>{l('Unverified Email Address')}</h2>
     <p>
diff --git a/root/admin/EditBanner.js b/root/admin/EditBanner.js
index b19b19d3419..aa164ef91d2 100644
--- a/root/admin/EditBanner.js
+++ b/root/admin/EditBanner.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import FormCsrfToken
   from '../static/scripts/edit/components/FormCsrfToken.js';
@@ -23,7 +21,7 @@ type Props = {
   }>,
 };
 
-const EditBanner = ({form}: Props): React.Element<typeof Layout> => (
+const EditBanner = ({form}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Edit Banner Message')}>
     <div id="content">
       <h1>{l('Edit banner message')}</h1>
diff --git a/root/admin/EmailSearch.js b/root/admin/EmailSearch.js
index d5fc3350000..6dfe0f80ae1 100644
--- a/root/admin/EmailSearch.js
+++ b/root/admin/EmailSearch.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import expand2react from '../static/scripts/common/i18n/expand2react.js';
 import FormRowText from '../static/scripts/edit/components/FormRowText.js';
@@ -26,7 +24,7 @@ type Props = {
 const EmailSearch = ({
   form,
   results,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Search users by email')}>
     <div id="content">
       <h1>{l('Search users by email')}</h1>
diff --git a/root/admin/IpLookup.js b/root/admin/IpLookup.js
index fadcfd77605..7779908a0c0 100644
--- a/root/admin/IpLookup.js
+++ b/root/admin/IpLookup.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 
 import UserList from './components/UserList.js';
@@ -21,7 +19,7 @@ type Props = {
 const IpLookup = ({
   ipHash,
   users,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('IP lookup')}>
     <div id="content">
       <h1>{l('IP lookup')}</h1>
diff --git a/root/admin/LockedUsernameSearch.js b/root/admin/LockedUsernameSearch.js
index 5f557bbadde..ac6ecbe661f 100644
--- a/root/admin/LockedUsernameSearch.js
+++ b/root/admin/LockedUsernameSearch.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import expand2react from '../static/scripts/common/i18n/expand2react.js';
 import bracketed from '../static/scripts/common/utility/bracketed.js';
@@ -30,7 +28,7 @@ const LockedUsernameSearch = ({
   form,
   results,
   showResults,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title="Search locked usernames">
     <div id="content">
       <h1>{'Search locked usernames'}</h1>
diff --git a/root/admin/LockedUsernameUnlock.js b/root/admin/LockedUsernameUnlock.js
index 37a6a7ae2c1..e383609398e 100644
--- a/root/admin/LockedUsernameUnlock.js
+++ b/root/admin/LockedUsernameUnlock.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import expand2text from '../static/scripts/common/i18n/expand2text.js';
 import FormCsrfToken
@@ -23,7 +21,7 @@ type Props = {
 const LockedUsernameUnlock = ({
   form,
   username,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title="Unlock username">
     <div id="content">
       <h1>{'Unlock username'}</h1>
diff --git a/root/admin/PrivilegeSearch.js b/root/admin/PrivilegeSearch.js
index fbf0b8f1ded..7dfd42debcd 100644
--- a/root/admin/PrivilegeSearch.js
+++ b/root/admin/PrivilegeSearch.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import PaginatedResults from '../components/PaginatedResults.js';
 import Layout from '../layout/index.js';
 import FormRowCheckbox
@@ -42,7 +40,7 @@ const PrivilegeSearch = ({
   form,
   pager,
   results,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Search users by privileges')}>
     <div id="content">
       <h1>{l('Search users by privileges')}</h1>
diff --git a/root/admin/attributes/Attribute.js b/root/admin/attributes/Attribute.js
index e224bbea62e..84d2eefe080 100644
--- a/root/admin/attributes/Attribute.js
+++ b/root/admin/attributes/Attribute.js
@@ -8,8 +8,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 import {compare} from '../../static/scripts/common/i18n.js';
 import expand2react from '../../static/scripts/common/i18n/expand2react.js';
@@ -85,7 +83,7 @@ const renderAttributes = (attribute: AttributeT) => {
 const Attribute = ({
   attributes,
   model,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={model}>
     <h1>
       <a href="/admin/attributes">{l('Attributes')}</a>
diff --git a/root/admin/attributes/CannotRemoveAttribute.js b/root/admin/attributes/CannotRemoveAttribute.js
index 2c6c879d415..52a19dc3b31 100644
--- a/root/admin/attributes/CannotRemoveAttribute.js
+++ b/root/admin/attributes/CannotRemoveAttribute.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const CannotRemoveAttribute = ({
   message,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Cannot Remove Attribute')}>
     <h1>{l('Cannot Remove Attribute')}</h1>
     <p>
diff --git a/root/admin/attributes/Index.js b/root/admin/attributes/Index.js
index b45dee4955d..b4c377b1530 100644
--- a/root/admin/attributes/Index.js
+++ b/root/admin/attributes/Index.js
@@ -8,15 +8,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 
 type Props = {
   +models: Array<string>,
 };
 
-const Attributes = ({models}: Props): React.Element<typeof Layout> => (
+const Attributes = ({models}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Attributes')}>
     <h1>{l('Attributes')}</h1>
     <ul>
diff --git a/root/admin/attributes/Language.js b/root/admin/attributes/Language.js
index 3acc3bbaed6..a32af42647e 100644
--- a/root/admin/attributes/Language.js
+++ b/root/admin/attributes/Language.js
@@ -8,8 +8,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 import {compare} from '../../static/scripts/common/i18n.js';
 import loopParity from '../../utility/loopParity.js';
@@ -28,7 +26,7 @@ type Props = {
 const Language = ({
   model,
   attributes,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   return (
     <Layout fullWidth title={model || l('Language')}>
       <h1>
diff --git a/root/admin/attributes/Script.js b/root/admin/attributes/Script.js
index ac3142d56db..f279c7e47b5 100644
--- a/root/admin/attributes/Script.js
+++ b/root/admin/attributes/Script.js
@@ -8,9 +8,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 import {compare} from '../../static/scripts/common/i18n.js';
 import loopParity from '../../utility/loopParity.js';
@@ -30,7 +27,7 @@ type Props = {
 const Script = ({
   model,
   attributes,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={model || l('Script')}>
     <h1>
       <a href="/admin/attributes">{l('Attributes')}</a>
diff --git a/root/admin/components/UserList.js b/root/admin/components/UserList.js
index b7f58bfb715..91fc89be1bc 100644
--- a/root/admin/components/UserList.js
+++ b/root/admin/components/UserList.js
@@ -19,7 +19,7 @@ type Props = {
   +users: $ReadOnlyArray<UnsanitizedEditorT>,
 };
 
-const UserList = ({users}: Props): React.Element<'table'> => {
+const UserList = ({users}: Props): React$Element<'table'> => {
   const $c = React.useContext(CatalystContext);
 
   return (
diff --git a/root/admin/statistics-events/CreateStatisticsEvent.js b/root/admin/statistics-events/CreateStatisticsEvent.js
index 6098e645d39..cf2b66bb643 100644
--- a/root/admin/statistics-events/CreateStatisticsEvent.js
+++ b/root/admin/statistics-events/CreateStatisticsEvent.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 
 import StatisticsEventEditForm from './StatisticsEventEditForm.js';
@@ -20,7 +18,7 @@ type PropsT = {
 
 const CreateStatisticsEvent = ({
   form,
-}: PropsT): React.Element<typeof Layout> => (
+}: PropsT): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Add a new statistics event')}>
     <div id="content">
       <h1>{l('Add a new statistics event')}</h1>
diff --git a/root/admin/statistics-events/DeleteStatisticsEvent.js b/root/admin/statistics-events/DeleteStatisticsEvent.js
index 2188d84a2e5..b354afb2acd 100644
--- a/root/admin/statistics-events/DeleteStatisticsEvent.js
+++ b/root/admin/statistics-events/DeleteStatisticsEvent.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 import expand2react from '../../static/scripts/common/i18n/expand2react.js';
 import FormSubmit from '../../static/scripts/edit/components/FormSubmit.js';
@@ -21,7 +19,7 @@ type PropsT = {
 
 const DeleteStatisticsEvent = ({
   event,
-}: PropsT): React.Element<typeof Layout> => (
+}: PropsT): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Remove statistics event')}>
     <h2>{l('Remove statistics event')}</h2>
     <table className="details">
diff --git a/root/admin/statistics-events/EditStatisticsEvent.js b/root/admin/statistics-events/EditStatisticsEvent.js
index bd4b6080140..23a49eb36a6 100644
--- a/root/admin/statistics-events/EditStatisticsEvent.js
+++ b/root/admin/statistics-events/EditStatisticsEvent.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 
 import StatisticsEventEditForm from './StatisticsEventEditForm.js';
@@ -20,7 +18,7 @@ type PropsT = {
 
 const EditStatisticsEvent = ({
   form,
-}: PropsT): React.Element<typeof Layout> => (
+}: PropsT): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Edit statistics event')}>
     <StatisticsEventEditForm form={form} />
   </Layout>
diff --git a/root/admin/statistics-events/StatisticsEventEditForm.js b/root/admin/statistics-events/StatisticsEventEditForm.js
index 585c37dd7b5..2ec922120aa 100644
--- a/root/admin/statistics-events/StatisticsEventEditForm.js
+++ b/root/admin/statistics-events/StatisticsEventEditForm.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import FormCsrfToken
   from '../../static/scripts/edit/components/FormCsrfToken.js';
 import FormRowTextLong
@@ -23,7 +21,7 @@ type PropsT = {
 
 const StatisticsEventForm = ({
   form,
-}: PropsT): React.Element<'form'> => (
+}: PropsT): React$Element<'form'> => (
   <form method="post">
     <FormCsrfToken form={form} />
     <div className="half-width">
diff --git a/root/admin/statistics-events/StatisticsEventIndex.js b/root/admin/statistics-events/StatisticsEventIndex.js
index 44852370d7e..cdcf910fee2 100644
--- a/root/admin/statistics-events/StatisticsEventIndex.js
+++ b/root/admin/statistics-events/StatisticsEventIndex.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 import expand2react from '../../static/scripts/common/i18n/expand2react.js';
 import loopParity from '../../utility/loopParity.js';
@@ -21,7 +19,7 @@ type PropsT = {
 
 const StatisticsEventIndex = ({
   events,
-}: PropsT): React.Element<typeof Layout> => (
+}: PropsT): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Statistics Events')}>
     <h1>{l('Statistics Events')}</h1>
     <table className="tbl">
diff --git a/root/admin/wikidoc/CreateWikiDoc.js b/root/admin/wikidoc/CreateWikiDoc.js
index 4e22ae80647..48fa86f36f3 100644
--- a/root/admin/wikidoc/CreateWikiDoc.js
+++ b/root/admin/wikidoc/CreateWikiDoc.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 import FormCsrfToken
   from '../../static/scripts/edit/components/FormCsrfToken.js';
@@ -27,7 +25,7 @@ type Props = {
 
 const CreateWikiDoc = ({
   form,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Add Page')}>
     <div id="content">
       <h1>{l('Add Page')}</h1>
diff --git a/root/admin/wikidoc/DeleteWikiDoc.js b/root/admin/wikidoc/DeleteWikiDoc.js
index c6e498639af..971238c5469 100644
--- a/root/admin/wikidoc/DeleteWikiDoc.js
+++ b/root/admin/wikidoc/DeleteWikiDoc.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 import FormCsrfToken
   from '../../static/scripts/edit/components/FormCsrfToken.js';
@@ -22,7 +20,7 @@ type Props = {
 const DeleteWikiDoc = ({
   form,
   page,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Remove Page')}>
     <div id="content">
       <h1>{l('Remove Page')}</h1>
diff --git a/root/admin/wikidoc/EditWikiDoc.js b/root/admin/wikidoc/EditWikiDoc.js
index f731355dc4d..b0ba16ab0f3 100644
--- a/root/admin/wikidoc/EditWikiDoc.js
+++ b/root/admin/wikidoc/EditWikiDoc.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 import FormCsrfToken
   from '../../static/scripts/edit/components/FormCsrfToken.js';
@@ -28,7 +26,7 @@ const EditWikiDoc = ({
   currentVersion,
   form,
   page,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Update Page')}>
     <div id="content">
       <h1>{l('Update Page')}</h1>
diff --git a/root/admin/wikidoc/WikiDocIndex.js b/root/admin/wikidoc/WikiDocIndex.js
index eef1caf0668..03d36ef94c9 100644
--- a/root/admin/wikidoc/WikiDocIndex.js
+++ b/root/admin/wikidoc/WikiDocIndex.js
@@ -143,7 +143,7 @@ const WikiDocTable = ({
   });
 };
 
-const WikiDocIndex = (props: PropsT): React.Element<typeof Layout> => {
+const WikiDocIndex = (props: PropsT): React$Element<typeof Layout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <Layout fullWidth title={l('Transclusion Table')}>
diff --git a/root/annotation/AnnotationComparison.js b/root/annotation/AnnotationComparison.js
index 5ce7df051c9..a48cd1f7c45 100644
--- a/root/annotation/AnnotationComparison.js
+++ b/root/annotation/AnnotationComparison.js
@@ -29,7 +29,7 @@ const AnnotationComparison = ({
   newAnnotation,
   numberOfRevisions,
   oldAnnotation,
-}: AnnotationComparisonProps): React.MixedElement => {
+}: AnnotationComparisonProps): React$MixedElement => {
   const $c = React.useContext(SanitizedCatalystContext);
   const entityType = entity.entityType;
   const entityUrlFragment = ENTITIES[entityType].url;
diff --git a/root/annotation/AnnotationHistory.js b/root/annotation/AnnotationHistory.js
index 6d58cbc9e05..05cbf6aa762 100644
--- a/root/annotation/AnnotationHistory.js
+++ b/root/annotation/AnnotationHistory.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ENTITIES from '../../entities.mjs';
 import PaginatedResults from '../components/PaginatedResults.js';
 import * as manifest from '../static/manifest.mjs';
@@ -27,7 +25,7 @@ const AnnotationHistory = ({
   annotations,
   entity,
   pager,
-}: AnnotationHistoryProps): React.MixedElement => {
+}: AnnotationHistoryProps): React$MixedElement => {
   const entityType = entity.entityType;
   const entityUrlFragment = ENTITIES[entityType].url;
   const baseUrl = `/${entityUrlFragment}/${entity.gid}`;
diff --git a/root/annotation/AnnotationRevision.js b/root/annotation/AnnotationRevision.js
index ae385a7f624..c641680f4cb 100644
--- a/root/annotation/AnnotationRevision.js
+++ b/root/annotation/AnnotationRevision.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Annotation from '../static/scripts/common/components/Annotation.js';
 import chooseLayoutComponent from '../utility/chooseLayoutComponent.js';
 
@@ -22,7 +20,7 @@ const AnnotationRevision = ({
   annotation,
   entity,
   numberOfRevisions,
-}: AnnotationRevisionProps): React.MixedElement => {
+}: AnnotationRevisionProps): React$MixedElement => {
   const entityType = entity.entityType;
   const LayoutComponent = chooseLayoutComponent(entityType);
 
diff --git a/root/annotation/EditAnnotation.js b/root/annotation/EditAnnotation.js
index 161af51db65..c71f66cd39d 100644
--- a/root/annotation/EditAnnotation.js
+++ b/root/annotation/EditAnnotation.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EnterEdit from '../static/scripts/edit/components/EnterEdit.js';
 import EnterEditNote
   from '../static/scripts/edit/components/EnterEditNote.js';
@@ -37,7 +35,7 @@ const EditAnnotation = ({
   form,
   preview,
   showPreview = false,
-}: EditAnnotationProps): React.MixedElement => {
+}: EditAnnotationProps): React$MixedElement => {
   const entityType = entity.entityType;
   const LayoutComponent = chooseLayoutComponent(entityType);
 
diff --git a/root/area/AreaArtists.js b/root/area/AreaArtists.js
index 21c5158cfec..c327876408d 100644
--- a/root/area/AreaArtists.js
+++ b/root/area/AreaArtists.js
@@ -26,7 +26,7 @@ const AreaArtists = ({
   area,
   artists,
   pager,
-}: Props): React.Element<typeof AreaLayout> => {
+}: Props): React$Element<typeof AreaLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <AreaLayout entity={area} page="artists" title={l('Artists')}>
diff --git a/root/area/AreaEvents.js b/root/area/AreaEvents.js
index 7d425e16f5f..8b6ee3521a7 100644
--- a/root/area/AreaEvents.js
+++ b/root/area/AreaEvents.js
@@ -26,7 +26,7 @@ const AreaEvents = ({
   area,
   events,
   pager,
-}: Props): React.Element<typeof AreaLayout> => {
+}: Props): React$Element<typeof AreaLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <AreaLayout entity={area} page="events" title={l('Events')}>
diff --git a/root/area/AreaHeader.js b/root/area/AreaHeader.js
index 01a48dbec8b..ac1ef1163e6 100644
--- a/root/area/AreaHeader.js
+++ b/root/area/AreaHeader.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityHeader from '../components/EntityHeader.js';
 import AreaContainmentLink
   from '../static/scripts/common/components/AreaContainmentLink.js';
@@ -23,7 +21,7 @@ type Props = {
 const AreaHeader = ({
   area,
   page,
-}: Props): React.Element<typeof EntityHeader> => {
+}: Props): React$Element<typeof EntityHeader> => {
   const areaType = localizeTypeNameForEntity(area);
   let subHeading: Expand2ReactOutput = areaType;
   if (area.containment?.length) {
diff --git a/root/area/AreaIndex.js b/root/area/AreaIndex.js
index 94fe31a0fc8..889ff86f308 100644
--- a/root/area/AreaIndex.js
+++ b/root/area/AreaIndex.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import * as manifest from '../static/manifest.mjs';
 import Annotation from '../static/scripts/common/components/Annotation.js';
 import Relationships
@@ -28,7 +26,7 @@ const AreaIndex = ({
   area,
   numberOfRevisions,
   wikipediaExtract,
-}: Props): React.Element<typeof AreaLayout> => (
+}: Props): React$Element<typeof AreaLayout> => (
   <AreaLayout entity={area} page="index">
     <Annotation
       annotation={area.latest_annotation}
diff --git a/root/area/AreaLabels.js b/root/area/AreaLabels.js
index 2c76ab1fa1f..daf7d96728f 100644
--- a/root/area/AreaLabels.js
+++ b/root/area/AreaLabels.js
@@ -26,7 +26,7 @@ const AreaLabels = ({
   area,
   labels,
   pager,
-}: Props): React.Element<typeof AreaLayout> => {
+}: Props): React$Element<typeof AreaLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <AreaLayout entity={area} page="labels" title={l('Labels')}>
diff --git a/root/area/AreaLayout.js b/root/area/AreaLayout.js
index be050df7f1c..1c6e8c07d11 100644
--- a/root/area/AreaLayout.js
+++ b/root/area/AreaLayout.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import AreaSidebar from '../layout/components/sidebar/AreaSidebar.js';
 import Layout from '../layout/index.js';
 import localizeAreaName
@@ -17,7 +15,7 @@ import localizeAreaName
 import AreaHeader from './AreaHeader.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +entity: AreaT,
   +fullWidth?: boolean,
   +page: string,
@@ -30,7 +28,7 @@ const AreaLayout = ({
   fullWidth = false,
   page,
   title,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout
     title={nonEmpty(title)
       ? hyphenateTitle(localizeAreaName(area), title)
diff --git a/root/area/AreaMerge.js b/root/area/AreaMerge.js
index 5700f5eadc1..982da163d7f 100644
--- a/root/area/AreaMerge.js
+++ b/root/area/AreaMerge.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import AreaList from '../components/list/AreaList.js';
 import Layout from '../layout/index.js';
 import sortByEntityName
@@ -26,7 +24,7 @@ type Props = {
 const AreaMerge = ({
   form,
   toMerge,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Merge areas')}>
     <div id="content">
       <h1>{l('Merge areas')}</h1>
diff --git a/root/area/AreaPlaces.js b/root/area/AreaPlaces.js
index 35696854e22..740787e1fc4 100644
--- a/root/area/AreaPlaces.js
+++ b/root/area/AreaPlaces.js
@@ -30,7 +30,7 @@ const AreaPlaces = ({
   mapDataArgs,
   pager,
   places,
-}: Props): React.Element<typeof AreaLayout> => {
+}: Props): React$Element<typeof AreaLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <AreaLayout entity={area} page="places" title={l('Places')}>
diff --git a/root/area/AreaRecordings.js b/root/area/AreaRecordings.js
index 18cfc927c3b..973c36de71c 100644
--- a/root/area/AreaRecordings.js
+++ b/root/area/AreaRecordings.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import RelationshipsTable from '../components/RelationshipsTable.js';
 
 import AreaLayout from './AreaLayout.js';
@@ -23,7 +21,7 @@ const AreaRecordings = ({
   area,
   pagedLinkTypeGroup,
   pager,
-}: Props): React.Element<typeof AreaLayout> => (
+}: Props): React$Element<typeof AreaLayout> => (
   <AreaLayout entity={area} page="recordings" title={l('Recordings')}>
     <RelationshipsTable
       entity={area}
diff --git a/root/area/AreaReleases.js b/root/area/AreaReleases.js
index 4b4d9bed6ee..f1a22cb9c01 100644
--- a/root/area/AreaReleases.js
+++ b/root/area/AreaReleases.js
@@ -29,7 +29,7 @@ const AreaReleases = ({
   pagedLinkTypeGroup,
   pager,
   releases,
-}: Props): React.Element<typeof AreaLayout> => {
+}: Props): React$Element<typeof AreaLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <AreaLayout entity={area} page="releases" title={l('Releases')}>
diff --git a/root/area/AreaUsers.js b/root/area/AreaUsers.js
index 35b606c54a4..942f87c62b0 100644
--- a/root/area/AreaUsers.js
+++ b/root/area/AreaUsers.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import PaginatedResults from '../components/PaginatedResults.js';
 import EditorLink from '../static/scripts/common/components/EditorLink.js';
 
@@ -24,7 +22,7 @@ const AreaUsers = ({
   area,
   editors,
   pager,
-}: Props): React.Element<typeof AreaLayout> => (
+}: Props): React$Element<typeof AreaLayout> => (
   <AreaLayout entity={area} page="users" title={l('Users')}>
     <h2>{l('Users')}</h2>
 
diff --git a/root/area/AreaWorks.js b/root/area/AreaWorks.js
index 9866075b34a..f47aec8d741 100644
--- a/root/area/AreaWorks.js
+++ b/root/area/AreaWorks.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import RelationshipsTable from '../components/RelationshipsTable.js';
 
 import AreaLayout from './AreaLayout.js';
@@ -23,7 +21,7 @@ const AreaWorks = ({
   area,
   pagedLinkTypeGroup,
   pager,
-}: Props): React.Element<typeof AreaLayout> => (
+}: Props): React$Element<typeof AreaLayout> => (
   <AreaLayout entity={area} page="works" title={l('Works')}>
     <RelationshipsTable
       entity={area}
diff --git a/root/artist/ArtistEvents.js b/root/artist/ArtistEvents.js
index f2f646f1859..56fecd02806 100644
--- a/root/artist/ArtistEvents.js
+++ b/root/artist/ArtistEvents.js
@@ -35,7 +35,7 @@ const ArtistEvents = ({
   filterForm,
   hasFilter,
   pager,
-}: Props): React.Element<typeof ArtistLayout> => {
+}: Props): React$Element<typeof ArtistLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <ArtistLayout entity={artist} page="events" title={l('Events')}>
diff --git a/root/artist/ArtistHeader.js b/root/artist/ArtistHeader.js
index 16ca80064e8..329dc5a5e1a 100644
--- a/root/artist/ArtistHeader.js
+++ b/root/artist/ArtistHeader.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityHeader from '../components/EntityHeader.js';
 import localizeTypeNameForEntity
   from '../static/scripts/common/i18n/localizeTypeNameForEntity.js';
@@ -21,7 +19,7 @@ type Props = {
 const ArtistHeader = ({
   artist,
   page,
-}: Props): React.Element<typeof EntityHeader> => {
+}: Props): React$Element<typeof EntityHeader> => {
   let headerClass = 'artistheader';
   if (nonEmpty(artist.typeName)) {
     headerClass += ` ${artist.typeName.toLowerCase()}-icon`;
diff --git a/root/artist/ArtistIndex.js b/root/artist/ArtistIndex.js
index fd82d800c68..bbb8b655a19 100644
--- a/root/artist/ArtistIndex.js
+++ b/root/artist/ArtistIndex.js
@@ -73,7 +73,7 @@ const FooterSwitch = ({
   hasVariousArtistsExtra,
   includingAllStatuses,
   showingVariousArtistsOnly,
-}: FooterSwitchProps): React.Element<'p' | typeof React.Fragment> => {
+}: FooterSwitchProps): React$Element<'p' | typeof React.Fragment> => {
   const artistLink = entityHref(artist);
 
   function buildLinks(
@@ -116,7 +116,7 @@ const FooterSwitch = ({
       return (
         <>
           {' ('}
-          {links.reduce((accum: Array<React.Node>, link, index) => {
+          {links.reduce((accum: Array<React$Node>, link, index) => {
             accum.push(link);
             if (index < (links.length - 1)) {
               accum.push(' / ');
@@ -212,7 +212,7 @@ const ArtistIndex = ({
   releaseGroups,
   showingVariousArtistsOnly,
   wikipediaExtract,
-}: Props): React.Element<typeof ArtistLayout> => {
+}: Props): React$Element<typeof ArtistLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   const existingRecordings = recordings?.length ? recordings : null;
   const existingReleaseGroups = releaseGroups?.length ? releaseGroups : null;
diff --git a/root/artist/ArtistLayout.js b/root/artist/ArtistLayout.js
index 35eac7d829f..192ea8c54ee 100644
--- a/root/artist/ArtistLayout.js
+++ b/root/artist/ArtistLayout.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistSidebar from '../layout/components/sidebar/ArtistSidebar.js';
 import Layout from '../layout/index.js';
 
 import ArtistHeader from './ArtistHeader.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +entity: ArtistT,
   +fullWidth?: boolean,
   +page: string,
@@ -28,7 +26,7 @@ const ArtistLayout = ({
   fullWidth = false,
   page,
   title,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout
     title={nonEmpty(title) ? hyphenateTitle(artist.name, title) : artist.name}
   >
diff --git a/root/artist/ArtistMerge.js b/root/artist/ArtistMerge.js
index 37272467df8..2d452de6b61 100644
--- a/root/artist/ArtistMerge.js
+++ b/root/artist/ArtistMerge.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistList from '../components/list/ArtistList.js';
 import Layout from '../layout/index.js';
 import sortByEntityName
@@ -28,7 +26,7 @@ type Props = {
 const ArtistMerge = ({
   form,
   toMerge,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Merge artists')}>
     <div id="content">
       <h1>{l('Merge artists')}</h1>
diff --git a/root/artist/ArtistRecordings.js b/root/artist/ArtistRecordings.js
index da9e31e95fb..64eb3f803be 100644
--- a/root/artist/ArtistRecordings.js
+++ b/root/artist/ArtistRecordings.js
@@ -49,7 +49,7 @@ const FooterSwitch = ({
   hasVideo,
   standaloneOnly,
   videoOnly,
-}: FooterSwitchProps): React.Element<'p'> => {
+}: FooterSwitchProps): React$Element<'p'> => {
   const showAllLink = (
     <a href={`/artist/${artist.gid}/recordings`}>
       {l('Show all recordings')}
@@ -135,7 +135,7 @@ const ArtistRecordings = ({
   releaseGroupAppearances,
   standaloneOnly,
   videoOnly,
-}: Props): React.Element<typeof ArtistLayout> => {
+}: Props): React$Element<typeof ArtistLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <ArtistLayout
diff --git a/root/artist/ArtistRelationships.js b/root/artist/ArtistRelationships.js
index 6857c7269b9..fe1d85ea3f8 100644
--- a/root/artist/ArtistRelationships.js
+++ b/root/artist/ArtistRelationships.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import RelationshipsTable from '../components/RelationshipsTable.js';
 import Relationships
   from '../static/scripts/common/components/Relationships.js';
@@ -25,7 +23,7 @@ const ArtistRelationships = ({
   artist,
   pagedLinkTypeGroup,
   pager,
-}: Props): React.Element<typeof ArtistLayout> => (
+}: Props): React$Element<typeof ArtistLayout> => (
   <ArtistLayout
     entity={artist}
     page="relationships"
diff --git a/root/artist/ArtistReleases.js b/root/artist/ArtistReleases.js
index d0b3bdd7603..d6ec857ae34 100644
--- a/root/artist/ArtistReleases.js
+++ b/root/artist/ArtistReleases.js
@@ -40,7 +40,7 @@ const ArtistReleases = ({
   releases,
   showingVariousArtistsOnly,
   wantVariousArtistsOnly,
-}: Props): React.Element<typeof ArtistLayout> => {
+}: Props): React$Element<typeof ArtistLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <ArtistLayout entity={artist} page="releases" title={l('Releases')}>
diff --git a/root/artist/ArtistWorks.js b/root/artist/ArtistWorks.js
index d82d1205fda..64e3ebd4cba 100644
--- a/root/artist/ArtistWorks.js
+++ b/root/artist/ArtistWorks.js
@@ -35,7 +35,7 @@ const ArtistWorks = ({
   hasFilter,
   pager,
   works,
-}: Props): React.Element<typeof ArtistLayout> => {
+}: Props): React$Element<typeof ArtistLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <ArtistLayout entity={artist} page="works" title={l('Works')}>
diff --git a/root/artist/CannotSplit.js b/root/artist/CannotSplit.js
index d1de2b429f2..b6b5fb78775 100644
--- a/root/artist/CannotSplit.js
+++ b/root/artist/CannotSplit.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistLayout from './ArtistLayout.js';
 
 type Props = {
@@ -19,7 +17,7 @@ type Props = {
 const CannotSplit = ({
   artist,
   isEmpty,
-}: Props): React.Element<typeof ArtistLayout> => (
+}: Props): React$Element<typeof ArtistLayout> => (
   <ArtistLayout entity={artist} page="cannot_split">
     <h2>{l('Split Into Separate Artists')}</h2>
     <p>
diff --git a/root/artist/SpecialPurpose.js b/root/artist/SpecialPurpose.js
index c92b4e836ba..25f7514144d 100644
--- a/root/artist/SpecialPurpose.js
+++ b/root/artist/SpecialPurpose.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistLayout from './ArtistLayout.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const SpecialPurpose = ({
   artist,
-}: Props): React.Element<typeof ArtistLayout> => (
+}: Props): React$Element<typeof ArtistLayout> => (
   <ArtistLayout
     entity={artist}
     fullWidth
diff --git a/root/artist_credit/ArtistCreditIndex.js b/root/artist_credit/ArtistCreditIndex.js
index 75f962a4f5c..55011ce3c8b 100644
--- a/root/artist_credit/ArtistCreditIndex.js
+++ b/root/artist_credit/ArtistCreditIndex.js
@@ -82,7 +82,7 @@ function buildSection(
 
 const ArtistCreditIndex = (
   props: Props,
-): React.Element<typeof ArtistCreditLayout> => {
+): React$Element<typeof ArtistCreditLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <ArtistCreditLayout
diff --git a/root/artist_credit/ArtistCreditLayout.js b/root/artist_credit/ArtistCreditLayout.js
index 0fddedf25a0..07b8a98f6d6 100644
--- a/root/artist_credit/ArtistCreditLayout.js
+++ b/root/artist_credit/ArtistCreditLayout.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Tabs from '../components/Tabs.js';
 import Layout from '../layout/index.js';
 import ArtistCreditUsageLink
@@ -18,7 +16,7 @@ import {reduceArtistCredit}
 
 type Props = {
   +artistCredit: $ReadOnly<{...ArtistCreditT, +id: number}>,
-  +children: React.Node,
+  +children: React$Node,
   +page: string,
   +title?: string,
 };
@@ -36,7 +34,7 @@ const ArtistCreditLayout = ({
   children,
   page,
   title,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout
     fullWidth
     title={
diff --git a/root/artist_credit/EntityList.js b/root/artist_credit/EntityList.js
index 8efc34d863b..9152fcf925c 100644
--- a/root/artist_credit/EntityList.js
+++ b/root/artist_credit/EntityList.js
@@ -49,7 +49,7 @@ const EntityList = ({
   entityType,
   page,
   pager,
-}: Props): React.Element<typeof ArtistCreditLayout> => {
+}: Props): React$Element<typeof ArtistCreditLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <ArtistCreditLayout artistCredit={artistCredit} page={page}>
diff --git a/root/cdstub/CDStubAddWhileLoggedIn.js b/root/cdstub/CDStubAddWhileLoggedIn.js
index 090d4c8b4a7..cc645156146 100644
--- a/root/cdstub/CDStubAddWhileLoggedIn.js
+++ b/root/cdstub/CDStubAddWhileLoggedIn.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import StatusPage from '../components/StatusPage.js';
 import FormSubmit from '../static/scripts/edit/components/FormSubmit.js';
 
@@ -18,7 +16,7 @@ type Props = {
 
 const CDStubAddWhileLoggedIn = ({
   cdToc,
-}: Props): React.Element<typeof StatusPage> => (
+}: Props): React$Element<typeof StatusPage> => (
   <StatusPage title={l('Cannot Add CD Stub')}>
     <p>
       {l(`You cannot add a CD stub while logged in to MusicBrainz.
diff --git a/root/cdstub/CDStubHeader.js b/root/cdstub/CDStubHeader.js
index 1bdbd8345fb..9c8ead213ce 100644
--- a/root/cdstub/CDStubHeader.js
+++ b/root/cdstub/CDStubHeader.js
@@ -21,7 +21,7 @@ type Props = {
 const CDStubHeader = ({
   cdstub,
   page,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const subHeading = exp.l(
     'CD stub by {artist}',
     {artist: cdstub.artist || l('Various Artists')},
diff --git a/root/cdstub/CDStubIndex.js b/root/cdstub/CDStubIndex.js
index 583ea51441c..387429d6d5a 100644
--- a/root/cdstub/CDStubIndex.js
+++ b/root/cdstub/CDStubIndex.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import calculateFullToc
   from '../static/scripts/common/utility/calculateFullToc.js';
 import formatTrackLength
@@ -25,7 +23,7 @@ type Props = {
 const CDStubIndex = ({
   cdstub,
   showArtists,
-}: Props): React.Element<typeof CDStubLayout> => {
+}: Props): React$Element<typeof CDStubLayout> => {
   const totalLength = cdstub.tracks.reduce(
     (length, track) => length + track.length,
     0,
diff --git a/root/cdstub/CDStubInfo.js b/root/cdstub/CDStubInfo.js
index 14afb880d97..9285b742757 100644
--- a/root/cdstub/CDStubInfo.js
+++ b/root/cdstub/CDStubInfo.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import formatTrackLength
   from '../static/scripts/common/utility/formatTrackLength.js';
 import loopParity from '../utility/loopParity.js';
@@ -21,7 +19,7 @@ type Props = {
 const CDStubInfo = ({
   cdstub,
   showArtists = false,
-}: Props): React.Element<'table'> => (
+}: Props): React$Element<'table'> => (
   <table className="tbl">
     <thead>
       <tr>
diff --git a/root/cdstub/CDStubLayout.js b/root/cdstub/CDStubLayout.js
index e41a192b0d5..4372fee7e7f 100644
--- a/root/cdstub/CDStubLayout.js
+++ b/root/cdstub/CDStubLayout.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CDStubSidebar from '../layout/components/sidebar/CDStubSidebar.js';
 import Layout from '../layout/index.js';
 
 import CDStubHeader from './CDStubHeader.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +entity: CDStubT,
   +fullWidth?: boolean,
   +page: string,
@@ -26,7 +24,7 @@ const CDStubLayout = ({
   entity: cdstub,
   fullWidth = false,
   page,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const title = texp.l(
     'CD stub “{title}” by {artist}',
     {
diff --git a/root/cdstub/CDStubNotFound.js b/root/cdstub/CDStubNotFound.js
index d450888e54e..6dc26af73e5 100644
--- a/root/cdstub/CDStubNotFound.js
+++ b/root/cdstub/CDStubNotFound.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import StatusPage from '../components/StatusPage.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const CDStubNotFound = ({
   discId,
-}: Props): React.Element<typeof StatusPage> => (
+}: Props): React$Element<typeof StatusPage> => (
   <StatusPage title={l('CD Stub Not Found')}>
     <p>
       {exp.l(
diff --git a/root/cdstub/DiscIdNotValid.js b/root/cdstub/DiscIdNotValid.js
index a1c95fb445d..0d05d715cb6 100644
--- a/root/cdstub/DiscIdNotValid.js
+++ b/root/cdstub/DiscIdNotValid.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import StatusPage from '../components/StatusPage.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const DiscIdNotValid = ({
   discId,
-}: Props): React.Element<typeof StatusPage> => (
+}: Props): React$Element<typeof StatusPage> => (
   <StatusPage title={l('Invalid Disc ID')}>
     <p>
       {exp.l(
diff --git a/root/cdstub/ImportCDStub.js b/root/cdstub/ImportCDStub.js
index f44783bfcca..c2cdd3bb266 100644
--- a/root/cdstub/ImportCDStub.js
+++ b/root/cdstub/ImportCDStub.js
@@ -31,7 +31,7 @@ const ImportCDStub = ({
   cdstub,
   form,
   pager,
-}: Props): React.Element<typeof CDStubLayout> => (
+}: Props): React$Element<typeof CDStubLayout> => (
   <CDStubLayout entity={cdstub} page="import">
     <h2>{l('Import CD Stub')}</h2>
     <p>
diff --git a/root/cdtoc/AttachCDTocConfirmation.js b/root/cdtoc/AttachCDTocConfirmation.js
index 1ac80c62ba9..12136a3b0b2 100644
--- a/root/cdtoc/AttachCDTocConfirmation.js
+++ b/root/cdtoc/AttachCDTocConfirmation.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import TrackDurationChanges from '../edit/components/TrackDurationChanges.js';
 import Layout from '../layout/index.js';
 import MediumTracklist from '../medium/MediumTracklist.js';
@@ -36,7 +34,7 @@ const AttachCDTocConfirmation = ({
   cdToc,
   form,
   medium,
-}: AttachCDTocConfirmationProps): React.Element<typeof Layout> => {
+}: AttachCDTocConfirmationProps): React$Element<typeof Layout> => {
   const newLengths = cdToc.track_details.map(track => track.length_time);
   const oldLengths = medium.cdtoc_tracks.map(track => track.length);
   const release = linkedEntities.release[medium.release_id];
diff --git a/root/cdtoc/CDTocInfo.js b/root/cdtoc/CDTocInfo.js
index bee815121c9..0a664dee476 100644
--- a/root/cdtoc/CDTocInfo.js
+++ b/root/cdtoc/CDTocInfo.js
@@ -18,7 +18,7 @@ type Props = {
   +cdToc: CDTocT,
 };
 
-const CDTocInfo = ({cdToc}: Props): React.Element<typeof React.Fragment> => (
+const CDTocInfo = ({cdToc}: Props): React$Element<typeof React.Fragment> => (
   <>
     <h2>{l('CD TOC details')}</h2>
 
diff --git a/root/cdtoc/RemoveDiscId.js b/root/cdtoc/RemoveDiscId.js
index 480dcf54da5..dde50ac696a 100644
--- a/root/cdtoc/RemoveDiscId.js
+++ b/root/cdtoc/RemoveDiscId.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseLayout from '../release/ReleaseLayout.js';
 import ArtistCreditLink
   from '../static/scripts/common/components/ArtistCreditLink.js';
@@ -30,7 +28,7 @@ const RemoveDiscId = ({
   form,
   mediumCDToc,
   release,
-}: RemoveDiscIdProps): React.Element<typeof ReleaseLayout> => (
+}: RemoveDiscIdProps): React$Element<typeof ReleaseLayout> => (
   <ReleaseLayout entity={release} fullWidth title={l('Remove Disc ID')}>
     <h2>{l('Remove Disc ID')}</h2>
 
diff --git a/root/cdtoc/SetTracklistDurations.js b/root/cdtoc/SetTracklistDurations.js
index 954461551fd..f1d471ed691 100644
--- a/root/cdtoc/SetTracklistDurations.js
+++ b/root/cdtoc/SetTracklistDurations.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import TrackDurationChanges from '../edit/components/TrackDurationChanges.js';
 import Layout from '../layout/index.js';
 import MediumTracklist from '../medium/MediumTracklist.js';
@@ -34,7 +32,7 @@ const SetTracklistDurations = ({
   cdToc,
   form,
   medium,
-}: SetTracklistDurationsProps): React.Element<typeof Layout> => {
+}: SetTracklistDurationsProps): React$Element<typeof Layout> => {
   const newLengths = cdToc.track_details.map(track => track.length_time);
   const oldLengths = medium.cdtoc_tracks.map(track => track.length);
   const release = linkedEntities.release[medium.release_id];
diff --git a/root/collection/CollectionHeader.js b/root/collection/CollectionHeader.js
index 7bcc9ec95d8..190fe5f67a1 100644
--- a/root/collection/CollectionHeader.js
+++ b/root/collection/CollectionHeader.js
@@ -25,7 +25,7 @@ type Props = {
 const CollectionHeader = ({
   collection,
   page,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const $c = React.useContext(SanitizedCatalystContext);
   const owner = collection.editor;
   const viewingOwnCollection = Boolean(
diff --git a/root/collection/CollectionIndex.js b/root/collection/CollectionIndex.js
index 571cc255cea..068fa06de85 100644
--- a/root/collection/CollectionIndex.js
+++ b/root/collection/CollectionIndex.js
@@ -158,7 +158,7 @@ const listPicker = (
 };
 
 const CollectionIndex = (props: Props):
-React.Element<typeof CollectionLayout> => {
+React$Element<typeof CollectionLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   const {
     collection,
diff --git a/root/collection/CollectionLayout.js b/root/collection/CollectionLayout.js
index 370fa1d5a05..9050fd7def6 100644
--- a/root/collection/CollectionLayout.js
+++ b/root/collection/CollectionLayout.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CollectionSidebar
   from '../layout/components/sidebar/CollectionSidebar.js';
 import Layout from '../layout/index.js';
@@ -16,7 +14,7 @@ import Layout from '../layout/index.js';
 import CollectionHeader from './CollectionHeader.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +entity: CollectionT,
   +fullWidth?: boolean,
   +page: string,
@@ -31,7 +29,7 @@ const CollectionLayout = ({
   page,
   recordingMbids,
   title,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const mainTitle = texp.l(
     'Collection “{collection}”',
     {collection: collection.name},
diff --git a/root/collection/CollectionMerge.js b/root/collection/CollectionMerge.js
index 9033e0055a9..efc73f20202 100644
--- a/root/collection/CollectionMerge.js
+++ b/root/collection/CollectionMerge.js
@@ -102,7 +102,7 @@ const CollectionMerge = ({
   privaciesDiffer,
   toMerge,
   typesDiffer,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const collections = sortByString(toMerge, collection => collection.name);
   const collaborators = sortByString(
     uniqBy(
diff --git a/root/collection/CreateCollection.js b/root/collection/CreateCollection.js
index d6b74c94e3c..7f30955b4ae 100644
--- a/root/collection/CreateCollection.js
+++ b/root/collection/CreateCollection.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import * as manifest from '../static/manifest.mjs';
 import CollectionEditForm
@@ -24,7 +22,7 @@ type Props = {
 const CreateCollection = ({
   collectionTypes,
   form,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout
     fullWidth
     title={l('Create a new collection')}
diff --git a/root/collection/DeleteCollection.js b/root/collection/DeleteCollection.js
index 0ade9ac0d4c..67506764a38 100644
--- a/root/collection/DeleteCollection.js
+++ b/root/collection/DeleteCollection.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityLink from '../static/scripts/common/components/EntityLink.js';
 import FormSubmit from '../static/scripts/edit/components/FormSubmit.js';
 
@@ -20,7 +18,7 @@ type Props = {
 
 const DeleteCollection = ({
   collection,
-}: Props): React.Element<typeof CollectionLayout> => (
+}: Props): React$Element<typeof CollectionLayout> => (
   <CollectionLayout
     entity={collection}
     fullWidth
diff --git a/root/collection/EditCollection.js b/root/collection/EditCollection.js
index 7ee98a0ca5b..54d854eed49 100644
--- a/root/collection/EditCollection.js
+++ b/root/collection/EditCollection.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import * as manifest from '../static/manifest.mjs';
 import CollectionEditForm
   from '../static/scripts/collection/components/CollectionEditForm.js';
@@ -26,7 +24,7 @@ const EditCollection = ({
   collection,
   collectionTypes,
   form,
-}: Props): React.Element<typeof CollectionLayout> => (
+}: Props): React$Element<typeof CollectionLayout> => (
   <CollectionLayout
     entity={collection}
     fullWidth
diff --git a/root/components/Aliases/AliasTable.js b/root/components/Aliases/AliasTable.js
index abb0201bada..6c0903f5b52 100644
--- a/root/components/Aliases/AliasTable.js
+++ b/root/components/Aliases/AliasTable.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import AliasTableBody from './AliasTableBody.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
   +entity: EntityWithAliasesT,
 };
 
-const AliasTable = (props: Props): React.Element<'table'> => (
+const AliasTable = (props: Props): React$Element<'table'> => (
   <table className="tbl">
     <thead>
       <tr>
diff --git a/root/components/Aliases/AliasTableBody.js b/root/components/Aliases/AliasTableBody.js
index 7e99578bb27..8eacdac3597 100644
--- a/root/components/Aliases/AliasTableBody.js
+++ b/root/components/Aliases/AliasTableBody.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import AliasTableRow from './AliasTableRow.js';
 
 type Props = {
@@ -20,7 +18,7 @@ type Props = {
 const AliasTableBody = ({
   aliases,
   ...props
-}: Props): React.Element<'tbody'> => {
+}: Props): React$Element<'tbody'> => {
   const aliasRows = [];
   for (let i = 0; i < aliases.length; i++) {
     const alias = aliases[i];
diff --git a/root/components/Aliases/AliasTableRow.js b/root/components/Aliases/AliasTableRow.js
index f9249d28996..c56eb3908e9 100644
--- a/root/components/Aliases/AliasTableRow.js
+++ b/root/components/Aliases/AliasTableRow.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import locales from '../../static/scripts/common/constants/locales.json';
 import bracketed from '../../static/scripts/common/utility/bracketed.js';
 import entityHref from '../../static/scripts/common/utility/entityHref.js';
@@ -29,7 +27,7 @@ const AliasTableRow = ({
   allowEditing,
   entity,
   row,
-}: Props): React.Element<'tr'> => (
+}: Props): React$Element<'tr'> => (
   <tr className={row}>
     <td colSpan={alias.name === alias.sort_name ? 2 : 1}>
       {alias.editsPending
diff --git a/root/components/Aliases/ArtistCreditList.js b/root/components/Aliases/ArtistCreditList.js
index ced968e782b..20e0ac7c64b 100644
--- a/root/components/Aliases/ArtistCreditList.js
+++ b/root/components/Aliases/ArtistCreditList.js
@@ -26,7 +26,7 @@ type Props = {
 const ArtistCreditList = ({
   artistCredits,
   entity,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <>
diff --git a/root/components/Aliases/index.js b/root/components/Aliases/index.js
index 37cba9d6dbb..25e8823f7cb 100644
--- a/root/components/Aliases/index.js
+++ b/root/components/Aliases/index.js
@@ -40,7 +40,7 @@ type Props = {
   +entity: EntityWithAliasesT,
 };
 
-const Aliases = ({aliases, entity}: Props): React.MixedElement => {
+const Aliases = ({aliases, entity}: Props): React$MixedElement => {
   const $c = React.useContext(CatalystContext);
   const entityType = entity.entityType;
   const allowEditing = canEdit($c, entityType);
diff --git a/root/components/Artwork.js b/root/components/Artwork.js
index 1f3cd47c7cc..aba1ae586f1 100644
--- a/root/components/Artwork.js
+++ b/root/components/Artwork.js
@@ -36,7 +36,7 @@ export const ArtworkImage = ({
   artwork,
   hover,
   message,
-}: Props): React.Element<typeof React.Fragment> => (
+}: Props): React$Element<typeof React.Fragment> => (
   <>
     <noscript>
       <img src={artwork.small_ia_thumbnail} />
@@ -58,7 +58,7 @@ export const Artwork = ({
   artwork,
   hover,
   message,
-}: Props): React.Element<'a'> => (
+}: Props): React$Element<'a'> => (
   <a
     className={artwork.mime_type === 'application/pdf'
       ? 'artwork-pdf'
diff --git a/root/components/CleanupBanner.js b/root/components/CleanupBanner.js
index 7f6a36d1e31..0215030f4aa 100644
--- a/root/components/CleanupBanner.js
+++ b/root/components/CleanupBanner.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 const cleanupBannerStrings = {
   artist: N_l(
     `This artist has no relationships, recordings, releases or
@@ -52,7 +50,7 @@ type Props = {
   +entityType: string,
 };
 
-const CleanupBanner = ({entityType}: Props): React.Element<'p'> => (
+const CleanupBanner = ({entityType}: Props): React$Element<'p'> => (
   <p className="cleanup">
     {cleanupBannerStrings[entityType]()}
   </p>
diff --git a/root/components/ConfirmLayout.js b/root/components/ConfirmLayout.js
index 6639ef19227..6cb12293067 100644
--- a/root/components/ConfirmLayout.js
+++ b/root/components/ConfirmLayout.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import FormCsrfToken
   from '../static/scripts/edit/components/FormCsrfToken.js';
@@ -25,7 +23,7 @@ const ConfirmLayout = ({
   form,
   question,
   title,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={title}>
     <h1>{title}</h1>
     <p>{question}</p>
diff --git a/root/components/EntityHeader.js b/root/components/EntityHeader.js
index a121c1917eb..13ebd26fa08 100644
--- a/root/components/EntityHeader.js
+++ b/root/components/EntityHeader.js
@@ -16,7 +16,7 @@ import EntityTabs from './EntityTabs.js';
 import SubHeader from './SubHeader.js';
 
 type Props = {
-  +editTab?: React.Element<EntityTabLink>,
+  +editTab?: React$Element<EntityTabLink>,
   +entity: CoreEntityT,
   +headerClass: string,
   +heading?: Expand2ReactOutput,
@@ -33,7 +33,7 @@ const EntityHeader = ({
   page,
   preHeader,
   subHeading,
-}: Props): React.Element<typeof React.Fragment> => (
+}: Props): React$Element<typeof React.Fragment> => (
   <>
     <div className={'entityheader ' + headerClass}>
       {nonEmpty(preHeader) ? preHeader : null}
diff --git a/root/components/EntityTabLink.js b/root/components/EntityTabLink.js
index ee194b48bb7..ac8079ed91c 100644
--- a/root/components/EntityTabLink.js
+++ b/root/components/EntityTabLink.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityLink from '../static/scripts/common/components/EntityLink.js';
 
 type Props = {
@@ -23,7 +21,7 @@ const EntityTabLink = ({
   disabled = false,
   selected,
   ...linkProps
-}: Props): React.Element<'li'> => (
+}: Props): React$Element<'li'> => (
   <li
     className={
       selected || disabled
diff --git a/root/components/EntityTabs.js b/root/components/EntityTabs.js
index 96e162f4589..fd1050bb0e9 100644
--- a/root/components/EntityTabs.js
+++ b/root/components/EntityTabs.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {CatalystContext} from '../context.mjs';
 import {ENTITIES} from '../static/scripts/common/constants.js';
 import isSpecialPurpose
@@ -76,8 +74,8 @@ function buildLinks(
   $c: CatalystContextT,
   entity: CoreEntityT,
   page?: string,
-  editTab: ?React.Element<typeof EntityTabLink>,
-): $ReadOnlyArray<React.Element<typeof EntityTabLink>> {
+  editTab: ?React$Element<typeof EntityTabLink>,
+): $ReadOnlyArray<React$Element<typeof EntityTabLink>> {
   const links = [buildLink(l('Overview'), entity, '', page, false, 'index')];
   const user = $c.user;
 
@@ -169,7 +167,7 @@ function buildLinks(
 }
 
 type Props = {
-  +editTab: ?React.Element<typeof EntityTabLink>,
+  +editTab: ?React$Element<typeof EntityTabLink>,
   +entity: CoreEntityT,
   +page?: string,
 };
@@ -178,7 +176,7 @@ const EntityTabs = ({
   editTab,
   entity,
   page,
-}: Props): React.Element<typeof Tabs> => (
+}: Props): React$Element<typeof Tabs> => (
   <Tabs>
     <CatalystContext.Consumer>
       {($c: CatalystContextT) => buildLinks($c, entity, page, editTab)}
diff --git a/root/components/GroupedTrackRelationships.js b/root/components/GroupedTrackRelationships.js
index aee1657861c..3f34becb8ba 100644
--- a/root/components/GroupedTrackRelationships.js
+++ b/root/components/GroupedTrackRelationships.js
@@ -125,7 +125,7 @@ export function isIrrelevantLinkType(
 
 const GroupedTrackRelationships = ({
   source,
-}: Props): Array<React.Element<'dl'>> => {
+}: Props): Array<React$Element<'dl'>> => {
   const workRelationships = [];
 
   const groupedRelationships = groupRelationships(
diff --git a/root/components/LinkSearchableEditType.js b/root/components/LinkSearchableEditType.js
index 7ed4617fd48..15951cd75e4 100644
--- a/root/components/LinkSearchableEditType.js
+++ b/root/components/LinkSearchableEditType.js
@@ -19,7 +19,7 @@ type Props = {
 const LinkSearchableEditType = ({
   editTypeId,
   text,
-}: Props): React.MixedElement => {
+}: Props): React$MixedElement => {
   const $c = React.useContext(CatalystContext);
   const url = new URL($c.req.uri);
   url.pathname = 'search/edits';
diff --git a/root/components/LinkSearchableLanguage.js b/root/components/LinkSearchableLanguage.js
index f7a64b36126..590ee156912 100644
--- a/root/components/LinkSearchableLanguage.js
+++ b/root/components/LinkSearchableLanguage.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import localizeLanguageName
   from '../static/scripts/common/i18n/localizeLanguageName.js';
 
@@ -22,7 +20,7 @@ type Props = {
 const LinkSearchableLanguage = ({
   entityType,
   language,
-}: Props): React.Element<typeof LinkSearchableProperty> => (
+}: Props): React$Element<typeof LinkSearchableProperty> => (
   <LinkSearchableProperty
     entityType={entityType}
     searchField="lang"
diff --git a/root/components/LinkSearchableProperty.js b/root/components/LinkSearchableProperty.js
index dd5a965787a..6f7ca35867e 100644
--- a/root/components/LinkSearchableProperty.js
+++ b/root/components/LinkSearchableProperty.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {CatalystContext} from '../context.mjs';
 import escapeLuceneValue
   from '../static/scripts/common/utility/escapeLuceneValue.js';
@@ -25,7 +23,7 @@ const LinkSearchableProperty = ({
   searchField,
   searchValue,
   text = searchValue,
-}: Props): React.MixedElement => (
+}: Props): React$MixedElement => (
   <CatalystContext.Consumer>
     {$c => {
       const url = new URL($c.req.uri);
diff --git a/root/components/PaginatedResults.js b/root/components/PaginatedResults.js
index b48a677a8e3..d4049abc121 100644
--- a/root/components/PaginatedResults.js
+++ b/root/components/PaginatedResults.js
@@ -15,7 +15,7 @@ import {formatCount} from '../statistics/utilities.js';
 import Paginator from './Paginator.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +guessSearch?: boolean,
   +pager: PagerT,
   +pageVar?: 'apps_page' | 'page' | 'tokens_page',
@@ -32,7 +32,7 @@ const PaginatedResults = ({
   query,
   search = false,
   total = false,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const $c = React.useContext(CatalystContext);
   const paginator = (
     <Paginator
diff --git a/root/components/Paginator.js b/root/components/Paginator.js
index 03474231b0c..aa6f13a791d 100644
--- a/root/components/Paginator.js
+++ b/root/components/Paginator.js
@@ -44,7 +44,7 @@ const Paginator = ({
   hash,
   pager,
   pageVar = 'page',
-}: Props): React.Element<'nav'> | null => {
+}: Props): React$Element<'nav'> | null => {
   const $c = React.useContext(SanitizedCatalystContext);
 
   const lastPage = pager.last_page;
diff --git a/root/components/RelatedEntitiesDisplay.js b/root/components/RelatedEntitiesDisplay.js
index 8632838d0e6..8a0136149e2 100644
--- a/root/components/RelatedEntitiesDisplay.js
+++ b/root/components/RelatedEntitiesDisplay.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 type Props = {
   +children: React$Node,
   +title: string,
@@ -16,7 +14,7 @@ type Props = {
 
 const RelatedEntitiesDisplay = (
   {children, title}: Props,
-): React.Element<'p'> => (
+): React$Element<'p'> => (
   <p>
     <strong>{addColonText(title)}</strong>
     {' '}
diff --git a/root/components/RelationshipTargetLinks.js b/root/components/RelationshipTargetLinks.js
index b0ca04fac98..a1f8c933097 100644
--- a/root/components/RelationshipTargetLinks.js
+++ b/root/components/RelationshipTargetLinks.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../static/scripts/common/components/DescriptiveLink.js';
 import EntityLink from '../static/scripts/common/components/EntityLink.js';
@@ -32,7 +30,7 @@ import relationshipDateText
 
 export function displayDatedExtraAttributes(
   pair: DatedExtraAttributes,
-): React.MixedElement | string {
+): React$MixedElement | string {
   const renderedDatePeriods = commaOnlyListText(
     pair.datePeriods.map(datePeriod => (
       relationshipDateText(datePeriod, false /* bracketEnded */)
@@ -64,7 +62,7 @@ type Props = {
 const RelationshipTargetLinks = ({
   hiddenArtistCredit,
   relationship,
-}: Props): React.MixedElement => {
+}: Props): React$MixedElement => {
   const target = relationship.target;
   const targetCredit = relationship.targetCredit;
   const disableLink = isDisabledLink(relationship.earliestDatePeriod, target);
@@ -86,7 +84,7 @@ const RelationshipTargetLinks = ({
   const datesAndAttributes = semicolonOnlyList(
     relationship.datedExtraAttributesList.map(displayDatedExtraAttributes),
   );
-  let result: React.MixedElement = (
+  let result: React$MixedElement = (
     <>
       {link}
       {datesAndAttributes ? (
diff --git a/root/components/RelationshipsTable.js b/root/components/RelationshipsTable.js
index c71f4f825d2..7394271efce 100644
--- a/root/components/RelationshipsTable.js
+++ b/root/components/RelationshipsTable.js
@@ -80,7 +80,7 @@ const RelationshipsTable = ({
   heading,
   pagedLinkTypeGroup,
   pager,
-}: Props): React.MixedElement | null => {
+}: Props): React$MixedElement | null => {
   const $c = React.useContext(CatalystContext);
 
   if (pagedLinkTypeGroup && !pager) {
@@ -103,7 +103,7 @@ const RelationshipsTable = ({
 
   type RelationshipsTableGroupPropsT = {
     +group: PagedLinkTypeGroupWithPhraseT,
-    +relationshipRows: $ReadOnlyArray<React.MixedElement>,
+    +relationshipRows: $ReadOnlyArray<React$MixedElement>,
   };
 
   const RelationshipsTableGroup = ({
@@ -217,11 +217,11 @@ const RelationshipsTable = ({
     );
   };
 
-  const tableRows: Array<React.MixedElement> = [];
+  const tableRows: Array<React$MixedElement> = [];
 
   const getRelationshipRows = (
     linkTypeGroup: PagedLinkTypeGroupT | PagedLinkTypeGroupWithPhraseT,
-    rows: Array<React.MixedElement>,
+    rows: Array<React$MixedElement>,
   ) => {
     let index = 0;
 
@@ -301,7 +301,7 @@ const RelationshipsTable = ({
         .sort((a, b) => compare(a.phrase, b.phrase));
 
       for (const linkTypeGroup of linkTypeGroups) {
-        const relationshipRows: Array<React.MixedElement> = [];
+        const relationshipRows: Array<React$MixedElement> = [];
         getRelationshipRows(linkTypeGroup, relationshipRows);
 
         tableRows.push(
@@ -342,7 +342,7 @@ const RelationshipsTable = ({
       </tbody>
     </table>
   );
-  let pageContent: React.MixedElement = tableElement;
+  let pageContent: React$MixedElement = tableElement;
   let finalHeading = heading;
 
   if (pagedLinkTypeGroup /*:: && pager */) {
diff --git a/root/components/ReleaseCatnoList.js b/root/components/ReleaseCatnoList.js
index 47b6c720e57..4697d39254e 100644
--- a/root/components/ReleaseCatnoList.js
+++ b/root/components/ReleaseCatnoList.js
@@ -7,11 +7,9 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import commaOnlyList from '../static/scripts/common/i18n/commaOnlyList.js';
 
-const displayCatno = (catno: string): React.Element<'span'> => (
+const displayCatno = (catno: string): React$Element<'span'> => (
   <span className="catalog-number">
     {catno}
   </span>
diff --git a/root/components/ReleaseLanguageScript.js b/root/components/ReleaseLanguageScript.js
index defa6f42c83..9286cb53229 100644
--- a/root/components/ReleaseLanguageScript.js
+++ b/root/components/ReleaseLanguageScript.js
@@ -11,7 +11,7 @@ import * as React from 'react';
 
 const ReleaseLanguageScript = ({
   release,
-}: {release: ReleaseT}): React.Element<typeof React.Fragment> => {
+}: {release: ReleaseT}): React$Element<typeof React.Fragment> => {
   const language = release.language;
   const script = release.script;
 
diff --git a/root/components/RemoveFromMergeTableCell.js b/root/components/RemoveFromMergeTableCell.js
index 1d6bcb561ad..6868edbf049 100644
--- a/root/components/RemoveFromMergeTableCell.js
+++ b/root/components/RemoveFromMergeTableCell.js
@@ -22,7 +22,7 @@ type Props = {
 const RemoveFromMergeTableCell = ({
   entity,
   toMerge,
-}: Props): React.Element<'td'> | null => {
+}: Props): React$Element<'td'> | null => {
   const $c = React.useContext(SanitizedCatalystContext);
   const url = ENTITIES[entity.entityType].url;
   return (
diff --git a/root/components/RequestLogin.js b/root/components/RequestLogin.js
index 424e549c96e..33fdd7b5651 100644
--- a/root/components/RequestLogin.js
+++ b/root/components/RequestLogin.js
@@ -16,7 +16,7 @@ type Props = {
   +text?: string,
 };
 
-const RequestLogin = ({text}: Props): React.Element<'a'> => {
+const RequestLogin = ({text}: Props): React$Element<'a'> => {
   const $c = React.useContext(CatalystContext);
   return (
     <a href={returnUri($c, '/login')}>
diff --git a/root/components/SortableTableHeader.js b/root/components/SortableTableHeader.js
index e314ca10f5b..54ab0e33965 100644
--- a/root/components/SortableTableHeader.js
+++ b/root/components/SortableTableHeader.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {CatalystContext} from '../context.mjs';
 import uriWith from '../utility/uriWith.js';
 
@@ -36,7 +34,7 @@ const SortableTableHeader = ({
   label,
   name,
   order,
-}: Props): React.MixedElement => (
+}: Props): React$MixedElement => (
   <CatalystContext.Consumer>
     {$c => (
       <a
diff --git a/root/components/StatusPage.js b/root/components/StatusPage.js
index 3f709998f85..88c742c2f45 100644
--- a/root/components/StatusPage.js
+++ b/root/components/StatusPage.js
@@ -7,16 +7,14 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +title: string,
 };
 
-const StatusPage = ({title, children}: Props): React.MixedElement => (
+const StatusPage = ({title, children}: Props): React$MixedElement => (
   <Layout fullWidth title={title}>
     <h1>{title}</h1>
     {children}
diff --git a/root/components/SubHeader.js b/root/components/SubHeader.js
index ad6e78fcce3..0f38a410dc1 100644
--- a/root/components/SubHeader.js
+++ b/root/components/SubHeader.js
@@ -7,11 +7,9 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
+type Props = {+subHeading: React$Node};
 
-type Props = {+subHeading: React.Node};
-
-const SubHeader = ({subHeading}: Props): React.Element<'p'> => (
+const SubHeader = ({subHeading}: Props): React$Element<'p'> => (
   <p className="subheader">
     <span className="prefix">{'~'}</span>
     {' '}
diff --git a/root/components/Tabs.js b/root/components/Tabs.js
index 3d5b29d3576..eb8697ef3d4 100644
--- a/root/components/Tabs.js
+++ b/root/components/Tabs.js
@@ -7,13 +7,11 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
 };
 
-const Tabs = ({children}: Props): React.Element<'div'> => (
+const Tabs = ({children}: Props): React$Element<'div'> => (
   <div className="tabs">
     <ul className="tabs">
       {children}
diff --git a/root/components/TagEntitiesList.js b/root/components/TagEntitiesList.js
index b4c9322896f..5296b0326ba 100644
--- a/root/components/TagEntitiesList.js
+++ b/root/components/TagEntitiesList.js
@@ -45,7 +45,7 @@ const TagEntitiesList = ({
   tag,
   taggedEntities,
   user,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const $c = React.useContext(CatalystContext);
 
   const totalCount = Object.values(taggedEntities)
diff --git a/root/components/UserAccountLayout.js b/root/components/UserAccountLayout.js
index 152866cb75a..37f80ba6080 100644
--- a/root/components/UserAccountLayout.js
+++ b/root/components/UserAccountLayout.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import EditorLink from '../static/scripts/common/components/EditorLink.js';
 import sanitizedEditor from '../utility/sanitizedEditor.mjs';
@@ -31,7 +29,7 @@ export type AccountLayoutUserT = {
 };
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +entity: AccountLayoutUserT,
   +page: string,
   +title?: string,
@@ -57,7 +55,7 @@ const UserAccountLayout = ({
   page,
   title,
   ...layoutProps
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout
     fullWidth
     title={nonEmpty(title)
diff --git a/root/components/UserAccountTabs.js b/root/components/UserAccountTabs.js
index ead5fce2206..a05dd16ba10 100644
--- a/root/components/UserAccountTabs.js
+++ b/root/components/UserAccountTabs.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {CatalystContext} from '../context.mjs';
 import DBDefs from '../static/scripts/common/DBDefs.mjs';
 import {isAccountAdmin} from '../static/scripts/common/utility/privileges.js';
@@ -21,7 +19,7 @@ function buildTabs(
   $c: CatalystContextT,
   user: AccountLayoutUserT,
   page: string,
-): $ReadOnlyArray<React.Element<'li'>> {
+): $ReadOnlyArray<React$Element<'li'>> {
   const viewingOwnProfile = Boolean($c.user && $c.user.id === user.id);
 
   const userName = encodeURIComponent(user.name);
@@ -127,7 +125,7 @@ type Props = {
 const UserAccountTabs = ({
   user,
   page,
-}: Props): React.Element<typeof Tabs> => (
+}: Props): React$Element<typeof Tabs> => (
   <Tabs>
     <CatalystContext.Consumer>
       {($c: CatalystContextT) => buildTabs($c, user, page)}
diff --git a/root/components/list/AreaList.js b/root/components/list/AreaList.js
index e2724ea14d8..341af99a07b 100644
--- a/root/components/list/AreaList.js
+++ b/root/components/list/AreaList.js
@@ -32,7 +32,7 @@ const AreaList = ({
   mergeForm,
   order,
   sortable,
-}: Props): React.Element<'table'> => {
+}: Props): React$Element<'table'> => {
   const $c = React.useContext(CatalystContext);
 
   const columns = React.useMemo(
diff --git a/root/components/list/ArtistList.js b/root/components/list/ArtistList.js
index 76f0384a846..bd46aae4ca6 100644
--- a/root/components/list/ArtistList.js
+++ b/root/components/list/ArtistList.js
@@ -51,7 +51,7 @@ const ArtistList = ({
   showRatings = false,
   showSortName = false,
   sortable,
-}: Props): React.Element<'table'> => {
+}: Props): React$Element<'table'> => {
   const $c = React.useContext(CatalystContext);
 
   const columns = React.useMemo(
diff --git a/root/components/list/EventList.js b/root/components/list/EventList.js
index 909844f03be..b18bd817234 100644
--- a/root/components/list/EventList.js
+++ b/root/components/list/EventList.js
@@ -57,7 +57,7 @@ const EventList = ({
   showRatings = false,
   showType = false,
   sortable,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const $c = React.useContext(CatalystContext);
 
   const columns = React.useMemo(
diff --git a/root/components/list/InstrumentList.js b/root/components/list/InstrumentList.js
index 7cf9cf63408..900ed03afb7 100644
--- a/root/components/list/InstrumentList.js
+++ b/root/components/list/InstrumentList.js
@@ -33,7 +33,7 @@ const InstrumentList = ({
   mergeForm,
   order,
   sortable,
-}: Props): React.Element<'table'> => {
+}: Props): React$Element<'table'> => {
   const $c = React.useContext(CatalystContext);
 
   const columns = React.useMemo(
diff --git a/root/components/list/LabelList.js b/root/components/list/LabelList.js
index 59b8244506d..59b4be33e44 100644
--- a/root/components/list/LabelList.js
+++ b/root/components/list/LabelList.js
@@ -40,7 +40,7 @@ const LabelList = ({
   order,
   showRatings = false,
   sortable,
-}: Props): React.Element<'table'> => {
+}: Props): React$Element<'table'> => {
   const $c = React.useContext(CatalystContext);
 
   const columns = React.useMemo(
diff --git a/root/components/list/PlaceList.js b/root/components/list/PlaceList.js
index 6edbd2c0cb9..dac018408f2 100644
--- a/root/components/list/PlaceList.js
+++ b/root/components/list/PlaceList.js
@@ -39,7 +39,7 @@ const PlaceList = ({
   places,
   showRatings = false,
   sortable,
-}: Props): React.Element<'table'> => {
+}: Props): React$Element<'table'> => {
   const $c = React.useContext(CatalystContext);
 
   const columns = React.useMemo(
diff --git a/root/components/list/RecordingList.js b/root/components/list/RecordingList.js
index c4af7278480..99b54891480 100644
--- a/root/components/list/RecordingList.js
+++ b/root/components/list/RecordingList.js
@@ -79,7 +79,7 @@ const RecordingList = ({
   showRatings = false,
   showReleaseGroups = false,
   sortable,
-}: Props): React.MixedElement => {
+}: Props): React$MixedElement => {
   const $c = React.useContext(SanitizedCatalystContext);
 
   const columns = React.useMemo(
diff --git a/root/components/list/ReleaseGroupList.js b/root/components/list/ReleaseGroupList.js
index 1143e1c59df..df01a3b82d4 100644
--- a/root/components/list/ReleaseGroupList.js
+++ b/root/components/list/ReleaseGroupList.js
@@ -55,7 +55,7 @@ export const ReleaseGroupListTable = ({
   showRatings = false,
   showType = true,
   sortable,
-}: ReleaseGroupListTableProps): React.Element<'table'> => {
+}: ReleaseGroupListTableProps): React$Element<'table'> => {
   const $c = React.useContext(CatalystContext);
 
   function getFirstReleaseYear(entity: ReleaseGroupT) {
@@ -155,7 +155,7 @@ const ReleaseGroupList = ({
   seriesItemNumbers,
   showRatings,
   sortable,
-}: ReleaseGroupListProps): Array<React.Element<typeof React.Fragment>> => {
+}: ReleaseGroupListProps): Array<React$Element<typeof React.Fragment>> => {
   const groupedReleaseGroups = groupBy(releaseGroups, x => x.typeName ?? '');
   const tables = [];
   for (const [type, releaseGroupsOfType] of groupedReleaseGroups) {
diff --git a/root/components/list/ReleaseList.js b/root/components/list/ReleaseList.js
index 05d35ff7dc5..f609ed1d063 100644
--- a/root/components/list/ReleaseList.js
+++ b/root/components/list/ReleaseList.js
@@ -62,7 +62,7 @@ const ReleaseList = ({
   showStatus = false,
   showType = false,
   sortable,
-}: Props): React.MixedElement => {
+}: Props): React$MixedElement => {
   const $c = React.useContext(CatalystContext);
 
   const columns = React.useMemo(
diff --git a/root/components/list/SeriesList.js b/root/components/list/SeriesList.js
index 52e3b485a85..395a949fc75 100644
--- a/root/components/list/SeriesList.js
+++ b/root/components/list/SeriesList.js
@@ -33,7 +33,7 @@ const SeriesList = ({
   order,
   series,
   sortable,
-}: Props): React.Element<'table'> => {
+}: Props): React$Element<'table'> => {
   const $c = React.useContext(CatalystContext);
 
   const columns = React.useMemo(
diff --git a/root/components/list/WorkList.js b/root/components/list/WorkList.js
index cdab0b7cf92..72ec3a3404f 100644
--- a/root/components/list/WorkList.js
+++ b/root/components/list/WorkList.js
@@ -44,7 +44,7 @@ const WorkList = ({
   showRatings = false,
   sortable,
   works,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const $c = React.useContext(CatalystContext);
 
   const columns = React.useMemo(
diff --git a/root/doc/DocError.js b/root/doc/DocError.js
index f9fb26b1ea1..814b41d051e 100644
--- a/root/doc/DocError.js
+++ b/root/doc/DocError.js
@@ -22,7 +22,7 @@ type Props = {
 
 const DocError = ({
   id,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const $c = React.useContext(CatalystContext);
 
   // We check whether we have a Google Custom Search engine
diff --git a/root/doc/DocPage.js b/root/doc/DocPage.js
index 77d3b3694c4..4940a827bca 100644
--- a/root/doc/DocPage.js
+++ b/root/doc/DocPage.js
@@ -29,7 +29,7 @@ type Props = {
 const DocPage = ({
   id,
   page,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   let doc = '';
   let lastDoc = '';
   // We check whether we have a Google Custom Search engine
diff --git a/root/doc/components/DocSearchBox.js b/root/doc/components/DocSearchBox.js
index 5548eb9cbac..b3ba68d4f9f 100644
--- a/root/doc/components/DocSearchBox.js
+++ b/root/doc/components/DocSearchBox.js
@@ -7,11 +7,9 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import FormSubmit from '../../static/scripts/edit/components/FormSubmit.js';
 
-const DocSearchBox = (): React.Element<'div'> => (
+const DocSearchBox = (): React$Element<'div'> => (
   <div className="wikidoc-search">
     <form action="/search" method="get">
       <input name="type" type="hidden" value="doc" />
diff --git a/root/edit/CancelEdit.js b/root/edit/CancelEdit.js
index 5d05da6f286..ac2437d55d6 100644
--- a/root/edit/CancelEdit.js
+++ b/root/edit/CancelEdit.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import EnterEditNote
   from '../static/scripts/edit/components/EnterEditNote.js';
@@ -23,7 +21,7 @@ type Props = {
 const CancelEdit = ({
   edit,
   form,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const detailsElement = getEditDetailsElement(edit);
 
   return (
diff --git a/root/edit/CannotApproveEdit.js b/root/edit/CannotApproveEdit.js
index 413b5c55c95..6cd30c8d968 100644
--- a/root/edit/CannotApproveEdit.js
+++ b/root/edit/CannotApproveEdit.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {EDIT_STATUS_DELETED} from '../constants.js';
 import Layout from '../layout/index.js';
 import EditLink from '../static/scripts/common/components/EditLink.js';
@@ -17,7 +15,7 @@ type Props = {
   +edit: GenericEditWithIdT,
 };
 
-const CannotApproveEdit = ({edit}: Props): React.Element<typeof Layout> => {
+const CannotApproveEdit = ({edit}: Props): React$Element<typeof Layout> => {
   const editDisplay = 'edit #' + edit.id;
   const editLink = <EditLink content={editDisplay} edit={edit} />;
   const editIsClosed = !edit.is_open;
diff --git a/root/edit/CannotCancelEdit.js b/root/edit/CannotCancelEdit.js
index 0e15a54d1cd..74234090e99 100644
--- a/root/edit/CannotCancelEdit.js
+++ b/root/edit/CannotCancelEdit.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import EditLink from '../static/scripts/common/components/EditLink.js';
 
@@ -16,7 +14,7 @@ type Props = {
   +edit: GenericEditWithIdT,
 };
 
-const CannotCancelEdit = ({edit}: Props): React.Element<typeof Layout> => {
+const CannotCancelEdit = ({edit}: Props): React$Element<typeof Layout> => {
   const editDisplay = 'edit #' + edit.id;
   const editIsClosed = !edit.is_open;
   const editLink = <EditLink content={editDisplay} edit={edit} />;
diff --git a/root/edit/CannotVote.js b/root/edit/CannotVote.js
index c5e2cf21c8f..8014cef6f97 100644
--- a/root/edit/CannotVote.js
+++ b/root/edit/CannotVote.js
@@ -7,11 +7,9 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 
-const CannotVote = (): React.Element<typeof Layout> => (
+const CannotVote = (): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Error Voting on Edits')}>
     <h1>{l('Error Voting on Edits')}</h1>
     <p>
diff --git a/root/edit/EditData.js b/root/edit/EditData.js
index 3ba7b49a8d3..7a94b1d55a6 100644
--- a/root/edit/EditData.js
+++ b/root/edit/EditData.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import EditLink from '../static/scripts/common/components/EditLink.js';
 import EntityLink from '../static/scripts/common/components/EntityLink.js';
@@ -32,7 +30,7 @@ const EditData = ({
   edit,
   rawData,
   relatedEntities,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const title = texp.l('Edit data for edit #{id}', {id: edit.id});
   const relatedEntityTypes = Object.keys(relatedEntities).sort();
 
diff --git a/root/edit/EditIndex.js b/root/edit/EditIndex.js
index c0fb2a96f48..ac4b22e7b9c 100644
--- a/root/edit/EditIndex.js
+++ b/root/edit/EditIndex.js
@@ -37,7 +37,7 @@ type Props = {
 const EditIndex = ({
   edit,
   fullWidth = false,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const $c = React.useContext(CatalystContext);
   const canAddNote = Boolean($c.user && editorMayAddNote(edit, $c.user));
   const isOwnEdit = Boolean($c.user && $c.user.id === edit.editor_id);
diff --git a/root/edit/NoteIsRequired.js b/root/edit/NoteIsRequired.js
index 743bb03b551..624fe2765a7 100644
--- a/root/edit/NoteIsRequired.js
+++ b/root/edit/NoteIsRequired.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import EditLink from '../static/scripts/common/components/EditLink.js';
 
@@ -16,7 +14,7 @@ type Props = {
   +edit: GenericEditWithIdT,
 };
 
-const NoteIsRequired = ({edit}: Props): React.Element<typeof Layout> => {
+const NoteIsRequired = ({edit}: Props): React$Element<typeof Layout> => {
   const editDisplay = 'edit #' + edit.id;
   const editLink = <EditLink content={editDisplay} edit={edit} />;
   return (
diff --git a/root/edit/NotesReceived.js b/root/edit/NotesReceived.js
index 542a2c89e88..782ba6565a9 100644
--- a/root/edit/NotesReceived.js
+++ b/root/edit/NotesReceived.js
@@ -30,7 +30,7 @@ type Props = {
 const NotesReceived = ({
   editNotes,
   pager,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const $c = React.useContext(CatalystContext);
 
   return (
diff --git a/root/edit/OpenEdits.js b/root/edit/OpenEdits.js
index a160f20e39e..e63f0bf98e0 100644
--- a/root/edit/OpenEdits.js
+++ b/root/edit/OpenEdits.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 
 import EditList from './components/EditList.js';
@@ -25,7 +23,7 @@ const OpenEdits = ({
   edits,
   pager,
   refineUrlArgs,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Open Edits')}>
     <div id="content">
       <h1>{l('Open Edits')}</h1>
diff --git a/root/edit/SubscribedEditorEdits.js b/root/edit/SubscribedEditorEdits.js
index cd7042af66d..263b0c078c3 100644
--- a/root/edit/SubscribedEditorEdits.js
+++ b/root/edit/SubscribedEditorEdits.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 
 import EditList from './components/EditList.js';
@@ -25,7 +23,7 @@ const SubscribedEditorEdits = ({
   edits,
   pager,
   refineUrlArgs,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Edits by Your Subscribed Editors')}>
     <div id="content">
       <h1>{l('Edits by Your Subscribed Editors')}</h1>
diff --git a/root/edit/SubscribedEdits.js b/root/edit/SubscribedEdits.js
index 4e7ba922ccb..8054c8dd939 100644
--- a/root/edit/SubscribedEdits.js
+++ b/root/edit/SubscribedEdits.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 
 import EditList from './components/EditList.js';
@@ -25,7 +23,7 @@ const SubscribedEdits = ({
   edits,
   pager,
   refineUrlArgs,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Edits for Your Subscribed Entities')}>
     <div id="content">
       <h1>{l('Edits for Your Subscribed Entities')}</h1>
diff --git a/root/edit/components/EditArtwork.js b/root/edit/components/EditArtwork.js
index f79803b49f7..5d677eaae07 100644
--- a/root/edit/components/EditArtwork.js
+++ b/root/edit/components/EditArtwork.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {Artwork} from '../../components/Artwork.js';
 import expand2html from '../../static/scripts/common/i18n/expand2html.js';
 import entityHref from '../../static/scripts/common/utility/entityHref.js';
@@ -23,7 +21,7 @@ const EditArtwork = ({
   artwork,
   colSpan,
   release,
-}: Props): React.Element<'tr'> => {
+}: Props): React$Element<'tr'> => {
   const historyMessage = release.gid ? (
     expand2html(
       l(`We are unable to display history for this cover
diff --git a/root/edit/components/EditHeader.js b/root/edit/components/EditHeader.js
index 07182374639..42f54326226 100644
--- a/root/edit/components/EditHeader.js
+++ b/root/edit/components/EditHeader.js
@@ -65,7 +65,7 @@ const EditHeader = ({
   edit,
   isSummary = false,
   voter,
-}: Props): React.Element<'div'> => {
+}: Props): React$Element<'div'> => {
   const $c = React.useContext(CatalystContext);
   const user = $c.user;
   const mayApprove = editorMayApprove(edit, user);
diff --git a/root/edit/components/EditList.js b/root/edit/components/EditList.js
index 448d25df249..402f98b314c 100644
--- a/root/edit/components/EditList.js
+++ b/root/edit/components/EditList.js
@@ -42,7 +42,7 @@ const EditList = ({
   refineUrlArgs,
   username,
   voter,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const $c = React.useContext(SanitizedCatalystContext);
 
   /*
diff --git a/root/edit/components/EditNote.js b/root/edit/components/EditNote.js
index b4401280455..1b2dbdb3156 100644
--- a/root/edit/components/EditNote.js
+++ b/root/edit/components/EditNote.js
@@ -54,7 +54,7 @@ const EditNote = ({
   editNote,
   index,
   isOnEditPage = false,
-}: PropsT): React.Element<'div'> => {
+}: PropsT): React$Element<'div'> => {
   const $c = React.useContext(CatalystContext);
   const isModBot = editNote.editor_id === 4;
   const anchor = returnNoteAnchor(edit, index);
diff --git a/root/edit/components/EditNotes.js b/root/edit/components/EditNotes.js
index 396225d74b2..36fe3647ae5 100644
--- a/root/edit/components/EditNotes.js
+++ b/root/edit/components/EditNotes.js
@@ -31,7 +31,7 @@ const EditNotes = ({
   index = 0,
   isOnEditPage,
   verbose = true,
-}: Props): React.Element<'div'> => {
+}: Props): React$Element<'div'> => {
   const $c = React.useContext(CatalystContext);
   const user = $c.user;
   const mayAddNote = editorMayAddNote(edit, user);
diff --git a/root/edit/components/EditSidebar.js b/root/edit/components/EditSidebar.js
index 998d956bc1c..538bc9b6f92 100644
--- a/root/edit/components/EditSidebar.js
+++ b/root/edit/components/EditSidebar.js
@@ -29,7 +29,7 @@ type Props = {
 
 const EditSidebar = ({
   edit,
-}: Props): React.Element<'div'> => {
+}: Props): React$Element<'div'> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <div id="sidebar">
diff --git a/root/edit/components/EditSummary.js b/root/edit/components/EditSummary.js
index 75d9a1da053..ac6b5abe1bc 100644
--- a/root/edit/components/EditSummary.js
+++ b/root/edit/components/EditSummary.js
@@ -33,7 +33,7 @@ type Props = {
 const EditSummary = ({
   edit,
   index,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const $c = React.useContext(CatalystContext);
   const user = $c.user;
   const mayAddNote = editorMayAddNote(edit, user);
diff --git a/root/edit/components/EditorTypeInfo.js b/root/edit/components/EditorTypeInfo.js
index e96606dbdfa..3c0697b6fbc 100644
--- a/root/edit/components/EditorTypeInfo.js
+++ b/root/edit/components/EditorTypeInfo.js
@@ -18,7 +18,7 @@ type Props = {
 
 const EditorTypeInfo = ({
   editor,
-}: Props): React.Element<typeof React.Fragment> | null => (
+}: Props): React$Element<typeof React.Fragment> | null => (
   editor == null ? null : (
     <>
       {editor.is_limited ? (
diff --git a/root/edit/components/HistoricReleaseList.js b/root/edit/components/HistoricReleaseList.js
index fb5ff4a9e51..10f86252c38 100644
--- a/root/edit/components/HistoricReleaseList.js
+++ b/root/edit/components/HistoricReleaseList.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
 import {DeletedLink}
@@ -26,7 +24,7 @@ type HistoricReleaseListProps = {
 
 export const HistoricReleaseListContent = ({
   releases,
-}: HistoricReleaseListContentProps): React.Element<'ul'> => (
+}: HistoricReleaseListContentProps): React$Element<'ul'> => (
   <ul>
     {releases.length ? (
       releases.map((release, index) => (
@@ -46,7 +44,7 @@ const HistoricReleaseList = ({
   colSpan,
   label,
   releases,
-}: HistoricReleaseListProps): React.Element<'tr'> => (
+}: HistoricReleaseListProps): React$Element<'tr'> => (
   <tr>
     <th>{nonEmpty(label) ? label : l('Releases:')}</th>
     <td colSpan={colSpan}>
diff --git a/root/edit/components/IntentionallyRawIcon.js b/root/edit/components/IntentionallyRawIcon.js
index 2a3c7fba3d7..4be5b0b39ac 100644
--- a/root/edit/components/IntentionallyRawIcon.js
+++ b/root/edit/components/IntentionallyRawIcon.js
@@ -7,13 +7,11 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import InformationIcon
   from '../../static/scripts/edit/components/InformationIcon.js';
 
 const IntentionallyRawIcon =
-  (): React.Element<typeof InformationIcon> => (
+  (): React$Element<typeof InformationIcon> => (
     <InformationIcon
       className="align-top"
       title={l(`This field is intentionally left as it was originally
diff --git a/root/edit/components/ListEdit.js b/root/edit/components/ListEdit.js
index 35e5e784cbd..598ab91517c 100644
--- a/root/edit/components/ListEdit.js
+++ b/root/edit/components/ListEdit.js
@@ -26,7 +26,7 @@ const ListEdit = ({
   edit,
   index,
   voter,
-}: Props): React.Element<'div'> => {
+}: Props): React$Element<'div'> => {
   const $c = React.useContext(SanitizedCatalystContext);
   const editStatusClass = getEditStatusClass(edit);
   const detailsElement = getEditDetailsElement(edit);
diff --git a/root/edit/components/ListHeader.js b/root/edit/components/ListHeader.js
index 73396564d67..2f87346a78e 100644
--- a/root/edit/components/ListHeader.js
+++ b/root/edit/components/ListHeader.js
@@ -28,7 +28,7 @@ const ListHeader = ({
   page,
   refineUrlArgs,
   username,
-}: Props): React.Element<'table'> => {
+}: Props): React$Element<'table'> => {
   const $c = React.useContext(CatalystContext);
   const isSecureConnection = $c.req.secure;
   const protocol = isSecureConnection ? 'https://' : 'http://';
diff --git a/root/edit/components/TrackDurationChanges.js b/root/edit/components/TrackDurationChanges.js
index 5cb1f1c4e80..e70a4630609 100644
--- a/root/edit/components/TrackDurationChanges.js
+++ b/root/edit/components/TrackDurationChanges.js
@@ -26,7 +26,7 @@ const TrackDurationChanges = ({
   newLengths,
   oldLabel,
   oldLengths,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const lengthsSize = oldLengths.length;
   const lengthComparisonTables = [];
   for (let i = 0; i < lengthsSize; i++) {
diff --git a/root/edit/components/Vote.js b/root/edit/components/Vote.js
index 90744af9e1f..111ac7c9d42 100644
--- a/root/edit/components/Vote.js
+++ b/root/edit/components/Vote.js
@@ -68,7 +68,7 @@ const Vote = ({
   edit,
   index = 0,
   summary = false,
-}: VoteProps): React.Element<'div'> | null => {
+}: VoteProps): React$Element<'div'> | null => {
   const $c = React.useContext(CatalystContext);
   const user = $c.user;
   if (DBDefs.DB_READ_ONLY || !user || !editorMayVote(edit, user)) {
diff --git a/root/edit/details/AddAnnotation.js b/root/edit/details/AddAnnotation.js
index 64ae583b6db..e92c9ee2f24 100644
--- a/root/edit/details/AddAnnotation.js
+++ b/root/edit/details/AddAnnotation.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
 import {addColonText} from '../../static/scripts/common/i18n/addColon.js';
@@ -20,7 +18,7 @@ type Props = {
   +edit: AddAnnotationEditT,
 };
 
-const AddAnnotation = ({edit}: Props): React.Element<'table'> => {
+const AddAnnotation = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const entityType = display.entity_type;
   const oldAnnotation = display.old_annotation;
diff --git a/root/edit/details/AddArea.js b/root/edit/details/AddArea.js
index d6c5ef3e2cd..db26fbc4d36 100644
--- a/root/edit/details/AddArea.js
+++ b/root/edit/details/AddArea.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
 import {commaOnlyListText}
@@ -21,7 +19,7 @@ type Props = {
   +edit: AddAreaEditT,
 };
 
-const AddArea = ({edit}: Props): React.MixedElement => {
+const AddArea = ({edit}: Props): React$MixedElement => {
   const display = edit.display_data;
   const areaType = display.type;
 
diff --git a/root/edit/details/AddArtist.js b/root/edit/details/AddArtist.js
index 9dcff89ed0d..dca589df508 100644
--- a/root/edit/details/AddArtist.js
+++ b/root/edit/details/AddArtist.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {
   artistBeginAreaLabel,
   artistBeginLabel,
@@ -27,7 +25,7 @@ type Props = {
   +edit: AddArtistEditT,
 };
 
-const AddArtist = ({edit}: Props): React.MixedElement => {
+const AddArtist = ({edit}: Props): React$MixedElement => {
   const display = edit.display_data;
   const area = display.area;
   const beginArea = display.begin_area;
diff --git a/root/edit/details/AddCoverArt.js b/root/edit/details/AddCoverArt.js
index c21d3108738..908fee5a78f 100644
--- a/root/edit/details/AddCoverArt.js
+++ b/root/edit/details/AddCoverArt.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
 import {commaOnlyListText}
@@ -19,7 +17,7 @@ type Props = {
   +edit: AddCoverArtEditT,
 };
 
-const AddCoverArt = ({edit}: Props): React.Element<'table'> => {
+const AddCoverArt = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
 
   return (
diff --git a/root/edit/details/AddDiscId.js b/root/edit/details/AddDiscId.js
index 679a0529e12..04e47060ca0 100644
--- a/root/edit/details/AddDiscId.js
+++ b/root/edit/details/AddDiscId.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CDTocLink from '../../static/scripts/common/components/CDTocLink.js';
 import MediumLink
   from '../../static/scripts/common/components/MediumLink.js';
@@ -18,7 +16,7 @@ type Props = {
   +edit: AddDiscIdEditT,
 };
 
-const AddDiscId = ({allowNew, edit}: Props): React.Element<'table'> => {
+const AddDiscId = ({allowNew, edit}: Props): React$Element<'table'> => {
   const medium = edit.display_data.medium;
   const cdToc = edit.display_data.medium_cdtoc.cdtoc;
 
diff --git a/root/edit/details/AddEvent.js b/root/edit/details/AddEvent.js
index d7d4a2a3aff..352dcfd8fc0 100644
--- a/root/edit/details/AddEvent.js
+++ b/root/edit/details/AddEvent.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityLink from '../../static/scripts/common/components/EntityLink.js';
 import formatDate from '../../static/scripts/common/utility/formatDate.js';
 import isDateEmpty from '../../static/scripts/common/utility/isDateEmpty.js';
@@ -18,7 +16,7 @@ type Props = {
   +edit: AddEventEditT,
 };
 
-const AddEvent = ({edit}: Props): React.MixedElement => {
+const AddEvent = ({edit}: Props): React$MixedElement => {
   const display = edit.display_data;
   const eventType = display.type;
 
diff --git a/root/edit/details/AddGenre.js b/root/edit/details/AddGenre.js
index 7373fca5ce3..a1444ad231e 100644
--- a/root/edit/details/AddGenre.js
+++ b/root/edit/details/AddGenre.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
 
@@ -16,7 +14,7 @@ type Props = {
   +edit: AddGenreEditT,
 };
 
-const AddGenre = ({edit}: Props): React.MixedElement => {
+const AddGenre = ({edit}: Props): React$MixedElement => {
   const display = edit.display_data;
 
   return (
diff --git a/root/edit/details/AddInstrument.js b/root/edit/details/AddInstrument.js
index 2453c8fd4e4..bd8770cb435 100644
--- a/root/edit/details/AddInstrument.js
+++ b/root/edit/details/AddInstrument.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityLink
   from '../../static/scripts/common/components/EntityLink.js';
 import expand2react from '../../static/scripts/common/i18n/expand2react.js';
@@ -19,7 +17,7 @@ type Props = {
   +edit: AddInstrumentEditT,
 };
 
-const AddInstrument = ({allowNew, edit}: Props): React.MixedElement => {
+const AddInstrument = ({allowNew, edit}: Props): React$MixedElement => {
   const display = edit.display_data;
   const description = display.description;
   const instrumentType = display.type;
diff --git a/root/edit/details/AddIsrcs.js b/root/edit/details/AddIsrcs.js
index 6fffbb506be..649e71d552b 100644
--- a/root/edit/details/AddIsrcs.js
+++ b/root/edit/details/AddIsrcs.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CodeLink
   from '../../static/scripts/common/components/CodeLink.js';
 import DescriptiveLink
@@ -18,7 +16,7 @@ type Props = {
   +edit: AddIsrcsEditT,
 };
 
-const AddIsrcs = ({edit}: Props): React.Element<'table'> => {
+const AddIsrcs = ({edit}: Props): React$Element<'table'> => {
   const additions = edit.display_data.additions;
   const clientVersion = edit.display_data.client_version;
 
diff --git a/root/edit/details/AddIswcs.js b/root/edit/details/AddIswcs.js
index 676a66ad8d1..1e216908a6b 100644
--- a/root/edit/details/AddIswcs.js
+++ b/root/edit/details/AddIswcs.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CodeLink
   from '../../static/scripts/common/components/CodeLink.js';
 import EntityLink
@@ -18,7 +16,7 @@ type Props = {
   +edit: AddIswcsEditT,
 };
 
-const AddIswcs = ({edit}: Props): React.Element<'table'> => {
+const AddIswcs = ({edit}: Props): React$Element<'table'> => {
   const additions = edit.display_data.additions;
 
   return (
diff --git a/root/edit/details/AddLabel.js b/root/edit/details/AddLabel.js
index 7009d2cdacb..08c822f11ba 100644
--- a/root/edit/details/AddLabel.js
+++ b/root/edit/details/AddLabel.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
 import EntityLink from '../../static/scripts/common/components/EntityLink.js';
@@ -22,7 +20,7 @@ type Props = {
   +edit: AddLabelEditT,
 };
 
-const AddLabel = ({allowNew, edit}: Props): React.MixedElement => {
+const AddLabel = ({allowNew, edit}: Props): React$MixedElement => {
   const display = edit.display_data;
   const type = display.type;
   return (
diff --git a/root/edit/details/AddMedium.js b/root/edit/details/AddMedium.js
index 306aff50311..c6ad11bed92 100644
--- a/root/edit/details/AddMedium.js
+++ b/root/edit/details/AddMedium.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import MediumTracklist
   from '../../medium/MediumTracklist.js';
 import DescriptiveLink
@@ -40,7 +38,7 @@ const CondensedTrackACsRow = ({
   endNumber,
   rowCounter,
   startNumber,
-}: CondensedTrackACsRowProps): React.Element<'tr'> => (
+}: CondensedTrackACsRowProps): React$Element<'tr'> => (
   <tr className={loopParity(rowCounter)}>
     <td className="pos t">
       {nonEmpty(endNumber) && endNumber !== startNumber
@@ -56,7 +54,7 @@ const CondensedTrackACsRow = ({
 const CondensedTrackACs = ({
   tracks,
 }: CondensedTrackACsProps):
-  Array<React.Element<typeof CondensedTrackACsRow>> => {
+  Array<React$Element<typeof CondensedTrackACsRow>> => {
   if (!tracks) {
     return [];
   }
@@ -104,7 +102,7 @@ const CondensedTrackACs = ({
   return rows;
 };
 
-const AddMedium = ({allowNew, edit}: Props): React.MixedElement => {
+const AddMedium = ({allowNew, edit}: Props): React$MixedElement => {
   const display = edit.display_data;
   const format = display.format;
 
diff --git a/root/edit/details/AddPlace.js b/root/edit/details/AddPlace.js
index c857f3f7ec0..7ca4828c6a4 100644
--- a/root/edit/details/AddPlace.js
+++ b/root/edit/details/AddPlace.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink from
   '../../static/scripts/common/components/DescriptiveLink.js';
 import formatDate from '../../static/scripts/common/utility/formatDate.js';
@@ -20,7 +18,7 @@ type Props = {
   +edit: AddPlaceEditT,
 };
 
-const AddPlace = ({edit}: Props): React.MixedElement => {
+const AddPlace = ({edit}: Props): React$MixedElement => {
   const display = edit.display_data;
   const type = display.type;
   const place = display.place;
diff --git a/root/edit/details/AddRelationship.js b/root/edit/details/AddRelationship.js
index eef9f4b770c..411519b05fa 100644
--- a/root/edit/details/AddRelationship.js
+++ b/root/edit/details/AddRelationship.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Relationship
   from '../../static/scripts/common/components/Relationship.js';
 
@@ -16,7 +14,7 @@ type Props = {
   +edit: AddRelationshipEditT,
 };
 
-const AddRelationship = ({edit}: Props): React.MixedElement => {
+const AddRelationship = ({edit}: Props): React$MixedElement => {
   const relationship = edit.display_data.relationship;
   return (
     <table className="details add-relationship">
diff --git a/root/edit/details/AddRelationshipAttribute.js b/root/edit/details/AddRelationshipAttribute.js
index 2ff2adbd4b8..310c9556dc2 100644
--- a/root/edit/details/AddRelationshipAttribute.js
+++ b/root/edit/details/AddRelationshipAttribute.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import localizeLinkAttributeTypeName
   from '../../static/scripts/common/i18n/localizeLinkAttributeTypeName.js';
 import yesNo from '../../static/scripts/common/utility/yesNo.js';
@@ -19,7 +17,7 @@ type Props = {
   +edit: AddRelationshipAttributeEditT,
 };
 
-const AddRelationshipAttribute = ({edit}: Props): React.Element<'table'> => {
+const AddRelationshipAttribute = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const description = display.description;
   const parent = display.parent;
diff --git a/root/edit/details/AddRelationshipType.js b/root/edit/details/AddRelationshipType.js
index d7370fd2070..085266f0777 100644
--- a/root/edit/details/AddRelationshipType.js
+++ b/root/edit/details/AddRelationshipType.js
@@ -23,7 +23,7 @@ type Props = {
 
 const AddRelationshipType = ({
   edit,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const display = edit.display_data;
   const entity0Type = ENTITY_NAMES[display.entity0_type]();
   const entity1Type = ENTITY_NAMES[display.entity1_type]();
diff --git a/root/edit/details/AddRelease.js b/root/edit/details/AddRelease.js
index 02606e2393e..3a8f6874005 100644
--- a/root/edit/details/AddRelease.js
+++ b/root/edit/details/AddRelease.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import * as manifest from '../../static/manifest.mjs';
 import DescriptiveLink from
   '../../static/scripts/common/components/DescriptiveLink.js';
@@ -24,7 +22,7 @@ type Props = {
   +edit: AddReleaseEditT,
 };
 
-const AddRelease = ({allowNew, edit}: Props): React.MixedElement => {
+const AddRelease = ({allowNew, edit}: Props): React$MixedElement => {
   const display = edit.display_data;
   const language = display.language;
   const packaging = display.packaging;
diff --git a/root/edit/details/AddReleaseGroup.js b/root/edit/details/AddReleaseGroup.js
index e3752cd8d0d..ea50c222ff1 100644
--- a/root/edit/details/AddReleaseGroup.js
+++ b/root/edit/details/AddReleaseGroup.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink from
   '../../static/scripts/common/components/DescriptiveLink.js';
 import ExpandedArtistCredit from
@@ -19,7 +17,7 @@ type Props = {
   +edit: AddReleaseGroupEditT,
 };
 
-const AddReleaseGroup = ({allowNew, edit}: Props): React.MixedElement => {
+const AddReleaseGroup = ({allowNew, edit}: Props): React$MixedElement => {
   const display = edit.display_data;
   const type = display.type;
   const secondaryType = display.secondary_types;
diff --git a/root/edit/details/AddReleaseLabel.js b/root/edit/details/AddReleaseLabel.js
index 91431ed8194..2c1c3e93dc6 100644
--- a/root/edit/details/AddReleaseLabel.js
+++ b/root/edit/details/AddReleaseLabel.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
 import EntityLink
@@ -18,7 +16,7 @@ type Props = {
   +edit: AddReleaseLabelEditT,
 };
 
-const AddReleaseLabel = ({edit}: Props): React.Element<'table'> => {
+const AddReleaseLabel = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
 
   return (
diff --git a/root/edit/details/AddRemoveAlias.js b/root/edit/details/AddRemoveAlias.js
index b8f758f6490..06e58859c0f 100644
--- a/root/edit/details/AddRemoveAlias.js
+++ b/root/edit/details/AddRemoveAlias.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
 import EntityLink from '../../static/scripts/common/components/EntityLink.js';
@@ -25,7 +23,7 @@ type Props = {
   edit: AddRemoveAliasEditT,
 };
 
-const AddRemoveAlias = ({edit}: Props): React.Element<'table'> => {
+const AddRemoveAlias = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const entityType = display.entity_type;
   const entity = display[entityType];
diff --git a/root/edit/details/AddSeries.js b/root/edit/details/AddSeries.js
index fee5162db6e..a928e53a8d1 100644
--- a/root/edit/details/AddSeries.js
+++ b/root/edit/details/AddSeries.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityLink from '../../static/scripts/common/components/EntityLink.js';
 
 type Props = {
   +edit: AddSeriesEditT,
 };
 
-const AddSeries = ({edit}: Props): React.MixedElement => {
+const AddSeries = ({edit}: Props): React$MixedElement => {
   const type = edit.display_data.type;
   const orderingType = edit.display_data.ordering_type;
 
diff --git a/root/edit/details/AddStandaloneRecording.js b/root/edit/details/AddStandaloneRecording.js
index 22290b7aeee..26d77b14ac5 100644
--- a/root/edit/details/AddStandaloneRecording.js
+++ b/root/edit/details/AddStandaloneRecording.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityLink from '../../static/scripts/common/components/EntityLink.js';
 import ExpandedArtistCredit from
   '../../static/scripts/common/components/ExpandedArtistCredit.js';
@@ -24,7 +22,7 @@ type Props = {
 const AddStandaloneRecording = ({
   allowNew,
   edit,
-}: Props): React.MixedElement => {
+}: Props): React$MixedElement => {
   const display = edit.display_data;
   return (
     <>
diff --git a/root/edit/details/AddWork.js b/root/edit/details/AddWork.js
index 8eb8c5205d5..3b2b111b72d 100644
--- a/root/edit/details/AddWork.js
+++ b/root/edit/details/AddWork.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityLink from '../../static/scripts/common/components/EntityLink.js';
 import {commaOnlyListText} from
   '../../static/scripts/common/i18n/commaOnlyList.js';
@@ -19,7 +17,7 @@ type Props = {
   +edit: AddWorkEditT,
 };
 
-const AddWork = ({edit}: Props): React.MixedElement => {
+const AddWork = ({edit}: Props): React$MixedElement => {
   const display = edit.display_data;
   const attributes = display.attributes ?? {};
   const type = display.type;
diff --git a/root/edit/details/ChangeReleaseQuality.js b/root/edit/details/ChangeReleaseQuality.js
index 32fe7a26f6e..70ee9c68a81 100644
--- a/root/edit/details/ChangeReleaseQuality.js
+++ b/root/edit/details/ChangeReleaseQuality.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
 import {QUALITY_NAMES} from '../../static/scripts/common/constants.js';
@@ -17,7 +15,7 @@ type Props = {
   +edit: ChangeReleaseQualityEditT,
 };
 
-const ChangeReleaseQuality = ({edit}: Props): React.Element<'table'> => {
+const ChangeReleaseQuality = ({edit}: Props): React$Element<'table'> => {
   const oldQuality = QUALITY_NAMES.get(edit.display_data.quality.old);
   const newQuality = QUALITY_NAMES.get(edit.display_data.quality.new);
   return (
diff --git a/root/edit/details/ChangeWikiDoc.js b/root/edit/details/ChangeWikiDoc.js
index f03d7c629d9..fc1bcd72508 100644
--- a/root/edit/details/ChangeWikiDoc.js
+++ b/root/edit/details/ChangeWikiDoc.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DBDefs from '../../static/scripts/common/DBDefs.mjs';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const ChangeWikiDoc = ({
   edit,
-}: Props): React.Element<'table'> => {
+}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const page = display.page;
   const oldVersion = display.old_version;
diff --git a/root/edit/details/EditAlias.js b/root/edit/details/EditAlias.js
index 5cf10dcf3ea..4110049b914 100644
--- a/root/edit/details/EditAlias.js
+++ b/root/edit/details/EditAlias.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
 import EntityLink from '../../static/scripts/common/components/EntityLink.js';
@@ -29,7 +27,7 @@ type Props = {
   +edit: EditAliasEditT,
 };
 
-const EditAlias = ({edit}: Props): React.Element<'table'> => {
+const EditAlias = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const entityType = display.entity_type;
   const entity = display[entityType];
diff --git a/root/edit/details/EditArea.js b/root/edit/details/EditArea.js
index 05bdc82bf8b..e78b9bfe406 100644
--- a/root/edit/details/EditArea.js
+++ b/root/edit/details/EditArea.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
 import {commaOnlyListText}
@@ -24,7 +22,7 @@ type Props = {
   +edit: EditAreaEditT,
 };
 
-const EditArea = ({edit}: Props): React.MixedElement => {
+const EditArea = ({edit}: Props): React$MixedElement => {
   const display = edit.display_data;
   const beginDate = display.begin_date;
   const comment = display.comment;
diff --git a/root/edit/details/EditArtist.js b/root/edit/details/EditArtist.js
index 658b3880cca..39396d81d1d 100644
--- a/root/edit/details/EditArtist.js
+++ b/root/edit/details/EditArtist.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {
   artistBeginAreaLabel,
   artistBeginLabel,
@@ -31,7 +29,7 @@ type Props = {
   +edit: EditArtistEditT,
 };
 
-const EditArtist = ({edit}: Props): React.MixedElement => {
+const EditArtist = ({edit}: Props): React$MixedElement => {
   const display = edit.display_data;
   const area = display.area;
   const beginDate = display.begin_date;
diff --git a/root/edit/details/EditArtistCredit.js b/root/edit/details/EditArtistCredit.js
index ec0b043ee30..93d9bae8860 100644
--- a/root/edit/details/EditArtistCredit.js
+++ b/root/edit/details/EditArtistCredit.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistCreditUsageLink
   from '../../static/scripts/common/components/ArtistCreditUsageLink.js';
 import ExpandedArtistCredit from
@@ -18,7 +16,7 @@ type Props = {
   +edit: EditArtistCreditEditT,
 };
 
-const EditArtistCredit = ({edit}: Props): React.Element<'table'> => {
+const EditArtistCredit = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
 
   return (
diff --git a/root/edit/details/EditBarcodes.js b/root/edit/details/EditBarcodes.js
index 3361954331e..05d4ce9341c 100644
--- a/root/edit/details/EditBarcodes.js
+++ b/root/edit/details/EditBarcodes.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
 import formatBarcode
@@ -19,7 +17,7 @@ type Props = {
   +edit: EditBarcodesEditT,
 };
 
-const EditBarcodes = ({edit}: Props): React.Element<'table'> => {
+const EditBarcodes = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
 
   return (
diff --git a/root/edit/details/EditCoverArt.js b/root/edit/details/EditCoverArt.js
index 79bc16f110b..05ef3b18832 100644
--- a/root/edit/details/EditCoverArt.js
+++ b/root/edit/details/EditCoverArt.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
 import {commaOnlyListText}
@@ -30,7 +28,7 @@ function displayCoverArtTypes(types: $ReadOnlyArray<CoverArtTypeT>) {
   return '';
 }
 
-const EditCoverArt = ({edit}: Props): React.Element<'table'> => {
+const EditCoverArt = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const comment = display.comment;
   const types = display.types;
diff --git a/root/edit/details/EditEvent.js b/root/edit/details/EditEvent.js
index d323feef5ec..66121e7d689 100644
--- a/root/edit/details/EditEvent.js
+++ b/root/edit/details/EditEvent.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityLink from '../../static/scripts/common/components/EntityLink.js';
 import formatDate from '../../static/scripts/common/utility/formatDate.js';
 import yesNo from '../../static/scripts/common/utility/yesNo.js';
@@ -21,7 +19,7 @@ type Props = {
   +edit: EditEventEditT,
 };
 
-const EditEvent = ({edit}: Props): React.Element<'table'> => {
+const EditEvent = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const name = display.name;
   const comment = display.comment;
diff --git a/root/edit/details/EditGenre.js b/root/edit/details/EditGenre.js
index 3a80ac737f3..7311dbd0872 100644
--- a/root/edit/details/EditGenre.js
+++ b/root/edit/details/EditGenre.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
 import WordDiff from '../../static/scripts/edit/components/edit/WordDiff.js';
@@ -17,7 +15,7 @@ type Props = {
   +edit: EditGenreEditT,
 };
 
-const EditGenre = ({edit}: Props): React.MixedElement => {
+const EditGenre = ({edit}: Props): React$MixedElement => {
   const display = edit.display_data;
   const comment = display.comment;
   const name = display.name;
diff --git a/root/edit/details/EditInstrument.js b/root/edit/details/EditInstrument.js
index 3f58be20d84..8075c1f2d4c 100644
--- a/root/edit/details/EditInstrument.js
+++ b/root/edit/details/EditInstrument.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityLink from '../../static/scripts/common/components/EntityLink.js';
 import FullChangeDiff from
   '../../static/scripts/edit/components/edit/FullChangeDiff.js';
@@ -20,7 +18,7 @@ type Props = {
   +edit: EditInstrumentEditT,
 };
 
-const EditInstrument = ({edit}: Props): React.Element<'table'> => {
+const EditInstrument = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const name = display.name;
   const comment = display.comment;
diff --git a/root/edit/details/EditLabel.js b/root/edit/details/EditLabel.js
index e39d2a42a0e..0aa5f42e76c 100644
--- a/root/edit/details/EditLabel.js
+++ b/root/edit/details/EditLabel.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink from
   '../../static/scripts/common/components/DescriptiveLink.js';
 import EntityLink from '../../static/scripts/common/components/EntityLink.js';
@@ -25,7 +23,7 @@ type Props = {
   +edit: EditLabelEditT,
 };
 
-const EditLabel = ({edit}: Props): React.Element<'table'> => {
+const EditLabel = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const name = display.name;
   const sortName = display.sort_name;
diff --git a/root/edit/details/EditMedium.js b/root/edit/details/EditMedium.js
index 01228ab791a..a8c273ad89b 100644
--- a/root/edit/details/EditMedium.js
+++ b/root/edit/details/EditMedium.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistCreditLink
   from '../../static/scripts/common/components/ArtistCreditLink.js';
 import DataTrackIcon
@@ -90,7 +88,7 @@ const ChangedMbidIcon = () => (
 const TracklistChangesAdd = ({
   change,
   changedMbids,
-}: TracklistChangesAddProps): React.Element<'tr'> => {
+}: TracklistChangesAddProps): React$Element<'tr'> => {
   const track = change.new_track;
   return (
     <tr className="diff-addition edit-medium-track">
@@ -137,7 +135,7 @@ const TracklistChangesChange = ({
   changedMbids,
   change,
   index,
-}: TracklistChangesChangeProps): React.Element<'tr'> => {
+}: TracklistChangesChangeProps): React$Element<'tr'> => {
   const oldTrack = change.old_track;
   const newTrack = change.new_track;
   const artistCreditDiff = diffArtistCredits(
@@ -265,7 +263,7 @@ const TracklistChangesChange = ({
 const TracklistChangesRemove = ({
   change,
   changedMbids,
-}: TracklistChangesRemoveProps): React.Element<'tr'> => {
+}: TracklistChangesRemoveProps): React$Element<'tr'> => {
   const track = change.old_track;
   return (
     <tr className="diff-removal edit-medium-track">
@@ -304,7 +302,7 @@ const TracklistChangesRemove = ({
 const TracklistChangesTable = ({
   changedMbids,
   changes,
-}: TracklistChangesTableProps): React.Element<'table'> => (
+}: TracklistChangesTableProps): React$Element<'table'> => (
   <table className="tbl">
     <thead>
       <tr>
@@ -364,7 +362,7 @@ const CondensedTrackACsDiffRow = ({
   oldArtistCredit,
   rowCounter,
   startNumber,
-}: CondensedTrackACsDiffRowProps): React.Element<'tr'> => (
+}: CondensedTrackACsDiffRowProps): React$Element<'tr'> => (
   <tr className={loopParity(rowCounter)}>
     <td className="pos t">
       {nonEmpty(endNumber) && endNumber !== startNumber
@@ -387,7 +385,7 @@ const CondensedTrackACsDiffRow = ({
 const CondensedTrackACsDiff = ({
   artistCreditChanges,
 }: CondensedTrackACsDiffProps):
-  Array<React.Element<typeof CondensedTrackACsDiffRow>> => {
+  Array<React$Element<typeof CondensedTrackACsDiffRow>> => {
   let thisOldCredit;
   let thisNewCredit;
   let thisPosition = 0;
@@ -444,7 +442,7 @@ const CondensedTrackACsDiff = ({
   return rows;
 };
 
-const EditMedium = ({edit}: Props): React.MixedElement => {
+const EditMedium = ({edit}: Props): React$MixedElement => {
   const display = edit.display_data;
   const artistCreditChanges = display.artist_credit_changes;
   const changedDataTracks = display.data_track_changes;
diff --git a/root/edit/details/EditPlace.js b/root/edit/details/EditPlace.js
index 889db82a5eb..43f282db8ff 100644
--- a/root/edit/details/EditPlace.js
+++ b/root/edit/details/EditPlace.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink from
   '../../static/scripts/common/components/DescriptiveLink.js';
 import formatDate from '../../static/scripts/common/utility/formatDate.js';
@@ -23,7 +21,7 @@ type Props = {
   +edit: EditPlaceEditT,
 };
 
-const EditPlace = ({edit}: Props): React.Element<'table'> => {
+const EditPlace = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const address = display.address;
   const area = display.area;
diff --git a/root/edit/details/EditRecording.js b/root/edit/details/EditRecording.js
index 732314ffb45..46a542c0ba1 100644
--- a/root/edit/details/EditRecording.js
+++ b/root/edit/details/EditRecording.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink from
   '../../static/scripts/common/components/DescriptiveLink.js';
 import ExpandedArtistCredit from
@@ -25,7 +23,7 @@ type Props = {
   +edit: EditRecordingEditT,
 };
 
-const EditRecording = ({edit}: Props): React.Element<'table'> => {
+const EditRecording = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const name = display.name;
   const comment = display.comment;
diff --git a/root/edit/details/EditRelationship.js b/root/edit/details/EditRelationship.js
index 0076fc66a79..fd8932a3b0a 100644
--- a/root/edit/details/EditRelationship.js
+++ b/root/edit/details/EditRelationship.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import RelationshipDiff
   from '../../static/scripts/edit/components/edit/RelationshipDiff.js';
 
@@ -16,7 +14,7 @@ type Props = {
   +edit: EditRelationshipEditT,
 };
 
-const EditRelationship = ({edit}: Props): React.MixedElement => (
+const EditRelationship = ({edit}: Props): React$MixedElement => (
   <table className="details edit-relationship">
     <RelationshipDiff
       newRelationship={edit.display_data.new}
diff --git a/root/edit/details/EditRelationshipAttribute.js b/root/edit/details/EditRelationshipAttribute.js
index faf2d62435c..e9c9640c209 100644
--- a/root/edit/details/EditRelationshipAttribute.js
+++ b/root/edit/details/EditRelationshipAttribute.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import expand2react from '../../static/scripts/common/i18n/expand2react.js';
 import localizeLinkAttributeTypeName
   from '../../static/scripts/common/i18n/localizeLinkAttributeTypeName.js';
@@ -23,7 +21,7 @@ type Props = {
   +edit: EditRelationshipAttributeEditT,
 };
 
-const EditRelationshipAttribute = ({edit}: Props): React.Element<'table'> => {
+const EditRelationshipAttribute = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const childOrder = display.child_order;
   const oldDescription = display.description.old ?? '';
diff --git a/root/edit/details/EditRelationshipType.js b/root/edit/details/EditRelationshipType.js
index ed5c6cba3c1..c7cae2569e4 100644
--- a/root/edit/details/EditRelationshipType.js
+++ b/root/edit/details/EditRelationshipType.js
@@ -92,7 +92,7 @@ function formatExample(
 
 const EditRelationshipType = ({
   edit,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const display = edit.display_data;
   const name = display.name;
   const oldDescription = display.description?.old ?? '';
diff --git a/root/edit/details/EditRelease.js b/root/edit/details/EditRelease.js
index 0556ecbaefe..99d715d0427 100644
--- a/root/edit/details/EditRelease.js
+++ b/root/edit/details/EditRelease.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink from
   '../../static/scripts/common/components/DescriptiveLink.js';
 import {DeletedLink}
@@ -28,7 +26,7 @@ type Props = {
   +edit: EditReleaseEditT,
 };
 
-const EditRelease = ({edit}: Props): React.MixedElement => {
+const EditRelease = ({edit}: Props): React$MixedElement => {
   const display = edit.display_data;
   const name = display.name;
   const artistCredit = display.artist_credit;
diff --git a/root/edit/details/EditReleaseGroup.js b/root/edit/details/EditReleaseGroup.js
index 2fe99521e9b..e5d323802ba 100644
--- a/root/edit/details/EditReleaseGroup.js
+++ b/root/edit/details/EditReleaseGroup.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink from
   '../../static/scripts/common/components/DescriptiveLink.js';
 import ExpandedArtistCredit from
@@ -22,7 +20,7 @@ type Props = {
   +edit: EditReleaseGroupEditT,
 };
 
-const EditReleaseGroup = ({edit}: Props): React.Element<'table'> => {
+const EditReleaseGroup = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const name = display.name;
   const comment = display.comment;
diff --git a/root/edit/details/EditReleaseLabel.js b/root/edit/details/EditReleaseLabel.js
index 58f279ecb53..ac929c74408 100644
--- a/root/edit/details/EditReleaseLabel.js
+++ b/root/edit/details/EditReleaseLabel.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import * as manifest from '../../static/manifest.mjs';
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
@@ -24,7 +22,7 @@ type Props = {
   +edit: EditReleaseLabelEditT,
 };
 
-const EditReleaseLabel = ({edit}: Props): React.Element<'table'> => {
+const EditReleaseLabel = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const barcode = display.barcode;
   const catNo = display.catalog_number;
diff --git a/root/edit/details/EditSeries.js b/root/edit/details/EditSeries.js
index ee4bc53feac..c1bcce4b47b 100644
--- a/root/edit/details/EditSeries.js
+++ b/root/edit/details/EditSeries.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityLink from '../../static/scripts/common/components/EntityLink.js';
 import FullChangeDiff from
   '../../static/scripts/edit/components/edit/FullChangeDiff.js';
@@ -18,7 +16,7 @@ type Props = {
   +edit: EditSeriesEditT,
 };
 
-const EditSeries = ({edit}: Props): React.Element<'table'> => {
+const EditSeries = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const name = display.name;
   const series = display.series;
diff --git a/root/edit/details/EditUrl.js b/root/edit/details/EditUrl.js
index 94d4e111654..ed8b459146c 100644
--- a/root/edit/details/EditUrl.js
+++ b/root/edit/details/EditUrl.js
@@ -21,7 +21,7 @@ type Props = {
   +edit: EditUrlEditT,
 };
 
-const EditUrl = ({edit}: Props): React.Element<typeof React.Fragment> => {
+const EditUrl = ({edit}: Props): React$Element<typeof React.Fragment> => {
   const display = edit.display_data;
   const description = display.description;
   const uri = display.uri;
diff --git a/root/edit/details/EditWork.js b/root/edit/details/EditWork.js
index ca7bfeeaf5a..6203459b53d 100644
--- a/root/edit/details/EditWork.js
+++ b/root/edit/details/EditWork.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
 import {commaOnlyListText}
@@ -29,7 +27,7 @@ type Props = {
 const localizeLanguage =
   (language: LanguageT) => localizeLanguageName(language, true);
 
-const EditWork = ({edit}: Props): React.Element<'table'> => {
+const EditWork = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const comment = display.comment;
   const iswc = display.iswc;
diff --git a/root/edit/details/MergeAreas.js b/root/edit/details/MergeAreas.js
index f5e635ec00d..fe3a514e352 100644
--- a/root/edit/details/MergeAreas.js
+++ b/root/edit/details/MergeAreas.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import AreaList from '../../components/list/AreaList.js';
 
 type Props = {
   +edit: MergeAreasEditT,
 };
 
-const MergeAreas = ({edit}: Props): React.Element<'table'> => (
+const MergeAreas = ({edit}: Props): React$Element<'table'> => (
   <table className="details merge-areas">
     <tr>
       <th>{l('Merge:')}</th>
diff --git a/root/edit/details/MergeArtists.js b/root/edit/details/MergeArtists.js
index b0e9c651cf4..78ce75b62ca 100644
--- a/root/edit/details/MergeArtists.js
+++ b/root/edit/details/MergeArtists.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistList from '../../components/list/ArtistList.js';
 import yesNo from '../../static/scripts/common/utility/yesNo.js';
 
@@ -16,7 +14,7 @@ type Props = {
   +edit: MergeArtistsEditT,
 };
 
-const MergeArtists = ({edit}: Props): React.Element<'table'> => (
+const MergeArtists = ({edit}: Props): React$Element<'table'> => (
   <table className="details merge-artists">
     <tr>
       <th>{l('Merge:')}</th>
diff --git a/root/edit/details/MergeEvents.js b/root/edit/details/MergeEvents.js
index 16a9691e395..a74d612afbf 100644
--- a/root/edit/details/MergeEvents.js
+++ b/root/edit/details/MergeEvents.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EventList from '../../components/list/EventList.js';
 
 type Props = {
   +edit: MergeEventsEditT,
 };
 
-const MergeEvents = ({edit}: Props): React.Element<'table'> => (
+const MergeEvents = ({edit}: Props): React$Element<'table'> => (
   <table className="details merge-events">
     <tr>
       <th>{l('Merge:')}</th>
diff --git a/root/edit/details/MergeInstruments.js b/root/edit/details/MergeInstruments.js
index 4466a2fbe8b..e5ba7657883 100644
--- a/root/edit/details/MergeInstruments.js
+++ b/root/edit/details/MergeInstruments.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import InstrumentList from '../../components/list/InstrumentList.js';
 
 type Props = {
   +edit: MergeInstrumentsEditT,
 };
 
-const MergeInstruments = ({edit}: Props): React.Element<'table'> => (
+const MergeInstruments = ({edit}: Props): React$Element<'table'> => (
   <table className="details merge-instruments">
     <tr>
       <th>{l('Merge:')}</th>
diff --git a/root/edit/details/MergeLabels.js b/root/edit/details/MergeLabels.js
index a5de13ed207..315132a0159 100644
--- a/root/edit/details/MergeLabels.js
+++ b/root/edit/details/MergeLabels.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import LabelList from '../../components/list/LabelList.js';
 
 type Props = {
   +edit: MergeLabelsEditT,
 };
 
-const MergeLabels = ({edit}: Props): React.Element<'table'> => (
+const MergeLabels = ({edit}: Props): React$Element<'table'> => (
   <table className="details merge-labels">
     <tr>
       <th>{l('Merge:')}</th>
diff --git a/root/edit/details/MergePlaces.js b/root/edit/details/MergePlaces.js
index e79f55541d9..e6a8e15acf6 100644
--- a/root/edit/details/MergePlaces.js
+++ b/root/edit/details/MergePlaces.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import PlaceList from '../../components/list/PlaceList.js';
 
 type Props = {
   +edit: MergePlacesEditT,
 };
 
-const MergePlaces = ({edit}: Props): React.Element<'table'> => (
+const MergePlaces = ({edit}: Props): React$Element<'table'> => (
   <table className="details merge-place">
     <tr>
       <th>{l('Merge:')}</th>
diff --git a/root/edit/details/MergeRecordings.js b/root/edit/details/MergeRecordings.js
index c44b833bb1c..d2d4f51fecb 100644
--- a/root/edit/details/MergeRecordings.js
+++ b/root/edit/details/MergeRecordings.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import RecordingList from '../../components/list/RecordingList.js';
 
 type Props = {
   +edit: MergeRecordingsEditT,
 };
 
-const MergeRecordings = ({edit}: Props): React.Element<'table'> => (
+const MergeRecordings = ({edit}: Props): React$Element<'table'> => (
   <table className="details merge-recordings">
     <tr>
       <th>{l('Merge:')}</th>
diff --git a/root/edit/details/MergeReleaseGroups.js b/root/edit/details/MergeReleaseGroups.js
index c03a0d23a47..5c9ff5605e7 100644
--- a/root/edit/details/MergeReleaseGroups.js
+++ b/root/edit/details/MergeReleaseGroups.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {ReleaseGroupListTable}
   from '../../components/list/ReleaseGroupList.js';
 
@@ -16,7 +14,7 @@ type Props = {
   +edit: MergeReleaseGroupsEditT,
 };
 
-const MergeReleaseGroups = ({edit}: Props): React.Element<'table'> => (
+const MergeReleaseGroups = ({edit}: Props): React$Element<'table'> => (
   <table className="details merge-release-groups">
     <tr>
       <th>{l('Merge:')}</th>
diff --git a/root/edit/details/MergeReleases.js b/root/edit/details/MergeReleases.js
index caac6a7c241..dc3ccbcfeb1 100644
--- a/root/edit/details/MergeReleases.js
+++ b/root/edit/details/MergeReleases.js
@@ -220,7 +220,7 @@ function getHtmlVars(
 
 const MergeReleases = ({
   edit,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const display = edit.display_data;
   const emptyReleases = display.empty_releases;
   const changes = display.changes;
diff --git a/root/edit/details/MergeSeries.js b/root/edit/details/MergeSeries.js
index 037580d9e1a..e09c252937a 100644
--- a/root/edit/details/MergeSeries.js
+++ b/root/edit/details/MergeSeries.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import SeriesList from '../../components/list/SeriesList.js';
 
 type Props = {
   +edit: MergeSeriesEditT,
 };
 
-const MergeSeries = ({edit}: Props): React.Element<'table'> => (
+const MergeSeries = ({edit}: Props): React$Element<'table'> => (
   <table className="details merge-series">
     <tr>
       <th>{l('Merge:')}</th>
diff --git a/root/edit/details/MergeWorks.js b/root/edit/details/MergeWorks.js
index 04f12d987aa..ff9cda12c0c 100644
--- a/root/edit/details/MergeWorks.js
+++ b/root/edit/details/MergeWorks.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import WorkList from '../../components/list/WorkList.js';
 
 type Props = {
   +edit: MergeWorksEditT,
 };
 
-const MergeWorks = ({edit}: Props): React.Element<'table'> => (
+const MergeWorks = ({edit}: Props): React$Element<'table'> => (
   <table className="details merge-works">
     <tr>
       <th>{l('Merge:')}</th>
diff --git a/root/edit/details/MoveDiscId.js b/root/edit/details/MoveDiscId.js
index f0c575264cc..404b2208909 100644
--- a/root/edit/details/MoveDiscId.js
+++ b/root/edit/details/MoveDiscId.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CDTocLink from '../../static/scripts/common/components/CDTocLink.js';
 import MediumLink
   from '../../static/scripts/common/components/MediumLink.js';
@@ -17,7 +15,7 @@ type Props = {
   +edit: MoveDiscIdEditT,
 };
 
-const MoveDiscId = ({edit}: Props): React.Element<'table'> => {
+const MoveDiscId = ({edit}: Props): React$Element<'table'> => {
   const oldMedium = edit.display_data.old_medium;
   const newMedium = edit.display_data.new_medium;
   const cdToc = edit.display_data.medium_cdtoc.cdtoc;
diff --git a/root/edit/details/RemoveCoverArt.js b/root/edit/details/RemoveCoverArt.js
index 70ed1b2edd3..66a7dffbab2 100644
--- a/root/edit/details/RemoveCoverArt.js
+++ b/root/edit/details/RemoveCoverArt.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
 import {commaOnlyListText}
@@ -19,7 +17,7 @@ type Props = {
   +edit: RemoveCoverArtEditT,
 };
 
-const RemoveCoverArt = ({edit}: Props): React.Element<'table'> => {
+const RemoveCoverArt = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
 
   return (
diff --git a/root/edit/details/RemoveDiscId.js b/root/edit/details/RemoveDiscId.js
index e0989337e2f..834d2fb77a8 100644
--- a/root/edit/details/RemoveDiscId.js
+++ b/root/edit/details/RemoveDiscId.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CDTocLink from '../../static/scripts/common/components/CDTocLink.js';
 import MediumLink
   from '../../static/scripts/common/components/MediumLink.js';
@@ -17,7 +15,7 @@ type Props = {
   +edit: RemoveDiscIdEditT,
 };
 
-const RemoveDiscId = ({edit}: Props): React.Element<'table'> => {
+const RemoveDiscId = ({edit}: Props): React$Element<'table'> => {
   const medium = edit.display_data.medium;
   const cdToc = edit.display_data.cdtoc;
 
diff --git a/root/edit/details/RemoveEntity.js b/root/edit/details/RemoveEntity.js
index 8cba77abd2a..bc7ac592ea3 100644
--- a/root/edit/details/RemoveEntity.js
+++ b/root/edit/details/RemoveEntity.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
 import {ENTITY_NAMES} from '../../static/scripts/common/constants.js';
@@ -17,7 +15,7 @@ type Props = {
   +edit: RemoveEntityEditT,
 };
 
-const RemoveEntity = ({edit}: Props): React.Element<'table'> => {
+const RemoveEntity = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
 
   return (
diff --git a/root/edit/details/RemoveIsrc.js b/root/edit/details/RemoveIsrc.js
index b2e4d8bcebf..818fcd651c3 100644
--- a/root/edit/details/RemoveIsrc.js
+++ b/root/edit/details/RemoveIsrc.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CodeLink
   from '../../static/scripts/common/components/CodeLink.js';
 import DescriptiveLink
@@ -19,7 +17,7 @@ type Props = {
   +edit: RemoveIsrcEditT,
 };
 
-const RemoveIsrc = ({edit}: Props): React.Element<'table'> => {
+const RemoveIsrc = ({edit}: Props): React$Element<'table'> => {
   const isrc = edit.display_data.isrc;
   const recording = linkedEntities.recording[isrc.recording_id];
 
diff --git a/root/edit/details/RemoveIswc.js b/root/edit/details/RemoveIswc.js
index 196669e235f..bffc4f56e75 100644
--- a/root/edit/details/RemoveIswc.js
+++ b/root/edit/details/RemoveIswc.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CodeLink
   from '../../static/scripts/common/components/CodeLink.js';
 import DescriptiveLink
@@ -19,7 +17,7 @@ type Props = {
   +edit: RemoveIswcEditT,
 };
 
-const RemoveIswc = ({edit}: Props): React.Element<'table'> => {
+const RemoveIswc = ({edit}: Props): React$Element<'table'> => {
   const iswc = edit.display_data.iswc;
   const work = linkedEntities.work[iswc.work_id];
 
diff --git a/root/edit/details/RemoveMedium.js b/root/edit/details/RemoveMedium.js
index bc21f9ebdaa..e22a920d48d 100644
--- a/root/edit/details/RemoveMedium.js
+++ b/root/edit/details/RemoveMedium.js
@@ -33,7 +33,7 @@ const areTracksEqual = (a: TrackT, b: TrackT) => (
 
 const RemoveMedium = ({
   edit,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const display = edit.display_data;
   const originalTracklist = display.tracks ?? [];
   const currentTracklist = display.medium.tracks ?? [];
diff --git a/root/edit/details/RemoveRelationship.js b/root/edit/details/RemoveRelationship.js
index a586bdde4e2..1c38bc2be13 100644
--- a/root/edit/details/RemoveRelationship.js
+++ b/root/edit/details/RemoveRelationship.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Relationship
   from '../../static/scripts/common/components/Relationship.js';
 
@@ -16,7 +14,7 @@ type Props = {
   +edit: RemoveRelationshipEditT,
 };
 
-const RemoveRelationship = ({edit}: Props): React.MixedElement => (
+const RemoveRelationship = ({edit}: Props): React$MixedElement => (
   <table className="details remove-relationship">
     <tr>
       <th>{l('Relationship:')}</th>
diff --git a/root/edit/details/RemoveRelationshipAttribute.js b/root/edit/details/RemoveRelationshipAttribute.js
index e9dcc3c811c..923ed6b6eb5 100644
--- a/root/edit/details/RemoveRelationshipAttribute.js
+++ b/root/edit/details/RemoveRelationshipAttribute.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import IntentionallyRawIcon from '../components/IntentionallyRawIcon.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const RemoveRelationshipAttribute = ({
   edit,
-}: Props): React.Element<'table'> => {
+}: Props): React$Element<'table'> => {
   const display = edit.display_data;
 
   const rawIconSection = (
diff --git a/root/edit/details/RemoveRelationshipType.js b/root/edit/details/RemoveRelationshipType.js
index 14d803b82e6..94622d9cb53 100644
--- a/root/edit/details/RemoveRelationshipType.js
+++ b/root/edit/details/RemoveRelationshipType.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {ENTITY_NAMES} from '../../static/scripts/common/constants.js';
 import IntentionallyRawIcon from '../components/IntentionallyRawIcon.js';
 
@@ -16,7 +14,7 @@ type Props = {
   +edit: RemoveRelationshipTypeEditT,
 };
 
-const RemoveRelationshipType = ({edit}: Props): React.Element<'table'> => {
+const RemoveRelationshipType = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const entity0Type = ENTITY_NAMES[display.entity0_type]();
   const entity1Type = ENTITY_NAMES[display.entity1_type]();
diff --git a/root/edit/details/RemoveReleaseLabel.js b/root/edit/details/RemoveReleaseLabel.js
index 658a9326e26..9eaf1c51dd9 100644
--- a/root/edit/details/RemoveReleaseLabel.js
+++ b/root/edit/details/RemoveReleaseLabel.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
 import EntityLink
@@ -18,7 +16,7 @@ type Props = {
   +edit: RemoveReleaseLabelEditT,
 };
 
-const RemoveReleaseLabel = ({edit}: Props): React.Element<'table'> => {
+const RemoveReleaseLabel = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
 
   return (
diff --git a/root/edit/details/ReorderCoverArt.js b/root/edit/details/ReorderCoverArt.js
index f04d84ec763..c5e6b13fd60 100644
--- a/root/edit/details/ReorderCoverArt.js
+++ b/root/edit/details/ReorderCoverArt.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {Artwork} from '../../components/Artwork.js';
 import DescriptiveLink
   from '../../static/scripts/common/components/DescriptiveLink.js';
@@ -19,7 +17,7 @@ type Props = {
   +edit: ReorderCoverArtEditT,
 };
 
-const ReorderCoverArt = ({edit}: Props): React.Element<'table'> => {
+const ReorderCoverArt = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const oldArt = display.old;
   const newArt = display.new;
diff --git a/root/edit/details/ReorderMediums.js b/root/edit/details/ReorderMediums.js
index 4aa1f541491..b5c2dff01df 100644
--- a/root/edit/details/ReorderMediums.js
+++ b/root/edit/details/ReorderMediums.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink from
   '../../static/scripts/common/components/DescriptiveLink.js';
 
@@ -16,7 +14,7 @@ type Props = {
   +edit: ReorderMediumsEditT,
 };
 
-const ReorderMediums = ({edit}: Props): React.Element<'table'> => {
+const ReorderMediums = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   let isFirstMediumChange = true;
 
diff --git a/root/edit/details/ReorderRelationships.js b/root/edit/details/ReorderRelationships.js
index 6ac4933fdb8..93ec079b67a 100644
--- a/root/edit/details/ReorderRelationships.js
+++ b/root/edit/details/ReorderRelationships.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Relationship
   from '../../static/scripts/common/components/Relationship.js';
 
@@ -16,7 +14,7 @@ type Props = {
   +edit: ReorderRelationshipsEditT,
 };
 
-const ReorderRelationships = ({edit}: Props): React.MixedElement => (
+const ReorderRelationships = ({edit}: Props): React$MixedElement => (
   <table className="details reorder-relationships">
     <tr>
       <th className="align-left wide">{l('Relationship')}</th>
diff --git a/root/edit/details/SetCoverArt.js b/root/edit/details/SetCoverArt.js
index 7bcc0ef6a69..b765e6f9c4e 100644
--- a/root/edit/details/SetCoverArt.js
+++ b/root/edit/details/SetCoverArt.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {Artwork} from '../../components/Artwork.js';
 import * as manifest from '../../static/manifest.mjs';
 import DescriptiveLink
@@ -21,7 +19,7 @@ type Props = {
   +edit: SetCoverArtEditT,
 };
 
-const SetCoverArt = ({edit}: Props): React.Element<'table'> => {
+const SetCoverArt = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const oldArt = display.artwork.old;
   const newArt = display.artwork.new;
diff --git a/root/edit/details/SetTrackLengths.js b/root/edit/details/SetTrackLengths.js
index b288893dee7..2388a79e899 100644
--- a/root/edit/details/SetTrackLengths.js
+++ b/root/edit/details/SetTrackLengths.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CDTocLink from '../../static/scripts/common/components/CDTocLink.js';
 import MediumLink
   from '../../static/scripts/common/components/MediumLink.js';
@@ -23,7 +21,7 @@ type Props = {
   +edit: SetTrackLengthsEditT,
 };
 
-const SetTrackLengths = ({edit}: Props): React.Element<'table'> => {
+const SetTrackLengths = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const medium = display.medium;
   const cdtoc = display.cdtoc;
diff --git a/root/edit/details/historic/AddDiscId.js b/root/edit/details/historic/AddDiscId.js
index 518b00af0b2..3628d5b8379 100644
--- a/root/edit/details/historic/AddDiscId.js
+++ b/root/edit/details/historic/AddDiscId.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CDTocLink
   from '../../../static/scripts/common/components/CDTocLink.js';
 import HistoricReleaseList
@@ -18,7 +16,7 @@ type Props = {
   +edit: AddDiscIdHistoricEditT,
 };
 
-const AddDiscId = ({edit}: Props): React.Element<'table'> => (
+const AddDiscId = ({edit}: Props): React$Element<'table'> => (
   <table className="details add-discid">
     <HistoricReleaseList releases={edit.display_data.releases} />
     <tr>
diff --git a/root/edit/details/historic/AddRelationship.js b/root/edit/details/historic/AddRelationship.js
index a366730303b..3e32bb57cb8 100644
--- a/root/edit/details/historic/AddRelationship.js
+++ b/root/edit/details/historic/AddRelationship.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {HistoricRelationship}
   from '../../../static/scripts/common/components/Relationship.js';
 
@@ -16,7 +14,7 @@ type Props = {
   +edit: AddRelationshipHistoricEditT,
 };
 
-const AddRelationship = ({edit}: Props): React.Element<'table'> => (
+const AddRelationship = ({edit}: Props): React$Element<'table'> => (
   <table className="details add-relationship-historic">
     <tr>
       <th rowSpan="2">{l('Relationships:')}</th>
diff --git a/root/edit/details/historic/AddRelease.js b/root/edit/details/historic/AddRelease.js
index c340fd67a4f..8b42ed27bce 100644
--- a/root/edit/details/historic/AddRelease.js
+++ b/root/edit/details/historic/AddRelease.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityLink
   from '../../../static/scripts/common/components/EntityLink.js';
 import formatDate
@@ -22,7 +20,7 @@ type Props = {
   +edit: AddReleaseHistoricEditT,
 };
 
-const AddRelease = ({edit}: Props): React.Element<'table'> => {
+const AddRelease = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const artist = display.artist;
   const type = display.type;
diff --git a/root/edit/details/historic/AddReleaseAnnotation.js b/root/edit/details/historic/AddReleaseAnnotation.js
index c0510e3cca8..307e8c3e15d 100644
--- a/root/edit/details/historic/AddReleaseAnnotation.js
+++ b/root/edit/details/historic/AddReleaseAnnotation.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import HistoricReleaseList from '../../components/HistoricReleaseList.js';
 
 type Props = {
   +edit: AddReleaseAnnotationHistoricEditT,
 };
 
-const AddReleaseAnnotation = ({edit}: Props): React.Element<'table'> => {
+const AddReleaseAnnotation = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
 
   return (
diff --git a/root/edit/details/historic/AddTrackKV.js b/root/edit/details/historic/AddTrackKV.js
index 089aac2b17c..5156e34eb5b 100644
--- a/root/edit/details/historic/AddTrackKV.js
+++ b/root/edit/details/historic/AddTrackKV.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityLink
   from '../../../static/scripts/common/components/EntityLink.js';
 import formatTrackLength
@@ -20,7 +18,7 @@ type Props = {
   +edit: AddTrackKVHistoricEditT,
 };
 
-const AddTrackKV = ({edit}: Props): React.Element<'table'> => {
+const AddTrackKV = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const artist = display.artist;
 
diff --git a/root/edit/details/historic/AddTrackOld.js b/root/edit/details/historic/AddTrackOld.js
index ebd1b5b403a..3c2a2f54e17 100644
--- a/root/edit/details/historic/AddTrackOld.js
+++ b/root/edit/details/historic/AddTrackOld.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import HistoricReleaseList
   from '../../components/HistoricReleaseList.js';
 
@@ -16,7 +14,7 @@ type Props = {
   +edit: AddTrackOldHistoricEditT,
 };
 
-const AddTrackOld = ({edit}: Props): React.Element<'table'> => (
+const AddTrackOld = ({edit}: Props): React$Element<'table'> => (
   <table className="details add-track">
     <HistoricReleaseList releases={edit.display_data.releases} />
 
diff --git a/root/edit/details/historic/ChangeArtistQuality.js b/root/edit/details/historic/ChangeArtistQuality.js
index ec35ed5779f..6a5c8f6c997 100644
--- a/root/edit/details/historic/ChangeArtistQuality.js
+++ b/root/edit/details/historic/ChangeArtistQuality.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../../static/scripts/common/components/DescriptiveLink.js';
 import {QUALITY_NAMES} from '../../../static/scripts/common/constants.js';
@@ -17,7 +15,7 @@ type Props = {
   +edit: ChangeArtistQualityHistoricEditT,
 };
 
-const ChangeArtistQuality = ({edit}: Props): React.Element<'table'> => {
+const ChangeArtistQuality = ({edit}: Props): React$Element<'table'> => {
   const oldQuality = QUALITY_NAMES.get(edit.display_data.quality.old);
   const newQuality = QUALITY_NAMES.get(edit.display_data.quality.new);
   return (
diff --git a/root/edit/details/historic/ChangeReleaseArtist.js b/root/edit/details/historic/ChangeReleaseArtist.js
index 704f9697337..e2040ec4989 100644
--- a/root/edit/details/historic/ChangeReleaseArtist.js
+++ b/root/edit/details/historic/ChangeReleaseArtist.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../../static/scripts/common/components/DescriptiveLink.js';
 import HistoricReleaseList from '../../components/HistoricReleaseList.js';
@@ -17,7 +15,7 @@ type Props = {
   +edit: ChangeReleaseArtistHistoricEditT,
 };
 
-const ChangeReleaseArtist = ({edit}: Props): React.Element<'table'> => (
+const ChangeReleaseArtist = ({edit}: Props): React$Element<'table'> => (
   <table className="details change-release-artist">
     <HistoricReleaseList
       colSpan="2"
diff --git a/root/edit/details/historic/ChangeReleaseGroup.js b/root/edit/details/historic/ChangeReleaseGroup.js
index 78d368b1eec..d8c51f0489a 100644
--- a/root/edit/details/historic/ChangeReleaseGroup.js
+++ b/root/edit/details/historic/ChangeReleaseGroup.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../../static/scripts/common/components/DescriptiveLink.js';
 import HistoricReleaseList from '../../components/HistoricReleaseList.js';
@@ -17,7 +15,7 @@ type Props = {
   +edit: ChangeReleaseGroupHistoricEditT,
 };
 
-const ChangeReleaseGroup = ({edit}: Props): React.Element<'table'> => (
+const ChangeReleaseGroup = ({edit}: Props): React$Element<'table'> => (
   <table className="details change-release-group">
     <HistoricReleaseList
       colSpan="2"
diff --git a/root/edit/details/historic/ChangeReleaseQuality.js b/root/edit/details/historic/ChangeReleaseQuality.js
index 261b88d358c..2f96b840423 100644
--- a/root/edit/details/historic/ChangeReleaseQuality.js
+++ b/root/edit/details/historic/ChangeReleaseQuality.js
@@ -17,7 +17,7 @@ type Props = {
   +edit: ChangeReleaseQualityHistoricEditT,
 };
 
-const ChangeReleaseQuality = ({edit}: Props): React.Element<'table'> => (
+const ChangeReleaseQuality = ({edit}: Props): React$Element<'table'> => (
   <table className="details change-release-quality">
     {edit.display_data.changes.map((change, index) => {
       const oldQuality = QUALITY_NAMES.get(change.quality.old);
diff --git a/root/edit/details/historic/EditRelationship.js b/root/edit/details/historic/EditRelationship.js
index 67e75b5141e..b90be355580 100644
--- a/root/edit/details/historic/EditRelationship.js
+++ b/root/edit/details/historic/EditRelationship.js
@@ -31,7 +31,7 @@ type Props = {
 
 const EditRelationship = ({
   edit,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const oldRels = edit.display_data.relationship.old;
   const newRels = edit.display_data.relationship.new;
   const isDataBroken = oldRels.length !== newRels.length;
diff --git a/root/edit/details/historic/EditReleaseAttributes.js b/root/edit/details/historic/EditReleaseAttributes.js
index fee53f8867c..287b28c643b 100644
--- a/root/edit/details/historic/EditReleaseAttributes.js
+++ b/root/edit/details/historic/EditReleaseAttributes.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {HistoricReleaseListContent}
   from '../../components/HistoricReleaseList.js';
 
@@ -30,7 +28,7 @@ function getTypeName(
   ) : '?';
 }
 
-const EditReleaseAttributes = ({edit}: Props): React.Element<'table'> => (
+const EditReleaseAttributes = ({edit}: Props): React$Element<'table'> => (
   <table className="details edit-release">
     <tr>
       <th>{l('Old:')}</th>
diff --git a/root/edit/details/historic/EditReleaseEvents.js b/root/edit/details/historic/EditReleaseEvents.js
index 19dc86a8375..47a412089a7 100644
--- a/root/edit/details/historic/EditReleaseEvents.js
+++ b/root/edit/details/historic/EditReleaseEvents.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityLink, {DeletedLink}
   from '../../../static/scripts/common/components/EntityLink.js';
 import formatDate from '../../../static/scripts/common/utility/formatDate.js';
@@ -20,7 +18,7 @@ type Props = {
 function buildEventComp(
   event: OldReleaseEventCompT,
   key: string,
-): React.Element<'tr'> {
+): React$Element<'tr'> {
   return (
     <tr key={key}>
       <td>
@@ -77,7 +75,7 @@ function buildEventComp(
 function buildEvent(
   event: OldReleaseEventT,
   key: string,
-): React.Element<'tr'> {
+): React$Element<'tr'> {
   return (
     <tr key={key}>
       <td>
@@ -103,7 +101,7 @@ function buildEvent(
   );
 }
 
-const EditReleaseEvents = ({edit}: Props): React.Element<'table'> => (
+const EditReleaseEvents = ({edit}: Props): React$Element<'table'> => (
   <table className="tbl edit-release-events">
     <thead>
       <tr>
diff --git a/root/edit/details/historic/EditReleaseLanguage.js b/root/edit/details/historic/EditReleaseLanguage.js
index 61516a1f703..7892d811eff 100644
--- a/root/edit/details/historic/EditReleaseLanguage.js
+++ b/root/edit/details/historic/EditReleaseLanguage.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {HistoricReleaseListContent}
   from '../../components/HistoricReleaseList.js';
 
@@ -16,7 +14,7 @@ type Props = {
   +edit: EditReleaseLanguageHistoricEditT,
 };
 
-const EditReleaseLanguage = ({edit}: Props): React.Element<'table'> => (
+const EditReleaseLanguage = ({edit}: Props): React$Element<'table'> => (
   <table className="details edit-release">
     <tr>
       <th>{l('Old:')}</th>
diff --git a/root/edit/details/historic/EditReleaseName.js b/root/edit/details/historic/EditReleaseName.js
index 4a83bf9aa45..260e9382a19 100644
--- a/root/edit/details/historic/EditReleaseName.js
+++ b/root/edit/details/historic/EditReleaseName.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import WordDiff
   from '../../../static/scripts/edit/components/edit/WordDiff.js';
 import HistoricReleaseList from '../../components/HistoricReleaseList.js';
@@ -17,7 +15,7 @@ type Props = {
   +edit: EditReleaseNameHistoricEditT,
 };
 
-const EditReleaseName = ({edit}: Props): React.Element<'table'> => (
+const EditReleaseName = ({edit}: Props): React$Element<'table'> => (
   <table className="details edit-release">
     <HistoricReleaseList colSpan="2" releases={edit.display_data.releases} />
     <WordDiff
diff --git a/root/edit/details/historic/EditTrack.js b/root/edit/details/historic/EditTrack.js
index dfcd65b33a8..5c505d27ccb 100644
--- a/root/edit/details/historic/EditTrack.js
+++ b/root/edit/details/historic/EditTrack.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../../static/scripts/common/components/DescriptiveLink.js';
 import WordDiff
@@ -18,7 +16,7 @@ type Props = {
   +edit: EditTrackHistoricEditT,
 };
 
-const EditTrack = ({edit}: Props): React.Element<'table'> => {
+const EditTrack = ({edit}: Props): React$Element<'table'> => {
   const display = edit.display_data;
   const artist = display.artist;
   const position = display.position;
diff --git a/root/edit/details/historic/MergeReleases.js b/root/edit/details/historic/MergeReleases.js
index d42636df3a6..3de7aca5f2c 100644
--- a/root/edit/details/historic/MergeReleases.js
+++ b/root/edit/details/historic/MergeReleases.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../../static/scripts/common/components/DescriptiveLink.js';
 import yesNo from '../../../static/scripts/common/utility/yesNo.js';
@@ -17,7 +15,7 @@ type Props = {
   +edit: MergeReleasesHistoricEditT,
 };
 
-const MergeReleases = ({edit}: Props): React.MixedElement => (
+const MergeReleases = ({edit}: Props): React$MixedElement => (
   <>
     <table className="details merge-releases">
       <tr>
diff --git a/root/edit/details/historic/MoveDiscId.js b/root/edit/details/historic/MoveDiscId.js
index 1f32ab279ec..dafacc5a0ed 100644
--- a/root/edit/details/historic/MoveDiscId.js
+++ b/root/edit/details/historic/MoveDiscId.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CDTocLink
   from '../../../static/scripts/common/components/CDTocLink.js';
 import HistoricReleaseList from '../../components/HistoricReleaseList.js';
@@ -17,7 +15,7 @@ type Props = {
   +edit: MoveDiscIdHistoricEditT,
 };
 
-const MoveDiscId = ({edit}: Props): React.Element<'table'> => (
+const MoveDiscId = ({edit}: Props): React$Element<'table'> => (
   <table className="details move-discid">
     <tr>
       <th>{l('Disc ID:')}</th>
diff --git a/root/edit/details/historic/MoveRelease.js b/root/edit/details/historic/MoveRelease.js
index f2f9e31a843..589572d486c 100644
--- a/root/edit/details/historic/MoveRelease.js
+++ b/root/edit/details/historic/MoveRelease.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../../static/scripts/common/components/DescriptiveLink.js';
 import yesNo from '../../../static/scripts/common/utility/yesNo.js';
@@ -18,7 +16,7 @@ type Props = {
   +edit: MoveReleaseHistoricEditT,
 };
 
-const MoveRelease = ({edit}: Props): React.Element<'table'> => (
+const MoveRelease = ({edit}: Props): React$Element<'table'> => (
   <table className="details edit-release">
     <HistoricReleaseList
       colSpan="2"
diff --git a/root/edit/details/historic/MoveReleaseToReleaseGroup.js b/root/edit/details/historic/MoveReleaseToReleaseGroup.js
index 4d6915c8297..03cf93a839a 100644
--- a/root/edit/details/historic/MoveReleaseToReleaseGroup.js
+++ b/root/edit/details/historic/MoveReleaseToReleaseGroup.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../../static/scripts/common/components/DescriptiveLink.js';
 
@@ -18,7 +16,7 @@ type Props = {
 
 const MoveReleaseToReleaseGroup = ({
   edit,
-}: Props): React.Element<'table'> => (
+}: Props): React$Element<'table'> => (
   <table className="details edit-release">
     <tr>
       <th>{l('Release:')}</th>
diff --git a/root/edit/details/historic/RemoveDiscId.js b/root/edit/details/historic/RemoveDiscId.js
index 2d3d884d52a..dfeeac85c53 100644
--- a/root/edit/details/historic/RemoveDiscId.js
+++ b/root/edit/details/historic/RemoveDiscId.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CDTocLink
   from '../../../static/scripts/common/components/CDTocLink.js';
 import HistoricReleaseList
@@ -18,7 +16,7 @@ type Props = {
   +edit: RemoveDiscIdHistoricEditT,
 };
 
-const RemoveDiscId = ({edit}: Props): React.Element<'table'> => (
+const RemoveDiscId = ({edit}: Props): React$Element<'table'> => (
   <table className="details remove-discid">
     <HistoricReleaseList releases={edit.display_data.releases} />
     <tr>
diff --git a/root/edit/details/historic/RemoveLabelAlias.js b/root/edit/details/historic/RemoveLabelAlias.js
index be3a6a5e47b..cef699a5f40 100644
--- a/root/edit/details/historic/RemoveLabelAlias.js
+++ b/root/edit/details/historic/RemoveLabelAlias.js
@@ -7,13 +7,11 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 type Props = {
   +edit: RemoveLabelAliasHistoricEditT,
 };
 
-const RemoveLabelAlias = ({edit}: Props): React.Element<'table'> => (
+const RemoveLabelAlias = ({edit}: Props): React$Element<'table'> => (
   <table className="details remove-label-alias">
     <tr>
       <th>{l('Alias:')}</th>
diff --git a/root/edit/details/historic/RemoveRelationship.js b/root/edit/details/historic/RemoveRelationship.js
index d8af5522596..dd118bc0494 100644
--- a/root/edit/details/historic/RemoveRelationship.js
+++ b/root/edit/details/historic/RemoveRelationship.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {HistoricRelationship}
   from '../../../static/scripts/common/components/Relationship.js';
 
@@ -16,7 +14,7 @@ type Props = {
   +edit: RemoveRelationshipHistoricEditT,
 };
 
-const RemoveRelationship = ({edit}: Props): React.Element<'table'> => (
+const RemoveRelationship = ({edit}: Props): React$Element<'table'> => (
   <table className="details remove-relationship-historic">
     <tr>
       {edit.display_data.relationships.length ? (
diff --git a/root/edit/details/historic/RemoveRelease.js b/root/edit/details/historic/RemoveRelease.js
index 116ca973cda..66c3f7c221c 100644
--- a/root/edit/details/historic/RemoveRelease.js
+++ b/root/edit/details/historic/RemoveRelease.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistCreditLink
   from '../../../static/scripts/common/components/ArtistCreditLink.js';
 import HistoricReleaseList
@@ -18,7 +16,7 @@ type Props = {
   +edit: RemoveReleaseHistoricEditT,
 };
 
-const RemoveRelease = ({edit}: Props): React.Element<'table'> => {
+const RemoveRelease = ({edit}: Props): React$Element<'table'> => {
   const artistCredit = edit.display_data.artist_credit;
   return (
     <table className="details remove-release">
diff --git a/root/edit/details/historic/RemoveReleases.js b/root/edit/details/historic/RemoveReleases.js
index ac273de41ff..8a4089d29a8 100644
--- a/root/edit/details/historic/RemoveReleases.js
+++ b/root/edit/details/historic/RemoveReleases.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../../static/scripts/common/components/DescriptiveLink.js';
 
@@ -16,7 +14,7 @@ type Props = {
   +edit: RemoveReleasesHistoricEditT,
 };
 
-const RemoveReleases = ({edit}: Props): React.Element<'table'> => (
+const RemoveReleases = ({edit}: Props): React$Element<'table'> => (
   <table className="details remove-releases">
     <tr>
       <th>{l('Releases:')}</th>
diff --git a/root/edit/details/historic/RemoveTrack.js b/root/edit/details/historic/RemoveTrack.js
index d2c90cd3b24..f92875796c1 100644
--- a/root/edit/details/historic/RemoveTrack.js
+++ b/root/edit/details/historic/RemoveTrack.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink
   from '../../../static/scripts/common/components/DescriptiveLink.js';
 import HistoricReleaseList
@@ -18,7 +16,7 @@ type Props = {
   +edit: RemoveTrackHistoricEditT,
 };
 
-const RemoveTrack = ({edit}: Props): React.Element<'table'> => (
+const RemoveTrack = ({edit}: Props): React$Element<'table'> => (
   <table className="details remove-track">
     <HistoricReleaseList releases={edit.display_data.releases} />
     <tr>
diff --git a/root/elections/ElectionDetails.js b/root/elections/ElectionDetails.js
index 7730ad9807d..cbefaaa418e 100644
--- a/root/elections/ElectionDetails.js
+++ b/root/elections/ElectionDetails.js
@@ -20,7 +20,7 @@ type PropsT = {
   +election: AutoEditorElectionT,
 };
 
-const ElectionDetails = ({election}: PropsT): React.MixedElement => {
+const ElectionDetails = ({election}: PropsT): React$MixedElement => {
   const $c = React.useContext(CatalystContext);
   return (
     <>
diff --git a/root/elections/ElectionTable/ElectionTableRows.js b/root/elections/ElectionTable/ElectionTableRows.js
index f1dbdee6002..25fec2d5632 100644
--- a/root/elections/ElectionTable/ElectionTableRows.js
+++ b/root/elections/ElectionTable/ElectionTableRows.js
@@ -22,7 +22,7 @@ type RowProps = {
 const ElectionTableRow = ({
   election,
   index,
-}: RowProps): React.Element<'tr'> => {
+}: RowProps): React$Element<'tr'> => {
   const $c = React.useContext(CatalystContext);
   return (
     <tr className={index % 2 ? 'even' : 'odd'}>
@@ -68,7 +68,7 @@ type Props = {
 
 const ElectionTableRows = ({
   elections,
-}: Props): $ReadOnlyArray<React.Element<typeof ElectionTableRow>> => (
+}: Props): $ReadOnlyArray<React$Element<typeof ElectionTableRow>> => (
   elections.map((election, index) => (
     <ElectionTableRow
       election={election}
diff --git a/root/elections/ElectionTable/index.js b/root/elections/ElectionTable/index.js
index 61bb140b1b9..cdd2c0f86cd 100644
--- a/root/elections/ElectionTable/index.js
+++ b/root/elections/ElectionTable/index.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Rows from './ElectionTableRows.js';
 
 type PropsT = {
@@ -17,7 +15,7 @@ type PropsT = {
 
 const ElectionTable = ({
   elections,
-}: PropsT): React.Element<'table'> => (
+}: PropsT): React$Element<'table'> => (
   <table className="tbl" style={{width: 'auto'}}>
     <thead>
       <tr>
diff --git a/root/elections/ElectionVotes.js b/root/elections/ElectionVotes.js
index 30f1f2fbc58..ad6c0f3a0ce 100644
--- a/root/elections/ElectionVotes.js
+++ b/root/elections/ElectionVotes.js
@@ -17,7 +17,7 @@ type PropsT = {
   +election: AutoEditorElectionT,
 };
 
-const ElectionVotes = ({election}: PropsT): React.Element<'table'> => {
+const ElectionVotes = ({election}: PropsT): React$Element<'table'> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <table className="tbl" style={{width: 'auto'}}>
diff --git a/root/elections/ElectionVoting.js b/root/elections/ElectionVoting.js
index acb3aed2042..6c95310bb44 100644
--- a/root/elections/ElectionVoting.js
+++ b/root/elections/ElectionVoting.js
@@ -20,7 +20,7 @@ type PropsT = {
   +election: AutoEditorElectionT,
 };
 
-const ElectionVoting = ({election}: PropsT): React.MixedElement => {
+const ElectionVoting = ({election}: PropsT): React$MixedElement => {
   const $c = React.useContext(CatalystContext);
   let message = exp.l(
     'To find out if you can vote for this candidate, please {url|log in}.',
diff --git a/root/elections/Index.js b/root/elections/Index.js
index 7a8fce4fa3a..caf028d689e 100644
--- a/root/elections/Index.js
+++ b/root/elections/Index.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 
 import ElectionTable from './ElectionTable/index.js';
@@ -17,7 +15,7 @@ type Props = {
   +elections: $ReadOnlyArray<AutoEditorElectionT>,
 };
 
-const Index = ({elections}: Props): React.Element<typeof Layout> => (
+const Index = ({elections}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Auto-editor elections')}>
     <h1>{l('Auto-editor elections')}</h1>
     {elections.length
diff --git a/root/elections/Nominate.js b/root/elections/Nominate.js
index 2595994557c..d258191f015 100644
--- a/root/elections/Nominate.js
+++ b/root/elections/Nominate.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ConfirmLayout from '../components/ConfirmLayout.js';
 import EditorLink from '../static/scripts/common/components/EditorLink.js';
 
@@ -20,7 +18,7 @@ type Props = {
 const Nominate = ({
   candidate,
   form,
-}: Props): React.Element<typeof ConfirmLayout> => (
+}: Props): React$Element<typeof ConfirmLayout> => (
   <ConfirmLayout
     form={form}
     question={exp.l(
diff --git a/root/elections/Show.js b/root/elections/Show.js
index e6cbdbc6a47..89f74356696 100644
--- a/root/elections/Show.js
+++ b/root/elections/Show.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 
 import ElectionDetails from './ElectionDetails.js';
@@ -19,7 +17,7 @@ type Props = {
   +election: AutoEditorElectionT,
 };
 
-const Show = ({election}: Props): React.Element<typeof Layout> | null => {
+const Show = ({election}: Props): React$Element<typeof Layout> | null => {
   if (!election) {
     return null;
   }
diff --git a/root/entity/Aliases.js b/root/entity/Aliases.js
index 5140f0ed0cb..6f2d9883521 100644
--- a/root/entity/Aliases.js
+++ b/root/entity/Aliases.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistCreditList from '../components/Aliases/ArtistCreditList.js';
 import AliasesComponent from '../components/Aliases/index.js';
 import chooseLayoutComponent from '../utility/chooseLayoutComponent.js';
@@ -23,7 +21,7 @@ const Aliases = ({
   aliases,
   artistCredits,
   entity,
-}: Props): React.MixedElement => {
+}: Props): React$MixedElement => {
   const entityType = entity.entityType;
   const LayoutComponent = chooseLayoutComponent(entityType);
 
diff --git a/root/entity/Details.js b/root/entity/Details.js
index 6f5c84ef9c3..7ecc01e4789 100644
--- a/root/entity/Details.js
+++ b/root/entity/Details.js
@@ -74,7 +74,7 @@ const WSLink = ({
 
 const Details = ({
   entity,
-}: DetailsProps): React.MixedElement => {
+}: DetailsProps): React$MixedElement => {
   const $c = React.useContext(CatalystContext);
   const entityType = entity.entityType;
   const entityProperties = ENTITIES[entityType];
diff --git a/root/entity/Edits.js b/root/entity/Edits.js
index b0e0c0f7fdc..37192beb289 100644
--- a/root/entity/Edits.js
+++ b/root/entity/Edits.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import SubHeader from '../components/SubHeader.js';
 import EditList from '../edit/components/EditList.js';
 import Layout from '../layout/index.js';
@@ -35,7 +33,7 @@ const Edits = ({
   pager,
   refineUrlArgs,
   showingOpenOnly,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const entityTypeClass = entity.entityType === 'release_group'
     ? 'rg'
     : entity.entityType;
diff --git a/root/entity/NotFound.js b/root/entity/NotFound.js
index 0401bdea22e..3883e17a7d9 100644
--- a/root/entity/NotFound.js
+++ b/root/entity/NotFound.js
@@ -8,8 +8,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import NotFoundComponent from '../components/NotFound.js';
 import expand2react from '../static/scripts/common/i18n/expand2react.js';
 
@@ -240,7 +238,7 @@ type Props = {
 
 const NotFound = ({
   namespace,
-}: Props): React.Element<typeof NotFoundComponent> => {
+}: Props): React$Element<typeof NotFoundComponent> => {
   const parameters = notFoundPages[namespace];
   return (
     <NotFoundComponent title={parameters.title()}>
diff --git a/root/entity/Ratings.js b/root/entity/Ratings.js
index 83e6f1ff372..b1824e2244d 100644
--- a/root/entity/Ratings.js
+++ b/root/entity/Ratings.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CritiqueBrainzLinks from '../components/CritiqueBrainzLinks.js';
 import * as manifest from '../static/manifest.mjs';
 import CritiqueBrainzReview
@@ -35,7 +33,7 @@ const Ratings = ({
   mostRecentReview,
   privateRatingCount,
   publicRatings,
-}: Props): React.MixedElement => {
+}: Props): React$MixedElement => {
   const entityType = entity.entityType;
   const entityProperties = ENTITIES[entity.entityType];
   const LayoutComponent = chooseLayoutComponent(entityType);
diff --git a/root/entity/Subscribers.js b/root/entity/Subscribers.js
index 0cab652c9ac..4ff15ffd88c 100644
--- a/root/entity/Subscribers.js
+++ b/root/entity/Subscribers.js
@@ -29,7 +29,7 @@ const Subscribers = ({
   privateEditors,
   publicEditors,
   subscribed,
-}: Props): React.MixedElement => {
+}: Props): React$MixedElement => {
   const $c = React.useContext(SanitizedCatalystContext);
   const entityType = entity.entityType;
   const LayoutComponent = chooseLayoutComponent(entityType);
diff --git a/root/entity/Tags.js b/root/entity/Tags.js
index 1880723acf2..009055edd06 100644
--- a/root/entity/Tags.js
+++ b/root/entity/Tags.js
@@ -26,7 +26,7 @@ const Tags = ({
   entity,
   moreTags,
   userTags,
-}: Props): React.MixedElement => {
+}: Props): React$MixedElement => {
   const $c = React.useContext(CatalystContext);
   const entityType = entity.entityType;
   const LayoutComponent = chooseLayoutComponent(entityType);
diff --git a/root/entity/alias/AddOrEditAlias.js b/root/entity/alias/AddOrEditAlias.js
index 6d65827a3e3..9570ac41cb6 100644
--- a/root/entity/alias/AddOrEditAlias.js
+++ b/root/entity/alias/AddOrEditAlias.js
@@ -8,8 +8,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import * as manifest from '../../static/manifest.mjs';
 import AliasEditForm from '../../static/scripts/alias/AliasEditForm.js';
 import {ENTITIES} from '../../static/scripts/common/constants.js';
@@ -33,7 +31,7 @@ const AddOrEditAlias = ({
   formType,
   locales,
   type,
-}: Props): React.MixedElement => {
+}: Props): React$MixedElement => {
   const LayoutComponent = chooseLayoutComponent(type);
   const header = formType === 'add'
     ? l('Add alias')
diff --git a/root/entity/alias/DeleteAlias.js b/root/entity/alias/DeleteAlias.js
index cf86f2c013f..8c49f39ccb6 100644
--- a/root/entity/alias/DeleteAlias.js
+++ b/root/entity/alias/DeleteAlias.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EnterEdit from '../../static/scripts/edit/components/EnterEdit.js';
 import EnterEditNote
   from '../../static/scripts/edit/components/EnterEditNote.js';
@@ -28,7 +26,7 @@ const DeleteAlias = ({
   entity,
   form,
   type,
-}: Props): React.MixedElement => {
+}: Props): React$MixedElement => {
   const LayoutComponent = chooseLayoutComponent(type);
   const header = l('Remove alias');
 
diff --git a/root/event/EventHeader.js b/root/event/EventHeader.js
index ede0d4d024e..b379d1ead89 100644
--- a/root/event/EventHeader.js
+++ b/root/event/EventHeader.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityHeader from '../components/EntityHeader.js';
 import localizeTypeNameForEntity
   from '../static/scripts/common/i18n/localizeTypeNameForEntity.js';
@@ -21,7 +19,7 @@ type Props = {
 const EventHeader = ({
   event,
   page,
-}: Props): React.Element<typeof EntityHeader> => (
+}: Props): React$Element<typeof EntityHeader> => (
   <EntityHeader
     entity={event}
     headerClass="eventheader"
diff --git a/root/event/EventIndex.js b/root/event/EventIndex.js
index 59938b68f42..3789a068a30 100644
--- a/root/event/EventIndex.js
+++ b/root/event/EventIndex.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CleanupBanner from '../components/CleanupBanner.js';
 import * as manifest from '../static/manifest.mjs';
 import Annotation from '../static/scripts/common/components/Annotation.js';
@@ -32,7 +30,7 @@ const EventIndex = ({
   event,
   numberOfRevisions,
   wikipediaExtract,
-}: Props): React.Element<typeof EventLayout> => {
+}: Props): React$Element<typeof EventLayout> => {
   const setlist = event.setlist;
 
   return (
diff --git a/root/event/EventLayout.js b/root/event/EventLayout.js
index 74aa09ff9cf..7077d1985d5 100644
--- a/root/event/EventLayout.js
+++ b/root/event/EventLayout.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EventSidebar from '../layout/components/sidebar/EventSidebar.js';
 import Layout from '../layout/index.js';
 
 import EventHeader from './EventHeader.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +entity: EventT,
   +fullWidth?: boolean,
   +page: string,
@@ -28,7 +26,7 @@ const EventLayout = ({
   fullWidth = false,
   page,
   title,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout
     title={nonEmpty(title) ? hyphenateTitle(event.name, title) : event.name}
   >
diff --git a/root/event/EventMerge.js b/root/event/EventMerge.js
index a5ff668ca66..074d3b34ab9 100644
--- a/root/event/EventMerge.js
+++ b/root/event/EventMerge.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EventList from '../components/list/EventList.js';
 import Layout from '../layout/index.js';
 import sortByEntityName
@@ -26,7 +24,7 @@ type Props = {
 const EventMerge = ({
   form,
   toMerge,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Merge events')}>
     <div id="content">
       <h1>{l('Merge events')}</h1>
diff --git a/root/genre/CreateGenre.js b/root/genre/CreateGenre.js
index 85340d5d940..4b07a7de27a 100644
--- a/root/genre/CreateGenre.js
+++ b/root/genre/CreateGenre.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import * as manifest from '../static/manifest.mjs';
 import GenreEditForm
@@ -22,7 +20,7 @@ type Props = {
 
 const CreateGenre = ({
   form,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Add a new genre')}>
     <div id="content">
       <h1>{l('Add a new genre')}</h1>
diff --git a/root/genre/DeleteGenre.js b/root/genre/DeleteGenre.js
index 18119c8cda5..a7874f6a615 100644
--- a/root/genre/DeleteGenre.js
+++ b/root/genre/DeleteGenre.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityLink from '../static/scripts/common/components/EntityLink.js';
 import EnterEdit from '../static/scripts/edit/components/EnterEdit.js';
 import EnterEditNote
@@ -25,7 +23,7 @@ type Props = {
 const DeleteGenre = ({
   entity: genre,
   form,
-}: Props): React.Element<typeof GenreLayout> => (
+}: Props): React$Element<typeof GenreLayout> => (
   <GenreLayout
     entity={genre}
     fullWidth
diff --git a/root/genre/EditGenre.js b/root/genre/EditGenre.js
index 502512a0d73..05845cd9b69 100644
--- a/root/genre/EditGenre.js
+++ b/root/genre/EditGenre.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import * as manifest from '../static/manifest.mjs';
 import GenreEditForm
   from '../static/scripts/genre/components/GenreEditForm.js';
@@ -24,7 +22,7 @@ type Props = {
 const EditGenre = ({
   entity,
   form,
-}: Props): React.Element<typeof GenreLayout> => (
+}: Props): React$Element<typeof GenreLayout> => (
   <GenreLayout
     entity={entity}
     fullWidth
diff --git a/root/genre/GenreHeader.js b/root/genre/GenreHeader.js
index 3d5ce9677f3..236292b3277 100644
--- a/root/genre/GenreHeader.js
+++ b/root/genre/GenreHeader.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityHeader from '../components/EntityHeader.js';
 import EntityLink from '../static/scripts/common/components/EntityLink.js';
 
@@ -20,7 +18,7 @@ type Props = {
 const GenreHeader = ({
   genre,
   page,
-}: Props): React.Element<typeof EntityHeader> => (
+}: Props): React$Element<typeof EntityHeader> => (
   <EntityHeader
     entity={genre}
     headerClass="genreheader"
diff --git a/root/genre/GenreIndex.js b/root/genre/GenreIndex.js
index f7a5d80f42b..72ce3edd849 100644
--- a/root/genre/GenreIndex.js
+++ b/root/genre/GenreIndex.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import * as manifest from '../static/manifest.mjs';
 import Annotation from '../static/scripts/common/components/Annotation.js';
 import Relationships
@@ -29,7 +27,7 @@ const GenreIndex = ({
   genre,
   numberOfRevisions,
   wikipediaExtract,
-}: Props): React.Element<typeof GenreLayout> => (
+}: Props): React$Element<typeof GenreLayout> => (
   <GenreLayout
     entity={genre}
     page="index"
diff --git a/root/genre/GenreLayout.js b/root/genre/GenreLayout.js
index d8b5bc641b1..4c27e79a9a2 100644
--- a/root/genre/GenreLayout.js
+++ b/root/genre/GenreLayout.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import GenreSidebar from '../layout/components/sidebar/GenreSidebar.js';
 import Layout from '../layout/index.js';
 
 import GenreHeader from './GenreHeader.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +entity: GenreT,
   +fullWidth?: boolean,
   +page: string,
@@ -28,7 +26,7 @@ const GenreLayout = ({
   fullWidth = false,
   page,
   title,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout
     title={nonEmpty(title) ? hyphenateTitle(genre.name, title) : genre.name}
   >
diff --git a/root/genre/GenreListPage.js b/root/genre/GenreListPage.js
index 70632d4e565..51e2ea09e50 100644
--- a/root/genre/GenreListPage.js
+++ b/root/genre/GenreListPage.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import EntityLink from '../static/scripts/common/components/EntityLink.js';
 
@@ -18,7 +16,7 @@ type PropsT = {
 
 const GenreListPage = ({
   genres,
-}: PropsT): React.Element<typeof Layout> => (
+}: PropsT): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Genre List')}>
     <div id="content">
       <h1>{l('Genre List')}</h1>
diff --git a/root/instrument/InstrumentArtists.js b/root/instrument/InstrumentArtists.js
index 729f8460563..a50ab6a15d0 100644
--- a/root/instrument/InstrumentArtists.js
+++ b/root/instrument/InstrumentArtists.js
@@ -28,7 +28,7 @@ const InstrumentArtists = ({
   instrument,
   instrumentCreditsAndRelTypes,
   pager,
-}: Props): React.Element<typeof InstrumentLayout> => {
+}: Props): React$Element<typeof InstrumentLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <InstrumentLayout
diff --git a/root/instrument/InstrumentHeader.js b/root/instrument/InstrumentHeader.js
index 03946b11290..5d0609ed34d 100644
--- a/root/instrument/InstrumentHeader.js
+++ b/root/instrument/InstrumentHeader.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityHeader from '../components/EntityHeader.js';
 import localizeTypeNameForEntity
   from '../static/scripts/common/i18n/localizeTypeNameForEntity.js';
@@ -21,7 +19,7 @@ type Props = {
 const InstrumentHeader = ({
   instrument,
   page,
-}: Props): React.Element<typeof EntityHeader> => (
+}: Props): React$Element<typeof EntityHeader> => (
   <EntityHeader
     entity={instrument}
     headerClass="instrumentheader"
diff --git a/root/instrument/InstrumentIndex.js b/root/instrument/InstrumentIndex.js
index bb8a877247c..49d1a48fa49 100644
--- a/root/instrument/InstrumentIndex.js
+++ b/root/instrument/InstrumentIndex.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import * as manifest from '../static/manifest.mjs';
 import Annotation from '../static/scripts/common/components/Annotation.js';
 import Relationships
@@ -29,7 +27,7 @@ const InstrumentIndex = ({
   instrument,
   numberOfRevisions,
   wikipediaExtract,
-}: Props): React.Element<typeof InstrumentLayout> => (
+}: Props): React$Element<typeof InstrumentLayout> => (
   <InstrumentLayout entity={instrument} page="index">
     {instrument.description ? (
       <>
diff --git a/root/instrument/InstrumentLayout.js b/root/instrument/InstrumentLayout.js
index e9e28c7014b..d32871737a7 100644
--- a/root/instrument/InstrumentLayout.js
+++ b/root/instrument/InstrumentLayout.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import InstrumentSidebar
   from '../layout/components/sidebar/InstrumentSidebar.js';
 import Layout from '../layout/index.js';
@@ -18,7 +16,7 @@ import localizeInstrumentName
 import InstrumentHeader from './InstrumentHeader.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +entity: InstrumentT,
   +fullWidth?: boolean,
   +page: string,
@@ -31,7 +29,7 @@ const InstrumentLayout = ({
   fullWidth = false,
   page,
   title,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const nameWithType = texp.l('{type} “{instrument}”', {
     instrument: localizeInstrumentName(instrument),
     type: nonEmpty(instrument.typeName)
diff --git a/root/instrument/InstrumentMerge.js b/root/instrument/InstrumentMerge.js
index ebdbd0ccb42..0dfa9368378 100644
--- a/root/instrument/InstrumentMerge.js
+++ b/root/instrument/InstrumentMerge.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import InstrumentList from '../components/list/InstrumentList.js';
 import Layout from '../layout/index.js';
 import sortByEntityName
@@ -26,7 +24,7 @@ type Props = {
 const InstrumentMerge = ({
   form,
   toMerge,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Merge instruments')}>
     <div id="content">
       <h1>{l('Merge instruments')}</h1>
diff --git a/root/instrument/InstrumentRecordings.js b/root/instrument/InstrumentRecordings.js
index 871a39bb5ef..756a612d675 100644
--- a/root/instrument/InstrumentRecordings.js
+++ b/root/instrument/InstrumentRecordings.js
@@ -28,7 +28,7 @@ const InstrumentRecordings = ({
   instrumentCreditsAndRelTypes,
   pager,
   recordings,
-}: Props): React.Element<typeof InstrumentLayout> => {
+}: Props): React$Element<typeof InstrumentLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <InstrumentLayout
diff --git a/root/instrument/InstrumentReleases.js b/root/instrument/InstrumentReleases.js
index c999dd75471..d12cc9e4957 100644
--- a/root/instrument/InstrumentReleases.js
+++ b/root/instrument/InstrumentReleases.js
@@ -28,7 +28,7 @@ const InstrumentReleases = ({
   instrumentCreditsAndRelTypes,
   pager,
   releases,
-}: Props): React.Element<typeof InstrumentLayout> => {
+}: Props): React$Element<typeof InstrumentLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <InstrumentLayout
diff --git a/root/instrument/List.js b/root/instrument/List.js
index 3e74baec6eb..6f7fd5e2f09 100644
--- a/root/instrument/List.js
+++ b/root/instrument/List.js
@@ -38,7 +38,7 @@ const Instrument = ({instrument}: {+instrument: InstrumentT}) => (
 const InstrumentList = ({
   instrument_types: instrumentTypes,
   instruments_by_type: instrumentsByType,
-}: PropsT): React.Element<typeof Layout> => {
+}: PropsT): React$Element<typeof Layout> => {
   const unknown = instrumentsByType.unknown;
 
   return (
diff --git a/root/isrc/Index.js b/root/isrc/Index.js
index b482824fbc3..3bc7537a790 100644
--- a/root/isrc/Index.js
+++ b/root/isrc/Index.js
@@ -28,7 +28,7 @@ type PropsT = {
 const Index = ({
   isrcs,
   recordings,
-}: PropsT): React.Element<typeof Layout> => {
+}: PropsT): React$Element<typeof Layout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   const userExists = !!$c.user;
   const isrc = isrcs[0];
diff --git a/root/iswc/Index.js b/root/iswc/Index.js
index 9f7929c7d40..e19059bc028 100644
--- a/root/iswc/Index.js
+++ b/root/iswc/Index.js
@@ -21,7 +21,7 @@ type Props = {
   +works: $ReadOnlyArray<WorkT>,
 };
 
-const Index = ({iswcs, works}: Props): React.Element<typeof Layout> => {
+const Index = ({iswcs, works}: Props): React$Element<typeof Layout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   const userExists = !!$c.user;
   const iswc = iswcs[0];
diff --git a/root/label/LabelHeader.js b/root/label/LabelHeader.js
index f312190e9a7..0639c211907 100644
--- a/root/label/LabelHeader.js
+++ b/root/label/LabelHeader.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityHeader from '../components/EntityHeader.js';
 
 type Props = {
@@ -19,7 +17,7 @@ type Props = {
 const LabelHeader = ({
   label,
   page,
-}: Props): React.Element<typeof EntityHeader> => (
+}: Props): React$Element<typeof EntityHeader> => (
   <EntityHeader
     entity={label}
     headerClass="labelheader"
diff --git a/root/label/LabelIndex.js b/root/label/LabelIndex.js
index d7c6fb347d9..a16ba031122 100644
--- a/root/label/LabelIndex.js
+++ b/root/label/LabelIndex.js
@@ -47,7 +47,7 @@ const LabelIndex = ({
   renamedFrom,
   renamedInto,
   wikipediaExtract,
-}: Props): React.Element<typeof LabelLayout> => {
+}: Props): React$Element<typeof LabelLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <LabelLayout entity={label} page="index">
diff --git a/root/label/LabelLayout.js b/root/label/LabelLayout.js
index edd4b7df498..4c8b2b8fdd0 100644
--- a/root/label/LabelLayout.js
+++ b/root/label/LabelLayout.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import LabelSidebar from '../layout/components/sidebar/LabelSidebar.js';
 import Layout from '../layout/index.js';
 
 import LabelHeader from './LabelHeader.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +entity: LabelT,
   +fullWidth?: boolean,
   +page: string,
@@ -28,7 +26,7 @@ const LabelLayout = ({
   fullWidth = false,
   page,
   title,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout
     title={nonEmpty(title) ? hyphenateTitle(label.name, title) : label.name}
   >
diff --git a/root/label/LabelMerge.js b/root/label/LabelMerge.js
index 3c0cf314a2b..ca942e320b7 100644
--- a/root/label/LabelMerge.js
+++ b/root/label/LabelMerge.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import LabelList from '../components/list/LabelList.js';
 import Layout from '../layout/index.js';
 import sortByEntityName
@@ -26,7 +24,7 @@ type Props = {
 const LabelMerge = ({
   form,
   toMerge,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Merge labels')}>
     <div id="content">
       <h1>{l('Merge labels')}</h1>
diff --git a/root/label/LabelRelationships.js b/root/label/LabelRelationships.js
index 8a27e0b4db5..9938a17b9f9 100644
--- a/root/label/LabelRelationships.js
+++ b/root/label/LabelRelationships.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import RelationshipsTable from '../components/RelationshipsTable.js';
 import Relationships
   from '../static/scripts/common/components/Relationships.js';
@@ -25,7 +23,7 @@ const LabelRelationships = ({
   label,
   pagedLinkTypeGroup,
   pager,
-}: Props): React.Element<typeof LabelLayout> => (
+}: Props): React$Element<typeof LabelLayout> => (
   <LabelLayout
     entity={label}
     page="relationships"
diff --git a/root/label/SpecialPurpose.js b/root/label/SpecialPurpose.js
index 6c8af082ab8..2146886dbce 100644
--- a/root/label/SpecialPurpose.js
+++ b/root/label/SpecialPurpose.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import LabelLayout from './LabelLayout.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const SpecialPurpose = ({
   label,
-}: Props): React.Element<typeof LabelLayout> => (
+}: Props): React$Element<typeof LabelLayout> => (
   <LabelLayout
     entity={label}
     fullWidth
diff --git a/root/layout/components/BottomMenu.js b/root/layout/components/BottomMenu.js
index 4b002ed3505..53e4f92c1d2 100644
--- a/root/layout/components/BottomMenu.js
+++ b/root/layout/components/BottomMenu.js
@@ -85,7 +85,7 @@ const LanguageMenu = ({
       </span>
       <ul>
         {serverLanguages.map(function (language, index) {
-          let inner: React.MixedElement =
+          let inner: React$MixedElement =
             <LanguageLink language={language} />;
 
           if (language.name === currentBCP47Language) {
@@ -327,7 +327,7 @@ const DocumentationMenu = () => (
   </li>
 );
 
-const BottomMenu = (): React.Element<'div'> => {
+const BottomMenu = (): React$Element<'div'> => {
   const $c = React.useContext(SanitizedCatalystContext);
   const serverLanguages = $c.stash.server_languages;
   return (
diff --git a/root/layout/components/ExternalLinks.js b/root/layout/components/ExternalLinks.js
index 11ae1319c27..41c177594da 100644
--- a/root/layout/components/ExternalLinks.js
+++ b/root/layout/components/ExternalLinks.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityLink from '../../static/scripts/common/components/EntityLink.js';
 import {FAVICON_CLASSES} from '../../static/scripts/common/constants.js';
 import {compare, l} from '../../static/scripts/common/i18n.js';
@@ -85,7 +83,7 @@ const ExternalLinks = ({
   entity,
   empty,
   heading,
-}: Props): React.MixedElement | null => {
+}: Props): React$MixedElement | null => {
   const relationships = entity.relationships;
   if (!relationships) {
     return null;
diff --git a/root/layout/components/FaviconLinks.js b/root/layout/components/FaviconLinks.js
index 4536399f1ff..386f52781a5 100644
--- a/root/layout/components/FaviconLinks.js
+++ b/root/layout/components/FaviconLinks.js
@@ -9,7 +9,7 @@
 
 import * as React from 'react';
 
-const FaviconLinks = (): React.Element<typeof React.Fragment> => (
+const FaviconLinks = (): React$Element<typeof React.Fragment> => (
   <>
     <link
       href="/static/images/favicons/apple-touch-icon-57x57.png"
diff --git a/root/layout/components/Footer.js b/root/layout/components/Footer.js
index 04ff32a5fc2..c2353f2aa43 100644
--- a/root/layout/components/Footer.js
+++ b/root/layout/components/Footer.js
@@ -17,7 +17,7 @@ import {bracketedText}
 import formatUserDate from '../../utility/formatUserDate.js';
 import {returnToCurrentPage} from '../../utility/returnUri.js';
 
-const Footer = (): React.Element<'div'> => {
+const Footer = (): React$Element<'div'> => {
   const $c = React.useContext(CatalystContext);
   const stash = $c.stash;
   return (
diff --git a/root/layout/components/Head.js b/root/layout/components/Head.js
index 617930cd7b9..0f0588fb83c 100644
--- a/root/layout/components/Head.js
+++ b/root/layout/components/Head.js
@@ -69,7 +69,7 @@ const Head = ({
   noIcons = false,
   pager,
   title,
-}: HeadProps): React.Element<'head'> => {
+}: HeadProps): React$Element<'head'> => {
   const $c = React.useContext(CatalystContext);
 
   return (
diff --git a/root/layout/components/Header.js b/root/layout/components/Header.js
index d1744560b21..167eec8f6da 100644
--- a/root/layout/components/Header.js
+++ b/root/layout/components/Header.js
@@ -7,13 +7,11 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import BottomMenu from './BottomMenu.js';
 import HeaderLogo from './HeaderLogo.js';
 import TopMenu from './TopMenu.js';
 
-const Header = (): React.Element<'div'> => (
+const Header = (): React$Element<'div'> => (
   <div className="header">
     <a className="logo" href="/" title="MusicBrainz">
       <HeaderLogo />
diff --git a/root/layout/components/HeaderLogo.js b/root/layout/components/HeaderLogo.js
index 7668a78924b..3a8edd8e7e8 100644
--- a/root/layout/components/HeaderLogo.js
+++ b/root/layout/components/HeaderLogo.js
@@ -7,12 +7,10 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import headerLogoSvgUrl
   from '../../static/images/layout/header-logo.svg';
 
-const HeaderLogo = (): React.Element<'img'> => (
+const HeaderLogo = (): React$Element<'img'> => (
   <img
     alt="MusicBrainz"
     className="logo"
diff --git a/root/layout/components/MergeHelper.js b/root/layout/components/MergeHelper.js
index 7891e78f790..8ccaa86edd6 100644
--- a/root/layout/components/MergeHelper.js
+++ b/root/layout/components/MergeHelper.js
@@ -18,7 +18,7 @@ type Props = {
   +merger: MergeQueueT,
 };
 
-const MergeHelper = ({merger}: Props): React.Element<'div'> => {
+const MergeHelper = ({merger}: Props): React$Element<'div'> => {
   const $c = React.useContext(CatalystContext);
 
   return (
diff --git a/root/layout/components/MetaDescription.js b/root/layout/components/MetaDescription.js
index 366736b7300..c0bfacd1a81 100644
--- a/root/layout/components/MetaDescription.js
+++ b/root/layout/components/MetaDescription.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {artistBeginLabel, artistEndLabel} from '../../artist/utils.js';
 import formatBarcode
   from '../../static/scripts/common/utility/formatBarcode.js';
@@ -190,7 +188,7 @@ type Props = {
   +entity: ?CoreEntityT,
 };
 
-const MetaDescription = ({entity}: Props): React.Element<'meta'> | null => {
+const MetaDescription = ({entity}: Props): React$Element<'meta'> | null => {
   if (!entity) {
     return null;
   }
diff --git a/root/layout/components/Search.js b/root/layout/components/Search.js
index 5a5688dca03..24fda3f65fe 100644
--- a/root/layout/components/Search.js
+++ b/root/layout/components/Search.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import SearchIcon from '../../static/scripts/common/components/SearchIcon.js';
 import DBDefs from '../../static/scripts/common/DBDefs.mjs';
 import {compare} from '../../static/scripts/common/i18n.js';
@@ -88,7 +86,7 @@ const SearchOptions = () => (
   </select>
 );
 
-const Search = (): React.Element<'form'> => (
+const Search = (): React$Element<'form'> => (
   <form action="/search" method="get">
     <input
       id="headerid-query"
diff --git a/root/layout/components/TopMenu.js b/root/layout/components/TopMenu.js
index 47471b1128a..85caffb8078 100644
--- a/root/layout/components/TopMenu.js
+++ b/root/layout/components/TopMenu.js
@@ -210,7 +210,7 @@ const UserMenu = () => {
   );
 };
 
-const TopMenu = (): React.Element<'div'> => (
+const TopMenu = (): React$Element<'div'> => (
   <div className="top">
     <div className="links-container">
       <UserMenu />
diff --git a/root/layout/components/globalsScript.mjs b/root/layout/components/globalsScript.mjs
index 042b9f4d313..133a084c196 100644
--- a/root/layout/components/globalsScript.mjs
+++ b/root/layout/components/globalsScript.mjs
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {CatalystContext} from '../../context.mjs';
 import DBDefs from '../../static/scripts/common/DBDefs-client.mjs';
 import escapeClosingTags from '../../utility/escapeClosingTags.js';
@@ -80,4 +78,4 @@ export default ((
       );
     }}
   </CatalystContext.Consumer>
-): React.MixedElement);
+): React$MixedElement);
diff --git a/root/layout/components/sidebar/AnnotationLinks.js b/root/layout/components/sidebar/AnnotationLinks.js
index 260bb0c63c3..f60f649e3ac 100644
--- a/root/layout/components/sidebar/AnnotationLinks.js
+++ b/root/layout/components/sidebar/AnnotationLinks.js
@@ -19,7 +19,7 @@ type Props = {
 
 const AnnotationLinks = ({
   entity,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const $c = React.useContext(CatalystContext);
   const numberOfRevisions = $c.stash.number_of_revisions ?? 0;
 
diff --git a/root/layout/components/sidebar/AreaSidebar.js b/root/layout/components/sidebar/AreaSidebar.js
index e626bd181b4..98a12302ed5 100644
--- a/root/layout/components/sidebar/AreaSidebar.js
+++ b/root/layout/components/sidebar/AreaSidebar.js
@@ -34,7 +34,7 @@ type Props = {
   +area: AreaT,
 };
 
-const AreaSidebar = ({area}: Props): React.Element<'div'> => {
+const AreaSidebar = ({area}: Props): React$Element<'div'> => {
   const $c = React.useContext(CatalystContext);
   const areaAge = age.age(area);
 
diff --git a/root/layout/components/sidebar/ArtistSidebar.js b/root/layout/components/sidebar/ArtistSidebar.js
index 33869d34379..92bb4931005 100644
--- a/root/layout/components/sidebar/ArtistSidebar.js
+++ b/root/layout/components/sidebar/ArtistSidebar.js
@@ -48,7 +48,7 @@ type Props = {
   +artist: ArtistT,
 };
 
-const ArtistSidebar = ({artist}: Props): React.Element<'div'> => {
+const ArtistSidebar = ({artist}: Props): React$Element<'div'> => {
   const $c = React.useContext(CatalystContext);
   const artistAge = age.age(artist);
   const gid = encodeURIComponent(artist.gid);
diff --git a/root/layout/components/sidebar/CDStubSidebar.js b/root/layout/components/sidebar/CDStubSidebar.js
index dfa9bb755c6..0005d7769ef 100644
--- a/root/layout/components/sidebar/CDStubSidebar.js
+++ b/root/layout/components/sidebar/CDStubSidebar.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CDStubLink
   from '../../../static/scripts/common/components/CDStubLink.js';
 import escapeLuceneValue
@@ -22,7 +20,7 @@ type Props = {
   +cdstub: CDStubT,
 };
 
-const CDStubSidebar = ({cdstub}: Props): React.Element<'div'> => {
+const CDStubSidebar = ({cdstub}: Props): React$Element<'div'> => {
   const now = parseDate((new Date()).toISOString().slice(0, 10));
 
   const addedAge = nonEmpty(cdstub.date_added) ? age({
diff --git a/root/layout/components/sidebar/CollectionLinks.js b/root/layout/components/sidebar/CollectionLinks.js
index c8bf04376b8..6d24b1d6b2e 100644
--- a/root/layout/components/sidebar/CollectionLinks.js
+++ b/root/layout/components/sidebar/CollectionLinks.js
@@ -35,7 +35,7 @@ const noCollectionsStrings = {
 
 const CollectionLinks = ({
   entity,
-}: Props): React.Element<typeof CollectionList> | null => {
+}: Props): React$Element<typeof CollectionList> | null => {
   const $c = React.useContext(CatalystContext);
   const numberOfCollections = $c.stash.number_of_collections || 0;
   if (!$c.user) {
diff --git a/root/layout/components/sidebar/CollectionList.js b/root/layout/components/sidebar/CollectionList.js
index d6a297a4401..bde9d7a2df3 100644
--- a/root/layout/components/sidebar/CollectionList.js
+++ b/root/layout/components/sidebar/CollectionList.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {CatalystContext} from '../../../context.mjs';
 import typeof EntityLink
   from '../../../static/scripts/common/components/EntityLink.js';
@@ -67,7 +65,7 @@ type CollectionListProps = {
   +ownCollectionsHeader: string,
   +ownCollectionsNoneText: string,
   +sectionClass: string,
-  +usersLink: React.Element<EntityLink>,
+  +usersLink: React$Element<EntityLink>,
   +usersLinkHeader: string,
 };
 
@@ -145,7 +143,7 @@ const CollectionList = ({
   sectionClass,
   usersLink,
   usersLinkHeader,
-}: CollectionListProps): React.MixedElement => (
+}: CollectionListProps): React$MixedElement => (
   <>
     <h2 className={sectionClass}>
       {header}
diff --git a/root/layout/components/sidebar/CollectionSidebar.js b/root/layout/components/sidebar/CollectionSidebar.js
index d8c20f9efba..9b9730add95 100644
--- a/root/layout/components/sidebar/CollectionSidebar.js
+++ b/root/layout/components/sidebar/CollectionSidebar.js
@@ -29,7 +29,7 @@ type Props = {
 const CollectionSidebar = ({
   collection,
   recordingMbids,
-}: Props): React.Element<'div'> => {
+}: Props): React$Element<'div'> => {
   const $c = React.useContext(CatalystContext);
   const typeName = collection.typeName;
   const owner = collection.editor;
diff --git a/root/layout/components/sidebar/EditLinks.js b/root/layout/components/sidebar/EditLinks.js
index e0205879f45..2f12a279011 100644
--- a/root/layout/components/sidebar/EditLinks.js
+++ b/root/layout/components/sidebar/EditLinks.js
@@ -15,7 +15,7 @@ import EntityLink
   from '../../../static/scripts/common/components/EntityLink.js';
 
 type Props = {
-  +children?: React.Node,
+  +children?: React$Node,
   +entity: CoreEntityT,
   +requiresPrivileges?: boolean,
 };
@@ -24,7 +24,7 @@ const EditLinks = ({
   children,
   entity,
   requiresPrivileges = false,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const $c = React.useContext(CatalystContext);
   return (
     <>
diff --git a/root/layout/components/sidebar/EventSidebar.js b/root/layout/components/sidebar/EventSidebar.js
index 71e129eaffa..d5b24de07dc 100644
--- a/root/layout/components/sidebar/EventSidebar.js
+++ b/root/layout/components/sidebar/EventSidebar.js
@@ -35,7 +35,7 @@ type Props = {
   +event: EventT,
 };
 
-const EventSidebar = ({event}: Props): React.Element<'div'> => {
+const EventSidebar = ({event}: Props): React$Element<'div'> => {
   const $c = React.useContext(CatalystContext);
   const hasBegin = !isDateEmpty(event.begin_date);
   const hasEnd = !isDateEmpty(event.end_date);
diff --git a/root/layout/components/sidebar/GenreSidebar.js b/root/layout/components/sidebar/GenreSidebar.js
index c415a9bb07f..201c236f6e4 100644
--- a/root/layout/components/sidebar/GenreSidebar.js
+++ b/root/layout/components/sidebar/GenreSidebar.js
@@ -23,7 +23,7 @@ type Props = {
   +genre: GenreT,
 };
 
-const GenreSidebar = ({genre}: Props): React.Element<'div'> => {
+const GenreSidebar = ({genre}: Props): React$Element<'div'> => {
   const $c = React.useContext(CatalystContext);
 
   return (
diff --git a/root/layout/components/sidebar/InstrumentSidebar.js b/root/layout/components/sidebar/InstrumentSidebar.js
index af1604dc316..b4d95fcbdea 100644
--- a/root/layout/components/sidebar/InstrumentSidebar.js
+++ b/root/layout/components/sidebar/InstrumentSidebar.js
@@ -33,7 +33,7 @@ type Props = {
   +instrument: InstrumentT,
 };
 
-const InstrumentSidebar = ({instrument}: Props): React.Element<'div'> => {
+const InstrumentSidebar = ({instrument}: Props): React$Element<'div'> => {
   const $c = React.useContext(CatalystContext);
 
   return (
diff --git a/root/layout/components/sidebar/LabelSidebar.js b/root/layout/components/sidebar/LabelSidebar.js
index f2f375dc85f..9ddd368faa5 100644
--- a/root/layout/components/sidebar/LabelSidebar.js
+++ b/root/layout/components/sidebar/LabelSidebar.js
@@ -40,7 +40,7 @@ type Props = {
   +label: LabelT,
 };
 
-const LabelSidebar = ({label}: Props): React.Element<'div'> => {
+const LabelSidebar = ({label}: Props): React$Element<'div'> => {
   const $c = React.useContext(CatalystContext);
   const labelAge = age.age(label);
   const gid = encodeURIComponent(label.gid);
diff --git a/root/layout/components/sidebar/LastUpdated.js b/root/layout/components/sidebar/LastUpdated.js
index 4a3c5db76ca..887ab0ccbee 100644
--- a/root/layout/components/sidebar/LastUpdated.js
+++ b/root/layout/components/sidebar/LastUpdated.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {CatalystContext} from '../../../context.mjs';
 import formatUserDate from '../../../utility/formatUserDate.js';
 
@@ -16,7 +14,7 @@ type Props = {
   +entity: CoreEntityT,
 };
 
-const LastUpdated = ({entity}: Props): React.Element<'p'> => {
+const LastUpdated = ({entity}: Props): React$Element<'p'> => {
   const lastUpdated = entity.last_updated;
   return (
     <p className="lastupdate">
diff --git a/root/layout/components/sidebar/MergeLink.js b/root/layout/components/sidebar/MergeLink.js
index 364b9c6ded9..378f50cd3b2 100644
--- a/root/layout/components/sidebar/MergeLink.js
+++ b/root/layout/components/sidebar/MergeLink.js
@@ -26,7 +26,7 @@ const mergeUrl = (
     returnToCurrentPage($c);
 };
 
-const MergeLink = ({entity}: Props): React.Element<'li'> => {
+const MergeLink = ({entity}: Props): React$Element<'li'> => {
   const $c = React.useContext(CatalystContext);
   return (
     <li>
diff --git a/root/layout/components/sidebar/PlaceSidebar.js b/root/layout/components/sidebar/PlaceSidebar.js
index 256674bf3cb..6b43276683e 100644
--- a/root/layout/components/sidebar/PlaceSidebar.js
+++ b/root/layout/components/sidebar/PlaceSidebar.js
@@ -37,7 +37,7 @@ type Props = {
   +place: PlaceT,
 };
 
-const PlaceSidebar = ({place}: Props): React.Element<'div'> => {
+const PlaceSidebar = ({place}: Props): React$Element<'div'> => {
   const $c = React.useContext(CatalystContext);
   const placeAge = age.age(place);
   const gid = encodeURIComponent(place.gid);
diff --git a/root/layout/components/sidebar/PlayOnListenBrainzButton.js b/root/layout/components/sidebar/PlayOnListenBrainzButton.js
index 142695d64c4..5a8d12515b9 100644
--- a/root/layout/components/sidebar/PlayOnListenBrainzButton.js
+++ b/root/layout/components/sidebar/PlayOnListenBrainzButton.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import listenBrainzIconUrl
   from '../../../static/images/icons/listenbrainz.png';
 
@@ -43,7 +41,7 @@ function getListenBrainzLink(
 const PlayOnListenBrainzButton = ({
   entityType,
   mbids,
-}: Props): React.Element<'a'> | null => {
+}: Props): React$Element<'a'> | null => {
   const link = getListenBrainzLink(entityType, mbids);
 
   if (link == null) {
diff --git a/root/layout/components/sidebar/RecordingSidebar.js b/root/layout/components/sidebar/RecordingSidebar.js
index badd9707405..4c46130bb5b 100644
--- a/root/layout/components/sidebar/RecordingSidebar.js
+++ b/root/layout/components/sidebar/RecordingSidebar.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import * as manifest from '../../../static/manifest.mjs';
 import ArtistCreditLink
   from '../../../static/scripts/common/components/ArtistCreditLink.js';
@@ -33,7 +31,7 @@ type Props = {
   +recording: RecordingWithArtistCreditT,
 };
 
-const RecordingSidebar = ({recording}: Props): React.Element<'div'> => {
+const RecordingSidebar = ({recording}: Props): React$Element<'div'> => {
   const firstReleaseYear = recording.first_release_date?.year;
 
   return (
diff --git a/root/layout/components/sidebar/ReleaseGroupSidebar.js b/root/layout/components/sidebar/ReleaseGroupSidebar.js
index dec39fb06ed..7d003e7e5ab 100644
--- a/root/layout/components/sidebar/ReleaseGroupSidebar.js
+++ b/root/layout/components/sidebar/ReleaseGroupSidebar.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {Artwork} from '../../../components/Artwork.js';
 import ArtistCreditLink
   from '../../../static/scripts/common/components/ArtistCreditLink.js';
@@ -35,7 +33,7 @@ type Props = {
 const ReleaseGroupSidebar = ({
   firstReleaseGid,
   releaseGroup,
-}: Props): React.Element<'div'> => {
+}: Props): React$Element<'div'> => {
   const gid = encodeURIComponent(releaseGroup.gid);
   const typeName = releaseGroupType(releaseGroup);
 
diff --git a/root/layout/components/sidebar/ReleaseSidebar.js b/root/layout/components/sidebar/ReleaseSidebar.js
index 2c5d9714d39..47b86170e4a 100644
--- a/root/layout/components/sidebar/ReleaseSidebar.js
+++ b/root/layout/components/sidebar/ReleaseSidebar.js
@@ -51,7 +51,7 @@ type Props = {
   +release: ReleaseT,
 };
 
-const ReleaseSidebar = ({release}: Props): React.Element<'div'> | null => {
+const ReleaseSidebar = ({release}: Props): React$Element<'div'> | null => {
   const $c = React.useContext(CatalystContext);
 
   const releaseGroup = release.releaseGroup;
diff --git a/root/layout/components/sidebar/RemoveLink.js b/root/layout/components/sidebar/RemoveLink.js
index b7ae4c90bb5..0dbc43b8b05 100644
--- a/root/layout/components/sidebar/RemoveLink.js
+++ b/root/layout/components/sidebar/RemoveLink.js
@@ -22,7 +22,7 @@ type Props = {
     | ReleaseT,
 };
 
-const RemoveLink = ({entity}: Props): React.Element<'li'> | null => {
+const RemoveLink = ({entity}: Props): React$Element<'li'> | null => {
   const $c = React.useContext(CatalystContext);
   if (!$c.stash.can_delete /*:: === true */) {
     return null;
diff --git a/root/layout/components/sidebar/SeriesSidebar.js b/root/layout/components/sidebar/SeriesSidebar.js
index eff57f4b5fb..9c1e365ac96 100644
--- a/root/layout/components/sidebar/SeriesSidebar.js
+++ b/root/layout/components/sidebar/SeriesSidebar.js
@@ -31,7 +31,7 @@ type Props = {
   +series: SeriesT,
 };
 
-const SeriesSidebar = ({series}: Props): React.Element<'div'> => {
+const SeriesSidebar = ({series}: Props): React$Element<'div'> => {
   const $c = React.useContext(CatalystContext);
 
   return (
diff --git a/root/layout/components/sidebar/SidebarBeginDate.js b/root/layout/components/sidebar/SidebarBeginDate.js
index 788d3b53842..b12275577ab 100644
--- a/root/layout/components/sidebar/SidebarBeginDate.js
+++ b/root/layout/components/sidebar/SidebarBeginDate.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {bracketedText}
   from '../../../static/scripts/common/utility/bracketed.js';
 import formatDate from '../../../static/scripts/common/utility/formatDate.js';
@@ -28,7 +26,7 @@ const SidebarBeginDate = ({
   age,
   entity,
   label,
-}: Props): React.MixedElement | null => (
+}: Props): React$MixedElement | null => (
   isDateEmpty(entity.begin_date) ? (
     null
   ) : (
diff --git a/root/layout/components/sidebar/SidebarDataQuality.js b/root/layout/components/sidebar/SidebarDataQuality.js
index 8b299daf8f6..52dc47a2404 100644
--- a/root/layout/components/sidebar/SidebarDataQuality.js
+++ b/root/layout/components/sidebar/SidebarDataQuality.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {QUALITY_NAMES} from '../../../static/scripts/common/constants.js';
 
 import {SidebarProperty} from './SidebarProperties.js';
@@ -17,7 +15,7 @@ type Props = {
   +quality: QualityT,
 };
 
-const SidebarDataQuality = ({quality}: Props): React.MixedElement | null => {
+const SidebarDataQuality = ({quality}: Props): React$MixedElement | null => {
   const name = QUALITY_NAMES.get(quality);
   let qualityClass;
   switch (quality) {
diff --git a/root/layout/components/sidebar/SidebarEndDate.js b/root/layout/components/sidebar/SidebarEndDate.js
index 2e6b750da34..3322be2844d 100644
--- a/root/layout/components/sidebar/SidebarEndDate.js
+++ b/root/layout/components/sidebar/SidebarEndDate.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {bracketedText}
   from '../../../static/scripts/common/utility/bracketed.js';
 import formatDate from '../../../static/scripts/common/utility/formatDate.js';
@@ -33,7 +31,7 @@ const SidebarEndDate = ({
   age,
   entity,
   label,
-}: Props): React.MixedElement | null => (
+}: Props): React$MixedElement | null => (
   isDateEmpty(entity.end_date) ? (
     entity.ended ? (
       <SidebarProperty className="end-date" label={label}>
diff --git a/root/layout/components/sidebar/SidebarIpis.js b/root/layout/components/sidebar/SidebarIpis.js
index 77116475a33..3efcb5a9667 100644
--- a/root/layout/components/sidebar/SidebarIpis.js
+++ b/root/layout/components/sidebar/SidebarIpis.js
@@ -26,7 +26,7 @@ type Props = {
 };
 
 const SidebarIpis = ({entity}: Props):
-  React.ChildrenArray<React.Element<typeof SidebarProperty>> => (
+  React.ChildrenArray<React$Element<typeof SidebarProperty>> => (
   entity.ipi_codes.map(buildSidebarIpi)
 );
 
diff --git a/root/layout/components/sidebar/SidebarIsnis.js b/root/layout/components/sidebar/SidebarIsnis.js
index 3229b81165f..4fc1169f748 100644
--- a/root/layout/components/sidebar/SidebarIsnis.js
+++ b/root/layout/components/sidebar/SidebarIsnis.js
@@ -32,7 +32,7 @@ type Props = {
 };
 
 const SidebarIsnis = ({entity}: Props):
-  React.ChildrenArray<React.Element<typeof SidebarProperty>> => (
+  React.ChildrenArray<React$Element<typeof SidebarProperty>> => (
   entity.isni_codes.map(buildSidebarIsni)
 );
 
diff --git a/root/layout/components/sidebar/SidebarLicenses.js b/root/layout/components/sidebar/SidebarLicenses.js
index 5535446798e..9839e4a9331 100644
--- a/root/layout/components/sidebar/SidebarLicenses.js
+++ b/root/layout/components/sidebar/SidebarLicenses.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import artLibreIconUrl
   from '../../../static/images/licenses/ArtLibre.png';
 import cc0IconUrl
@@ -109,22 +107,22 @@ const LicenseDisplay = ({url}: {+url: UrlT}) => {
 };
 
 const cmpLinkPhrase = (
-  a: [string, React.MixedElement],
-  b: [string, React.MixedElement],
+  a: [string, React$MixedElement],
+  b: [string, React$MixedElement],
 ) => compare(a[0], b[0]);
 
 type Props = {
   +entity: CoreEntityT,
 };
 
-const SidebarLicenses = ({entity}: Props): React.MixedElement | null => {
+const SidebarLicenses = ({entity}: Props): React$MixedElement | null => {
   const relationships = entity.relationships;
 
   if (!relationships) {
     return null;
   }
 
-  const licenses: Array<[string, React.MixedElement]> = [];
+  const licenses: Array<[string, React$MixedElement]> = [];
   for (const r of relationships) {
     const target = r.target;
     if (target.entityType === 'url' &&
diff --git a/root/layout/components/sidebar/SidebarProperties.js b/root/layout/components/sidebar/SidebarProperties.js
index 0fb24ff9e29..19ad59f5a44 100644
--- a/root/layout/components/sidebar/SidebarProperties.js
+++ b/root/layout/components/sidebar/SidebarProperties.js
@@ -10,7 +10,7 @@
 import * as React from 'react';
 
 type SidebarPropertyProps = {
-  +children: React.Node,
+  +children: React$Node,
   +className: string,
   +label: string,
 };
@@ -19,7 +19,7 @@ export const SidebarProperty = ({
   children,
   className,
   label,
-}: SidebarPropertyProps): React.Element<typeof React.Fragment> => (
+}: SidebarPropertyProps): React$Element<typeof React.Fragment> => (
   <>
     <dt>{label}</dt>
     <dd className={className}>
@@ -29,14 +29,14 @@ export const SidebarProperty = ({
 );
 
 type SidebarPropertiesProps = {
-  +children: React.Node,
+  +children: React$Node,
   +className?: string,
 };
 
 export const SidebarProperties = ({
   className,
   children,
-}: SidebarPropertiesProps): React.Element<'dl'> => {
+}: SidebarPropertiesProps): React$Element<'dl'> => {
   let _className = 'properties';
   if (nonEmpty(className)) {
     _className += ' ' + className;
diff --git a/root/layout/components/sidebar/SidebarRating.js b/root/layout/components/sidebar/SidebarRating.js
index 3e715389c9f..4051789b7a4 100644
--- a/root/layout/components/sidebar/SidebarRating.js
+++ b/root/layout/components/sidebar/SidebarRating.js
@@ -22,7 +22,7 @@ type Props = {
 const SidebarRating = ({
   entity,
   heading,
-}: Props): React.Element<typeof React.Fragment> => (
+}: Props): React$Element<typeof React.Fragment> => (
   <>
     <h2 className="rating">{nonEmpty(heading) ? heading : l('Rating')}</h2>
     <p>
diff --git a/root/layout/components/sidebar/SidebarTags.js b/root/layout/components/sidebar/SidebarTags.js
index 77abdda153e..87c1d654b90 100644
--- a/root/layout/components/sidebar/SidebarTags.js
+++ b/root/layout/components/sidebar/SidebarTags.js
@@ -34,7 +34,7 @@ const TagList = ({
 }: TagListProps) => {
   const upvotedTags = tags ? tags.filter(tag => tag.count > 0) : null;
   const links = upvotedTags ? upvotedTags.reduce((
-    accum: Array<React.Element<typeof TagLink>>,
+    accum: Array<React$Element<typeof TagLink>>,
     aggregatedTag,
   ) => {
     if (Boolean(aggregatedTag.tag.genre) === isGenreList) {
@@ -55,7 +55,7 @@ const TagList = ({
 
 const SidebarTags = ({
   entity,
-}: SidebarTagsProps): React.Element<typeof React.Fragment> | null => {
+}: SidebarTagsProps): React$Element<typeof React.Fragment> | null => {
   const $c = React.useContext(CatalystContext);
   const aggregatedTags = $c.stash.top_tags;
   const more = Boolean($c.stash.more_tags);
diff --git a/root/layout/components/sidebar/SidebarType.js b/root/layout/components/sidebar/SidebarType.js
index a5e8e63b96a..c0badb86419 100644
--- a/root/layout/components/sidebar/SidebarType.js
+++ b/root/layout/components/sidebar/SidebarType.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import linkedEntities
   from '../../../static/scripts/common/linkedEntities.mjs';
 
@@ -22,7 +20,7 @@ type Props = {
 const SidebarType = ({
   entity,
   typeType,
-}: Props): React.MixedElement | null => (
+}: Props): React$MixedElement | null => (
   entity.typeID == null ? null : (
     <SidebarProperty className="type" label={l('Type:')}>
       {lp_attributes(
diff --git a/root/layout/components/sidebar/SubscriptionLinks.js b/root/layout/components/sidebar/SubscriptionLinks.js
index 326e243083f..328b555e27e 100644
--- a/root/layout/components/sidebar/SubscriptionLinks.js
+++ b/root/layout/components/sidebar/SubscriptionLinks.js
@@ -20,7 +20,7 @@ type Props = {
 
 const SubscriptionLinks = ({
   entity,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const $c = React.useContext(CatalystContext);
   const entityType = entity.entityType;
   const id = encodeURIComponent(String(entity.id));
diff --git a/root/layout/components/sidebar/UrlSidebar.js b/root/layout/components/sidebar/UrlSidebar.js
index 6660493df5e..7aafb4bc4a4 100644
--- a/root/layout/components/sidebar/UrlSidebar.js
+++ b/root/layout/components/sidebar/UrlSidebar.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EditLinks from './EditLinks.js';
 import LastUpdated from './LastUpdated.js';
 
@@ -16,7 +14,7 @@ type Props = {
   +url: UrlT,
 };
 
-const UrlSidebar = ({url}: Props): React.Element<'div'> => {
+const UrlSidebar = ({url}: Props): React$Element<'div'> => {
   return (
     <div id="sidebar">
       <EditLinks entity={url} />
diff --git a/root/layout/components/sidebar/WorkSidebar.js b/root/layout/components/sidebar/WorkSidebar.js
index 19abefdad9e..2547e134041 100644
--- a/root/layout/components/sidebar/WorkSidebar.js
+++ b/root/layout/components/sidebar/WorkSidebar.js
@@ -37,7 +37,7 @@ type Props = {
   +work: WorkT,
 };
 
-const WorkSidebar = ({work}: Props): React.Element<'div'> => {
+const WorkSidebar = ({work}: Props): React$Element<'div'> => {
   const $c = React.useContext(CatalystContext);
   const {attributes, iswcs, languages, typeID} = work;
   const showInfo = Boolean(
diff --git a/root/layout/index.js b/root/layout/index.js
index 3ccec3034d4..9007617de55 100644
--- a/root/layout/index.js
+++ b/root/layout/index.js
@@ -166,7 +166,7 @@ const Layout = ({
   noIcons,
   pager,
   title,
-}: Props): React.Element<'html'> => {
+}: Props): React$Element<'html'> => {
   const $c = React.useContext(CatalystContext);
 
   const showAlert = nonEmpty($c.stash.alert) &&
diff --git a/root/main/ConfirmSeed.js b/root/main/ConfirmSeed.js
index 9529a3e9e33..d03598696cb 100644
--- a/root/main/ConfirmSeed.js
+++ b/root/main/ConfirmSeed.js
@@ -26,7 +26,7 @@ type Props = {
 const ConfirmSeed = ({
   origin,
   postParameters,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   const title = l('Confirm Form Submission');
   return (
diff --git a/root/main/error/Error400.js b/root/main/error/Error400.js
index f5d5dde11ae..e9a3a4c7a89 100644
--- a/root/main/error/Error400.js
+++ b/root/main/error/Error400.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import bugTrackerURL
   from '../../static/scripts/common/utility/bugTrackerURL.js';
 
@@ -24,7 +22,7 @@ type Props = {
 const Error400 = ({
   message,
   useLanguages,
-}: Props): React.Element<typeof ErrorLayout> => (
+}: Props): React$Element<typeof ErrorLayout> => (
   <ErrorLayout title={l('Bad Request')}>
     <p>
       <strong>
diff --git a/root/main/error/Error401.js b/root/main/error/Error401.js
index e0f45f5e708..fdddd1b34eb 100644
--- a/root/main/error/Error401.js
+++ b/root/main/error/Error401.js
@@ -13,7 +13,7 @@ import {CatalystContext} from '../../context.mjs';
 
 import ErrorLayout from './ErrorLayout.js';
 
-const Error401 = (): React.Element<typeof ErrorLayout> => {
+const Error401 = (): React$Element<typeof ErrorLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <ErrorLayout title={l('Unauthorized Request')}>
diff --git a/root/main/error/Error403.js b/root/main/error/Error403.js
index 5fa278b9f8f..377da6a1597 100644
--- a/root/main/error/Error403.js
+++ b/root/main/error/Error403.js
@@ -15,7 +15,7 @@ import bugTrackerURL
 
 import ErrorLayout from './ErrorLayout.js';
 
-const Error403 = (): React.Element<typeof ErrorLayout> => {
+const Error403 = (): React$Element<typeof ErrorLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <ErrorLayout title={l('Forbidden Request')}>
diff --git a/root/main/error/Error404.js b/root/main/error/Error404.js
index 57f5bc5c77c..e252c3cabc1 100644
--- a/root/main/error/Error404.js
+++ b/root/main/error/Error404.js
@@ -26,7 +26,7 @@ type Props = {
 
 const Error404 = ({
   message,
-}: Props): React.Element<typeof ErrorLayout> => {
+}: Props): React$Element<typeof ErrorLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <ErrorLayout title={l('Page Not Found')}>
diff --git a/root/main/error/Error500.js b/root/main/error/Error500.js
index c9bfcb07bdd..41d57bc3451 100644
--- a/root/main/error/Error500.js
+++ b/root/main/error/Error500.js
@@ -31,7 +31,7 @@ const Error500 = ({
   formattedErrors,
   hostname,
   useLanguages,
-}: Props): React.Element<typeof ErrorLayout> => {
+}: Props): React$Element<typeof ErrorLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <ErrorLayout title={l('Internal Server Error')}>
diff --git a/root/main/error/Error503.js b/root/main/error/Error503.js
index cbd2175aab4..0ef7383ae2b 100644
--- a/root/main/error/Error503.js
+++ b/root/main/error/Error503.js
@@ -7,11 +7,9 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ErrorLayout from './ErrorLayout.js';
 
-const Error503 = (): React.Element<typeof ErrorLayout> => (
+const Error503 = (): React$Element<typeof ErrorLayout> => (
   <ErrorLayout title={l('System Busy')}>
     <p>
       <strong>
diff --git a/root/main/error/ErrorLayout.js b/root/main/error/ErrorLayout.js
index 46744b5a011..ab712c7d269 100644
--- a/root/main/error/ErrorLayout.js
+++ b/root/main/error/ErrorLayout.js
@@ -7,19 +7,17 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +title: string,
 };
 
 const ErrorLayout = ({
   children,
   title,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={title}>
     <div id="content">
       <h1>{title}</h1>
diff --git a/root/main/error/MirrorError403.js b/root/main/error/MirrorError403.js
index 395b9b27752..ab66e60b27c 100644
--- a/root/main/error/MirrorError403.js
+++ b/root/main/error/MirrorError403.js
@@ -7,11 +7,9 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ErrorLayout from './ErrorLayout.js';
 
-const MirrorError403 = (): React.Element<typeof ErrorLayout> => (
+const MirrorError403 = (): React$Element<typeof ErrorLayout> => (
   <ErrorLayout title={l('Forbidden Request')}>
     <p>
       <strong>
diff --git a/root/main/error/MirrorError404.js b/root/main/error/MirrorError404.js
index e7e55032368..67047ab1a19 100644
--- a/root/main/error/MirrorError404.js
+++ b/root/main/error/MirrorError404.js
@@ -7,11 +7,9 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ErrorLayout from './ErrorLayout.js';
 
-const MirrorError404 = (): React.Element<typeof ErrorLayout> => (
+const MirrorError404 = (): React$Element<typeof ErrorLayout> => (
   <ErrorLayout title={l('Page Not Found')}>
     <p>
       <strong>
diff --git a/root/main/error/TimeoutError.js b/root/main/error/TimeoutError.js
index 501bcb46d41..dec4cbfb729 100644
--- a/root/main/error/TimeoutError.js
+++ b/root/main/error/TimeoutError.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ErrorEnvironment from './components/ErrorEnvironment.js';
 import ErrorInfo from './components/ErrorInfo.js';
 import ErrorLayout from './ErrorLayout.js';
@@ -23,7 +21,7 @@ const TimeoutError = ({
   formattedErrors,
   hostname,
   useLanguages,
-}: Props): React.Element<typeof ErrorLayout> => (
+}: Props): React$Element<typeof ErrorLayout> => (
   <ErrorLayout title={l('Request Timed Out')}>
     <p>
       <strong>
diff --git a/root/main/error/components/ErrorEnvironment.js b/root/main/error/components/ErrorEnvironment.js
index a8cc2a28961..83cb60eded6 100644
--- a/root/main/error/components/ErrorEnvironment.js
+++ b/root/main/error/components/ErrorEnvironment.js
@@ -19,7 +19,7 @@ type Props = {
 const ErrorEnvironment = ({
   hostname,
   useLanguages = false,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const $c = React.useContext(CatalystContext);
   return (
     <>
diff --git a/root/main/error/components/ErrorInfo.js b/root/main/error/components/ErrorInfo.js
index 3019c3b882f..7b976864058 100644
--- a/root/main/error/components/ErrorInfo.js
+++ b/root/main/error/components/ErrorInfo.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 type Props = {
   +formattedErrors?: $ReadOnlyArray<string>,
   +message?: string,
@@ -17,7 +15,7 @@ type Props = {
 const ErrorInfo = ({
   formattedErrors,
   message,
-}: Props): (React.Element<'p'>) => (
+}: Props): (React$Element<'p'>) => (
   formattedErrors ? (
     <p id="errors">
       <strong>{ln('Error:', 'Errors:', formattedErrors.length)}</strong>
diff --git a/root/main/index.js b/root/main/index.js
index 8a4b56a03d7..5234cd28e70 100644
--- a/root/main/index.js
+++ b/root/main/index.js
@@ -8,7 +8,6 @@
  */
 
 import he from 'he';
-import * as React from 'react';
 
 import {ArtworkImage} from '../components/Artwork.js';
 import Layout from '../layout/index.js';
@@ -30,7 +29,7 @@ type Props = {
 const Homepage = ({
   blogEntries,
   newestReleases,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout
     fullWidth
     isHomepage
diff --git a/root/mbid/NotFound.js b/root/mbid/NotFound.js
index a8ed5c036e3..8db484119c1 100644
--- a/root/mbid/NotFound.js
+++ b/root/mbid/NotFound.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import NotFound from '../components/NotFound.js';
 
 type Props = {
@@ -19,7 +17,7 @@ type Props = {
 const MbidNotFound = ({
   isGuid,
   mbid,
-}: Props): React.Element<typeof NotFound> => (
+}: Props): React$Element<typeof NotFound> => (
   <NotFound title={isGuid ? l('MBID Not Found') : l('Invalid MBID')}>
     <p>
       {nonEmpty(mbid) && isGuid ? (
diff --git a/root/medium/MediumTracklist.js b/root/medium/MediumTracklist.js
index 67ed1874bef..cd6daa73f2c 100644
--- a/root/medium/MediumTracklist.js
+++ b/root/medium/MediumTracklist.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistCreditLink
   from '../static/scripts/common/components/ArtistCreditLink.js';
 import DataTrackIcon
@@ -34,7 +32,7 @@ const MediumTracklist = ({
   showArtists = false,
   showRatings = false,
   tracks,
-}: Props): Array<React.Element<'tr'>> => {
+}: Props): Array<React$Element<'tr'>> => {
   if (!tracks) {
     return [];
   }
diff --git a/root/oauth2/OAuth2Authorize.js b/root/oauth2/OAuth2Authorize.js
index dadad695d3a..4a7abca4207 100644
--- a/root/oauth2/OAuth2Authorize.js
+++ b/root/oauth2/OAuth2Authorize.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {ACCESS_SCOPE_PERMISSIONS} from '../constants.js';
 import Layout from '../layout/index.js';
 import FormCsrfToken
@@ -26,7 +24,7 @@ const OAuth2Authorize = ({
   form,
   offline,
   permissions,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('OAuth Authorization')}>
     <h1>{l('Authorization')}</h1>
 
diff --git a/root/oauth2/OAuth2Error.js b/root/oauth2/OAuth2Error.js
index 7f64630f3bd..4d07066e867 100644
--- a/root/oauth2/OAuth2Error.js
+++ b/root/oauth2/OAuth2Error.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 
 type Props = {
@@ -19,7 +17,7 @@ type Props = {
 const OAuth2Error = ({
   errorDescription,
   errorMessage,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('OAuth Authorization Error')}>
     <h1>{texp.l('Error: {error}', {error: errorMessage})}</h1>
     <p>{errorDescription}</p>
diff --git a/root/oauth2/OAuth2FormPost.js b/root/oauth2/OAuth2FormPost.js
index 9e58388b7a2..fbf075667c2 100644
--- a/root/oauth2/OAuth2FormPost.js
+++ b/root/oauth2/OAuth2FormPost.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 type Props = {
   +applicationName: string,
   +fields: {+[fieldName: string]: string, ...},
@@ -19,7 +17,7 @@ const OAuth2FormPost = ({
   applicationName,
   fields,
   redirectUri,
-}: Props): React.Element<'html'> => {
+}: Props): React$Element<'html'> => {
   const title = texp.l('Redirecting to {application}', {
     application: applicationName,
   });
diff --git a/root/oauth2/OAuth2Oob.js b/root/oauth2/OAuth2Oob.js
index a5c0fb50892..974077a2445 100644
--- a/root/oauth2/OAuth2Oob.js
+++ b/root/oauth2/OAuth2Oob.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 
 type Props = {
@@ -19,7 +17,7 @@ type Props = {
 const OAuth2Oob = ({
   application,
   code,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('OAuth Authorization')}>
     <h1>{l('Success!')}</h1>
     <p>
diff --git a/root/otherlookup/OtherLookupForm.js b/root/otherlookup/OtherLookupForm.js
index 62e62dbd1ed..d796bc93dff 100644
--- a/root/otherlookup/OtherLookupForm.js
+++ b/root/otherlookup/OtherLookupForm.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import FieldErrors from '../static/scripts/edit/components/FieldErrors.js';
 import FormLabel from '../static/scripts/edit/components/FormLabel.js';
 import FormRow from '../static/scripts/edit/components/FormRow.js';
@@ -30,7 +28,7 @@ const OtherLookupFormRow = ({
   action,
   field,
   label,
-}: OtherLookupFormRowProps): React.Element<'form'> => (
+}: OtherLookupFormRowProps): React$Element<'form'> => (
   <form action={'/otherlookup/' + action}>
     <FormRow>
       <FormLabel forField={field} label={label} required={field.has_errors} />
@@ -51,7 +49,7 @@ const OtherLookupFormRow = ({
 
 const OtherLookupForm = ({
   form,
-}: OtherLookupFormProps): React.Element<'div'> => (
+}: OtherLookupFormProps): React$Element<'div'> => (
   <div className="searchform">
     <OtherLookupFormRow
       action="catno"
diff --git a/root/otherlookup/OtherLookupIndex.js b/root/otherlookup/OtherLookupIndex.js
index 3a93fd22dba..a7d3789fabf 100644
--- a/root/otherlookup/OtherLookupIndex.js
+++ b/root/otherlookup/OtherLookupIndex.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 
 import OtherLookupForm from './OtherLookupForm.js';
@@ -20,7 +18,7 @@ type Props = {
 
 const OtherLookupIndex = ({
   form,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Other Lookups')}>
     <div className="content">
       <h1>{l('Other Lookups')}</h1>
diff --git a/root/otherlookup/OtherLookupReleaseResults.js b/root/otherlookup/OtherLookupReleaseResults.js
index 5aed533be8b..9dceb47a028 100644
--- a/root/otherlookup/OtherLookupReleaseResults.js
+++ b/root/otherlookup/OtherLookupReleaseResults.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from '../components/list/ReleaseList.js';
 import Layout from '../layout/index.js';
 
@@ -20,7 +18,7 @@ type Props = {
 
 const OtherLookupReleaseResults = ({
   results,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Search Results')}>
     <h1>{l('Search Results')}</h1>
     {results.length ? (
diff --git a/root/place/PlaceEvents.js b/root/place/PlaceEvents.js
index 7c439de5346..392a9bea585 100644
--- a/root/place/PlaceEvents.js
+++ b/root/place/PlaceEvents.js
@@ -26,7 +26,7 @@ const PlaceEvents = ({
   events,
   pager,
   place,
-}: Props): React.Element<typeof PlaceLayout> => {
+}: Props): React$Element<typeof PlaceLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <PlaceLayout entity={place} page="events" title={l('Events')}>
diff --git a/root/place/PlaceHeader.js b/root/place/PlaceHeader.js
index a1b96a7b1da..3e8ce09b1e8 100644
--- a/root/place/PlaceHeader.js
+++ b/root/place/PlaceHeader.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityHeader from '../components/EntityHeader.js';
 import localizeTypeNameForEntity
   from '../static/scripts/common/i18n/localizeTypeNameForEntity.js';
@@ -21,7 +19,7 @@ type Props = {
 const PlaceHeader = ({
   place,
   page,
-}: Props): React.Element<typeof EntityHeader> => (
+}: Props): React$Element<typeof EntityHeader> => (
   <EntityHeader
     entity={place}
     headerClass="placeheader"
diff --git a/root/place/PlaceIndex.js b/root/place/PlaceIndex.js
index c5291f39e4d..41b2ae21d98 100644
--- a/root/place/PlaceIndex.js
+++ b/root/place/PlaceIndex.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CleanupBanner from '../components/CleanupBanner.js';
 import * as manifest from '../static/manifest.mjs';
 import Annotation from '../static/scripts/common/components/Annotation.js';
@@ -31,7 +29,7 @@ const PlaceIndex = ({
   numberOfRevisions,
   place,
   wikipediaExtract,
-}: Props): React.Element<typeof PlaceLayout> => (
+}: Props): React$Element<typeof PlaceLayout> => (
   <PlaceLayout entity={place} page="index">
     {eligibleForCleanup ? (
       <CleanupBanner entityType="place" />
diff --git a/root/place/PlaceLayout.js b/root/place/PlaceLayout.js
index 2acbf4e8afc..06a1375639f 100644
--- a/root/place/PlaceLayout.js
+++ b/root/place/PlaceLayout.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import PlaceSidebar from '../layout/components/sidebar/PlaceSidebar.js';
 import Layout from '../layout/index.js';
 
 import PlaceHeader from './PlaceHeader.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +entity: PlaceT,
   +fullWidth?: boolean,
   +page: string,
@@ -28,7 +26,7 @@ const PlaceLayout = ({
   fullWidth = false,
   page,
   title,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout
     title={nonEmpty(title) ? hyphenateTitle(place.name, title) : place.name}
   >
diff --git a/root/place/PlaceMap.js b/root/place/PlaceMap.js
index be564d6a4b7..b337c1d7680 100644
--- a/root/place/PlaceMap.js
+++ b/root/place/PlaceMap.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import * as manifest from '../static/manifest.mjs';
 import DBDefs from '../static/scripts/common/DBDefs-client.mjs';
 
@@ -28,7 +26,7 @@ type Props = {
 const PlaceMap = ({
   mapDataArgs,
   place,
-}: Props): React.Element<typeof PlaceLayout> => (
+}: Props): React$Element<typeof PlaceLayout> => (
   <PlaceLayout entity={place} page="map" title={l('Map')}>
     {place.coordinates ? (
       DBDefs.MAPBOX_ACCESS_TOKEN ? (
diff --git a/root/place/PlaceMerge.js b/root/place/PlaceMerge.js
index 727265f1cb5..cb710f4fb26 100644
--- a/root/place/PlaceMerge.js
+++ b/root/place/PlaceMerge.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import PlaceList from '../components/list/PlaceList.js';
 import Layout from '../layout/index.js';
 import sortByEntityName
@@ -26,7 +24,7 @@ type Props = {
 const PlaceMerge = ({
   form,
   toMerge,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Merge places')}>
     <div id="content">
       <h1>{l('Merge places')}</h1>
diff --git a/root/place/PlacePerformances.js b/root/place/PlacePerformances.js
index f4302b0abd8..cdfbe7a372a 100644
--- a/root/place/PlacePerformances.js
+++ b/root/place/PlacePerformances.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import RelationshipsTable from '../components/RelationshipsTable.js';
 
 import PlaceLayout from './PlaceLayout.js';
@@ -23,7 +21,7 @@ const PlacePerformances = ({
   pagedLinkTypeGroup,
   pager,
   place,
-}: Props): React.Element<typeof PlaceLayout> => (
+}: Props): React$Element<typeof PlaceLayout> => (
   <PlaceLayout
     entity={place}
     page="performances"
diff --git a/root/recording/RecordingFingerprints.js b/root/recording/RecordingFingerprints.js
index 2fb0788925f..853eed1732f 100644
--- a/root/recording/RecordingFingerprints.js
+++ b/root/recording/RecordingFingerprints.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import FingerprintTable
   from '../static/scripts/common/components/FingerprintTable.js';
 
@@ -20,7 +18,7 @@ type Props = {
 
 const RecordingFingerprints = ({
   recording,
-}: Props): React.Element<typeof RecordingLayout> => (
+}: Props): React$Element<typeof RecordingLayout> => (
   <RecordingLayout
     entity={recording}
     page="fingerprints"
diff --git a/root/recording/RecordingHeader.js b/root/recording/RecordingHeader.js
index a32cc6fd95d..88d6b8b5062 100644
--- a/root/recording/RecordingHeader.js
+++ b/root/recording/RecordingHeader.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityHeader from '../components/EntityHeader.js';
 import * as manifest from '../static/manifest.mjs';
 import ArtistCreditLink
@@ -23,7 +21,7 @@ type Props = {
 const RecordingHeader = ({
   recording,
   page,
-}: Props): React.Element<typeof EntityHeader> => {
+}: Props): React$Element<typeof EntityHeader> => {
   const lArgs = {
     artist: <ArtistCreditLink artistCredit={recording.artistCredit} />,
   };
diff --git a/root/recording/RecordingIndex.js b/root/recording/RecordingIndex.js
index 55e90469f48..1b481e26ece 100644
--- a/root/recording/RecordingIndex.js
+++ b/root/recording/RecordingIndex.js
@@ -165,7 +165,7 @@ const RecordingIndex = ({
   pager,
   recording,
   tracks,
-}: Props): React.Element<typeof RecordingLayout> => (
+}: Props): React$Element<typeof RecordingLayout> => (
   <RecordingLayout entity={recording} page="index">
     <Annotation
       annotation={recording.latest_annotation}
diff --git a/root/recording/RecordingLayout.js b/root/recording/RecordingLayout.js
index 7dea96b7007..8e3d72b732a 100644
--- a/root/recording/RecordingLayout.js
+++ b/root/recording/RecordingLayout.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import RecordingSidebar
   from '../layout/components/sidebar/RecordingSidebar.js';
 import Layout from '../layout/index.js';
@@ -19,7 +17,7 @@ import {
 import RecordingHeader from './RecordingHeader.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +entity: RecordingWithArtistCreditT,
   +fullWidth?: boolean,
   +page: string,
@@ -32,7 +30,7 @@ const RecordingLayout = ({
   fullWidth = false,
   page,
   title,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const titleArgs = {
     artist: reduceArtistCredit(recording.artistCredit),
     name: recording.name,
diff --git a/root/recording/RecordingMerge.js b/root/recording/RecordingMerge.js
index 5ed05e4ff3c..5877c56c85a 100644
--- a/root/recording/RecordingMerge.js
+++ b/root/recording/RecordingMerge.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import RecordingList from '../components/list/RecordingList.js';
 import Layout from '../layout/index.js';
 import sortByEntityName
@@ -28,7 +26,7 @@ const RecordingMerge = ({
   form,
   isrcsDiffer = false,
   toMerge,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Merge recordings')}>
     <div id="content">
       <h1>{l('Merge recordings')}</h1>
diff --git a/root/relationship/RelationshipsHeader.js b/root/relationship/RelationshipsHeader.js
index 7a2a599470a..4d36ceaf961 100644
--- a/root/relationship/RelationshipsHeader.js
+++ b/root/relationship/RelationshipsHeader.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Tabs from '../components/Tabs.js';
 import buildTab from '../utility/buildTab.js';
 
@@ -33,7 +31,7 @@ type Props = {
   +page?: string,
 };
 
-const RelationshipsHeader = ({page}: Props): React.MixedElement => (
+const RelationshipsHeader = ({page}: Props): React$MixedElement => (
   <>
     <div className="relationshipsheader">
       <h1>{l('Relationships')}</h1>
diff --git a/root/relationship/linkattributetype/RelationshipAttributeTypeInUse.js b/root/relationship/linkattributetype/RelationshipAttributeTypeInUse.js
index 4d02f4787b1..d121bc75c29 100644
--- a/root/relationship/linkattributetype/RelationshipAttributeTypeInUse.js
+++ b/root/relationship/linkattributetype/RelationshipAttributeTypeInUse.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const RelationshipAttributeTypeInUse = ({
   type,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Relationship attribute in use')}>
     <div className="content">
       <h1>{l('Relationship attribute in use')}</h1>
diff --git a/root/relationship/linkattributetype/RelationshipAttributeTypeIndex.js b/root/relationship/linkattributetype/RelationshipAttributeTypeIndex.js
index a6dfe256258..7b115f94578 100644
--- a/root/relationship/linkattributetype/RelationshipAttributeTypeIndex.js
+++ b/root/relationship/linkattributetype/RelationshipAttributeTypeIndex.js
@@ -29,7 +29,7 @@ type Props = {
 
 const AttributeTree = ({
   attribute,
-}: {attribute: LinkAttrTypeT}): React.Element<'li'> => {
+}: {attribute: LinkAttrTypeT}): React$Element<'li'> => {
   const childrenAttrs = attribute.children || [];
   return (
     <li style={{marginTop: '0.25em'}}>
@@ -67,7 +67,7 @@ const AttributeTree = ({
 const RelationshipAttributeTypeIndex = ({
   attribute,
   relationships,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   const isInstrumentRoot = attribute.id === 14;
   const isInstrumentChild = attribute.root_id === 14 && !isInstrumentRoot;
diff --git a/root/relationship/linkattributetype/RelationshipAttributeTypesList.js b/root/relationship/linkattributetype/RelationshipAttributeTypesList.js
index b6af19df923..aa78a11d4b6 100644
--- a/root/relationship/linkattributetype/RelationshipAttributeTypesList.js
+++ b/root/relationship/linkattributetype/RelationshipAttributeTypesList.js
@@ -99,7 +99,7 @@ const AttributeDetails = ({
 
 const AttributeTree = ({
   attribute,
-}: AttributeTreeProps): React.Element<'li'> => {
+}: AttributeTreeProps): React$Element<'li'> => {
   const childrenAttrs = attribute.children || [];
   return (
     <li style={{marginTop: '0.25em'}}>
@@ -172,7 +172,7 @@ const AttributesList = ({root}: AttributesListProps) => {
 
 const RelationshipAttributeTypesList = ({
   root,
-}: AttributesListProps): React.Element<typeof Layout> => {
+}: AttributesListProps): React$Element<typeof Layout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <Layout fullWidth noIcons title={l('Relationship Attributes')}>
diff --git a/root/relationship/linktype/RelationshipTypeInUse.js b/root/relationship/linktype/RelationshipTypeInUse.js
index 7c1312bb2ee..45d30ae9fc0 100644
--- a/root/relationship/linktype/RelationshipTypeInUse.js
+++ b/root/relationship/linktype/RelationshipTypeInUse.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const RelationshipTypeInUse = ({
   type,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Relationship Type In Use')}>
     <div className="content">
       <h1>{l('Relationship Type In Use')}</h1>
diff --git a/root/relationship/linktype/RelationshipTypeIndex.js b/root/relationship/linktype/RelationshipTypeIndex.js
index cbc3407528c..e55410b85d3 100644
--- a/root/relationship/linktype/RelationshipTypeIndex.js
+++ b/root/relationship/linktype/RelationshipTypeIndex.js
@@ -84,7 +84,7 @@ const UsedAttributesList = ({
 
 const RelationshipTypeIndex = ({
   relType,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   const childrenTypes = relType.children || [];
   const typeName = upperFirst(l_relationships(relType.name));
diff --git a/root/relationship/linktype/RelationshipTypePairTree.js b/root/relationship/linktype/RelationshipTypePairTree.js
index 4478788d079..b6d56724a21 100644
--- a/root/relationship/linktype/RelationshipTypePairTree.js
+++ b/root/relationship/linktype/RelationshipTypePairTree.js
@@ -34,7 +34,7 @@ type RelationshipTypePairTreeProps = {
 
 const RelationshipTypeDetails = ({
   relType,
-}: RelationshipTypeDetailsProps): React.Element<'li'> => {
+}: RelationshipTypeDetailsProps): React$Element<'li'> => {
   const $c = React.useContext(SanitizedCatalystContext);
   const childrenTypes = relType.children || [];
   return (
@@ -156,7 +156,7 @@ const RelationshipTypeDetails = ({
 
 const RelationshipTypePairTree = ({
   root,
-}: RelationshipTypePairTreeProps): React.Element<typeof Layout> => {
+}: RelationshipTypePairTreeProps): React$Element<typeof Layout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   const childrenTypes = root.children || [];
   const type0 = root.type0;
diff --git a/root/relationship/linktype/RelationshipTypesList.js b/root/relationship/linktype/RelationshipTypesList.js
index f21c49762bf..008015391da 100644
--- a/root/relationship/linktype/RelationshipTypesList.js
+++ b/root/relationship/linktype/RelationshipTypesList.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../../layout/index.js';
 import formatEntityTypeName
   from '../../static/scripts/common/utility/formatEntityTypeName.js';
@@ -58,7 +56,7 @@ const TypesTable = ({table, types}: Props) => (
 const RelationshipTypesList = ({
   table,
   types,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth noIcons title={l('Relationship Types')}>
     <div className="wikicontent" id="content">
       <RelationshipsHeader page="relationships" />
diff --git a/root/release/CoverArt.js b/root/release/CoverArt.js
index c67b0726dea..73d106aec7a 100644
--- a/root/release/CoverArt.js
+++ b/root/release/CoverArt.js
@@ -25,7 +25,7 @@ type Props = {
 
 const CoverArtLinks = ({
   artwork,
-}: {artwork: ArtworkT}): React.Element<typeof React.Fragment> => (
+}: {artwork: ArtworkT}): React$Element<typeof React.Fragment> => (
   <>
     {artwork.small_thumbnail ? (
       <>
@@ -52,7 +52,7 @@ const CoverArtLinks = ({
 const CoverArt = ({
   coverArt,
   release,
-}: Props): React.Element<typeof ReleaseLayout> => {
+}: Props): React$Element<typeof ReleaseLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   const title = l('Cover Art');
 
diff --git a/root/release/CoverArtDarkened.js b/root/release/CoverArtDarkened.js
index b46cdf30376..52b6e8c89ca 100644
--- a/root/release/CoverArtDarkened.js
+++ b/root/release/CoverArtDarkened.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseLayout from './ReleaseLayout.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const CoverArtDarkened = ({
   release,
-}: Props): React.Element<typeof ReleaseLayout> => {
+}: Props): React$Element<typeof ReleaseLayout> => {
   const title = l('Cannot Add Cover Art');
 
   return (
diff --git a/root/release/CoverArtFields.js b/root/release/CoverArtFields.js
index b5730f7346b..54264bbec75 100644
--- a/root/release/CoverArtFields.js
+++ b/root/release/CoverArtFields.js
@@ -28,7 +28,7 @@ type Props = {
 const CoverArtFields = ({
   form,
   typeIdOptions,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const typeIdField = form.field.type_id;
   const selectedTypeIds = new Set(typeIdField.value.map(
     value => String(value),
diff --git a/root/release/EditRelationships.js b/root/release/EditRelationships.js
index 2308a6f318a..036a6502419 100644
--- a/root/release/EditRelationships.js
+++ b/root/release/EditRelationships.js
@@ -17,7 +17,7 @@ import ReleaseRelationshipEditor
 
 import ReleaseHeader from './ReleaseHeader.js';
 
-const EditRelationships = (): React.Element<typeof Layout> => {
+const EditRelationships = (): React$Element<typeof Layout> => {
   const $c = React.useContext(CatalystContext);
   const release = $c.stash.source_entity;
   invariant(release?.entityType === 'release');
diff --git a/root/release/ReleaseHeader.js b/root/release/ReleaseHeader.js
index 95f72a4f384..45a6fd4228b 100644
--- a/root/release/ReleaseHeader.js
+++ b/root/release/ReleaseHeader.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityHeader from '../components/EntityHeader.js';
 import * as manifest from '../static/manifest.mjs';
 import ArtistCreditLink
@@ -25,7 +23,7 @@ type Props = {
 const ReleaseHeader = ({
   release,
   page,
-}: Props): React.Element<typeof EntityHeader> => {
+}: Props): React$Element<typeof EntityHeader> => {
   const rgLink = release.releaseGroup
     ? texp.ln(
       'see all versions of this release, {count} available',
diff --git a/root/release/ReleaseIndex.js b/root/release/ReleaseIndex.js
index 8238c6ade89..7d1dca782dc 100644
--- a/root/release/ReleaseIndex.js
+++ b/root/release/ReleaseIndex.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import * as manifest from '../static/manifest.mjs';
 import Annotation from '../static/scripts/common/components/Annotation.js';
 import linkedEntities from '../static/scripts/common/linkedEntities.mjs';
@@ -30,7 +28,7 @@ const ReleaseIndex = ({
   noScript,
   numberOfRevisions,
   release,
-}: PropsT): React.Element<typeof ReleaseLayout> => {
+}: PropsT): React$Element<typeof ReleaseLayout> => {
   const {
     link_attribute_type: linkAttributeTypes,
     link_type: linkTypes,
diff --git a/root/release/ReleaseLayout.js b/root/release/ReleaseLayout.js
index 230509eb908..74483335c8f 100644
--- a/root/release/ReleaseLayout.js
+++ b/root/release/ReleaseLayout.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseSidebar from '../layout/components/sidebar/ReleaseSidebar.js';
 import Layout from '../layout/index.js';
 import {reduceArtistCredit}
@@ -17,7 +15,7 @@ import {reduceArtistCredit}
 import ReleaseHeader from './ReleaseHeader.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +entity: ReleaseT,
   +fullWidth?: boolean,
   +page?: string,
@@ -30,7 +28,7 @@ const ReleaseLayout = ({
   fullWidth = false,
   page,
   title,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const mainTitle = texp.l('Release “{name}” by {artist}', {
     artist: reduceArtistCredit(release.artistCredit),
     name: release.name,
diff --git a/root/release/ReleaseMerge.js b/root/release/ReleaseMerge.js
index b250b35257f..75a4dc13ca0 100644
--- a/root/release/ReleaseMerge.js
+++ b/root/release/ReleaseMerge.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from '../components/list/ReleaseList.js';
 import Layout from '../layout/index.js';
 import * as manifest from '../static/manifest.mjs';
@@ -35,7 +33,7 @@ const ReleaseMerge = ({
   form,
   mediums,
   toMerge,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Merge releases')}>
     <div id="content">
       <h1>{l('Merge releases')}</h1>
diff --git a/root/release/RemoveCoverArt.js b/root/release/RemoveCoverArt.js
index 91f9105007c..1967cbb5445 100644
--- a/root/release/RemoveCoverArt.js
+++ b/root/release/RemoveCoverArt.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {Artwork} from '../components/Artwork.js';
 import ArtistCreditLink
   from '../static/scripts/common/components/ArtistCreditLink.js';
@@ -29,7 +27,7 @@ const RemoveCoverArt = ({
   artwork,
   form,
   release,
-}: Props): React.Element<typeof ReleaseLayout> => {
+}: Props): React$Element<typeof ReleaseLayout> => {
   const title = l('Remove Cover Art');
 
   return (
diff --git a/root/release_group/ReleaseGroupHeader.js b/root/release_group/ReleaseGroupHeader.js
index 9a20c2c3c7c..fb734c8ce34 100644
--- a/root/release_group/ReleaseGroupHeader.js
+++ b/root/release_group/ReleaseGroupHeader.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityHeader from '../components/EntityHeader.js';
 import ArtistCreditLink
   from '../static/scripts/common/components/ArtistCreditLink.js';
@@ -21,7 +19,7 @@ type Props = {
 const ReleaseGroupHeader = ({
   releaseGroup,
   page,
-}: Props): React.Element<typeof EntityHeader> => {
+}: Props): React$Element<typeof EntityHeader> => {
   return (
     <EntityHeader
       entity={releaseGroup}
diff --git a/root/release_group/ReleaseGroupIndex.js b/root/release_group/ReleaseGroupIndex.js
index c4b9de3a4f3..10109a74335 100644
--- a/root/release_group/ReleaseGroupIndex.js
+++ b/root/release_group/ReleaseGroupIndex.js
@@ -125,7 +125,7 @@ const ReleaseGroupIndex = ({
   releaseGroup,
   releases,
   wikipediaExtract,
-}: Props): React.Element<typeof ReleaseGroupLayout> => {
+}: Props): React$Element<typeof ReleaseGroupLayout> => {
   const $c = React.useContext(CatalystContext);
   const firstReleaseGid = releases.length ? releases[0][0].gid : null;
 
diff --git a/root/release_group/ReleaseGroupLayout.js b/root/release_group/ReleaseGroupLayout.js
index 05a155665a8..033fde33e1c 100644
--- a/root/release_group/ReleaseGroupLayout.js
+++ b/root/release_group/ReleaseGroupLayout.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseGroupSidebar
   from '../layout/components/sidebar/ReleaseGroupSidebar.js';
 import Layout from '../layout/index.js';
@@ -18,7 +16,7 @@ import {reduceArtistCredit}
 import ReleaseGroupHeader from './ReleaseGroupHeader.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +entity: ReleaseGroupT,
   +firstReleaseGid?: string | null,
   +fullWidth?: boolean,
@@ -33,7 +31,7 @@ const ReleaseGroupLayout = ({
   fullWidth = false,
   page,
   title,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const mainTitle = texp.l('Release group “{name}” by {artist}', {
     artist: reduceArtistCredit(releaseGroup.artistCredit),
     name: releaseGroup.name,
diff --git a/root/release_group/ReleaseGroupMerge.js b/root/release_group/ReleaseGroupMerge.js
index 28b774a62d4..63c3f27dd1a 100644
--- a/root/release_group/ReleaseGroupMerge.js
+++ b/root/release_group/ReleaseGroupMerge.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {ReleaseGroupListTable} from '../components/list/ReleaseGroupList.js';
 import Layout from '../layout/index.js';
 import sortByEntityName
@@ -26,7 +24,7 @@ type Props = {
 const ReleaseGroupMerge = ({
   form,
   toMerge,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Merge release groups')}>
     <div id="content">
       <h1>{l('Merge release groups')}</h1>
diff --git a/root/report/AnnotationsArtists.js b/root/report/AnnotationsArtists.js
index 438272f2554..ed420877356 100644
--- a/root/report/AnnotationsArtists.js
+++ b/root/report/AnnotationsArtists.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistList from './components/ArtistList.js';
 import ReportLayout from './components/ReportLayout.js';
 import useAnnotationColumns from './hooks/useAnnotationColumns.js';
@@ -22,7 +20,7 @@ const AnnotationsArtists = ({
   items,
   pager,
 }: ReportDataT<ReportArtistAnnotationT>):
-React.Element<typeof ReportLayout> => {
+React$Element<typeof ReportLayout> => {
   const annotationColumns = useAnnotationColumns<ReportArtistAnnotationT>();
 
   return (
diff --git a/root/report/AnnotationsEvents.js b/root/report/AnnotationsEvents.js
index ab05c15b4d1..0be02067984 100644
--- a/root/report/AnnotationsEvents.js
+++ b/root/report/AnnotationsEvents.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EventList from './components/EventList.js';
 import ReportLayout from './components/ReportLayout.js';
 import useAnnotationColumns from './hooks/useAnnotationColumns.js';
@@ -22,7 +20,7 @@ const AnnotationsEvents = ({
   items,
   pager,
 }: ReportDataT<ReportEventAnnotationT>):
-React.Element<typeof ReportLayout> => {
+React$Element<typeof ReportLayout> => {
   const annotationColumns = useAnnotationColumns<ReportEventAnnotationT>();
 
   return (
diff --git a/root/report/AnnotationsLabels.js b/root/report/AnnotationsLabels.js
index be0389abd78..7a03328b9ed 100644
--- a/root/report/AnnotationsLabels.js
+++ b/root/report/AnnotationsLabels.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import LabelList from './components/LabelList.js';
 import ReportLayout from './components/ReportLayout.js';
 import useAnnotationColumns from './hooks/useAnnotationColumns.js';
@@ -22,7 +20,7 @@ const AnnotationsLabels = ({
   items,
   pager,
 }: ReportDataT<ReportLabelAnnotationT>):
-React.Element<typeof ReportLayout> => {
+React$Element<typeof ReportLayout> => {
   const annotationColumns = useAnnotationColumns<ReportLabelAnnotationT>();
 
   return (
diff --git a/root/report/AnnotationsPlaces.js b/root/report/AnnotationsPlaces.js
index e59a09cf5fc..7678b022aa3 100644
--- a/root/report/AnnotationsPlaces.js
+++ b/root/report/AnnotationsPlaces.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import PlaceList from './components/PlaceList.js';
 import ReportLayout from './components/ReportLayout.js';
 import useAnnotationColumns from './hooks/useAnnotationColumns.js';
@@ -22,7 +20,7 @@ const AnnotationsPlaces = ({
   items,
   pager,
 }: ReportDataT<ReportPlaceAnnotationT>):
-React.Element<typeof ReportLayout> => {
+React$Element<typeof ReportLayout> => {
   const annotationColumns = useAnnotationColumns<ReportPlaceAnnotationT>();
 
   return (
diff --git a/root/report/AnnotationsRecordings.js b/root/report/AnnotationsRecordings.js
index a671f4c1653..5c55f5f8718 100644
--- a/root/report/AnnotationsRecordings.js
+++ b/root/report/AnnotationsRecordings.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import RecordingList from './components/RecordingList.js';
 import ReportLayout from './components/ReportLayout.js';
 import useAnnotationColumns from './hooks/useAnnotationColumns.js';
@@ -22,7 +20,7 @@ const AnnotationsRecordings = ({
   items,
   pager,
 }: ReportDataT<ReportRecordingAnnotationT>):
-React.Element<typeof ReportLayout> => {
+React$Element<typeof ReportLayout> => {
   const annotationColumns =
     useAnnotationColumns<ReportRecordingAnnotationT>();
 
diff --git a/root/report/AnnotationsReleaseGroups.js b/root/report/AnnotationsReleaseGroups.js
index 15ac5d4ca2b..b388be0fb53 100644
--- a/root/report/AnnotationsReleaseGroups.js
+++ b/root/report/AnnotationsReleaseGroups.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseGroupList from './components/ReleaseGroupList.js';
 import ReportLayout from './components/ReportLayout.js';
 import useAnnotationColumns from './hooks/useAnnotationColumns.js';
@@ -22,7 +20,7 @@ const AnnotationsReleaseGroups = ({
   items,
   pager,
 }: ReportDataT<ReportReleaseGroupAnnotationT>):
-React.Element<typeof ReportLayout> => {
+React$Element<typeof ReportLayout> => {
   const annotationColumns =
     useAnnotationColumns<ReportReleaseGroupAnnotationT>();
 
diff --git a/root/report/AnnotationsReleases.js b/root/report/AnnotationsReleases.js
index 4416d9d2de3..8ea905f9630 100644
--- a/root/report/AnnotationsReleases.js
+++ b/root/report/AnnotationsReleases.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import useAnnotationColumns from './hooks/useAnnotationColumns.js';
@@ -22,7 +20,7 @@ const AnnotationsReleases = ({
   items,
   pager,
 }: ReportDataT<ReportReleaseAnnotationT>):
-React.Element<typeof ReportLayout> => {
+React$Element<typeof ReportLayout> => {
   const annotationColumns = useAnnotationColumns<ReportReleaseAnnotationT>();
 
   return (
diff --git a/root/report/AnnotationsSeries.js b/root/report/AnnotationsSeries.js
index 3cca5eff233..b996b94d3e7 100644
--- a/root/report/AnnotationsSeries.js
+++ b/root/report/AnnotationsSeries.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReportLayout from './components/ReportLayout.js';
 import SeriesList from './components/SeriesList.js';
 import useAnnotationColumns from './hooks/useAnnotationColumns.js';
@@ -22,7 +20,7 @@ const AnnotationsSeries = ({
   items,
   pager,
 }: ReportDataT<ReportSeriesAnnotationT>):
-React.Element<typeof ReportLayout> => {
+React$Element<typeof ReportLayout> => {
   const annotationColumns = useAnnotationColumns<ReportSeriesAnnotationT>();
 
   return (
diff --git a/root/report/AnnotationsWorks.js b/root/report/AnnotationsWorks.js
index 45670ff5e7e..90a5c248eef 100644
--- a/root/report/AnnotationsWorks.js
+++ b/root/report/AnnotationsWorks.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReportLayout from './components/ReportLayout.js';
 import WorkList from './components/WorkList.js';
 import useAnnotationColumns from './hooks/useAnnotationColumns.js';
@@ -22,7 +20,7 @@ const AnnotationsWorks = ({
   items,
   pager,
 }: ReportDataT<ReportWorkAnnotationT>):
-React.Element<typeof ReportLayout> => {
+React$Element<typeof ReportLayout> => {
   const annotationColumns = useAnnotationColumns<ReportWorkAnnotationT>();
 
   return (
diff --git a/root/report/ArtistCreditsWithDubiousTrailingPhrases.js b/root/report/ArtistCreditsWithDubiousTrailingPhrases.js
index 08a3f0c191b..686e0006b1d 100644
--- a/root/report/ArtistCreditsWithDubiousTrailingPhrases.js
+++ b/root/report/ArtistCreditsWithDubiousTrailingPhrases.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistCreditList from './components/ArtistCreditList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportArtistCreditT, ReportDataT} from './types.js';
@@ -19,7 +17,7 @@ const ArtistCreditsWithDubiousTrailingPhrases = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportArtistCreditT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportArtistCreditT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ArtistsContainingDisambiguationComments.js b/root/report/ArtistsContainingDisambiguationComments.js
index 8cdd22d1016..846100b0df3 100644
--- a/root/report/ArtistsContainingDisambiguationComments.js
+++ b/root/report/ArtistsContainingDisambiguationComments.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistList from './components/ArtistList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportArtistT, ReportDataT} from './types.js';
@@ -19,7 +17,7 @@ const ArtistsContainingDisambiguationComments = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportArtistT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportArtistT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ArtistsDisambiguationSameName.js b/root/report/ArtistsDisambiguationSameName.js
index 346eb7501d5..9476e389a91 100644
--- a/root/report/ArtistsDisambiguationSameName.js
+++ b/root/report/ArtistsDisambiguationSameName.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistList from './components/ArtistList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportArtistT, ReportDataT} from './types.js';
@@ -19,7 +17,7 @@ const ArtistsDisambiguationSameName = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportArtistT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportArtistT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ArtistsThatMayBeGroups.js b/root/report/ArtistsThatMayBeGroups.js
index b9e8a37ff70..68d2d95f835 100644
--- a/root/report/ArtistsThatMayBeGroups.js
+++ b/root/report/ArtistsThatMayBeGroups.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistList from './components/ArtistList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportArtistT, ReportDataT} from './types.js';
@@ -19,7 +17,7 @@ const ArtistsThatMayBeGroups = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportArtistT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportArtistT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ArtistsThatMayBePersons.js b/root/report/ArtistsThatMayBePersons.js
index 37e3d542d78..7a08c2283d0 100644
--- a/root/report/ArtistsThatMayBePersons.js
+++ b/root/report/ArtistsThatMayBePersons.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistList from './components/ArtistList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportArtistT, ReportDataT} from './types.js';
@@ -19,7 +17,7 @@ const ArtistsThatMayBePersons = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportArtistT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportArtistT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ArtistsWithMultipleOccurrencesInArtistCredits.js b/root/report/ArtistsWithMultipleOccurrencesInArtistCredits.js
index 60d1d071b22..bc542ff8fee 100644
--- a/root/report/ArtistsWithMultipleOccurrencesInArtistCredits.js
+++ b/root/report/ArtistsWithMultipleOccurrencesInArtistCredits.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistList from './components/ArtistList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportArtistT, ReportDataT} from './types.js';
@@ -19,7 +17,7 @@ const ArtistsWithMultipleOccurrencesInArtistCredits = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportArtistT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportArtistT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ArtistsWithNoSubscribers.js b/root/report/ArtistsWithNoSubscribers.js
index c4e37300762..007b2f96bbd 100644
--- a/root/report/ArtistsWithNoSubscribers.js
+++ b/root/report/ArtistsWithNoSubscribers.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistList from './components/ArtistList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportArtistT, ReportDataT} from './types.js';
@@ -19,7 +17,7 @@ const ArtistsWithNoSubscribers = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportArtistT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportArtistT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/AsinsWithMultipleReleases.js b/root/report/AsinsWithMultipleReleases.js
index 95ba49bd288..872ea7456bd 100644
--- a/root/report/AsinsWithMultipleReleases.js
+++ b/root/report/AsinsWithMultipleReleases.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseUrlList from './components/ReleaseUrlList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseUrlT} from './types.js';
@@ -19,7 +17,7 @@ const AsinsWithMultipleReleases = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseUrlT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseUrlT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={exp.l(
diff --git a/root/report/BadAmazonUrls.js b/root/report/BadAmazonUrls.js
index d18640b7afd..8e2eb75e397 100644
--- a/root/report/BadAmazonUrls.js
+++ b/root/report/BadAmazonUrls.js
@@ -7,7 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
 import type {CellRenderProps} from 'react-table';
 
 import EntityLink from '../static/scripts/common/components/EntityLink.js';
@@ -22,7 +21,7 @@ const BadAmazonUrls = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseUrlT>): React.Element<typeof ReportLayout> => {
+}: ReportDataT<ReportReleaseUrlT>): React$Element<typeof ReportLayout> => {
   const urlColumn = {
     Cell: ({row: {original}}: CellRenderProps<ReportReleaseUrlT, empty>) => {
       const url = original.url;
diff --git a/root/report/CDTocDubiousLength.js b/root/report/CDTocDubiousLength.js
index 53df5ae9a35..f2a10a6d4c5 100644
--- a/root/report/CDTocDubiousLength.js
+++ b/root/report/CDTocDubiousLength.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CDTocList from './components/CDTocList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportCDTocT, ReportDataT} from './types.js';
@@ -19,7 +17,7 @@ const CDTocDubiousLength = ({
   filtered,
   items,
   pager,
-}: ReportDataT<ReportCDTocT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportCDTocT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/CDTocNotApplied.js b/root/report/CDTocNotApplied.js
index b8d8d15eaa8..f1fb840a604 100644
--- a/root/report/CDTocNotApplied.js
+++ b/root/report/CDTocNotApplied.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CDTocReleaseList from './components/CDTocReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportCDTocReleaseT, ReportDataT} from './types.js';
@@ -19,7 +17,7 @@ const CDTocNotApplied = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportCDTocReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportCDTocReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/CatNoLooksLikeAsin.js b/root/report/CatNoLooksLikeAsin.js
index cfec0ca061b..b3769099219 100644
--- a/root/report/CatNoLooksLikeAsin.js
+++ b/root/report/CatNoLooksLikeAsin.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import useCatNoColumn from './hooks/useCatNoColumn.js';
@@ -20,7 +18,7 @@ const CatNoLooksLikeAsin = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseCatNoT>): React.Element<typeof ReportLayout> => {
+}: ReportDataT<ReportReleaseCatNoT>): React$Element<typeof ReportLayout> => {
   const catNoColumn = useCatNoColumn<ReportReleaseCatNoT>();
 
   return (
diff --git a/root/report/CatNoLooksLikeIsrc.js b/root/report/CatNoLooksLikeIsrc.js
index 89f1e403261..59afca19b2c 100644
--- a/root/report/CatNoLooksLikeIsrc.js
+++ b/root/report/CatNoLooksLikeIsrc.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import useCatNoColumn from './hooks/useCatNoColumn.js';
@@ -20,7 +18,7 @@ const CatNoLooksLikeIsrc = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseCatNoT>): React.Element<typeof ReportLayout> => {
+}: ReportDataT<ReportReleaseCatNoT>): React$Element<typeof ReportLayout> => {
   const catNoColumn = useCatNoColumn<ReportReleaseCatNoT>();
 
   return (
diff --git a/root/report/CatNoLooksLikeLabelCode.js b/root/report/CatNoLooksLikeLabelCode.js
index 7301ecbdb29..0d5efc982b0 100644
--- a/root/report/CatNoLooksLikeLabelCode.js
+++ b/root/report/CatNoLooksLikeLabelCode.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import useCatNoColumn from './hooks/useCatNoColumn.js';
@@ -21,7 +19,7 @@ const CatNoLooksLikeLabelCode = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseCatNoT>): React.Element<typeof ReportLayout> => {
+}: ReportDataT<ReportReleaseCatNoT>): React$Element<typeof ReportLayout> => {
   const catNoColumn = useCatNoColumn<ReportReleaseCatNoT>();
 
   return (
diff --git a/root/report/CollaborationRelationships.js b/root/report/CollaborationRelationships.js
index 1c6c977806a..be34c06e1eb 100644
--- a/root/report/CollaborationRelationships.js
+++ b/root/report/CollaborationRelationships.js
@@ -21,7 +21,7 @@ const CollaborationRelationships = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportCollaborationT>): React.Element<typeof ReportLayout> => {
+}: ReportDataT<ReportCollaborationT>): React$Element<typeof ReportLayout> => {
   let lastID = 0;
   let currentID = 0;
 
diff --git a/root/report/DeprecatedRelationshipArtists.js b/root/report/DeprecatedRelationshipArtists.js
index 2056e0f2262..46f3726fd55 100644
--- a/root/report/DeprecatedRelationshipArtists.js
+++ b/root/report/DeprecatedRelationshipArtists.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {
   relTypeColumn,
 } from '../utility/tableColumns.js';
@@ -24,7 +22,7 @@ const DeprecatedRelationshipArtists = ({
   items,
   pager,
 }: ReportDataT<ReportArtistRelationshipT>):
-React.Element<typeof ReportLayout> => (
+React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/DeprecatedRelationshipLabels.js b/root/report/DeprecatedRelationshipLabels.js
index 202f8fecbad..e5ae7069962 100644
--- a/root/report/DeprecatedRelationshipLabels.js
+++ b/root/report/DeprecatedRelationshipLabels.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {
   relTypeColumn,
 } from '../utility/tableColumns.js';
@@ -24,7 +22,7 @@ const DeprecatedRelationshipLabels = ({
   items,
   pager,
 }: ReportDataT<ReportLabelRelationshipT>):
-React.Element<typeof ReportLayout> => (
+React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/DeprecatedRelationshipPlaces.js b/root/report/DeprecatedRelationshipPlaces.js
index c52a18ac389..c7be45745b2 100644
--- a/root/report/DeprecatedRelationshipPlaces.js
+++ b/root/report/DeprecatedRelationshipPlaces.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {
   relTypeColumn,
 } from '../utility/tableColumns.js';
@@ -24,7 +22,7 @@ const DeprecatedRelationshipPlaces = ({
   items,
   pager,
 }: ReportDataT<ReportPlaceRelationshipT>):
-React.Element<typeof ReportLayout> => (
+React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/DeprecatedRelationshipRecordings.js b/root/report/DeprecatedRelationshipRecordings.js
index 543c6b9d394..449addf7854 100644
--- a/root/report/DeprecatedRelationshipRecordings.js
+++ b/root/report/DeprecatedRelationshipRecordings.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {
   relTypeColumn,
 } from '../utility/tableColumns.js';
@@ -24,7 +22,7 @@ const DeprecatedRelationshipRecordings = ({
   items,
   pager,
 }: ReportDataT<ReportRecordingRelationshipT>):
-React.Element<typeof ReportLayout> => (
+React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/DeprecatedRelationshipReleaseGroups.js b/root/report/DeprecatedRelationshipReleaseGroups.js
index 39ad17c93b6..e03b58df93f 100644
--- a/root/report/DeprecatedRelationshipReleaseGroups.js
+++ b/root/report/DeprecatedRelationshipReleaseGroups.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {
   relTypeColumn,
 } from '../utility/tableColumns.js';
@@ -24,7 +22,7 @@ const DeprecatedRelationshipReleaseGroups = ({
   items,
   pager,
 }: ReportDataT<ReportReleaseGroupRelationshipT>):
-React.Element<typeof ReportLayout> => (
+React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/DeprecatedRelationshipReleases.js b/root/report/DeprecatedRelationshipReleases.js
index 9d52e83e8ce..2b9313a0e2e 100644
--- a/root/report/DeprecatedRelationshipReleases.js
+++ b/root/report/DeprecatedRelationshipReleases.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {
   relTypeColumn,
 } from '../utility/tableColumns.js';
@@ -24,7 +22,7 @@ const DeprecatedRelationshipReleases = ({
   items,
   pager,
 }: ReportDataT<ReportReleaseRelationshipT>):
-React.Element<typeof ReportLayout> => (
+React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/DeprecatedRelationshipUrls.js b/root/report/DeprecatedRelationshipUrls.js
index c01e38f945e..18712ddaa52 100644
--- a/root/report/DeprecatedRelationshipUrls.js
+++ b/root/report/DeprecatedRelationshipUrls.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {
   relTypeColumn,
 } from '../utility/tableColumns.js';
@@ -24,7 +22,7 @@ const DeprecatedRelationshipUrls = ({
   items,
   pager,
 }: ReportDataT<ReportUrlRelationshipT>):
-React.Element<typeof ReportLayout> => (
+React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/DeprecatedRelationshipWorks.js b/root/report/DeprecatedRelationshipWorks.js
index 676750776e7..bf0824dc57d 100644
--- a/root/report/DeprecatedRelationshipWorks.js
+++ b/root/report/DeprecatedRelationshipWorks.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {
   relTypeColumn,
 } from '../utility/tableColumns.js';
@@ -24,7 +22,7 @@ const DeprecatedRelationshipWorks = ({
   items,
   pager,
 }: ReportDataT<ReportWorkRelationshipT>):
-React.Element<typeof ReportLayout> => (
+React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/DiscogsLinksWithMultipleArtists.js b/root/report/DiscogsLinksWithMultipleArtists.js
index b63d5dd188d..6b24f093a29 100644
--- a/root/report/DiscogsLinksWithMultipleArtists.js
+++ b/root/report/DiscogsLinksWithMultipleArtists.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistUrlList from './components/ArtistUrlList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportArtistUrlT, ReportDataT} from './types.js';
@@ -20,7 +18,7 @@ const DiscogsLinksWithMultipleArtists = ({
   items,
   pager,
 }: ReportDataT<ReportArtistUrlT>):
-React.Element<typeof ReportLayout> => (
+React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/DiscogsLinksWithMultipleLabels.js b/root/report/DiscogsLinksWithMultipleLabels.js
index 1d4674f34fc..b6cb1b811a5 100644
--- a/root/report/DiscogsLinksWithMultipleLabels.js
+++ b/root/report/DiscogsLinksWithMultipleLabels.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import LabelUrlList from './components/LabelUrlList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportLabelUrlT} from './types.js';
@@ -20,7 +18,7 @@ const DiscogsLinksWithMultipleLabels = ({
   items,
   pager,
 }: ReportDataT<ReportLabelUrlT>):
-React.Element<typeof ReportLayout> => (
+React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/DiscogsLinksWithMultipleReleaseGroups.js b/root/report/DiscogsLinksWithMultipleReleaseGroups.js
index bfc9c0ab36f..1c5494fdbe2 100644
--- a/root/report/DiscogsLinksWithMultipleReleaseGroups.js
+++ b/root/report/DiscogsLinksWithMultipleReleaseGroups.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseGroupUrlList from './components/ReleaseGroupUrlList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseGroupUrlT} from './types.js';
@@ -20,7 +18,7 @@ const DiscogsLinksWithMultipleReleaseGroups = ({
   items,
   pager,
 }: ReportDataT<ReportReleaseGroupUrlT>):
-React.Element<typeof ReportLayout> => (
+React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/DiscogsLinksWithMultipleReleases.js b/root/report/DiscogsLinksWithMultipleReleases.js
index 55371d5c83e..f0747e71f6d 100644
--- a/root/report/DiscogsLinksWithMultipleReleases.js
+++ b/root/report/DiscogsLinksWithMultipleReleases.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseUrlList from './components/ReleaseUrlList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseUrlT} from './types.js';
@@ -20,7 +18,7 @@ const DiscogsLinksWithMultipleReleases = ({
   items,
   pager,
 }: ReportDataT<ReportReleaseUrlT>):
-React.Element<typeof ReportLayout> => (
+React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={exp.l(
diff --git a/root/report/DuplicateArtists.js b/root/report/DuplicateArtists.js
index 45861e0b4a4..07918451ea3 100644
--- a/root/report/DuplicateArtists.js
+++ b/root/report/DuplicateArtists.js
@@ -26,7 +26,7 @@ const DuplicateArtists = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportArtistT>): React.Element<typeof ReportLayout> => {
+}: ReportDataT<ReportArtistT>): React$Element<typeof ReportLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
 
   let currentKey: ?string = '';
diff --git a/root/report/DuplicateEvents.js b/root/report/DuplicateEvents.js
index 348b68dadcc..75db74cd4cd 100644
--- a/root/report/DuplicateEvents.js
+++ b/root/report/DuplicateEvents.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EventList from './components/EventList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportEventT} from './types.js';
@@ -19,7 +17,7 @@ const DuplicateEvents = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportEventT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportEventT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/DuplicateRelationshipsArtists.js b/root/report/DuplicateRelationshipsArtists.js
index eea4d68ad72..9775f566860 100644
--- a/root/report/DuplicateRelationshipsArtists.js
+++ b/root/report/DuplicateRelationshipsArtists.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistList from './components/ArtistList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportArtistT, ReportDataT} from './types.js';
@@ -19,7 +17,7 @@ const DuplicateRelationshipsArtists = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportArtistT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportArtistT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/DuplicateRelationshipsLabels.js b/root/report/DuplicateRelationshipsLabels.js
index 76b19fe8165..8407b11eeeb 100644
--- a/root/report/DuplicateRelationshipsLabels.js
+++ b/root/report/DuplicateRelationshipsLabels.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import LabelList from './components/LabelList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportLabelT} from './types.js';
@@ -19,7 +17,7 @@ const DuplicateRelationshipsLabels = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportLabelT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportLabelT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/DuplicateRelationshipsRecordings.js b/root/report/DuplicateRelationshipsRecordings.js
index 0741675f078..4f8d57b2b8a 100644
--- a/root/report/DuplicateRelationshipsRecordings.js
+++ b/root/report/DuplicateRelationshipsRecordings.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import RecordingList from './components/RecordingList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportRecordingT} from './types.js';
@@ -19,7 +17,7 @@ const DuplicateRelationshipsRecordings = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportRecordingT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportRecordingT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/DuplicateRelationshipsReleaseGroups.js b/root/report/DuplicateRelationshipsReleaseGroups.js
index 8185d1bd681..4b41b0cef0c 100644
--- a/root/report/DuplicateRelationshipsReleaseGroups.js
+++ b/root/report/DuplicateRelationshipsReleaseGroups.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseGroupList from './components/ReleaseGroupList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseGroupT} from './types.js';
@@ -19,7 +17,7 @@ const DuplicateRelationshipsReleaseGroups = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseGroupT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseGroupT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/DuplicateRelationshipsReleases.js b/root/report/DuplicateRelationshipsReleases.js
index 4aae5de9fbb..d838517c627 100644
--- a/root/report/DuplicateRelationshipsReleases.js
+++ b/root/report/DuplicateRelationshipsReleases.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const DuplicateRelationshipsReleases = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/DuplicateRelationshipsWorks.js b/root/report/DuplicateRelationshipsWorks.js
index 565966c20d9..1b823c9a8e8 100644
--- a/root/report/DuplicateRelationshipsWorks.js
+++ b/root/report/DuplicateRelationshipsWorks.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReportLayout from './components/ReportLayout.js';
 import WorkList from './components/WorkList.js';
 import type {ReportDataT, ReportWorkT} from './types.js';
@@ -19,7 +17,7 @@ const DuplicateRelationshipsWorks = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportWorkT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportWorkT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/DuplicateReleaseGroups.js b/root/report/DuplicateReleaseGroups.js
index 18f6f55d0d8..24be3ff171e 100644
--- a/root/report/DuplicateReleaseGroups.js
+++ b/root/report/DuplicateReleaseGroups.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import PaginatedResults from '../components/PaginatedResults.js';
 import ArtistCreditLink
   from '../static/scripts/common/components/ArtistCreditLink.js';
@@ -30,7 +28,7 @@ const DuplicateReleaseGroups = ({
   items,
   pager,
 }: ReportDataT<ReportReleaseGroupWithKeyT>):
-React.Element<typeof ReportLayout> => {
+React$Element<typeof ReportLayout> => {
   let currentKey = '';
   let lastKey = '';
 
diff --git a/root/report/EventSequenceNotInSeries.js b/root/report/EventSequenceNotInSeries.js
index 39caf22889f..324285d01b0 100644
--- a/root/report/EventSequenceNotInSeries.js
+++ b/root/report/EventSequenceNotInSeries.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EventList from './components/EventList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportEventT} from './types.js';
@@ -19,7 +17,7 @@ const EventSequenceNotInSeries = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportEventT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportEventT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/FeaturingRecordings.js b/root/report/FeaturingRecordings.js
index 274ad524d81..5c6477dd477 100644
--- a/root/report/FeaturingRecordings.js
+++ b/root/report/FeaturingRecordings.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import RecordingList from './components/RecordingList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportRecordingT} from './types.js';
@@ -19,7 +17,7 @@ const FeaturingRecordings = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportRecordingT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportRecordingT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={exp.l(
diff --git a/root/report/FeaturingReleaseGroups.js b/root/report/FeaturingReleaseGroups.js
index 34cc350a839..8a58a4809fb 100644
--- a/root/report/FeaturingReleaseGroups.js
+++ b/root/report/FeaturingReleaseGroups.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseGroupList from './components/ReleaseGroupList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseGroupT} from './types.js';
@@ -19,7 +17,7 @@ const FeaturingReleaseGroups = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseGroupT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseGroupT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={exp.l(
diff --git a/root/report/FeaturingReleases.js b/root/report/FeaturingReleases.js
index a62a973e3a1..7403eb75c2a 100644
--- a/root/report/FeaturingReleases.js
+++ b/root/report/FeaturingReleases.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const FeaturingReleases = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={exp.l(
diff --git a/root/report/FilterLink.js b/root/report/FilterLink.js
index 7a2857befc4..4e2e8faba4f 100644
--- a/root/report/FilterLink.js
+++ b/root/report/FilterLink.js
@@ -16,7 +16,7 @@ type Props = {
   +filtered: boolean,
 };
 
-const FilterLink = ({filtered = false}: Props): React.Element<'li'> => {
+const FilterLink = ({filtered = false}: Props): React$Element<'li'> => {
   const $c = React.useContext(SanitizedCatalystContext);
   const reqUri = $c.req.uri;
 
diff --git a/root/report/InstrumentsWithoutAnImage.js b/root/report/InstrumentsWithoutAnImage.js
index b89687b13a3..c0a80ab9510 100644
--- a/root/report/InstrumentsWithoutAnImage.js
+++ b/root/report/InstrumentsWithoutAnImage.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import InstrumentList from './components/InstrumentList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportInstrumentT} from './types.js';
@@ -19,7 +17,7 @@ const InstrumentsWithoutAnImage = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportInstrumentT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportInstrumentT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/InstrumentsWithoutWikidata.js b/root/report/InstrumentsWithoutWikidata.js
index ae6af75f142..7f4048ed6f1 100644
--- a/root/report/InstrumentsWithoutWikidata.js
+++ b/root/report/InstrumentsWithoutWikidata.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import InstrumentList from './components/InstrumentList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportInstrumentT} from './types.js';
@@ -19,7 +17,7 @@ const InstrumentsWithoutWikidata = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportInstrumentT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportInstrumentT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/IsrcsWithManyRecordings.js b/root/report/IsrcsWithManyRecordings.js
index b136b5dd94f..820c0332039 100644
--- a/root/report/IsrcsWithManyRecordings.js
+++ b/root/report/IsrcsWithManyRecordings.js
@@ -26,7 +26,7 @@ const IsrcsWithManyRecordings = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportIsrcT>): React.Element<typeof ReportLayout> => {
+}: ReportDataT<ReportIsrcT>): React$Element<typeof ReportLayout> => {
   let lastIsrc: string = '';
   let currentIsrc: string = '';
 
diff --git a/root/report/IswcsWithManyWorks.js b/root/report/IswcsWithManyWorks.js
index 0e216a8ff89..eaacc5c36f5 100644
--- a/root/report/IswcsWithManyWorks.js
+++ b/root/report/IswcsWithManyWorks.js
@@ -23,7 +23,7 @@ const IswcsWithManyWorks = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportIswcT>): React.Element<typeof ReportLayout> => {
+}: ReportDataT<ReportIswcT>): React$Element<typeof ReportLayout> => {
   let lastIswc: string = '';
   let currentIswc: string = '';
 
diff --git a/root/report/LabelsDisambiguationSameName.js b/root/report/LabelsDisambiguationSameName.js
index 6b2690b991f..201dba9b084 100644
--- a/root/report/LabelsDisambiguationSameName.js
+++ b/root/report/LabelsDisambiguationSameName.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import LabelList from './components/LabelList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportLabelT} from './types.js';
@@ -19,7 +17,7 @@ const LabelsDisambiguationSameName = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportLabelT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportLabelT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/LimitedEditors.js b/root/report/LimitedEditors.js
index 5eb8b4db1f2..4936aaa468b 100644
--- a/root/report/LimitedEditors.js
+++ b/root/report/LimitedEditors.js
@@ -22,7 +22,7 @@ const LimitedEditors = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportEditorT>): React.Element<typeof ReportLayout> => {
+}: ReportDataT<ReportEditorT>): React$Element<typeof ReportLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <ReportLayout
diff --git a/root/report/LinksWithMultipleEntities.js b/root/report/LinksWithMultipleEntities.js
index 8db0ea95c2b..d8cf246cf47 100644
--- a/root/report/LinksWithMultipleEntities.js
+++ b/root/report/LinksWithMultipleEntities.js
@@ -30,7 +30,7 @@ const LinksWithMultipleEntities = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportEntryT>): React.Element<typeof ReportLayout> => {
+}: ReportDataT<ReportEntryT>): React$Element<typeof ReportLayout> => {
   const $c = React.useContext(CatalystContext);
 
   return (
diff --git a/root/report/MediumsWithOrderInTitle.js b/root/report/MediumsWithOrderInTitle.js
index f8cd43a7e25..04bd7ad7c4a 100644
--- a/root/report/MediumsWithOrderInTitle.js
+++ b/root/report/MediumsWithOrderInTitle.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const MediumsWithOrderInTitle = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={exp.l(
diff --git a/root/report/MediumsWithSequenceIssues.js b/root/report/MediumsWithSequenceIssues.js
index 88a96fdf203..f3dbeab2cc1 100644
--- a/root/report/MediumsWithSequenceIssues.js
+++ b/root/report/MediumsWithSequenceIssues.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const MediumsWithSequenceIssues = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/MislinkedPseudoReleases.js b/root/report/MislinkedPseudoReleases.js
index ce0ae9f2574..384a2e5542a 100644
--- a/root/report/MislinkedPseudoReleases.js
+++ b/root/report/MislinkedPseudoReleases.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const MislinkedPseudoReleases = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/MultipleAsins.js b/root/report/MultipleAsins.js
index 456ee23f26b..0ca0f835571 100644
--- a/root/report/MultipleAsins.js
+++ b/root/report/MultipleAsins.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const MultipleAsins = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/MultipleDiscogsLinks.js b/root/report/MultipleDiscogsLinks.js
index ed9bca88022..379b6557a73 100644
--- a/root/report/MultipleDiscogsLinks.js
+++ b/root/report/MultipleDiscogsLinks.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const MultipleDiscogsLinks = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={exp.l(
diff --git a/root/report/NoLanguage.js b/root/report/NoLanguage.js
index 7894b5bf996..48ff598313e 100644
--- a/root/report/NoLanguage.js
+++ b/root/report/NoLanguage.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import useReleaseLanguageColumn from './hooks/useReleaseLanguageColumn.js';
@@ -20,7 +18,7 @@ const NoLanguage = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => {
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => {
   const releaseLanguageColumn = useReleaseLanguageColumn<ReportReleaseT>();
 
   return (
diff --git a/root/report/NoScript.js b/root/report/NoScript.js
index fbd460d705d..2b74ce9cc58 100644
--- a/root/report/NoScript.js
+++ b/root/report/NoScript.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import useReleaseLanguageColumn from './hooks/useReleaseLanguageColumn.js';
@@ -20,7 +18,7 @@ const NoScript = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => {
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => {
   const releaseLanguageColumn = useReleaseLanguageColumn<ReportReleaseT>();
 
   return (
diff --git a/root/report/PartOfSetRelationships.js b/root/report/PartOfSetRelationships.js
index c7fa7a59417..b06544991a0 100644
--- a/root/report/PartOfSetRelationships.js
+++ b/root/report/PartOfSetRelationships.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const PartOfSetRelationships = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={exp.l(
diff --git a/root/report/PlacesWithoutCoordinates.js b/root/report/PlacesWithoutCoordinates.js
index 716042aad31..e39cc77600d 100644
--- a/root/report/PlacesWithoutCoordinates.js
+++ b/root/report/PlacesWithoutCoordinates.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import PaginatedResults from '../components/PaginatedResults.js';
 import DescriptiveLink
   from '../static/scripts/common/components/DescriptiveLink.js';
@@ -25,7 +23,7 @@ const PlacesWithoutCoordinates = ({
   items,
   pager,
 }: ReportDataT<ReportPlaceRelationshipT>):
-React.Element<typeof ReportLayout> => (
+React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l('This report lists places without coordinates.')}
diff --git a/root/report/PossibleCollaborations.js b/root/report/PossibleCollaborations.js
index 82d913f7a73..5342ea7d533 100644
--- a/root/report/PossibleCollaborations.js
+++ b/root/report/PossibleCollaborations.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistList from './components/ArtistList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportArtistT, ReportDataT} from './types.js';
@@ -19,7 +17,7 @@ const PossibleCollaborations = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportArtistT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportArtistT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={exp.l(
diff --git a/root/report/RecordingTrackDifferentName.js b/root/report/RecordingTrackDifferentName.js
index f520023fcb1..b60647f2f2c 100644
--- a/root/report/RecordingTrackDifferentName.js
+++ b/root/report/RecordingTrackDifferentName.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {
   trackColumn,
 } from '../utility/tableColumns.js';
@@ -32,7 +30,7 @@ const RecordingTrackDifferentName = ({
   items,
   pager,
 }: ReportDataT<ReportRecordingTrackT>):
-React.Element<typeof ReportLayout> => (
+React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/RecordingsSameNameDifferentArtistsSameName.js b/root/report/RecordingsSameNameDifferentArtistsSameName.js
index 47d16321e49..fcb6026cbaf 100644
--- a/root/report/RecordingsSameNameDifferentArtistsSameName.js
+++ b/root/report/RecordingsSameNameDifferentArtistsSameName.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import PaginatedResults from '../components/PaginatedResults.js';
 import ArtistCreditLink
   from '../static/scripts/common/components/ArtistCreditLink.js';
@@ -25,7 +23,7 @@ const RecordingsSameNameDifferentArtistsSameName = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportRecordingT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportRecordingT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={exp.l(
diff --git a/root/report/RecordingsWithEarliestReleaseRelationships.js b/root/report/RecordingsWithEarliestReleaseRelationships.js
index 9c9b9778e98..9b07f6cd677 100644
--- a/root/report/RecordingsWithEarliestReleaseRelationships.js
+++ b/root/report/RecordingsWithEarliestReleaseRelationships.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import RecordingList from './components/RecordingList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportRecordingT} from './types.js';
@@ -19,7 +17,7 @@ const RecordingsWithEarliestReleaseRelationships = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportRecordingT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportRecordingT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/RecordingsWithFutureDates.js b/root/report/RecordingsWithFutureDates.js
index 06d3d3acd91..f811a13cc68 100644
--- a/root/report/RecordingsWithFutureDates.js
+++ b/root/report/RecordingsWithFutureDates.js
@@ -26,7 +26,7 @@ const RecordingsWithFutureDates = ({
   items,
   pager,
 }: ReportDataT<ReportRecordingRelationshipT>):
-React.Element<typeof ReportLayout> => {
+React$Element<typeof ReportLayout> => {
   const extraColumns = React.useMemo(
     () => {
       const beginDateColumn = defineTextColumn<ReportRecordingRelationshipT>({
diff --git a/root/report/RecordingsWithVaryingTrackLengths.js b/root/report/RecordingsWithVaryingTrackLengths.js
index 9941259d5aa..c7022e0d0d9 100644
--- a/root/report/RecordingsWithVaryingTrackLengths.js
+++ b/root/report/RecordingsWithVaryingTrackLengths.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import RecordingList from './components/RecordingList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportRecordingT} from './types.js';
@@ -19,7 +17,7 @@ const RecordingsWithVaryingTrackLengths = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportRecordingT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportRecordingT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/RecordingsWithoutVaCredit.js b/root/report/RecordingsWithoutVaCredit.js
index ceb16218547..1cadd67391d 100644
--- a/root/report/RecordingsWithoutVaCredit.js
+++ b/root/report/RecordingsWithoutVaCredit.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import RecordingList from './components/RecordingList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportRecordingT} from './types.js';
@@ -19,7 +17,7 @@ const RecordingsWithoutVaCredit = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportRecordingT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportRecordingT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/RecordingsWithoutVaLink.js b/root/report/RecordingsWithoutVaLink.js
index b22ff56c1e9..7786e6a7cef 100644
--- a/root/report/RecordingsWithoutVaLink.js
+++ b/root/report/RecordingsWithoutVaLink.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import RecordingList from './components/RecordingList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportRecordingT} from './types.js';
@@ -19,7 +17,7 @@ const RecordingsWithoutVaLink = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportRecordingT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportRecordingT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ReleaseGroupsWithoutVaCredit.js b/root/report/ReleaseGroupsWithoutVaCredit.js
index cb933f8985b..69e89103899 100644
--- a/root/report/ReleaseGroupsWithoutVaCredit.js
+++ b/root/report/ReleaseGroupsWithoutVaCredit.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseGroupList from './components/ReleaseGroupList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseGroupT} from './types.js';
@@ -19,7 +17,7 @@ const ReleaseGroupsWithoutVaCredit = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseGroupT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseGroupT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ReleaseGroupsWithoutVaLink.js b/root/report/ReleaseGroupsWithoutVaLink.js
index 304d9b00b7c..17053cb7de3 100644
--- a/root/report/ReleaseGroupsWithoutVaLink.js
+++ b/root/report/ReleaseGroupsWithoutVaLink.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseGroupList from './components/ReleaseGroupList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseGroupT} from './types.js';
@@ -19,7 +17,7 @@ const ReleaseGroupsWithoutVaLink = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseGroupT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseGroupT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ReleaseLabelSameArtist.js b/root/report/ReleaseLabelSameArtist.js
index cff4534951e..11fd96ce116 100644
--- a/root/report/ReleaseLabelSameArtist.js
+++ b/root/report/ReleaseLabelSameArtist.js
@@ -7,7 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
 import type {CellRenderProps} from 'react-table';
 
 import ReleaseList from './components/ReleaseList.js';
@@ -20,7 +19,7 @@ const ReleaseLabelSameArtist = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseLabelT>): React.Element<typeof ReportLayout> => {
+}: ReportDataT<ReportReleaseLabelT>): React$Element<typeof ReportLayout> => {
   const labelColumn = {
     Cell: ({
       row: {original},
diff --git a/root/report/ReleaseRgDifferentName.js b/root/report/ReleaseRgDifferentName.js
index 949da92f7cb..2cf1b95e450 100644
--- a/root/report/ReleaseRgDifferentName.js
+++ b/root/report/ReleaseRgDifferentName.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {
   defineEntityColumn,
 } from '../utility/tableColumns.js';
@@ -24,7 +22,7 @@ const ReleaseRgDifferentName = ({
   items,
   pager,
 }: ReportDataT<ReportReleaseReleaseGroupT>):
-React.Element<typeof ReportLayout> => {
+React$Element<typeof ReportLayout> => {
   const releaseGroupColumn = defineEntityColumn<ReportReleaseReleaseGroupT>({
     columnName: 'release_group',
     descriptive: false,
diff --git a/root/report/ReleasedTooEarly.js b/root/report/ReleasedTooEarly.js
index 23f16695ae2..cb4df205450 100644
--- a/root/report/ReleasedTooEarly.js
+++ b/root/report/ReleasedTooEarly.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const ReleasedTooEarly = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ReleasesConflictingDiscIds.js b/root/report/ReleasesConflictingDiscIds.js
index d87bd79a12a..0bd59aa106b 100644
--- a/root/report/ReleasesConflictingDiscIds.js
+++ b/root/report/ReleasesConflictingDiscIds.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const ReleasesConflictingDiscIds = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ReleasesMissingDiscIds.js b/root/report/ReleasesMissingDiscIds.js
index f6f3aa3a1e8..80ae018d096 100644
--- a/root/report/ReleasesMissingDiscIds.js
+++ b/root/report/ReleasesMissingDiscIds.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const ReleasesMissingDiscIds = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ReleasesSameBarcode.js b/root/report/ReleasesSameBarcode.js
index b9d0ef415e5..14adad81341 100644
--- a/root/report/ReleasesSameBarcode.js
+++ b/root/report/ReleasesSameBarcode.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import formatBarcode from '../static/scripts/common/utility/formatBarcode.js';
 import {
   defineEntityColumn,
@@ -34,7 +32,7 @@ const ReleasesSameBarcode = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportRowT>): React.Element<typeof ReportLayout> => {
+}: ReportDataT<ReportRowT>): React$Element<typeof ReportLayout> => {
   const barcodeColumn = defineTextColumn<ReportRowT>({
     cellProps: {className: 'barcode-cell'},
     columnName: 'barcode',
diff --git a/root/report/ReleasesToConvert.js b/root/report/ReleasesToConvert.js
index e183dcc2d20..2f1c6cb5b60 100644
--- a/root/report/ReleasesToConvert.js
+++ b/root/report/ReleasesToConvert.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const ReleasesToConvert = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ReleasesWithAmazonCoverArt.js b/root/report/ReleasesWithAmazonCoverArt.js
index 1237404dab3..76ad582d30e 100644
--- a/root/report/ReleasesWithAmazonCoverArt.js
+++ b/root/report/ReleasesWithAmazonCoverArt.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const ReleasesWithAmazonCoverArt = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ReleasesWithCaaNoTypes.js b/root/report/ReleasesWithCaaNoTypes.js
index d0cac0f57f4..e159cfc6d09 100644
--- a/root/report/ReleasesWithCaaNoTypes.js
+++ b/root/report/ReleasesWithCaaNoTypes.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const ReleasesWithCaaNoTypes = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ReleasesWithDownloadRelationships.js b/root/report/ReleasesWithDownloadRelationships.js
index 44d27936455..553a73dbda3 100644
--- a/root/report/ReleasesWithDownloadRelationships.js
+++ b/root/report/ReleasesWithDownloadRelationships.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const ReleasesWithDownloadRelationships = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ReleasesWithEmptyMediums.js b/root/report/ReleasesWithEmptyMediums.js
index a3075642149..4cd704ddb8e 100644
--- a/root/report/ReleasesWithEmptyMediums.js
+++ b/root/report/ReleasesWithEmptyMediums.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const ReleasesWithEmptyMediums = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ReleasesWithMailOrderRelationships.js b/root/report/ReleasesWithMailOrderRelationships.js
index e8e0ee0bdec..e28d432a1c3 100644
--- a/root/report/ReleasesWithMailOrderRelationships.js
+++ b/root/report/ReleasesWithMailOrderRelationships.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const ReleasesWithMailOrderRelationships = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ReleasesWithNoMediums.js b/root/report/ReleasesWithNoMediums.js
index a2928e5ce14..177595557d7 100644
--- a/root/report/ReleasesWithNoMediums.js
+++ b/root/report/ReleasesWithNoMediums.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const ReleasesWithNoMediums = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ReleasesWithUnlikelyLanguageScript.js b/root/report/ReleasesWithUnlikelyLanguageScript.js
index 6fdd1d68509..a9a1a874e54 100644
--- a/root/report/ReleasesWithUnlikelyLanguageScript.js
+++ b/root/report/ReleasesWithUnlikelyLanguageScript.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import useReleaseLanguageColumn from './hooks/useReleaseLanguageColumn.js';
@@ -20,7 +18,7 @@ const ReleasesWithUnlikelyLanguageScript = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => {
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => {
   const releaseLanguageColumn = useReleaseLanguageColumn<ReportReleaseT>();
 
   return (
diff --git a/root/report/ReleasesWithoutVaCredit.js b/root/report/ReleasesWithoutVaCredit.js
index 4d96bdeece4..8e058d420b6 100644
--- a/root/report/ReleasesWithoutVaCredit.js
+++ b/root/report/ReleasesWithoutVaCredit.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const ReleasesWithoutVaCredit = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ReleasesWithoutVaLink.js b/root/report/ReleasesWithoutVaLink.js
index 60fd5d53a31..878b9ab82c0 100644
--- a/root/report/ReleasesWithoutVaLink.js
+++ b/root/report/ReleasesWithoutVaLink.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const ReleasesWithoutVaLink = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/ReportNotAvailable.js b/root/report/ReportNotAvailable.js
index fddc82afbdf..6fdc787258b 100644
--- a/root/report/ReportNotAvailable.js
+++ b/root/report/ReportNotAvailable.js
@@ -7,11 +7,9 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 
-const ReportNotAvailable = (): React.Element<typeof Layout> => (
+const ReportNotAvailable = (): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Error')}>
     <div id="content">
       <h1>{l('Error')}</h1>
diff --git a/root/report/ReportsIndex.js b/root/report/ReportsIndex.js
index b8aa9f52a2e..5f7b352d5a1 100644
--- a/root/report/ReportsIndex.js
+++ b/root/report/ReportsIndex.js
@@ -24,7 +24,7 @@ type ReportsIndexEntryProps = {
 const ReportsIndexEntry = ({
   content,
   reportName,
-}: ReportsIndexEntryProps): React.Element<'li'> => (
+}: ReportsIndexEntryProps): React$Element<'li'> => (
   <li>
     <a href={`/report/${reportName}`}>
       {content}
@@ -33,7 +33,7 @@ const ReportsIndexEntry = ({
 
 );
 
-const ReportsIndex = (): React.Element<typeof Layout> => {
+const ReportsIndex = (): React$Element<typeof Layout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <Layout fullWidth title={l('Reports')}>
diff --git a/root/report/SeparateDiscs.js b/root/report/SeparateDiscs.js
index 4eb42ef1ca0..261b9ca0bf2 100644
--- a/root/report/SeparateDiscs.js
+++ b/root/report/SeparateDiscs.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const SeparateDiscs = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/SetInDifferentRg.js b/root/report/SetInDifferentRg.js
index 9af17fc8c4c..6f301bfe080 100644
--- a/root/report/SetInDifferentRg.js
+++ b/root/report/SetInDifferentRg.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseGroupList from './components/ReleaseGroupList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseGroupT} from './types.js';
@@ -19,7 +17,7 @@ const SetInDifferentRg = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseGroupT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseGroupT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={exp.l(
diff --git a/root/report/ShouldNotHaveDiscIds.js b/root/report/ShouldNotHaveDiscIds.js
index 2d20f28efd9..d76b6de6848 100644
--- a/root/report/ShouldNotHaveDiscIds.js
+++ b/root/report/ShouldNotHaveDiscIds.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const ShouldNotHaveDiscIds = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/SingleMediumReleasesWithMediumTitles.js b/root/report/SingleMediumReleasesWithMediumTitles.js
index 25558376d82..e3af1c8f5f3 100644
--- a/root/report/SingleMediumReleasesWithMediumTitles.js
+++ b/root/report/SingleMediumReleasesWithMediumTitles.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const SingleMediumReleasesWithMediumTitles = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/SomeFormatsUnset.js b/root/report/SomeFormatsUnset.js
index 577d7f6f177..7f944537258 100644
--- a/root/report/SomeFormatsUnset.js
+++ b/root/report/SomeFormatsUnset.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const SomeFormatsUnset = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/SuperfluousDataTracks.js b/root/report/SuperfluousDataTracks.js
index 19d84f7c279..2425d8e6973 100644
--- a/root/report/SuperfluousDataTracks.js
+++ b/root/report/SuperfluousDataTracks.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const SuperfluousDataTracks = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={exp.l(
diff --git a/root/report/TracksNamedWithSequence.js b/root/report/TracksNamedWithSequence.js
index c9dd61c64df..6613061539c 100644
--- a/root/report/TracksNamedWithSequence.js
+++ b/root/report/TracksNamedWithSequence.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const TracksNamedWithSequence = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/TracksWithSequenceIssues.js b/root/report/TracksWithSequenceIssues.js
index 2e9802b550e..5c8f5b27cf9 100644
--- a/root/report/TracksWithSequenceIssues.js
+++ b/root/report/TracksWithSequenceIssues.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const TracksWithSequenceIssues = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/TracksWithoutTimes.js b/root/report/TracksWithoutTimes.js
index 684809cd297..e5a0080abf3 100644
--- a/root/report/TracksWithoutTimes.js
+++ b/root/report/TracksWithoutTimes.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const TracksWithoutTimes = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/UnlinkedPseudoReleases.js b/root/report/UnlinkedPseudoReleases.js
index d5b544d8659..5ce8913b21a 100644
--- a/root/report/UnlinkedPseudoReleases.js
+++ b/root/report/UnlinkedPseudoReleases.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReleaseList from './components/ReleaseList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportReleaseT} from './types.js';
@@ -19,7 +17,7 @@ const UnlinkedPseudoReleases = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportReleaseT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportReleaseT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/VideosInNonVideoMediums.js b/root/report/VideosInNonVideoMediums.js
index 77c8cc1f36e..62366e67752 100644
--- a/root/report/VideosInNonVideoMediums.js
+++ b/root/report/VideosInNonVideoMediums.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import RecordingList from './components/RecordingList.js';
 import ReportLayout from './components/ReportLayout.js';
 import type {ReportDataT, ReportRecordingT} from './types.js';
@@ -19,7 +17,7 @@ const VideosInNonVideoMediums = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportRecordingT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportRecordingT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={l(
diff --git a/root/report/WikidataLinksWithMultipleEntities.js b/root/report/WikidataLinksWithMultipleEntities.js
index 83d766bc5c0..81f8b0aa43a 100644
--- a/root/report/WikidataLinksWithMultipleEntities.js
+++ b/root/report/WikidataLinksWithMultipleEntities.js
@@ -30,7 +30,7 @@ const WikidataLinksWithMultipleEntities = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportEntryT>): React.Element<typeof ReportLayout> => {
+}: ReportDataT<ReportEntryT>): React$Element<typeof ReportLayout> => {
   const $c = React.useContext(CatalystContext);
 
   return (
diff --git a/root/report/WorkSameTypeAsParent.js b/root/report/WorkSameTypeAsParent.js
index 6aa1b119feb..5f13e32daf8 100644
--- a/root/report/WorkSameTypeAsParent.js
+++ b/root/report/WorkSameTypeAsParent.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ReportLayout from './components/ReportLayout.js';
 import WorkList from './components/WorkList.js';
 import type {ReportDataT, ReportWorkT} from './types.js';
@@ -19,7 +17,7 @@ const WorkSameTypeAsParent = ({
   generated,
   items,
   pager,
-}: ReportDataT<ReportWorkT>): React.Element<typeof ReportLayout> => (
+}: ReportDataT<ReportWorkT>): React$Element<typeof ReportLayout> => (
   <ReportLayout
     canBeFiltered={canBeFiltered}
     description={exp.l(
diff --git a/root/report/components/ArtistCreditList.js b/root/report/components/ArtistCreditList.js
index 758acf78dc2..899d6ea0f88 100644
--- a/root/report/components/ArtistCreditList.js
+++ b/root/report/components/ArtistCreditList.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import PaginatedResults from '../../components/PaginatedResults.js';
 import ArtistCreditUsageLink
   from '../../static/scripts/common/components/ArtistCreditUsageLink.js';
@@ -23,7 +21,7 @@ type Props = {
 const ArtistCreditList = ({
   items,
   pager,
-}: Props): React.Element<typeof PaginatedResults> => (
+}: Props): React$Element<typeof PaginatedResults> => (
   <PaginatedResults pager={pager}>
     <table className="tbl">
       <thead>
diff --git a/root/report/components/ArtistList.js b/root/report/components/ArtistList.js
index 9712a95ca82..68a35b4ea7c 100644
--- a/root/report/components/ArtistList.js
+++ b/root/report/components/ArtistList.js
@@ -31,7 +31,7 @@ const ArtistList = <D: {+artist: ?ArtistT, ...}>({
   items,
   pager,
   subPath,
-}: Props<D>): React.Element<typeof PaginatedResults> => {
+}: Props<D>): React$Element<typeof PaginatedResults> => {
   const existingArtistItems = items.reduce((
     result: Array<D>,
     item,
diff --git a/root/report/components/ArtistUrlList.js b/root/report/components/ArtistUrlList.js
index 6764e5a8786..03150eeef98 100644
--- a/root/report/components/ArtistUrlList.js
+++ b/root/report/components/ArtistUrlList.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import PaginatedResults from '../../components/PaginatedResults.js';
 import EntityLink from '../../static/scripts/common/components/EntityLink.js';
 import bracketed from '../../static/scripts/common/utility/bracketed.js';
@@ -22,7 +20,7 @@ type Props = {
 const ArtistUrlList = ({
   items,
   pager,
-}: Props): React.Element<typeof PaginatedResults> => {
+}: Props): React$Element<typeof PaginatedResults> => {
   let lastGID: string = '';
   let currentGID: string = '';
 
diff --git a/root/report/components/CDTocList.js b/root/report/components/CDTocList.js
index e2dc735f231..7eac2565aa0 100644
--- a/root/report/components/CDTocList.js
+++ b/root/report/components/CDTocList.js
@@ -27,7 +27,7 @@ type Props = {
 const CDTocList = ({
   items,
   pager,
-}: Props): React.Element<typeof PaginatedResults> => {
+}: Props): React$Element<typeof PaginatedResults> => {
   const existingCDTocItems = items.reduce((
     result: Array<ReportCDTocT>,
     item,
diff --git a/root/report/components/CDTocReleaseList.js b/root/report/components/CDTocReleaseList.js
index 23053b9c6e1..3856b12fadb 100644
--- a/root/report/components/CDTocReleaseList.js
+++ b/root/report/components/CDTocReleaseList.js
@@ -26,7 +26,7 @@ type Props = {
 const CDTocReleaseList = ({
   items,
   pager,
-}: Props): React.Element<typeof PaginatedResults> => {
+}: Props): React$Element<typeof PaginatedResults> => {
   const existingCDTocItems = items.reduce((
     result: Array<ReportCDTocReleaseT>,
     item,
diff --git a/root/report/components/EditorList.js b/root/report/components/EditorList.js
index 6ca3a62717b..f3fc8f717ac 100644
--- a/root/report/components/EditorList.js
+++ b/root/report/components/EditorList.js
@@ -27,7 +27,7 @@ type Props = {
 const EditorList = ({
   items,
   pager,
-}: Props): React.Element<typeof PaginatedResults> => {
+}: Props): React$Element<typeof PaginatedResults> => {
   const existingEditorItems = items.reduce((
     result: Array<ReportEditorT>,
     item,
diff --git a/root/report/components/EventList.js b/root/report/components/EventList.js
index f4379c10eea..831718e1453 100644
--- a/root/report/components/EventList.js
+++ b/root/report/components/EventList.js
@@ -33,7 +33,7 @@ const EventList = <D: {+event: ?EventT, ...}>({
   columnsAfter,
   items,
   pager,
-}: Props<D>): React.Element<typeof PaginatedResults> => {
+}: Props<D>): React$Element<typeof PaginatedResults> => {
   const existingEventItems = items.reduce((
     result: Array<D>,
     item,
diff --git a/root/report/components/InstrumentList.js b/root/report/components/InstrumentList.js
index d3a8a8ffc24..77fe78b92d7 100644
--- a/root/report/components/InstrumentList.js
+++ b/root/report/components/InstrumentList.js
@@ -27,7 +27,7 @@ type Props = {
 const InstrumentList = ({
   items,
   pager,
-}: Props): React.Element<typeof PaginatedResults> => {
+}: Props): React$Element<typeof PaginatedResults> => {
   const $c = React.useContext(CatalystContext);
   const existingInstrumentItems = items.reduce((
     result: Array<ReportInstrumentT>,
diff --git a/root/report/components/LabelList.js b/root/report/components/LabelList.js
index c0fc959014c..8cb45d8abad 100644
--- a/root/report/components/LabelList.js
+++ b/root/report/components/LabelList.js
@@ -28,7 +28,7 @@ const LabelList = <D: {+label: ?LabelT, ...}>({
   columnsAfter,
   items,
   pager,
-}: Props<D>): React.Element<typeof PaginatedResults> => {
+}: Props<D>): React$Element<typeof PaginatedResults> => {
   const existingLabelItems = items.reduce((
     result: Array<D>,
     item,
diff --git a/root/report/components/LabelUrlList.js b/root/report/components/LabelUrlList.js
index efc51ac67dd..4d5c9e8041d 100644
--- a/root/report/components/LabelUrlList.js
+++ b/root/report/components/LabelUrlList.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import PaginatedResults from '../../components/PaginatedResults.js';
 import EntityLink from '../../static/scripts/common/components/EntityLink.js';
 import bracketed from '../../static/scripts/common/utility/bracketed.js';
@@ -22,7 +20,7 @@ type Props = {
 const LabelUrlList = ({
   items,
   pager,
-}: Props): React.Element<typeof PaginatedResults> => {
+}: Props): React$Element<typeof PaginatedResults> => {
   let lastGID: string = '';
   let currentGID: string = '';
 
diff --git a/root/report/components/PlaceList.js b/root/report/components/PlaceList.js
index 872083a371e..71ac7ffee2b 100644
--- a/root/report/components/PlaceList.js
+++ b/root/report/components/PlaceList.js
@@ -28,7 +28,7 @@ const PlaceList = <D: {+place: ?PlaceT, ...}>({
   columnsAfter,
   items,
   pager,
-}: Props<D>): React.Element<typeof PaginatedResults> => {
+}: Props<D>): React$Element<typeof PaginatedResults> => {
   const existingPlaceItems = items.reduce((
     result: Array<D>,
     item,
diff --git a/root/report/components/RecordingList.js b/root/report/components/RecordingList.js
index 2185997c7ee..e719364d331 100644
--- a/root/report/components/RecordingList.js
+++ b/root/report/components/RecordingList.js
@@ -29,7 +29,7 @@ const RecordingList = <D: {+recording: ?RecordingT, ...}>({
   columnsAfter,
   items,
   pager,
-}: Props<D>): React.Element<typeof PaginatedResults> => {
+}: Props<D>): React$Element<typeof PaginatedResults> => {
   const existingRecordingItems = items.reduce((
     result: Array<D>,
     item,
diff --git a/root/report/components/ReleaseGroupList.js b/root/report/components/ReleaseGroupList.js
index 8d48b851aa0..e26f6a6acce 100644
--- a/root/report/components/ReleaseGroupList.js
+++ b/root/report/components/ReleaseGroupList.js
@@ -30,7 +30,7 @@ const ReleaseGroupList = <D: {+release_group: ?ReleaseGroupT, ...}>({
   columnsAfter,
   items,
   pager,
-}: Props<D>): React.Element<typeof PaginatedResults> => {
+}: Props<D>): React$Element<typeof PaginatedResults> => {
   const existingReleaseGroupItems = items.reduce((
     result: Array<D>,
     item,
diff --git a/root/report/components/ReleaseGroupUrlList.js b/root/report/components/ReleaseGroupUrlList.js
index 822fcb04e67..8b3557cfe10 100644
--- a/root/report/components/ReleaseGroupUrlList.js
+++ b/root/report/components/ReleaseGroupUrlList.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import PaginatedResults from '../../components/PaginatedResults.js';
 import ArtistCreditLink
   from '../../static/scripts/common/components/ArtistCreditLink.js';
@@ -24,7 +22,7 @@ type Props = {
 const ReleaseGroupUrlList = ({
   items,
   pager,
-}: Props): React.Element<typeof PaginatedResults> => {
+}: Props): React$Element<typeof PaginatedResults> => {
   let lastGID: string = '';
   let currentGID: string = '';
 
diff --git a/root/report/components/ReleaseList.js b/root/report/components/ReleaseList.js
index 9636f73a97f..471e4ca14d4 100644
--- a/root/report/components/ReleaseList.js
+++ b/root/report/components/ReleaseList.js
@@ -31,7 +31,7 @@ const ReleaseList = <D: {+release: ?ReleaseT, ...}>({
   items,
   pager,
   subPath,
-}: Props<D>): React.Element<typeof PaginatedResults> => {
+}: Props<D>): React$Element<typeof PaginatedResults> => {
   const existingReleaseItems = items.reduce((
     result: Array<D>,
     item,
diff --git a/root/report/components/ReleaseUrlList.js b/root/report/components/ReleaseUrlList.js
index b4f8e75919d..88f1d9ba942 100644
--- a/root/report/components/ReleaseUrlList.js
+++ b/root/report/components/ReleaseUrlList.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import PaginatedResults from '../../components/PaginatedResults.js';
 import ArtistCreditLink
   from '../../static/scripts/common/components/ArtistCreditLink.js';
@@ -24,7 +22,7 @@ type Props = {
 const ReleaseUrlList = ({
   items,
   pager,
-}: Props): React.Element<typeof PaginatedResults> => {
+}: Props): React$Element<typeof PaginatedResults> => {
   let lastGID: string = '';
   let currentGID: string = '';
 
diff --git a/root/report/components/ReportLayout.js b/root/report/components/ReportLayout.js
index 0e93c258809..5d3352807de 100644
--- a/root/report/components/ReportLayout.js
+++ b/root/report/components/ReportLayout.js
@@ -37,7 +37,7 @@ const countTextPicker = {
 
 type Props = {
   +canBeFiltered: boolean,
-  +children: React.Node,
+  +children: React$Node,
   +countText?: string,
   +description: Expand2ReactOutput,
   +entityType: string,
@@ -59,7 +59,7 @@ const ReportLayout = ({
   generated,
   title,
   totalEntries,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const $c = React.useContext(CatalystContext);
 
   return (
diff --git a/root/report/components/SeriesList.js b/root/report/components/SeriesList.js
index 65d328d37b1..06900a35fb9 100644
--- a/root/report/components/SeriesList.js
+++ b/root/report/components/SeriesList.js
@@ -28,7 +28,7 @@ const SeriesList = <D: {+series: ?SeriesT, ...}>({
   columnsAfter,
   items,
   pager,
-}: Props<D>): React.Element<typeof PaginatedResults> => {
+}: Props<D>): React$Element<typeof PaginatedResults> => {
   const existingSeriesItems = items.reduce((
     result: Array<D>,
     item,
diff --git a/root/report/components/UrlList.js b/root/report/components/UrlList.js
index d09f6067a3b..e21f6cb76c1 100644
--- a/root/report/components/UrlList.js
+++ b/root/report/components/UrlList.js
@@ -26,7 +26,7 @@ const UrlList = <D: {+url: ?UrlT, ...}>({
   columnsAfter,
   items,
   pager,
-}: Props<D>): React.Element<typeof PaginatedResults> => {
+}: Props<D>): React$Element<typeof PaginatedResults> => {
   const existingUrlItems = items.reduce((
     result: Array<D>,
     item,
diff --git a/root/report/components/WorkList.js b/root/report/components/WorkList.js
index 68b9fa98e00..e35e163aec1 100644
--- a/root/report/components/WorkList.js
+++ b/root/report/components/WorkList.js
@@ -31,7 +31,7 @@ const WorkList = <D: {+work: ?WorkT, ...}>({
   columnsAfter,
   items,
   pager,
-}: Props<D>): React.Element<typeof PaginatedResults> => {
+}: Props<D>): React$Element<typeof PaginatedResults> => {
   const existingWorkItems = items.reduce((
     result: Array<D>,
     item,
diff --git a/root/search/SearchIndex.js b/root/search/SearchIndex.js
index 74112c45344..6712a036914 100644
--- a/root/search/SearchIndex.js
+++ b/root/search/SearchIndex.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 import OtherLookupForm from '../otherlookup/OtherLookupForm.js';
 import type {OtherLookupFormT} from '../otherlookup/types.js';
@@ -26,7 +24,7 @@ const SearchIndex = ({
   otherLookupForm,
   searchForm,
   tagLookupForm,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Search')}>
     <div id="content">
       <h1>{l('Search')}</h1>
diff --git a/root/search/components/AnnotationResults.js b/root/search/components/AnnotationResults.js
index bc5ea1874d1..0bada483238 100644
--- a/root/search/components/AnnotationResults.js
+++ b/root/search/components/AnnotationResults.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityLink from '../../static/scripts/common/components/EntityLink.js';
 import formatEntityTypeName
   from '../../static/scripts/common/utility/formatEntityTypeName.js';
@@ -47,7 +45,7 @@ const AnnotationResults = ({
   pager,
   query,
   results,
-}: ResultsPropsT<AnnotationT>): React.Element<typeof ResultsLayout> => (
+}: ResultsPropsT<AnnotationT>): React$Element<typeof ResultsLayout> => (
   <ResultsLayout form={form} lastUpdated={lastUpdated}>
     <PaginatedSearchResults
       buildResult={buildResult}
diff --git a/root/search/components/AreaResults.js b/root/search/components/AreaResults.js
index 9a8b00b4dc7..65387308096 100644
--- a/root/search/components/AreaResults.js
+++ b/root/search/components/AreaResults.js
@@ -52,7 +52,7 @@ const AreaResults = ({
   pager,
   query,
   results,
-}: ResultsPropsT<AreaT>): React.Element<typeof ResultsLayout> => {
+}: ResultsPropsT<AreaT>): React$Element<typeof ResultsLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <ResultsLayout form={form} lastUpdated={lastUpdated}>
diff --git a/root/search/components/ArtistResults.js b/root/search/components/ArtistResults.js
index 01e115c9544..7499bad38de 100644
--- a/root/search/components/ArtistResults.js
+++ b/root/search/components/ArtistResults.js
@@ -44,7 +44,7 @@ export const ArtistResultsInline = ({
   query,
   results,
 }: InlineResultsPropsT<ArtistT>):
-React.Element<typeof PaginatedSearchResults> => (
+React$Element<typeof PaginatedSearchResults> => (
   <PaginatedSearchResults
     buildResult={(result, index) => buildResult(result, index)}
     columns={
@@ -72,7 +72,7 @@ const ArtistResults = ({
   pager,
   query,
   results,
-}: ResultsPropsT<ArtistT>): React.Element<typeof ResultsLayout> => {
+}: ResultsPropsT<ArtistT>): React$Element<typeof ResultsLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <ResultsLayout form={form} lastUpdated={lastUpdated}>
diff --git a/root/search/components/CDStubResults.js b/root/search/components/CDStubResults.js
index cdc24a7c018..c95e5c8c7ff 100644
--- a/root/search/components/CDStubResults.js
+++ b/root/search/components/CDStubResults.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CDStubLink from '../../static/scripts/common/components/CDStubLink.js';
 import loopParity from '../../utility/loopParity.js';
 import type {ResultsPropsT, SearchResultT} from '../types.js';
@@ -37,7 +35,7 @@ const CDStubResults = ({
   pager,
   query,
   results,
-}: ResultsPropsT<CDStubT>): React.Element<typeof ResultsLayout> => (
+}: ResultsPropsT<CDStubT>): React$Element<typeof ResultsLayout> => (
   <ResultsLayout form={form} lastUpdated={lastUpdated}>
     <PaginatedSearchResults
       buildResult={buildResult}
diff --git a/root/search/components/DocResults.js b/root/search/components/DocResults.js
index b698ee33e1e..c7dd649a6e3 100644
--- a/root/search/components/DocResults.js
+++ b/root/search/components/DocResults.js
@@ -12,7 +12,7 @@ import * as React from 'react';
 import Layout from '../../layout/index.js';
 import {GOOGLE_CUSTOM_SEARCH} from '../../static/scripts/common/DBDefs.mjs';
 
-const DocResults = (): React.Element<typeof Layout> => (
+const DocResults = (): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Documentation Search')}>
     <div className="wikicontent" id="content">
       <h1>{l('Documentation Search')}</h1>
diff --git a/root/search/components/EditorResults.js b/root/search/components/EditorResults.js
index 2d699a63577..bd7b86d2868 100644
--- a/root/search/components/EditorResults.js
+++ b/root/search/components/EditorResults.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EditorLink from '../../static/scripts/common/components/EditorLink.js';
 import loopParity from '../../utility/loopParity.js';
 import type {ResultsPropsT, SearchResultT} from '../types.js';
@@ -35,7 +33,7 @@ const EditorResults = ({
   pager,
   query,
   results,
-}: ResultsPropsT<EditorT>): React.Element<typeof ResultsLayout> => (
+}: ResultsPropsT<EditorT>): React$Element<typeof ResultsLayout> => (
   <ResultsLayout form={form} lastUpdated={lastUpdated}>
     <PaginatedSearchResults
       buildResult={buildResult}
diff --git a/root/search/components/EventResults.js b/root/search/components/EventResults.js
index e703172729c..4cab207ac71 100644
--- a/root/search/components/EventResults.js
+++ b/root/search/components/EventResults.js
@@ -62,7 +62,7 @@ const EventResults = ({
   pager,
   query,
   results,
-}: ResultsPropsT<EventT>): React.Element<typeof ResultsLayout> => {
+}: ResultsPropsT<EventT>): React$Element<typeof ResultsLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <ResultsLayout form={form} lastUpdated={lastUpdated}>
diff --git a/root/search/components/InstrumentResults.js b/root/search/components/InstrumentResults.js
index 78a8731ca37..a0efc62d877 100644
--- a/root/search/components/InstrumentResults.js
+++ b/root/search/components/InstrumentResults.js
@@ -42,7 +42,7 @@ const InstrumentResults = ({
   pager,
   query,
   results,
-}: ResultsPropsT<InstrumentT>): React.Element<typeof ResultsLayout> => {
+}: ResultsPropsT<InstrumentT>): React$Element<typeof ResultsLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   return (
     <ResultsLayout form={form} lastUpdated={lastUpdated}>
diff --git a/root/search/components/LabelResults.js b/root/search/components/LabelResults.js
index bc1916e5446..b9d9b75d36d 100644
--- a/root/search/components/LabelResults.js
+++ b/root/search/components/LabelResults.js
@@ -55,7 +55,7 @@ const LabelResults = ({
   pager,
   query,
   results,
-}: ResultsPropsT<LabelT>): React.Element<typeof ResultsLayout> => {
+}: ResultsPropsT<LabelT>): React$Element<typeof ResultsLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <ResultsLayout form={form} lastUpdated={lastUpdated}>
diff --git a/root/search/components/PaginatedSearchResults.js b/root/search/components/PaginatedSearchResults.js
index 4d5df879697..7c39e1c91ae 100644
--- a/root/search/components/PaginatedSearchResults.js
+++ b/root/search/components/PaginatedSearchResults.js
@@ -15,8 +15,8 @@ import uriWith from '../../utility/uriWith.js';
 import {type SearchResultT} from '../types.js';
 
 type Props<T> = {
-  +buildResult: (SearchResultT<T>, number) => React.Node,
-  +columns: React.Node,
+  +buildResult: (SearchResultT<T>, number) => React$Node,
+  +columns: React$Node,
   +pager: PagerT,
   +query: string,
   +results: $ReadOnlyArray<SearchResultT<T>>,
@@ -28,7 +28,7 @@ const PaginatedSearchResults = <T>({
   pager,
   query,
   results,
-}: Props<T>): React.Element<typeof PaginatedResults | 'p'> => {
+}: Props<T>): React$Element<typeof PaginatedResults | 'p'> => {
   const $c = React.useContext(CatalystContext);
   const hasLastPage = pager.total_entries > 0;
   const lastPageUrl = hasLastPage
diff --git a/root/search/components/PlaceResults.js b/root/search/components/PlaceResults.js
index 0d4091f0c04..147308c53e5 100644
--- a/root/search/components/PlaceResults.js
+++ b/root/search/components/PlaceResults.js
@@ -52,7 +52,7 @@ const PlaceResults = ({
   pager,
   query,
   results,
-}: ResultsPropsT<PlaceT>): React.Element<typeof ResultsLayout> => {
+}: ResultsPropsT<PlaceT>): React$Element<typeof ResultsLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <ResultsLayout form={form} lastUpdated={lastUpdated}>
diff --git a/root/search/components/RecordingResults.js b/root/search/components/RecordingResults.js
index 1a7b5a488dc..47c36caec9b 100644
--- a/root/search/components/RecordingResults.js
+++ b/root/search/components/RecordingResults.js
@@ -130,7 +130,7 @@ export const RecordingResultsInline = ({
   query,
   results,
 }: InlineResultsPropsT<RecordingWithArtistCreditT>):
-React.Element<typeof PaginatedSearchResults> => {
+React$Element<typeof PaginatedSearchResults> => {
   const $c = React.useContext(CatalystContext);
 
   return (
@@ -163,7 +163,7 @@ const RecordingResults = ({
   query,
   results,
 }: ResultsPropsT<RecordingWithArtistCreditT>):
-React.Element<typeof ResultsLayout> => {
+React$Element<typeof ResultsLayout> => {
   const $c = React.useContext(CatalystContext);
   linenum = 0;
   return (
diff --git a/root/search/components/ReleaseGroupResults.js b/root/search/components/ReleaseGroupResults.js
index 14edde84f8f..7d45444c78f 100644
--- a/root/search/components/ReleaseGroupResults.js
+++ b/root/search/components/ReleaseGroupResults.js
@@ -52,7 +52,7 @@ const ReleaseGroupResults = ({
   pager,
   query,
   results,
-}: ResultsPropsT<ReleaseGroupT>): React.Element<typeof ResultsLayout> => {
+}: ResultsPropsT<ReleaseGroupT>): React$Element<typeof ResultsLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <ResultsLayout form={form} lastUpdated={lastUpdated}>
diff --git a/root/search/components/ReleaseResults.js b/root/search/components/ReleaseResults.js
index a144f1bc7f4..025a0f0fce9 100644
--- a/root/search/components/ReleaseResults.js
+++ b/root/search/components/ReleaseResults.js
@@ -101,7 +101,7 @@ export const ReleaseResultsInline = ({
   query,
   results,
 }: InlineResultsPropsT<ReleaseT>):
-React.Element<typeof PaginatedSearchResults> => {
+React$Element<typeof PaginatedSearchResults> => {
   const $c = React.useContext(CatalystContext);
 
   return (
@@ -138,7 +138,7 @@ const ReleaseResults = ({
   pager,
   query,
   results,
-}: ResultsPropsT<ReleaseT>): React.Element<typeof ResultsLayout> => {
+}: ResultsPropsT<ReleaseT>): React$Element<typeof ResultsLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <ResultsLayout form={form} lastUpdated={lastUpdated}>
diff --git a/root/search/components/ResultsLayout.js b/root/search/components/ResultsLayout.js
index 13eeb073272..2fb0828882a 100644
--- a/root/search/components/ResultsLayout.js
+++ b/root/search/components/ResultsLayout.js
@@ -16,7 +16,7 @@ import formatUserDate from '../../utility/formatUserDate.js';
 import SearchForm from './SearchForm.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +form: SearchFormT,
   +lastUpdated?: string,
 };
@@ -25,7 +25,7 @@ const ResultsLayout = ({
   children,
   form,
   lastUpdated,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const $c = React.useContext(CatalystContext);
 
   return (
diff --git a/root/search/components/SearchError.js b/root/search/components/SearchError.js
index d2d45a7cac7..61a2abeaeb0 100644
--- a/root/search/components/SearchError.js
+++ b/root/search/components/SearchError.js
@@ -7,22 +7,20 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import StatusPage from '../../components/StatusPage.js';
 import TagLookupForm from '../../taglookup/Form.js';
 
 import SearchForm from './SearchForm.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +form: SearchFormT | TagLookupFormT,
 };
 
 const SearchError = ({
   children,
   form,
-}: Props): React.Element<typeof StatusPage> => (
+}: Props): React$Element<typeof StatusPage> => (
   <StatusPage title={l('Search Error')}>
     {children}
     <p>
diff --git a/root/search/components/SearchForm.js b/root/search/components/SearchForm.js
index 062ca870132..eccf10b186d 100644
--- a/root/search/components/SearchForm.js
+++ b/root/search/components/SearchForm.js
@@ -69,7 +69,7 @@ const methodOptions = [
 
 const SearchForm = ({
   form,
-}: Props): React.Element<typeof React.Fragment> => (
+}: Props): React$Element<typeof React.Fragment> => (
   <>
     <div className="searchform">
       <form action="/search" method="get">
diff --git a/root/search/components/SeriesResults.js b/root/search/components/SeriesResults.js
index bf8b34f9181..c2ecd17060a 100644
--- a/root/search/components/SeriesResults.js
+++ b/root/search/components/SeriesResults.js
@@ -46,7 +46,7 @@ const SeriesResults = ({
   pager,
   query,
   results,
-}: ResultsPropsT<SeriesT>): React.Element<typeof ResultsLayout> => {
+}: ResultsPropsT<SeriesT>): React$Element<typeof ResultsLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <ResultsLayout form={form} lastUpdated={lastUpdated}>
diff --git a/root/search/components/TagResults.js b/root/search/components/TagResults.js
index 57b4d46a162..ee854f99e0c 100644
--- a/root/search/components/TagResults.js
+++ b/root/search/components/TagResults.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityLink from '../../static/scripts/common/components/EntityLink.js';
 import TagLink from '../../static/scripts/common/components/TagLink.js';
 import loopParity from '../../utility/loopParity.js';
@@ -44,7 +42,7 @@ const TagResults = ({
   pager,
   query,
   results,
-}: ResultsPropsT<TagT>): React.Element<typeof ResultsLayout> => (
+}: ResultsPropsT<TagT>): React$Element<typeof ResultsLayout> => (
   <ResultsLayout form={form} lastUpdated={lastUpdated}>
     <PaginatedSearchResults
       buildResult={buildResult}
diff --git a/root/search/components/WorkResults.js b/root/search/components/WorkResults.js
index d17d7201373..76f1d10ac97 100644
--- a/root/search/components/WorkResults.js
+++ b/root/search/components/WorkResults.js
@@ -43,7 +43,7 @@ const WorkResults = ({
   pager,
   query,
   results,
-}: ResultsPropsT<WorkT>): React.Element<typeof ResultsLayout> => {
+}: ResultsPropsT<WorkT>): React$Element<typeof ResultsLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <ResultsLayout form={form} lastUpdated={lastUpdated}>
diff --git a/root/search/error/General.js b/root/search/error/General.js
index 8293e4ff427..6d45bba7947 100644
--- a/root/search/error/General.js
+++ b/root/search/error/General.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import SearchError from '../components/SearchError.js';
 
 type Props = {
@@ -19,7 +17,7 @@ type Props = {
 const General = ({
   form,
   query,
-}: Props): React.Element<typeof SearchError> => (
+}: Props): React$Element<typeof SearchError> => (
   <SearchError form={form}>
     <p>
       {exp.l(
diff --git a/root/search/error/InternalError.js b/root/search/error/InternalError.js
index d56705b87dd..9d4f4f5dd43 100644
--- a/root/search/error/InternalError.js
+++ b/root/search/error/InternalError.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import SearchError from '../components/SearchError.js';
 
 type Props = {
@@ -19,7 +17,7 @@ type Props = {
 const InternalError = ({
   error,
   form,
-}: Props): React.Element<typeof SearchError> => (
+}: Props): React$Element<typeof SearchError> => (
   <SearchError form={form}>
     <p>
       {l(`The search server could not fulfill your request
diff --git a/root/search/error/Invalid.js b/root/search/error/Invalid.js
index cf6cff91f6d..4a7f18d0cb6 100644
--- a/root/search/error/Invalid.js
+++ b/root/search/error/Invalid.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import SearchError from '../components/SearchError.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const Invalid = ({
   form,
-}: Props): React.Element<typeof SearchError> => (
+}: Props): React$Element<typeof SearchError> => (
   <SearchError form={form}>
     <p>
       {l(`Your search query was deemed invalid
diff --git a/root/search/error/NoInfo.js b/root/search/error/NoInfo.js
index 095b6b64ee6..0000dc4a56e 100644
--- a/root/search/error/NoInfo.js
+++ b/root/search/error/NoInfo.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import SearchError from '../components/SearchError.js';
 
 type Props = {
@@ -19,7 +17,7 @@ type Props = {
 const NoInfo = ({
   form,
   query,
-}: Props): React.Element<typeof SearchError> => (
+}: Props): React$Element<typeof SearchError> => (
   <SearchError form={form}>
     <p>
       {exp.l(
diff --git a/root/search/error/NoResults.js b/root/search/error/NoResults.js
index 6f49b8111d6..b922316845d 100644
--- a/root/search/error/NoResults.js
+++ b/root/search/error/NoResults.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import SearchError from '../components/SearchError.js';
 
 type Props = {
@@ -21,7 +19,7 @@ const NoResults = ({
   form,
   query,
   type,
-}: Props): React.Element<typeof SearchError> => (
+}: Props): React$Element<typeof SearchError> => (
   <SearchError form={form}>
     <p>
       {exp.l(
diff --git a/root/search/error/RateLimited.js b/root/search/error/RateLimited.js
index 619b47a346b..f36d548bb1d 100644
--- a/root/search/error/RateLimited.js
+++ b/root/search/error/RateLimited.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import SearchError from '../components/SearchError.js';
 
 type Props = {
@@ -19,7 +17,7 @@ type Props = {
 const RateLimited = ({
   form,
   query,
-}: Props): React.Element<typeof SearchError> => (
+}: Props): React$Element<typeof SearchError> => (
   <SearchError form={form}>
     <p>
       {exp.l(
diff --git a/root/search/error/UriTooLarge.js b/root/search/error/UriTooLarge.js
index f1b36e303d6..d18db408fb1 100644
--- a/root/search/error/UriTooLarge.js
+++ b/root/search/error/UriTooLarge.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import SearchError from '../components/SearchError.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const UriTooLarge = ({
   form,
-}: Props): React.Element<typeof SearchError> => (
+}: Props): React$Element<typeof SearchError> => (
   <SearchError form={form}>
     <p>{l('Sorry, your query was too large.')}</p>
   </SearchError>
diff --git a/root/series/SeriesHeader.js b/root/series/SeriesHeader.js
index 1fd829881b7..0b9d02e734c 100644
--- a/root/series/SeriesHeader.js
+++ b/root/series/SeriesHeader.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityHeader from '../components/EntityHeader.js';
 import localizeTypeNameForEntity
   from '../static/scripts/common/i18n/localizeTypeNameForEntity.js';
@@ -21,7 +19,7 @@ type Props = {
 const SeriesHeader = ({
   series,
   page,
-}: Props): React.Element<typeof EntityHeader> => (
+}: Props): React$Element<typeof EntityHeader> => (
   <EntityHeader
     entity={series}
     headerClass="seriesheader"
diff --git a/root/series/SeriesIndex.js b/root/series/SeriesIndex.js
index d1ff09dbda7..5acc70a7c5b 100644
--- a/root/series/SeriesIndex.js
+++ b/root/series/SeriesIndex.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CleanupBanner from '../components/CleanupBanner.js';
 import ArtistList from '../components/list/ArtistList.js';
 import EventList from '../components/list/EventList.js';
@@ -118,7 +116,7 @@ const SeriesIndex = ({
   series,
   seriesItemNumbers,
   wikipediaExtract,
-}: SeriesIndexProps): React.Element<typeof SeriesLayout> => {
+}: SeriesIndexProps): React$Element<typeof SeriesLayout> => {
   const seriesEntityType = series.type.item_entity_type;
   const existingEntities = entities?.length ? entities : null;
   return (
diff --git a/root/series/SeriesLayout.js b/root/series/SeriesLayout.js
index ad57d39459a..54c88f482af 100644
--- a/root/series/SeriesLayout.js
+++ b/root/series/SeriesLayout.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import SeriesSidebar from '../layout/components/sidebar/SeriesSidebar.js';
 import Layout from '../layout/index.js';
 
 import SeriesHeader from './SeriesHeader.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +entity: SeriesT,
   +fullWidth?: boolean,
   +page: string,
@@ -28,7 +26,7 @@ const SeriesLayout = ({
   fullWidth = false,
   page,
   title,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout
     title={nonEmpty(title) ? hyphenateTitle(series.name, title) : series.name}
   >
diff --git a/root/series/SeriesMerge.js b/root/series/SeriesMerge.js
index e74ed0694ad..b7d0391f39b 100644
--- a/root/series/SeriesMerge.js
+++ b/root/series/SeriesMerge.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import SeriesList from '../components/list/SeriesList.js';
 import Layout from '../layout/index.js';
 import sortByEntityName
@@ -26,7 +24,7 @@ type Props = {
 const SeriesMerge = ({
   form,
   toMerge,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Merge series')}>
     <div id="content">
       <h1>{l('Merge series')}</h1>
diff --git a/root/static/manifest.mjs b/root/static/manifest.mjs
index 145de3abe15..b64921b8ff8 100644
--- a/root/static/manifest.mjs
+++ b/root/static/manifest.mjs
@@ -19,8 +19,6 @@
 import fs from 'fs';
 import path from 'path';
 
-import * as React from 'react';
-
 import {
   MB_SERVER_ROOT,
   STATIC_RESOURCES_LOCATION,
@@ -51,7 +49,7 @@ const jsExt = /\.js(?:on)?$/;
 export function js(
   manifest: string,
   extraAttrs?: {+'async'?: 'async', +'data-args'?: mixed} | null = null,
-): React.Element<'script'> {
+): React$Element<'script'> {
   if (jsExt.test(manifest)) {
     throw new Error(
       'Do not include .js in the manifest path name',
diff --git a/root/static/scripts/account/components/ApplicationForm.js b/root/static/scripts/account/components/ApplicationForm.js
index bbd80176643..5fdbc6d3ab4 100644
--- a/root/static/scripts/account/components/ApplicationForm.js
+++ b/root/static/scripts/account/components/ApplicationForm.js
@@ -71,7 +71,7 @@ class ApplicationForm extends React.Component<Props, State> {
     }));
   }
 
-  render(): React.Element<'form'> {
+  render(): React$Element<'form'> {
     return (
       <form method="post">
         <FormCsrfToken form={this.state.form} />
@@ -120,4 +120,4 @@ export type ApplicationFormPropsT = Props;
 export default (hydrate<Props>(
   'div.application-form',
   ApplicationForm,
-): React.AbstractComponent<Props, void>);
+): React$AbstractComponent<Props, void>);
diff --git a/root/static/scripts/account/components/EditProfileForm.js b/root/static/scripts/account/components/EditProfileForm.js
index 1925065b97c..5b2d4a5ab9e 100644
--- a/root/static/scripts/account/components/EditProfileForm.js
+++ b/root/static/scripts/account/components/EditProfileForm.js
@@ -159,7 +159,7 @@ class EditProfileForm extends React.Component<Props, State> {
     }));
   }
 
-  render(): React.Element<'form'> {
+  render(): React$Element<'form'> {
     const form = this.state.form;
     const field = form.field;
     const areaField = field.area.field;
@@ -315,5 +315,5 @@ export type EditProfileFormPropsT = Props;
 
 export default (
   hydrate<Props>('div.edit-profile-form', EditProfileForm):
-  React.AbstractComponent<Props, void>
+  React$AbstractComponent<Props, void>
 );
diff --git a/root/static/scripts/account/components/PreferencesForm.js b/root/static/scripts/account/components/PreferencesForm.js
index a7df884c96e..c4cd802b7ad 100644
--- a/root/static/scripts/account/components/PreferencesForm.js
+++ b/root/static/scripts/account/components/PreferencesForm.js
@@ -147,7 +147,7 @@ class PreferencesForm extends React.Component<Props, State> {
     }));
   }
 
-  render(): React.Element<'form'> {
+  render(): React$Element<'form'> {
     const field = this.state.form.field;
     return (
       <form method="post">
@@ -269,4 +269,4 @@ export type PreferencesFormPropsT = Props;
 export default (hydrate<Props>(
   'div.preferences-form',
   PreferencesForm,
-): React.AbstractComponent<Props, void>);
+): React$AbstractComponent<Props, void>);
diff --git a/root/static/scripts/alias/AliasEditForm.js b/root/static/scripts/alias/AliasEditForm.js
index e50e3c03ca6..89c663b6623 100644
--- a/root/static/scripts/alias/AliasEditForm.js
+++ b/root/static/scripts/alias/AliasEditForm.js
@@ -200,7 +200,7 @@ const AliasEditForm = ({
   form: initialForm,
   locales,
   searchHintType,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const localeOptions = {
     grouped: false,
     options: locales,
@@ -353,4 +353,4 @@ const AliasEditForm = ({
 export default (hydrate<Props>(
   'div.alias-edit-form',
   AliasEditForm,
-): React.AbstractComponent<Props, void>);
+): React$AbstractComponent<Props, void>);
diff --git a/root/static/scripts/annotation/AnnotationHistoryTable.js b/root/static/scripts/annotation/AnnotationHistoryTable.js
index 359ea5dba99..a25c88a1c1a 100644
--- a/root/static/scripts/annotation/AnnotationHistoryTable.js
+++ b/root/static/scripts/annotation/AnnotationHistoryTable.js
@@ -63,7 +63,7 @@ function reducer(state: StateT, action: ActionT): StateT {
 const AnnotationHistoryTable = ({
   annotations,
   baseUrl,
-}: Props): React.Element<'table'> => {
+}: Props): React$Element<'table'> => {
   const $c = React.useContext(SanitizedCatalystContext);
 
   const canCompare = annotations.length > 1;
@@ -164,4 +164,4 @@ const AnnotationHistoryTable = ({
 export default (hydrate<Props>(
   'div.annotation-history-table',
   AnnotationHistoryTable,
-): React.AbstractComponent<Props, void>);
+): React$AbstractComponent<Props, void>);
diff --git a/root/static/scripts/artist/components/ArtistCreditRenamer.js b/root/static/scripts/artist/components/ArtistCreditRenamer.js
index 7f8b6480502..16e25342f09 100644
--- a/root/static/scripts/artist/components/ArtistCreditRenamer.js
+++ b/root/static/scripts/artist/components/ArtistCreditRenamer.js
@@ -150,9 +150,9 @@ const ArtistCreditRenamer = ({
   artistName,
   initialArtistName,
   initialSelectedArtistCreditIds,
-}: ArtistCreditRenamerPropsT): React.MixedElement | null => {
+}: ArtistCreditRenamerPropsT): React$MixedElement | null => {
   const rowsRef = React.useRef<
-    $ReadOnlyArray<React.Element<typeof ArtistCreditRow>> | null,
+    $ReadOnlyArray<React$Element<typeof ArtistCreditRow>> | null,
   >(null);
 
   const [state, dispatch] = React.useReducer(
@@ -318,4 +318,4 @@ const ArtistCreditRenamer = ({
 export default (hydrate<ArtistCreditRenamerPropsT>(
   'div.artist-credit-renamer',
   ArtistCreditRenamer,
-): React.AbstractComponent<ArtistCreditRenamerPropsT, void>);
+): React$AbstractComponent<ArtistCreditRenamerPropsT, void>);
diff --git a/root/static/scripts/collection/components/CollectionEditForm.js b/root/static/scripts/collection/components/CollectionEditForm.js
index fb09314da55..816facf71f0 100644
--- a/root/static/scripts/collection/components/CollectionEditForm.js
+++ b/root/static/scripts/collection/components/CollectionEditForm.js
@@ -165,4 +165,4 @@ const CollectionEditForm = ({collectionTypes, form}: Props) => {
 export default (hydrate<Props>(
   'div.collection-edit-form',
   CollectionEditForm,
-): React.AbstractComponent<Props, void>);
+): React$AbstractComponent<Props, void>);
diff --git a/root/static/scripts/common/components/AcoustIdCell.js b/root/static/scripts/common/components/AcoustIdCell.js
index c888e4b819c..3540ac3bbfb 100644
--- a/root/static/scripts/common/components/AcoustIdCell.js
+++ b/root/static/scripts/common/components/AcoustIdCell.js
@@ -89,7 +89,7 @@ function loadAcoustIdData(
 
 const AcoustIdCell = ({
   recordingMbid,
-}: PropsT): React.Element<typeof React.Fragment> => {
+}: PropsT): React$Element<typeof React.Fragment> => {
   const [acoustIdTracks, setAcoustIdTracks] = React.useState<
     $ReadOnlyArray<AcoustIdTrackT> | null,
   >(null);
@@ -142,5 +142,5 @@ export default (
   hydrate<PropsT>(
     'div.acoustids',
     AcoustIdCell,
-  ): React.AbstractComponent<PropsT, void>
+  ): React$AbstractComponent<PropsT, void>
 );
diff --git a/root/static/scripts/common/components/Annotation.js b/root/static/scripts/common/components/Annotation.js
index 79edaa0ebdb..7f024ca7f72 100644
--- a/root/static/scripts/common/components/Annotation.js
+++ b/root/static/scripts/common/components/Annotation.js
@@ -8,7 +8,6 @@
  */
 
 import mutate from 'mutate-cow';
-import * as React from 'react';
 
 import {SanitizedCatalystContext} from '../../../../context.mjs';
 import formatUserDate from '../../../../utility/formatUserDate.js';
@@ -160,4 +159,4 @@ export default (hydrate<Props>(
       };
     });
   },
-): React.AbstractComponent<Props, void>);
+): React$AbstractComponent<Props, void>);
diff --git a/root/static/scripts/common/components/ArtistCreditLink.js b/root/static/scripts/common/components/ArtistCreditLink.js
index 383060423a7..25927e5bab6 100644
--- a/root/static/scripts/common/components/ArtistCreditLink.js
+++ b/root/static/scripts/common/components/ArtistCreditLink.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import informationIconUrl from '../../../images/icons/information.png';
 import Tooltip from '../../edit/components/Tooltip.js';
 
@@ -29,7 +27,7 @@ type MpIconProps = {
 
 export const MpIcon = (hydrate<MpIconProps>('span.ac-mp', (
   {artistCredit}: MpIconProps,
-): React.MixedElement => {
+): React$MixedElement => {
   let editSearch =
     '/search/edits?auto_edit_filter=&order=desc&negation=0' +
     '&combinator=and&conditions.0.field=type&conditions.0.operator=%3D' +
@@ -60,7 +58,7 @@ export const MpIcon = (hydrate<MpIconProps>('span.ac-mp', (
       }
     />
   );
-}): React.AbstractComponent<MpIconProps, void>);
+}): React$AbstractComponent<MpIconProps, void>);
 
 const ArtistCreditLink = ({
   artistCredit,
@@ -69,9 +67,9 @@ const ArtistCreditLink = ({
   showEditsPending = true,
   showIcon = false,
   ...props
-}: Props): React.Node => {
+}: Props): React$Node => {
   const names = artistCredit.names;
-  const parts: Array<React.Node> = [];
+  const parts: Array<React$Node> = [];
   for (let i = 0; i < names.length; i++) {
     const credit = names[i];
     const artist = credit.artist;
diff --git a/root/static/scripts/common/components/ArtistCreditUsageLink.js b/root/static/scripts/common/components/ArtistCreditUsageLink.js
index 807544fb5cd..03799d4ab83 100644
--- a/root/static/scripts/common/components/ArtistCreditUsageLink.js
+++ b/root/static/scripts/common/components/ArtistCreditUsageLink.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {reduceArtistCredit} from '../immutable-entities.js';
 
 import {MpIcon} from './ArtistCreditLink.js';
@@ -27,7 +25,7 @@ const ArtistCreditUsageLink = ({
   showEditsPending = false,
   subPath,
   ...props
-}: Props): React.Element<'a' | 'span'> | null => {
+}: Props): React$Element<'a' | 'span'> | null => {
   const id = artistCredit.id;
   if (id == null) {
     return null;
diff --git a/root/static/scripts/common/components/ArtistListEntry.js b/root/static/scripts/common/components/ArtistListEntry.js
index a4fa3dff10f..6c687543e72 100644
--- a/root/static/scripts/common/components/ArtistListEntry.js
+++ b/root/static/scripts/common/components/ArtistListEntry.js
@@ -147,7 +147,7 @@ const ArtistListEntry = ({
   showInstrumentCreditsAndRelTypes,
   showRatings,
   showSortName,
-}: ArtistListEntryProps): React.Element<'tr'> => (
+}: ArtistListEntryProps): React$Element<'tr'> => (
   <tr className={loopParity(index)} data-score={score ?? null}>
     <ArtistListRow
       artist={artist}
diff --git a/root/static/scripts/common/components/ArtistRoles.js b/root/static/scripts/common/components/ArtistRoles.js
index 122e9b3b56c..b079bda8513 100644
--- a/root/static/scripts/common/components/ArtistRoles.js
+++ b/root/static/scripts/common/components/ArtistRoles.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {commaOnlyListText} from '../i18n/commaOnlyList.js';
 import localizeArtistRoles from '../i18n/localizeArtistRoles.js';
 
@@ -43,7 +41,7 @@ const buildArtistRoleRow = (relation: RelationT) => {
 
 const ArtistRoles = ({
   relations,
-}: ArtistRolesProps): React.Element<typeof CollapsibleList> => (
+}: ArtistRolesProps): React$Element<typeof CollapsibleList> => (
   <CollapsibleList
     ariaLabel={l('Artist Roles')}
     buildRow={buildArtistRoleRow}
@@ -59,4 +57,4 @@ const ArtistRoles = ({
 export default (hydrate<ArtistRolesProps>(
   'div.artist-roles-container',
   ArtistRoles,
-): React.AbstractComponent<ArtistRolesProps, void>);
+): React$AbstractComponent<ArtistRolesProps, void>);
diff --git a/root/static/scripts/common/components/AttributeList.js b/root/static/scripts/common/components/AttributeList.js
index e5d3e60b3d8..26676d4f6e0 100644
--- a/root/static/scripts/common/components/AttributeList.js
+++ b/root/static/scripts/common/components/AttributeList.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {SidebarProperty}
   from '../../../../layout/components/sidebar/SidebarProperties.js';
 import {bracketedText} from '../utility/bracketed.js';
@@ -78,4 +76,4 @@ const AttributeList = ({
 export default (hydrate<AttributeListProps>(
   'div.entity-attributes-container',
   AttributeList,
-): React.AbstractComponent<AttributeListProps, void>);
+): React$AbstractComponent<AttributeListProps, void>);
diff --git a/root/static/scripts/common/components/Autocomplete2.js b/root/static/scripts/common/components/Autocomplete2.js
index 641d41a551b..014ae9896b7 100644
--- a/root/static/scripts/common/components/Autocomplete2.js
+++ b/root/static/scripts/common/components/Autocomplete2.js
@@ -247,7 +247,7 @@ const AutocompleteItem = React.memo(<+T: EntityItemT>({
   isSelected,
   item,
   selectItem,
-}: AutocompleteItemPropsT<T>): React.MixedElement => {
+}: AutocompleteItemPropsT<T>): React$MixedElement => {
   const itemId = `${autocompleteId}-item-${item.id}`;
   const isDisabled = !!item.disabled;
   const isSeparator = !!item.separator;
@@ -310,7 +310,7 @@ const AutocompleteItem = React.memo(<+T: EntityItemT>({
 
 const Autocomplete2 = (React.memo(<+T: EntityItemT>(
   props: PropsT<T>,
-): React.Element<'div'> => {
+): React$Element<'div'> => {
   const {dispatch, state} = props;
 
   const {
diff --git a/root/static/scripts/common/components/Autocomplete2/formatters.js b/root/static/scripts/common/components/Autocomplete2/formatters.js
index 265a773dcff..dcc6a880a75 100644
--- a/root/static/scripts/common/components/Autocomplete2/formatters.js
+++ b/root/static/scripts/common/components/Autocomplete2/formatters.js
@@ -39,7 +39,7 @@ function isNonLatin(str: string) {
 }
 
 function showExtraInfo(
-  children: React.Node,
+  children: React$Node,
   className?: string = 'comment',
 ) {
   return (
@@ -54,7 +54,7 @@ function showBracketedTextInfo(comment: ?string) {
 }
 
 function showExtraInfoLine(
-  children: React.Node,
+  children: React$Node,
   className?: string = 'comment',
 ) {
   return (
diff --git a/root/static/scripts/common/components/ButtonPopover.js b/root/static/scripts/common/components/ButtonPopover.js
index 48a42d50cf1..07ff28d4117 100644
--- a/root/static/scripts/common/components/ButtonPopover.js
+++ b/root/static/scripts/common/components/ButtonPopover.js
@@ -16,8 +16,8 @@ import {unwrapNl} from '../i18n.js';
 import Popover from './Popover.js';
 
 type PropsT = {
-  +buildChildren: (() => void) => React.Node,
-  +buttonContent: React.Node,
+  +buildChildren: (() => void) => React$Node,
+  +buttonContent: React$Node,
   +buttonProps?: {
     className?: string,
     id?: string,
@@ -30,10 +30,10 @@ type PropsT = {
   +isDisabled?: boolean,
   +isOpen: boolean,
   +toggle: (boolean) => void,
-  +wrapButton?: (React.MixedElement) => React.MixedElement,
+  +wrapButton?: (React$MixedElement) => React$MixedElement,
 };
 
-const ButtonPopover = (props: PropsT): React.MixedElement => {
+const ButtonPopover = (props: PropsT): React$MixedElement => {
   const {
     buttonContent,
     buttonProps = null,
@@ -95,7 +95,7 @@ const ButtonPopover = (props: PropsT): React.MixedElement => {
     className: buttonProps.className,
   } : null;
 
-  let buttonElement: React.MixedElement = (
+  let buttonElement: React$MixedElement = (
     <button
       aria-controls={isOpen ? dialogProps.id : null}
       aria-haspopup="dialog"
diff --git a/root/static/scripts/common/components/CDStubLink.js b/root/static/scripts/common/components/CDStubLink.js
index 31897322a6b..abe75ea2344 100644
--- a/root/static/scripts/common/components/CDStubLink.js
+++ b/root/static/scripts/common/components/CDStubLink.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import entityHref from '../utility/entityHref.js';
 
 type Props = {
@@ -21,7 +19,7 @@ const CDStubLink = ({
   cdstub,
   content,
   subPath,
-}: Props): React.Element<'a'> => (
+}: Props): React$Element<'a'> => (
   <a href={entityHref(cdstub, subPath)}>
     <bdi>
       {content}
diff --git a/root/static/scripts/common/components/CDTocLink.js b/root/static/scripts/common/components/CDTocLink.js
index bfdb7e24e44..55e2a604fa7 100644
--- a/root/static/scripts/common/components/CDTocLink.js
+++ b/root/static/scripts/common/components/CDTocLink.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import entityHref from '../utility/entityHref.js';
 
 type Props = {
@@ -24,7 +22,7 @@ type Props = {
 
 const CDTocLink = (
   {cdToc, content, subPath, anchorPath}: Props,
-): React.Element<'a'> => (
+): React$Element<'a'> => (
   <a href={entityHref(cdToc, subPath, anchorPath)}>
     <bdi>
       {nonEmpty(content) ? content : cdToc.discid}
diff --git a/root/static/scripts/common/components/Cardinality.js b/root/static/scripts/common/components/Cardinality.js
index 64f5e6f05c7..44a22cc4686 100644
--- a/root/static/scripts/common/components/Cardinality.js
+++ b/root/static/scripts/common/components/Cardinality.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {bracketedText} from '../utility/bracketed.js';
 
 type Props = {
   +cardinality: number,
 };
 
-const Cardinality = ({cardinality}: Props): React.MixedElement => {
+const Cardinality = ({cardinality}: Props): React$MixedElement => {
   let cardinalityName;
   switch (cardinality) {
     case 0:
diff --git a/root/static/scripts/common/components/CodeLink.js b/root/static/scripts/common/components/CodeLink.js
index 80cc5d305cc..732c52699ac 100644
--- a/root/static/scripts/common/components/CodeLink.js
+++ b/root/static/scripts/common/components/CodeLink.js
@@ -7,16 +7,14 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import entityHref from '../utility/entityHref.js';
 
 type Props = {
   +code: IsrcT | IswcT,
 };
 
-const CodeLink = ({code}: Props): React.MixedElement=> {
-  let link: React.MixedElement = (
+const CodeLink = ({code}: Props): React$MixedElement=> {
+  let link: React$MixedElement = (
     <a href={entityHref(code)}>
       <bdi>
         {/* $FlowIssue[prop-missing] */}
diff --git a/root/static/scripts/common/components/Collapsible.js b/root/static/scripts/common/components/Collapsible.js
index 74f9757aae9..b06e3f441de 100644
--- a/root/static/scripts/common/components/Collapsible.js
+++ b/root/static/scripts/common/components/Collapsible.js
@@ -40,7 +40,7 @@ class Collapsible extends React.Component<Props, State> {
     }
   }
 
-  containerRef: {current: null | React.ElementRef<'div'>};
+  containerRef: {current: null | React$ElementRef<'div'>};
 
   handleToggleBound: (event: SyntheticEvent<HTMLAnchorElement>) => void;
 
@@ -51,7 +51,7 @@ class Collapsible extends React.Component<Props, State> {
     }));
   }
 
-  render(): React.MixedElement {
+  render(): React$MixedElement {
     const {className, html} = this.props;
     const {isCollapsed, isCollapsible} = this.state;
 
diff --git a/root/static/scripts/common/components/CollapsibleList.js b/root/static/scripts/common/components/CollapsibleList.js
index d05dc247842..e3f8218fdc9 100644
--- a/root/static/scripts/common/components/CollapsibleList.js
+++ b/root/static/scripts/common/components/CollapsibleList.js
@@ -20,7 +20,7 @@ export type BuildRowPropsT = {
 type Props<T> = {
   +ariaLabel: string,
   +buildRow:
-    (T, ?BuildRowPropsT) => React.Element<'li' | typeof SidebarProperty>,
+    (T, ?BuildRowPropsT) => React$Element<'li' | typeof SidebarProperty>,
   +buildRowProps?: BuildRowPropsT,
   +className: string,
   +ContainerElement?: 'dl' | 'ul',
@@ -44,7 +44,7 @@ const CollapsibleList = <T>({
   showLessTitle,
   toShowAfter,
   toShowBefore,
-}: Props<T>): React.MixedElement | null => {
+}: Props<T>): React$MixedElement | null => {
   const [expanded, setExpanded] = React.useState<boolean>(false);
 
   const expand = (event: SyntheticMouseEvent<HTMLAnchorElement>) => {
diff --git a/root/static/scripts/common/components/CommonsImage.js b/root/static/scripts/common/components/CommonsImage.js
index 4361d715c5f..60a6455077d 100644
--- a/root/static/scripts/common/components/CommonsImage.js
+++ b/root/static/scripts/common/components/CommonsImage.js
@@ -36,7 +36,7 @@ class CommonsImage extends React.Component<Props, State> {
     }
   }
 
-  render(): React.MixedElement | null {
+  render(): React$MixedElement | null {
     const {image} = this.state;
     return image ? (
       <div className="picture">
@@ -56,4 +56,4 @@ export default (hydrate<Props>(
   'div.commons-image',
   CommonsImage,
   minimalEntity,
-): React.AbstractComponent<Props, void>);
+): React$AbstractComponent<Props, void>);
diff --git a/root/static/scripts/common/components/CountryAbbr.js b/root/static/scripts/common/components/CountryAbbr.js
index 45c2077c685..cd73e4e9aef 100644
--- a/root/static/scripts/common/components/CountryAbbr.js
+++ b/root/static/scripts/common/components/CountryAbbr.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import entityHref from '../utility/entityHref.js';
 import primaryAreaCode from '../utility/primaryAreaCode.js';
 
@@ -22,7 +20,7 @@ const CountryAbbr = ({
   className,
   country,
   withLink = false,
-}: Props): React.Element<'span'> | null => {
+}: Props): React$Element<'span'> | null => {
   const primaryCode = primaryAreaCode(country);
   if (empty(primaryCode)) {
     return null;
@@ -30,7 +28,7 @@ const CountryAbbr = ({
   const combinedClass =
     ('flag flag-' + primaryCode) +
     (nonEmpty(className) ? (' ' + className) : '');
-  let content: React.MixedElement = (
+  let content: React$MixedElement = (
     <abbr title={l_countries(country.name)}>
       {primaryCode}
     </abbr>
diff --git a/root/static/scripts/common/components/CritiqueBrainzReview.js b/root/static/scripts/common/components/CritiqueBrainzReview.js
index 7db593e8cbd..34732cbf0f5 100644
--- a/root/static/scripts/common/components/CritiqueBrainzReview.js
+++ b/root/static/scripts/common/components/CritiqueBrainzReview.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {SanitizedCatalystContext} from '../../../../context.mjs';
 import formatUserDate from '../../../../utility/formatUserDate.js';
 import hydrate from '../../../../utility/hydrate.js';
@@ -62,4 +60,4 @@ const CritiqueBrainzReview = ({review, title}: Props) => (
 export default (hydrate<Props, Props>(
   'div.critiquebrainz-review',
   CritiqueBrainzReview,
-): React.AbstractComponent<Props, void>);
+): React$AbstractComponent<Props, void>);
diff --git a/root/static/scripts/common/components/DataTrackIcon.js b/root/static/scripts/common/components/DataTrackIcon.js
index 9048175a2aa..45a2c4244de 100644
--- a/root/static/scripts/common/components/DataTrackIcon.js
+++ b/root/static/scripts/common/components/DataTrackIcon.js
@@ -7,9 +7,7 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
-const DataTrackIcon = (): React.Element<'div'> => (
+const DataTrackIcon = (): React$Element<'div'> => (
   <div
     className="data-track icon img"
     title={l('This track is a data track.')}
diff --git a/root/static/scripts/common/components/DescriptiveLink.js b/root/static/scripts/common/components/DescriptiveLink.js
index 55ca21f57bc..3726476e7b5 100644
--- a/root/static/scripts/common/components/DescriptiveLink.js
+++ b/root/static/scripts/common/components/DescriptiveLink.js
@@ -8,7 +8,6 @@
  */
 
 import ko from 'knockout';
-import * as React from 'react';
 
 import AreaWithContainmentLink from './AreaWithContainmentLink.js';
 import ArtistCreditLink from './ArtistCreditLink.js';
@@ -42,7 +41,7 @@ const DescriptiveLink = ({
   showIcon = false,
   subPath,
   target,
-}: DescriptiveLinkProps): Expand2ReactOutput | React.Node => {
+}: DescriptiveLinkProps): Expand2ReactOutput | React$Node => {
   const sharedProps = {
     showDisambiguation,
     showEditsPending,
diff --git a/root/static/scripts/common/components/Dialog.js b/root/static/scripts/common/components/Dialog.js
index 955679025cd..24d3caf1f9f 100644
--- a/root/static/scripts/common/components/Dialog.js
+++ b/root/static/scripts/common/components/Dialog.js
@@ -18,7 +18,7 @@ import {
 import ErrorBoundary from './ErrorBoundary.js';
 
 export type RequiredPropsT = {
-  +children: React.Node,
+  +children: React$Node,
   +dialogRef: {current: HTMLDivElement | null},
   +id: string,
   +onEscape: (Event | SyntheticEvent<>) => void,
@@ -29,7 +29,7 @@ export type PropsT = $ReadOnly<{
   +activeElementRef?: {-current: HTMLElement},
   +className?: string,
   +onClick?: (SyntheticMouseEvent<HTMLDivElement>) => void,
-  +siblings?: React.Node,
+  +siblings?: React$Node,
   // Set `title` to a non-null value to show the title bar.
   +title?: string,
   +trapFocus?: boolean,
@@ -81,7 +81,7 @@ const Dialog = ({
   siblings,
   title,
   trapFocus = false,
-}: PropsT): React.Element<'div'> => {
+}: PropsT): React$Element<'div'> => {
   const tabbableElementRef = React.useRef<HTMLElement | null>(null);
 
   React.useLayoutEffect(() => {
diff --git a/root/static/scripts/common/components/EditLink.js b/root/static/scripts/common/components/EditLink.js
index 8edc3c5f859..ec47f6d6541 100644
--- a/root/static/scripts/common/components/EditLink.js
+++ b/root/static/scripts/common/components/EditLink.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {editHref} from '../utility/entityHref.js';
 
 type Props = {
@@ -21,7 +19,7 @@ const EditLink = ({
   edit,
   content,
   subPath,
-}: Props): React.Element<'a'> => (
+}: Props): React$Element<'a'> => (
   <a href={editHref(edit, subPath)}>
     <bdi>
       {content}
diff --git a/root/static/scripts/common/components/EditorLink.js b/root/static/scripts/common/components/EditorLink.js
index a6e50eaf4d5..e9b444c0313 100644
--- a/root/static/scripts/common/components/EditorLink.js
+++ b/root/static/scripts/common/components/EditorLink.js
@@ -7,13 +7,11 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import defaultAvatarUrl from '../../../images/entity/editor.svg';
 import entityHref from '../utility/entityHref.js';
 import isolateText from '../utility/isolateText.js';
 
-const MissingEditorLink = (): React.Element<'span'> => {
+const MissingEditorLink = (): React$Element<'span'> => {
   return (
     <span
       className="deleted tooltip"
@@ -39,7 +37,7 @@ const EditorLink = ({
   content: passedContent,
   avatarSize = 15,
   subPath,
-}: Props): React.Element<typeof MissingEditorLink | 'a'> => {
+}: Props): React$Element<typeof MissingEditorLink | 'a'> => {
   if (!editor) {
     return <MissingEditorLink />;
   }
diff --git a/root/static/scripts/common/components/EntityLink.js b/root/static/scripts/common/components/EntityLink.js
index a2b49ff9869..a86fdbf9e38 100644
--- a/root/static/scripts/common/components/EntityLink.js
+++ b/root/static/scripts/common/components/EntityLink.js
@@ -31,7 +31,7 @@ export const DeletedLink = ({
   className,
   deletedCaption,
   name,
-}: DeletedLinkProps): React.Element<'span'> => {
+}: DeletedLinkProps): React$Element<'span'> => {
   const caption = nonEmpty(deletedCaption) ? deletedCaption : (allowNew
     ? l('This entity will be created by this edit.')
     : l('This entity has been removed, and cannot be displayed correctly.'));
diff --git a/root/static/scripts/common/components/ErrorBoundary.js b/root/static/scripts/common/components/ErrorBoundary.js
index f0d9129aa1c..748c2542008 100644
--- a/root/static/scripts/common/components/ErrorBoundary.js
+++ b/root/static/scripts/common/components/ErrorBoundary.js
@@ -35,7 +35,7 @@ export default class ErrorBoundary extends React.Component<Props, State> {
     });
   }
 
-  render(): React.Node {
+  render(): React$Node {
     const errorMessage = this.state.errorMessage;
     if (errorMessage) {
       return <div className="error">{errorMessage}</div>;
diff --git a/root/static/scripts/common/components/EventLocations.js b/root/static/scripts/common/components/EventLocations.js
index 37bd6fee003..6d6a684b241 100644
--- a/root/static/scripts/common/components/EventLocations.js
+++ b/root/static/scripts/common/components/EventLocations.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DescriptiveLink from './DescriptiveLink.js';
 
 type Props = {
   +event: EventT,
 };
 
-const EventLocations = ({event}: Props): React.Element<'ul'> => (
+const EventLocations = ({event}: Props): React$Element<'ul'> => (
   <ul>
     {event.places.map(place => (
       <li key={place.entity.id}>
diff --git a/root/static/scripts/common/components/ExpandedArtistCredit.js b/root/static/scripts/common/components/ExpandedArtistCredit.js
index c48f233160d..29ca65a64cb 100644
--- a/root/static/scripts/common/components/ExpandedArtistCredit.js
+++ b/root/static/scripts/common/components/ExpandedArtistCredit.js
@@ -6,8 +6,6 @@
  * http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import commaOnlyList from '../i18n/commaOnlyList.js';
 
 import ArtistCreditLink from './ArtistCreditLink.js';
@@ -19,7 +17,7 @@ type Props = {
 
 export const ExpandedArtistCreditList = ({
   artistCredit,
-}: Props): React.Element<'span'> | null => {
+}: Props): React$Element<'span'> | null => {
   if (!artistCredit) {
     return null;
   }
@@ -51,7 +49,7 @@ export const ExpandedArtistCreditList = ({
   return null;
 };
 
-const ExpandedArtistCredit = ({artistCredit}: Props): React.MixedElement => (
+const ExpandedArtistCredit = ({artistCredit}: Props): React$MixedElement => (
   <>
     <ArtistCreditLink artistCredit={artistCredit} />
     <br />
diff --git a/root/static/scripts/common/components/Filter.js b/root/static/scripts/common/components/Filter.js
index 8c201f8d308..6a38191e3ee 100644
--- a/root/static/scripts/common/components/Filter.js
+++ b/root/static/scripts/common/components/Filter.js
@@ -74,5 +74,5 @@ const Filter = ({ajaxFormUrl, initialFilterForm}: Props) => {
 
 export default (
   hydrate<Props>('div.filter', Filter):
-  React.AbstractComponent<Props, void>
+  React$AbstractComponent<Props, void>
 );
diff --git a/root/static/scripts/common/components/FilterForm.js b/root/static/scripts/common/components/FilterForm.js
index c598ff0eb1c..641774a6d1b 100644
--- a/root/static/scripts/common/components/FilterForm.js
+++ b/root/static/scripts/common/components/FilterForm.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import SelectField from '../../common/components/SelectField.js';
 import FieldErrors from '../../edit/components/FieldErrors.js';
 import {addColonText} from '../i18n/addColon.js';
@@ -52,7 +50,7 @@ function getSubmitText(type: string) {
   return '';
 }
 
-const FilterForm = ({form}: Props): React.Element<'div'> => {
+const FilterForm = ({form}: Props): React$Element<'div'> => {
   const typeIdField = form.field.type_id;
   const typeIdOptions = form.options_type_id;
   const secondaryTypeIdField = form.field.secondary_type_id;
diff --git a/root/static/scripts/common/components/FingerprintTable.js b/root/static/scripts/common/components/FingerprintTable.js
index a8737691bf8..bada555b80f 100644
--- a/root/static/scripts/common/components/FingerprintTable.js
+++ b/root/static/scripts/common/components/FingerprintTable.js
@@ -118,4 +118,4 @@ const FingerprintTable = ({recording}: {recording: RecordingT}) => {
 export default (hydrate<{recording: RecordingT}>(
   'div.acoustid-fingerprints',
   FingerprintTable,
-): React.AbstractComponent<{recording: RecordingT}, void>);
+): React$AbstractComponent<{recording: RecordingT}, void>);
diff --git a/root/static/scripts/common/components/InstrumentListEntry.js b/root/static/scripts/common/components/InstrumentListEntry.js
index 5bf291d14b6..47ce59d35ad 100644
--- a/root/static/scripts/common/components/InstrumentListEntry.js
+++ b/root/static/scripts/common/components/InstrumentListEntry.js
@@ -65,7 +65,7 @@ const InstrumentListEntry = ({
   index,
   instrument,
   score,
-}: InstrumentListEntryProps): React.Element<'tr'> => (
+}: InstrumentListEntryProps): React$Element<'tr'> => (
   <tr className={loopParity(index)} data-score={score ?? null}>
     <InstrumentListRow
       checkboxes={checkboxes}
diff --git a/root/static/scripts/common/components/IrombookImage.js b/root/static/scripts/common/components/IrombookImage.js
index 74c232c6ccb..ef66bffe267 100644
--- a/root/static/scripts/common/components/IrombookImage.js
+++ b/root/static/scripts/common/components/IrombookImage.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 type Props = {
   +entity: InstrumentT,
 };
@@ -17,7 +15,7 @@ function isIrombookImage(url: UrlT): boolean {
   return /https:\/\/staticbrainz\.org\/irombook\//.test(url.href_url);
 }
 
-const IrombookImage = ({entity}: Props): React.Element<'div'> | null => {
+const IrombookImage = ({entity}: Props): React$Element<'div'> | null => {
   const relationships = entity.relationships;
 
   if (!relationships) {
diff --git a/root/static/scripts/common/components/IsrcList.js b/root/static/scripts/common/components/IsrcList.js
index f1b678250f0..8d75e697a6f 100644
--- a/root/static/scripts/common/components/IsrcList.js
+++ b/root/static/scripts/common/components/IsrcList.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {SidebarProperty}
   from '../../../../layout/components/sidebar/SidebarProperties.js';
 
@@ -57,4 +55,4 @@ const IsrcList = ({
 export default (hydrate<IsrcListProps>(
   'div.isrc-list-container',
   IsrcList,
-): React.AbstractComponent<IsrcListProps, void>);
+): React$AbstractComponent<IsrcListProps, void>);
diff --git a/root/static/scripts/common/components/IswcList.js b/root/static/scripts/common/components/IswcList.js
index 4a3d81850c0..a6691a5d3e4 100644
--- a/root/static/scripts/common/components/IswcList.js
+++ b/root/static/scripts/common/components/IswcList.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {SidebarProperty}
   from '../../../../layout/components/sidebar/SidebarProperties.js';
 
@@ -57,4 +55,4 @@ const IswcList = ({
 export default (hydrate<IswcListProps>(
   'div.iswc-list-container',
   IswcList,
-): React.AbstractComponent<IswcListProps, void>);
+): React$AbstractComponent<IswcListProps, void>);
diff --git a/root/static/scripts/common/components/Modal.js b/root/static/scripts/common/components/Modal.js
index f3da8758182..495d6f3e3f1 100644
--- a/root/static/scripts/common/components/Modal.js
+++ b/root/static/scripts/common/components/Modal.js
@@ -25,7 +25,7 @@ type PropsT = $ReadOnly<{
   +title: string,
 }>;
 
-const Modal = (props: PropsT): React.Portal => {
+const Modal = (props: PropsT): React$Portal => {
   const {
     className,
     dialogRef,
diff --git a/root/static/scripts/common/components/OrderableDirection.js b/root/static/scripts/common/components/OrderableDirection.js
index b80421fde65..2fbb01011be 100644
--- a/root/static/scripts/common/components/OrderableDirection.js
+++ b/root/static/scripts/common/components/OrderableDirection.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {bracketedText} from '../utility/bracketed.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const OrderableDirection = ({
   direction,
-}: Props): React.MixedElement => {
+}: Props): React$MixedElement => {
   let directionName;
   switch (direction) {
     case 0:
diff --git a/root/static/scripts/common/components/Popover.js b/root/static/scripts/common/components/Popover.js
index 58ecde53cd2..1d796e13f73 100644
--- a/root/static/scripts/common/components/Popover.js
+++ b/root/static/scripts/common/components/Popover.js
@@ -40,7 +40,7 @@ const POPPER_OPTIONS = {
 };
 
 type PropsT = {
-  +buildChildren: (() => void) => React.Node,
+  +buildChildren: (() => void) => React$Node,
   +buttonRef: {current: HTMLButtonElement | null},
   +className?: string,
   +closeAndReturnFocus: () => void,
@@ -48,7 +48,7 @@ type PropsT = {
   +id: string,
 };
 
-const Popover = (props: PropsT): React.Portal => {
+const Popover = (props: PropsT): React$Portal => {
   const {
     buildChildren,
     buttonRef,
diff --git a/root/static/scripts/common/components/PostParameters.js b/root/static/scripts/common/components/PostParameters.js
index a3ef8b96102..24c6a926f28 100644
--- a/root/static/scripts/common/components/PostParameters.js
+++ b/root/static/scripts/common/components/PostParameters.js
@@ -24,7 +24,7 @@ const textAreaRegExp = /(^|\.)(annotation|edit_note)$/;
 
 const PostParameters = ({
   params,
-}: PropsT): React.MixedElement => {
+}: PropsT): React$MixedElement => {
   const [expanded, setExpanded] = React.useState(false);
 
   const sortedParams:
@@ -96,4 +96,4 @@ const PostParameters = ({
 export default (hydrate(
   'div.post-parameters',
   PostParameters,
-): React.AbstractComponent<PropsT, void>);
+): React$AbstractComponent<PropsT, void>);
diff --git a/root/static/scripts/common/components/PregapTrackIcon.js b/root/static/scripts/common/components/PregapTrackIcon.js
index e9a4ceba4c8..abf0104179a 100644
--- a/root/static/scripts/common/components/PregapTrackIcon.js
+++ b/root/static/scripts/common/components/PregapTrackIcon.js
@@ -7,9 +7,7 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
-const PregapTrackIcon = (): React.Element<'div'> => (
+const PregapTrackIcon = (): React$Element<'div'> => (
   <div
     className="pregap-track icon img"
     title={l('This track is hidden in the pregap.')}
diff --git a/root/static/scripts/common/components/RatingStars.js b/root/static/scripts/common/components/RatingStars.js
index 3bfb1527e3e..8113195f5a4 100644
--- a/root/static/scripts/common/components/RatingStars.js
+++ b/root/static/scripts/common/components/RatingStars.js
@@ -39,7 +39,7 @@ type RatingStarsProps = {
 
 export const StaticRatingStars = ({
   rating,
-}: StaticRatingStarsProps): React.Element<'span'> => {
+}: StaticRatingStarsProps): React$Element<'span'> => {
   const starRating = rating == null ? 0 : (5 * rating / 100);
   return (
     <span className="inline-rating">
@@ -55,7 +55,7 @@ export const StaticRatingStars = ({
   );
 };
 
-const RatingStars = ({entity}: RatingStarsProps): React.Element<'span'> => {
+const RatingStars = ({entity}: RatingStarsProps): React$Element<'span'> => {
   const currentStarRating =
     entity.user_rating == null ? 0 : (5 * entity.user_rating / 100);
   const $c = React.useContext(SanitizedCatalystContext);
diff --git a/root/static/scripts/common/components/RelatedSeries.js b/root/static/scripts/common/components/RelatedSeries.js
index dae3cc6f715..9860b59e46f 100644
--- a/root/static/scripts/common/components/RelatedSeries.js
+++ b/root/static/scripts/common/components/RelatedSeries.js
@@ -28,8 +28,8 @@ export function isNotSeriesPart(r: RelationshipT): boolean {
   return !seriesPartLinkTypes.has(linkedEntities.link_type[r.linkTypeID].gid);
 }
 
-const RelatedSeries = ({seriesIds}: Props): React.MixedElement => {
-  const parts: Array<React.Node> = [
+const RelatedSeries = ({seriesIds}: Props): React$MixedElement => {
+  const parts: Array<React$Node> = [
     /* eslint-disable react/jsx-key */
     <h2 className="related-series">
       {l('Related series')}
diff --git a/root/static/scripts/common/components/RelatedWorks.js b/root/static/scripts/common/components/RelatedWorks.js
index 2eb9d6e22ce..e56db1a6ebd 100644
--- a/root/static/scripts/common/components/RelatedWorks.js
+++ b/root/static/scripts/common/components/RelatedWorks.js
@@ -28,8 +28,8 @@ type Props = {
   +workIds: $ReadOnlyArray<number>,
 };
 
-const RelatedWorks = ({workIds}: Props): React.MixedElement => {
-  const parts: Array<React.Node> = [
+const RelatedWorks = ({workIds}: Props): React$MixedElement => {
+  const parts: Array<React$Node> = [
     /* eslint-disable react/jsx-key */
     <h2 className="related-works">
       {l('Related works')}
diff --git a/root/static/scripts/common/components/Relationship.js b/root/static/scripts/common/components/Relationship.js
index 2e0462882c0..ef784cbdd7e 100644
--- a/root/static/scripts/common/components/Relationship.js
+++ b/root/static/scripts/common/components/Relationship.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {
   getExtraAttributes,
   interpolate,
@@ -34,7 +32,7 @@ type RelationshipPropsT = {
     content: string,
     relationship: RelationshipT,
     allowNew: ?boolean,
-  ) => React.MixedElement,
+  ) => React$MixedElement,
   +relationship: RelationshipT,
 };
 
@@ -159,7 +157,7 @@ const RelationshipContent = ({
 
 export const HistoricRelationship = ({
   relationship,
-}: HistoricRelationshipPropsT): React.MixedElement => (
+}: HistoricRelationshipPropsT): React$MixedElement => (
   relationship.editsPending ? (
     <span className="mp mp-rel">
       <HistoricRelationshipContent relationship={relationship} />
@@ -167,7 +165,7 @@ export const HistoricRelationship = ({
   ) : <HistoricRelationshipContent relationship={relationship} />
 );
 
-const Relationship = (props: RelationshipPropsT): React.MixedElement => (
+const Relationship = (props: RelationshipPropsT): React$MixedElement => (
   props.relationship.editsPending ? (
     <span className="mp mp-rel">
       <RelationshipContent {...props} />
diff --git a/root/static/scripts/common/components/Relationships.js b/root/static/scripts/common/components/Relationships.js
index 5e0279c2dbf..6e1ed61d602 100644
--- a/root/static/scripts/common/components/Relationships.js
+++ b/root/static/scripts/common/components/Relationships.js
@@ -69,7 +69,7 @@ const Relationships = (React.memo<PropsT>(({
   relationships: passedRelationships,
   showIfEmpty = false,
   source,
-}: PropsT): React.Element<typeof React.Fragment> => {
+}: PropsT): React$Element<typeof React.Fragment> => {
   let srcRels = source.relationships;
   let relationships = passedRelationships;
   if (!relationships) {
@@ -130,6 +130,6 @@ const Relationships = (React.memo<PropsT>(({
       ) : null}
     </>
   );
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 export default Relationships;
diff --git a/root/static/scripts/common/components/ReleaseEvent.js b/root/static/scripts/common/components/ReleaseEvent.js
index 9ca7396f647..074def0a728 100644
--- a/root/static/scripts/common/components/ReleaseEvent.js
+++ b/root/static/scripts/common/components/ReleaseEvent.js
@@ -20,7 +20,7 @@ type Props = {
 
 const ReleaseEvent = ({
   event,
-}: Props): React.Element<typeof React.Fragment> => (
+}: Props): React$Element<typeof React.Fragment> => (
   <>
     {isDateEmpty(event.date) ? null : (
       <>
diff --git a/root/static/scripts/common/components/ReleaseEvents.js b/root/static/scripts/common/components/ReleaseEvents.js
index 8e778face09..218fd26e278 100644
--- a/root/static/scripts/common/components/ReleaseEvents.js
+++ b/root/static/scripts/common/components/ReleaseEvents.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import formatDate from '../utility/formatDate.js';
 import isDateEmpty from '../utility/isDateEmpty.js';
 
@@ -103,4 +101,4 @@ const ReleaseEvents = ({
 export default (hydrate<ReleaseEventsProps>(
   'div.release-events-container',
   ReleaseEvents,
-): React.AbstractComponent<ReleaseEventsProps, void>);
+): React$AbstractComponent<ReleaseEventsProps, void>);
diff --git a/root/static/scripts/common/components/ReleaseGroupAppearances.js b/root/static/scripts/common/components/ReleaseGroupAppearances.js
index 5c49bbe46b7..1770244475f 100644
--- a/root/static/scripts/common/components/ReleaseGroupAppearances.js
+++ b/root/static/scripts/common/components/ReleaseGroupAppearances.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityLink from './EntityLink.js';
 
 const buildAppearancesRow = (releaseGroup: ReleaseGroupT) => (
@@ -23,7 +21,7 @@ type ReleaseGroupAppearancesProps = {
 
 const ReleaseGroupAppearances = (
   {appearances}: ReleaseGroupAppearancesProps,
-): React.Element<'ul'> | null => {
+): React$Element<'ul'> | null => {
   const releaseGroups = appearances.results;
   const unloadedReleaseGroupCount = appearances.hits - releaseGroups.length;
   return (
diff --git a/root/static/scripts/common/components/SearchIcon.js b/root/static/scripts/common/components/SearchIcon.js
index b665f3dd8e2..f4498003ac6 100644
--- a/root/static/scripts/common/components/SearchIcon.js
+++ b/root/static/scripts/common/components/SearchIcon.js
@@ -7,11 +7,9 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import searchIconUrl from '../../../images/icons/search.svg';
 
-const SearchIcon = (): React.Element<'img'> => (
+const SearchIcon = (): React$Element<'img'> => (
   <img
     alt={l('Search')}
     className="search"
diff --git a/root/static/scripts/common/components/SelectField.js b/root/static/scripts/common/components/SelectField.js
index a9ff1dfe33c..cdc9dc53501 100644
--- a/root/static/scripts/common/components/SelectField.js
+++ b/root/static/scripts/common/components/SelectField.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {unwrapNl} from '../i18n.js';
 import getSelectValue from '../utility/getSelectValue.js';
 
@@ -83,7 +81,7 @@ export const MultipleSelectField = ({
   required,
   uncontrolled = false,
   ...props
-}: MultipleSelectFieldProps): React.Element<'select'> => {
+}: MultipleSelectFieldProps): React$Element<'select'> => {
   const selectProps: MultipleSelectElementProps = {...props, multiple: true};
 
   if (selectProps.className === undefined) {
@@ -123,7 +121,7 @@ const SelectField = ({
   required,
   uncontrolled = false,
   ...props
-}: SelectFieldProps): React.Element<'select'> => {
+}: SelectFieldProps): React$Element<'select'> => {
   const selectProps: SelectElementProps = props;
 
   if (selectProps.className === undefined) {
diff --git a/root/static/scripts/common/components/StaticRelationshipsDisplay.js b/root/static/scripts/common/components/StaticRelationshipsDisplay.js
index 14f7d9d7b5e..8a497ea293c 100644
--- a/root/static/scripts/common/components/StaticRelationshipsDisplay.js
+++ b/root/static/scripts/common/components/StaticRelationshipsDisplay.js
@@ -62,7 +62,7 @@ type PropsT = {
 const StaticRelationshipsDisplay = (React.memo<PropsT>(({
   hiddenArtistCredit,
   relationships: groupedRelationships,
-}: PropsT): Array<React.Element<'table'>> => {
+}: PropsT): Array<React$Element<'table'>> => {
   const tables = [];
 
   for (let i = 0; i < groupedRelationships.length; i++) {
@@ -143,6 +143,6 @@ const StaticRelationshipsDisplay = (React.memo<PropsT>(({
   }
 
   return tables;
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 export default StaticRelationshipsDisplay;
diff --git a/root/static/scripts/common/components/TagEditor.js b/root/static/scripts/common/components/TagEditor.js
index a94f16f6131..7c354fb1fae 100644
--- a/root/static/scripts/common/components/TagEditor.js
+++ b/root/static/scripts/common/components/TagEditor.js
@@ -92,7 +92,7 @@ const VoteButton = ({
   text,
   title,
   vote,
-}: VoteButtonPropsT): React.Element<'button'> => {
+}: VoteButtonPropsT): React$Element<'button'> => {
   const isActive = vote === currentVote;
   const className = 'tag-vote tag-' + VOTE_ACTIONS[vote];
   const buttonTitle = isActive
@@ -117,7 +117,7 @@ const VoteButton = ({
 const UpvoteButton = ({
   callback,
   currentVote,
-}: GenericVoteButtonPropsT): React.Element<typeof VoteButton> => (
+}: GenericVoteButtonPropsT): React$Element<typeof VoteButton> => (
   <VoteButton
     activeTitle={l('You’ve upvoted this tag')}
     callback={callback}
@@ -131,7 +131,7 @@ const UpvoteButton = ({
 const DownvoteButton = ({
   callback,
   currentVote,
-}: GenericVoteButtonPropsT): React.Element<typeof VoteButton> => (
+}: GenericVoteButtonPropsT): React$Element<typeof VoteButton> => (
   <VoteButton
     activeTitle={l('You’ve downvoted this tag')}
     callback={callback}
@@ -152,7 +152,7 @@ const VoteButtons = ({
   callback,
   count,
   currentVote,
-}: VoteButtonsPropsT): React.Element<'span'> => {
+}: VoteButtonsPropsT): React$Element<'span'> => {
   const $c = React.useContext(SanitizedCatalystContext);
 
   let className = '';
@@ -189,7 +189,7 @@ const TagRow = ({
   currentVote,
   index,
   tag,
-}: TagRowPropsT): React.Element<'li'> => (
+}: TagRowPropsT): React$Element<'li'> => (
   <li className={loopParity(index)} key={tag.name}>
     <TagLink tag={tag.name} />
     <VoteButtons
@@ -317,15 +317,15 @@ class TagEditor extends React.Component<TagEditorProps, TagEditorState> {
   }
 
   createTagRows(): {
-    +genres: $ReadOnlyArray<React.MixedElement>,
-    +tags: $ReadOnlyArray<React.MixedElement>,
+    +genres: $ReadOnlyArray<React$MixedElement>,
+    +tags: $ReadOnlyArray<React$MixedElement>,
     } {
     const tags = this.state.tags;
 
     return tags.reduce((
       accum: {
-        +genres: Array<React.MixedElement>,
-        +tags: Array<React.MixedElement>,
+        +genres: Array<React$MixedElement>,
+        +tags: Array<React$MixedElement>,
       },
       t: UserTagT,
       index: number,
@@ -526,7 +526,7 @@ export const MainTagEditor = (hydrate<TagEditorProps>(
       this.setState({positiveTagsOnly: false});
     }
 
-    render(): React.MixedElement {
+    render(): React$MixedElement {
       const {tags, positiveTagsOnly} = this.state;
       const tagRows = this.createTagRows();
 
@@ -648,12 +648,12 @@ export const MainTagEditor = (hydrate<TagEditorProps>(
     }
   },
   minimalEntity,
-): React.AbstractComponent<TagEditorProps, void>);
+): React$AbstractComponent<TagEditorProps, void>);
 
 export const SidebarTagEditor = (hydrate<TagEditorProps>(
   'div.sidebar-tags',
   class extends TagEditor {
-    render(): React.MixedElement {
+    render(): React$MixedElement {
       const tagRows = this.createTagRows();
       return (
         <>
@@ -706,7 +706,7 @@ export const SidebarTagEditor = (hydrate<TagEditorProps>(
     }
   },
   minimalEntity,
-): React.AbstractComponent<TagEditorProps, void>);
+): React$AbstractComponent<TagEditorProps, void>);
 
 function createInitialTagState(
   aggregatedTags: $ReadOnlyArray<AggregatedTagT>,
diff --git a/root/static/scripts/common/components/TagLink.js b/root/static/scripts/common/components/TagLink.js
index e000cca760d..cba004c5f9c 100644
--- a/root/static/scripts/common/components/TagLink.js
+++ b/root/static/scripts/common/components/TagLink.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 type UserTagLinkProps = {
   +content?: string,
   +showDownvoted?: boolean,
@@ -25,7 +23,7 @@ type TagLinkProps = {
 
 export const UserTagLink = (
   {content, showDownvoted = false, subPath, tag, username}: UserTagLinkProps,
-): React.Element<'a'> => {
+): React$Element<'a'> => {
   const url = '/user/' + encodeURIComponent(username) +
               '/tag/' + encodeURIComponent(tag) +
               (subPath == null ? '' : '/' + subPath) +
@@ -35,7 +33,7 @@ export const UserTagLink = (
 
 const TagLink = (
   {content, subPath, tag}: TagLinkProps,
-): React.Element<'a'> => {
+): React$Element<'a'> => {
   const url = '/tag/' + encodeURIComponent(tag) +
               (subPath == null ? '' : '/' + subPath);
   return <a href={url}>{content == null ? tag : content}</a>;
diff --git a/root/static/scripts/common/components/TaggerIcon.js b/root/static/scripts/common/components/TaggerIcon.js
index 190ff8a6875..d51f44a957a 100644
--- a/root/static/scripts/common/components/TaggerIcon.js
+++ b/root/static/scripts/common/components/TaggerIcon.js
@@ -34,7 +34,7 @@ type Props = {
 const TaggerIcon = ({
   entityType,
   gid,
-}: Props): React.MixedElement | null => {
+}: Props): React$MixedElement | null => {
   const $c = React.useContext(SanitizedCatalystContext);
 
   const tport = $c.session?.tport;
@@ -90,5 +90,5 @@ export default (
   hydrate<Props>(
     'span.tagger-icon',
     TaggerIcon,
-  ): React.AbstractComponent<Props, void>
+  ): React$AbstractComponent<Props, void>
 );
diff --git a/root/static/scripts/common/components/Warning.js b/root/static/scripts/common/components/Warning.js
index dd257eed074..a7f32d3b73b 100644
--- a/root/static/scripts/common/components/Warning.js
+++ b/root/static/scripts/common/components/Warning.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import WarningIcon from './WarningIcon.js';
 
 type Props = {
@@ -20,7 +18,7 @@ const Warning = ({
   className,
   message,
   ...divProps
-}: Props): React.Element<'div'> => (
+}: Props): React$Element<'div'> => (
   <div
     className={'warning' + (nonEmpty(className) ? ' ' + className : '')}
     {...divProps}
diff --git a/root/static/scripts/common/components/WarningIcon.js b/root/static/scripts/common/components/WarningIcon.js
index 156b7833679..7cc9b202f96 100644
--- a/root/static/scripts/common/components/WarningIcon.js
+++ b/root/static/scripts/common/components/WarningIcon.js
@@ -7,11 +7,9 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import warningIconUrl from '../../../images/icons/warning.png';
 
-const WarningIcon = (): React.Element<'img'> => (
+const WarningIcon = (): React$Element<'img'> => (
   <img
     alt={l('Warning')}
     className="warning"
diff --git a/root/static/scripts/common/components/WikipediaExtract.js b/root/static/scripts/common/components/WikipediaExtract.js
index 3cb5e2d7d36..8c6dba61a7a 100644
--- a/root/static/scripts/common/components/WikipediaExtract.js
+++ b/root/static/scripts/common/components/WikipediaExtract.js
@@ -38,7 +38,7 @@ class WikipediaExtract extends React.Component<Props, State> {
     }
   }
 
-  render(): React.MixedElement | null {
+  render(): React$MixedElement | null {
     const {wikipediaExtract} = this.state;
     return wikipediaExtract ? (
       <>
@@ -67,4 +67,4 @@ export default (hydrate<Props>(
   'div.wikipedia-extract',
   WikipediaExtract,
   minimalEntity,
-): React.AbstractComponent<Props, void>);
+): React$AbstractComponent<Props, void>);
diff --git a/root/static/scripts/common/components/WorkArtists.js b/root/static/scripts/common/components/WorkArtists.js
index 069ddc425b9..cec30d60156 100644
--- a/root/static/scripts/common/components/WorkArtists.js
+++ b/root/static/scripts/common/components/WorkArtists.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import ArtistCreditLink from './ArtistCreditLink.js';
 import CollapsibleList from './CollapsibleList.js';
 
@@ -40,4 +38,4 @@ const WorkArtists = ({artists}: WorkArtistsProps) => (
 export default (hydrate<WorkArtistsProps>(
   'div.work-artists-container',
   WorkArtists,
-): React.AbstractComponent<WorkArtistsProps, void>);
+): React$AbstractComponent<WorkArtistsProps, void>);
diff --git a/root/static/scripts/common/components/WorkListEntry.js b/root/static/scripts/common/components/WorkListEntry.js
index 8de8e2fe528..df7331be43b 100644
--- a/root/static/scripts/common/components/WorkListEntry.js
+++ b/root/static/scripts/common/components/WorkListEntry.js
@@ -48,7 +48,7 @@ export const WorkListRow = ({
   showIswcs = false,
   showRatings = false,
   work,
-}: WorkListRowProps): React.Element<typeof React.Fragment> => {
+}: WorkListRowProps): React$Element<typeof React.Fragment> => {
   const $c = React.useContext(CatalystContext);
 
   return (
@@ -139,7 +139,7 @@ const WorkListEntry = ({
   showIswcs,
   showRatings,
   work,
-}: WorkListEntryProps): React.Element<'tr'> => (
+}: WorkListEntryProps): React$Element<'tr'> => (
   <tr className={loopParity(index)} data-score={score ?? null}>
     <WorkListRow
       checkboxes={checkboxes}
diff --git a/root/static/scripts/common/hooks/usePagedMediumTable.js b/root/static/scripts/common/hooks/usePagedMediumTable.js
index 6b0204fa437..e0775d6ec42 100644
--- a/root/static/scripts/common/hooks/usePagedMediumTable.js
+++ b/root/static/scripts/common/hooks/usePagedMediumTable.js
@@ -41,8 +41,8 @@ type TracksResponseT = {
 type PagedMediumTableVarsT = {
   +columnCount: number,
   +loadedTrackCount: number,
-  +mediumHeaderLink: React.MixedElement,
-  +pagingElements: React.MixedElement,
+  +mediumHeaderLink: React$MixedElement,
+  +pagingElements: React$MixedElement,
   +showArtists: boolean,
 };
 
diff --git a/root/static/scripts/common/i18n/expand2.js b/root/static/scripts/common/i18n/expand2.js
index bcba00c29a8..d40d250ebae 100644
--- a/root/static/scripts/common/i18n/expand2.js
+++ b/root/static/scripts/common/i18n/expand2.js
@@ -268,7 +268,7 @@ export const createCondSubstParser = <T, V>(
  * of type V, and produce an expansion result of type T.
  *
  * So in the case of expand2react, the types would be:
- * expand<string | React.Element<any>, string | number | React.Element<any>>;
+ * expand<string | React$Element<any>, string | number | React$Element<any>>;
  *
  * And for expand2text they'd be:
  * expand<string, string | number>;
diff --git a/root/static/scripts/common/i18n/expand2react.js b/root/static/scripts/common/i18n/expand2react.js
index 7f28870dedb..e0d02d0ee2c 100644
--- a/root/static/scripts/common/i18n/expand2react.js
+++ b/root/static/scripts/common/i18n/expand2react.js
@@ -115,7 +115,7 @@ const parseVarSubst = createVarSubstParser<Output, Input>(
 );
 
 const parseLinkSubst: Parser<
-  React.Element<'a'> | string | NO_MATCH,
+  React$Element<'a'> | string | NO_MATCH,
   Input,
 > = saveMatch(function (args) {
   const name = accept(linkSubstStart);
diff --git a/root/static/scripts/common/utility/formatSetlist.js b/root/static/scripts/common/utility/formatSetlist.js
index afefcf1ac84..d8781516826 100644
--- a/root/static/scripts/common/utility/formatSetlist.js
+++ b/root/static/scripts/common/utility/formatSetlist.js
@@ -51,7 +51,7 @@ export default function formatSetlist(
   setlistText: string,
 ): Expand2ReactOutput {
   const rawLines = setlistText.split(/(?:\r\n|\n\r|\r|\n)/);
-  const elements: Array<React.Node> = [];
+  const elements: Array<React$Node> = [];
 
   for (const rawLine of rawLines) {
     if (empty(rawLine)) {
diff --git a/root/static/scripts/common/utility/isolateText.js b/root/static/scripts/common/utility/isolateText.js
index b234eee6fe2..0c8647c11ab 100644
--- a/root/static/scripts/common/utility/isolateText.js
+++ b/root/static/scripts/common/utility/isolateText.js
@@ -7,9 +7,7 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
-function isolateText(content: ?React$Node): React.Element<'bdi'> | string {
+function isolateText(content: ?React$Node): React$Element<'bdi'> | string {
   if (content != null && content !== '') {
     return <bdi>{content}</bdi>;
   }
diff --git a/root/static/scripts/edit/components/AddEntityDialog.js b/root/static/scripts/edit/components/AddEntityDialog.js
index 30bccee83bb..54af3712a5e 100644
--- a/root/static/scripts/edit/components/AddEntityDialog.js
+++ b/root/static/scripts/edit/components/AddEntityDialog.js
@@ -41,7 +41,7 @@ const AddEntityDialog = ({
   close,
   entityType,
   name,
-}: PropsT): React.Element<typeof Modal> => {
+}: PropsT): React$Element<typeof Modal> => {
   const dialogRef = React.useRef<HTMLDivElement | null>(null);
   const iframeRef = React.useRef<HTMLIFrameElement | null>(null);
   const instanceRef = React.useRef<InstanceT | null>(null);
diff --git a/root/static/scripts/edit/components/AddIcon.js b/root/static/scripts/edit/components/AddIcon.js
index f73860753f6..e018e3f3a63 100644
--- a/root/static/scripts/edit/components/AddIcon.js
+++ b/root/static/scripts/edit/components/AddIcon.js
@@ -7,11 +7,9 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import addIconUrl from '../../../images/icons/add.png';
 
-const AddIcon = (): React.Element<'img'> => (
+const AddIcon = (): React$Element<'img'> => (
   <img
     className="bottom"
     src={addIconUrl}
diff --git a/root/static/scripts/edit/components/DateRangeFieldset.js b/root/static/scripts/edit/components/DateRangeFieldset.js
index e5d350a7bbd..5e1b4e1d6a1 100644
--- a/root/static/scripts/edit/components/DateRangeFieldset.js
+++ b/root/static/scripts/edit/components/DateRangeFieldset.js
@@ -225,6 +225,6 @@ const DateRangeFieldset = (React.memo<PropsT>(({
       </fieldset>
     </>
   );
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 export default DateRangeFieldset;
diff --git a/root/static/scripts/edit/components/EnterEdit.js b/root/static/scripts/edit/components/EnterEdit.js
index b6b681f8e25..5fabfd55620 100644
--- a/root/static/scripts/edit/components/EnterEdit.js
+++ b/root/static/scripts/edit/components/EnterEdit.js
@@ -7,10 +7,8 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 type CommonProps = {
-  +children?: React.Node,
+  +children?: React$Node,
   +disabled?: boolean,
   +form: ReadOnlyFormT<{
     +make_votable: ReadOnlyFieldT<boolean>,
@@ -34,7 +32,7 @@ const EnterEdit = ({
   disabled = false,
   form,
   ...otherProps
-}: Props): React.MixedElement => {
+}: Props): React$MixedElement => {
   const isMakeVotableChecked = form.field.make_votable.value;
   const makeVotableProps: {
     checked?: boolean,
diff --git a/root/static/scripts/edit/components/EnterEditNote.js b/root/static/scripts/edit/components/EnterEditNote.js
index a80838b40b8..ddd02d90565 100644
--- a/root/static/scripts/edit/components/EnterEditNote.js
+++ b/root/static/scripts/edit/components/EnterEditNote.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import FieldErrors from './FieldErrors.js';
 import FormRow from './FormRow.js';
 
@@ -33,7 +31,7 @@ const EnterEditNote = ({
   hideHelp = false,
   ...otherProps
 }: Props):
-React.Element<'fieldset'> => {
+React$Element<'fieldset'> => {
   const textAreaProps: {
     defaultValue?: string,
     onChange?: (event: SyntheticEvent<HTMLTextAreaElement>) => void,
diff --git a/root/static/scripts/edit/components/ExternalLinkAttributeDialog.js b/root/static/scripts/edit/components/ExternalLinkAttributeDialog.js
index 440f5a46ddf..c383d2ef4f7 100644
--- a/root/static/scripts/edit/components/ExternalLinkAttributeDialog.js
+++ b/root/static/scripts/edit/components/ExternalLinkAttributeDialog.js
@@ -129,7 +129,7 @@ const reducer = (state: StateT, action: ActionT): StateT => {
   );
 };
 
-const ExternalLinkAttributeDialog = (props: PropsT): React.MixedElement => {
+const ExternalLinkAttributeDialog = (props: PropsT): React$MixedElement => {
   const buttonRef = React.useRef<HTMLButtonElement | null>(null);
   const [open, setOpen] = React.useState(false);
 
@@ -186,7 +186,7 @@ const ExternalLinkAttributeDialog = (props: PropsT): React.MixedElement => {
   };
 
   const buildPopoverChildren =
-    (closeAndReturnFocus: () => void): React.Element<'form'> => {
+    (closeAndReturnFocus: () => void): React$Element<'form'> => {
       return (
         <form
           className="external-link-attribute-dialog"
diff --git a/root/static/scripts/edit/components/FieldErrors.js b/root/static/scripts/edit/components/FieldErrors.js
index 9c57ae7d65a..f9a26e71aae 100644
--- a/root/static/scripts/edit/components/FieldErrors.js
+++ b/root/static/scripts/edit/components/FieldErrors.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import expand2react from '../../common/i18n/expand2react.js';
 import {type AnyFieldT} from '../utility/iterSubfields.js';
 import subfieldErrors from '../utility/subfieldErrors.js';
@@ -39,7 +37,7 @@ export const FieldErrorsList = ({
 }: {
   +errors: ?$ReadOnlyArray<string>,
   +hasHtmlErrors: boolean,
-}): React.Element<'ul'> | null => {
+}): React$Element<'ul'> | null => {
   if (errors?.length) {
     return (
       <ul className="errors">
@@ -56,7 +54,7 @@ const FieldErrors = ({
   field,
   hasHtmlErrors = false,
   includeSubFields = true,
-}: Props): React.Element<typeof FieldErrorsList> | null => {
+}: Props): React$Element<typeof FieldErrorsList> | null => {
   if (!field) {
     return null;
   }
diff --git a/root/static/scripts/edit/components/FormCsrfToken.js b/root/static/scripts/edit/components/FormCsrfToken.js
index 46e460aef58..09d774f8737 100644
--- a/root/static/scripts/edit/components/FormCsrfToken.js
+++ b/root/static/scripts/edit/components/FormCsrfToken.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 type PropsT = {
   +form: ReadOnlyFormT<{
     +csrf_session_key?: ReadOnlyFieldT<string>,
@@ -17,7 +15,7 @@ type PropsT = {
   }>,
 };
 
-const FormCsrfToken = ({form}: PropsT): React.Node => {
+const FormCsrfToken = ({form}: PropsT): React$Node => {
   const sessionKeyField = form.field.csrf_session_key;
   const tokenField = form.field.csrf_token;
   return (sessionKeyField && tokenField) ? (
diff --git a/root/static/scripts/edit/components/FormLabel.js b/root/static/scripts/edit/components/FormLabel.js
index 6e5d0a334e2..6fa7eb2d92c 100644
--- a/root/static/scripts/edit/components/FormLabel.js
+++ b/root/static/scripts/edit/components/FormLabel.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 type Props = {
   +forField?: {+html_name: string, ...},
   +label: string,
   +required?: boolean,
 };
 
-const FormLabel = (props: Props): React.Element<'label'> => (
+const FormLabel = (props: Props): React$Element<'label'> => (
   <label
     className={props.required /*:: === true */ ? 'required' : ''}
     htmlFor={props.forField ? 'id-' + props.forField.html_name : null}
diff --git a/root/static/scripts/edit/components/FormRow.js b/root/static/scripts/edit/components/FormRow.js
index 91564a24e15..6f6aef8b818 100644
--- a/root/static/scripts/edit/components/FormRow.js
+++ b/root/static/scripts/edit/components/FormRow.js
@@ -7,10 +7,8 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +hasNoLabel?: boolean,
 };
 
@@ -18,7 +16,7 @@ const FormRow = ({
   children,
   hasNoLabel = false,
   ...props
-}: Props): React.Element<'div'> => (
+}: Props): React$Element<'div'> => (
   <div
     className={'row' + (hasNoLabel ? ' no-label' : '')}
     {...props}
diff --git a/root/static/scripts/edit/components/FormRowCheckbox.js b/root/static/scripts/edit/components/FormRowCheckbox.js
index c2e9aafc75b..f624d2e2785 100644
--- a/root/static/scripts/edit/components/FormRowCheckbox.js
+++ b/root/static/scripts/edit/components/FormRowCheckbox.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import FieldErrors from './FieldErrors.js';
 import FormRow from './FormRow.js';
 
 type CommonProps = {
   +disabled?: boolean,
   +field: ReadOnlyFieldT<boolean>,
-  +help?: React.Node,
+  +help?: React$Node,
   +label: string,
 };
 
@@ -38,7 +36,7 @@ const FormRowCheckbox = ({
   // $FlowIssue[prop-missing]
   onChange,
   uncontrolled,
-}: Props): React.Element<typeof FormRow> => {
+}: Props): React$Element<typeof FormRow> => {
   const extraProps: {
     checked?: boolean,
     defaultChecked?: boolean,
diff --git a/root/static/scripts/edit/components/FormRowEmailLong.js b/root/static/scripts/edit/components/FormRowEmailLong.js
index 1d7ed9c9b89..279ce210bda 100644
--- a/root/static/scripts/edit/components/FormRowEmailLong.js
+++ b/root/static/scripts/edit/components/FormRowEmailLong.js
@@ -7,14 +7,12 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import type {Props as FormRowTextProps} from './FormRowText.js';
 import FormRowTextLong from './FormRowTextLong.js';
 
 const FormRowEmailLong = (
   props: FormRowTextProps,
-): React.Element<typeof FormRowTextLong> => (
+): React$Element<typeof FormRowTextLong> => (
   <FormRowTextLong type="email" {...props} />
 );
 
diff --git a/root/static/scripts/edit/components/FormRowNameWithGuessCase.js b/root/static/scripts/edit/components/FormRowNameWithGuessCase.js
index 332c3cea7e7..6a8858f40db 100644
--- a/root/static/scripts/edit/components/FormRowNameWithGuessCase.js
+++ b/root/static/scripts/edit/components/FormRowNameWithGuessCase.js
@@ -110,7 +110,7 @@ export const FormRowNameWithGuessCase = ({
   guessFeat = false,
   isGuessCaseOptionsOpen = false,
   label = addColonText(l('Name')),
-}: PropsT): React.Element<typeof FormRowText> => {
+}: PropsT): React$Element<typeof FormRowText> => {
   function handleNameChange(event: SyntheticKeyboardEvent<HTMLInputElement>) {
     dispatch({
       name: event.currentTarget.value,
diff --git a/root/static/scripts/edit/components/FormRowPartialDate.js b/root/static/scripts/edit/components/FormRowPartialDate.js
index c67c04b2513..c893f618ed6 100644
--- a/root/static/scripts/edit/components/FormRowPartialDate.js
+++ b/root/static/scripts/edit/components/FormRowPartialDate.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import FieldErrors from './FieldErrors.js';
 import FormLabel from './FormLabel.js';
 import FormRow from './FormRow.js';
@@ -20,7 +18,7 @@ import PartialDateInput, {
 export type ActionT = PartialDateInputActionT;
 
 type CommonProps = {
-  +children?: React.Node,
+  +children?: React$Node,
   +disabled?: boolean,
   +field: PartialDateFieldT,
   +label: string,
@@ -52,7 +50,7 @@ const FormRowPartialDate = ({
   label,
   required = false,
   ...inputProps
-}: Props): React.Element<typeof FormRow> => (
+}: Props): React$Element<typeof FormRow> => (
   <FormRow>
     <FormLabel
       forField={field.field.year}
diff --git a/root/static/scripts/edit/components/FormRowRadio.js b/root/static/scripts/edit/components/FormRowRadio.js
index 24908560e14..d11b45464da 100644
--- a/root/static/scripts/edit/components/FormRowRadio.js
+++ b/root/static/scripts/edit/components/FormRowRadio.js
@@ -32,7 +32,7 @@ const FormRowRadio = ({
   label,
   options,
   required = false,
-}: Props): React.Element<typeof FormRow> => (
+}: Props): React$Element<typeof FormRow> => (
   <FormRow>
     <FormLabel label={label} required={required} />
     <div className="no-label">
diff --git a/root/static/scripts/edit/components/FormRowSelect.js b/root/static/scripts/edit/components/FormRowSelect.js
index 24919e674a4..559265dc87b 100644
--- a/root/static/scripts/edit/components/FormRowSelect.js
+++ b/root/static/scripts/edit/components/FormRowSelect.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import SelectField from '../../common/components/SelectField.js';
 
 import FieldErrors from './FieldErrors.js';
@@ -23,7 +21,7 @@ type Props = {
   +field: ReadOnlyFieldT<number | string>,
   +frozen?: boolean,
   +hasHtmlErrors?: boolean,
-  +helpers?: React.Node,
+  +helpers?: React$Node,
   +label: string,
   +onChange?: (event: SyntheticEvent<HTMLSelectElement>) => void,
   +options: MaybeGroupedOptionsT,
@@ -47,7 +45,7 @@ const FormRowSelect = ({
   options,
   required: passedRequired = false,
   uncontrolled = false,
-}: Props): React.Element<typeof FormRow> => {
+}: Props): React$Element<typeof FormRow> => {
   let required = passedRequired;
   if (!allowEmpty) {
     // If the field can't be unset, there's nothing required from the user.
diff --git a/root/static/scripts/edit/components/FormRowSelectList.js b/root/static/scripts/edit/components/FormRowSelectList.js
index 69640f271ad..07aeb770008 100644
--- a/root/static/scripts/edit/components/FormRowSelectList.js
+++ b/root/static/scripts/edit/components/FormRowSelectList.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import SelectField from '../../common/components/SelectField.js';
 
 import FieldErrors from './FieldErrors.js';
@@ -42,7 +40,7 @@ const FormRowSelectList = <S: {+id: number, ...}>({
   removeClassName,
   removeLabel,
   repeatable,
-}: Props<S>): React.Element<typeof FormRow> => (
+}: Props<S>): React$Element<typeof FormRow> => (
   <FormRow>
     <label>{addColonText(label)}</label>
     <div className="form-row-select-list">
diff --git a/root/static/scripts/edit/components/FormRowSortNameWithGuessCase.js b/root/static/scripts/edit/components/FormRowSortNameWithGuessCase.js
index 8c97da6ff58..805921353e2 100644
--- a/root/static/scripts/edit/components/FormRowSortNameWithGuessCase.js
+++ b/root/static/scripts/edit/components/FormRowSortNameWithGuessCase.js
@@ -81,7 +81,7 @@ export const FormRowSortNameWithGuessCase = ({
   field,
   label = addColonText(l('Sort name')),
   required = false,
-}: PropsT): React.Element<typeof FormRowText> => {
+}: PropsT): React$Element<typeof FormRowText> => {
   const handleSortNameChange = React.useCallback((
     event: SyntheticKeyboardEvent<HTMLInputElement>,
   ) => {
diff --git a/root/static/scripts/edit/components/FormRowText.js b/root/static/scripts/edit/components/FormRowText.js
index bb93cdd2901..1563cd051a6 100644
--- a/root/static/scripts/edit/components/FormRowText.js
+++ b/root/static/scripts/edit/components/FormRowText.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import FieldErrors from './FieldErrors.js';
 import FormLabel from './FormLabel.js';
 import FormRow from './FormRow.js';
@@ -29,7 +27,7 @@ type InputProps = {
 };
 
 type CommonProps = {
-  +children?: React.Node,
+  +children?: React$Node,
   +className?: string,
   +disabled?: boolean,
   +field: ReadOnlyFieldT<?string>,
@@ -50,7 +48,7 @@ export type Props =
       uncontrolled: true,
     }>;
 
-const FormRowText = (props: Props): React.Element<typeof FormRow> => {
+const FormRowText = (props: Props): React$Element<typeof FormRow> => {
   const field = props.field;
   const required = props.required ?? false;
 
diff --git a/root/static/scripts/edit/components/FormRowTextArea.js b/root/static/scripts/edit/components/FormRowTextArea.js
index 6bf64d43bb2..b6bd7060fdd 100644
--- a/root/static/scripts/edit/components/FormRowTextArea.js
+++ b/root/static/scripts/edit/components/FormRowTextArea.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import FieldErrors from './FieldErrors.js';
 import FormLabel from './FormLabel.js';
 import FormRow from './FormRow.js';
@@ -28,7 +26,7 @@ const FormRowTextArea = ({
   required = false,
   rows = 5,
   ...textareaProps
-}: Props): React.Element<typeof FormRow> => (
+}: Props): React$Element<typeof FormRow> => (
   <FormRow>
     <FormLabel forField={field} label={label} required={required} />
     <textarea
diff --git a/root/static/scripts/edit/components/FormRowTextLong.js b/root/static/scripts/edit/components/FormRowTextLong.js
index 681a1e248a9..1f003212c3c 100644
--- a/root/static/scripts/edit/components/FormRowTextLong.js
+++ b/root/static/scripts/edit/components/FormRowTextLong.js
@@ -7,14 +7,12 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import type {Props as FormRowTextProps} from './FormRowText.js';
 import FormRowText from './FormRowText.js';
 
 const FormRowTextLong = (
   props: FormRowTextProps,
-): React.Element<typeof FormRowText> => (
+): React$Element<typeof FormRowText> => (
   <FormRowText size={47} {...props} />
 );
 
diff --git a/root/static/scripts/edit/components/FormRowURLLong.js b/root/static/scripts/edit/components/FormRowURLLong.js
index b32c25d544c..1ba4bd8f34c 100644
--- a/root/static/scripts/edit/components/FormRowURLLong.js
+++ b/root/static/scripts/edit/components/FormRowURLLong.js
@@ -7,14 +7,12 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import type {Props as FormRowTextProps} from './FormRowText.js';
 import FormRowTextLong from './FormRowTextLong.js';
 
 const FormRowURLLong = (
   props: FormRowTextProps,
-): React.Element<typeof FormRowTextLong> => (
+): React$Element<typeof FormRowTextLong> => (
   <FormRowTextLong type="url" {...props} />
 );
 
diff --git a/root/static/scripts/edit/components/FormSubmit.js b/root/static/scripts/edit/components/FormSubmit.js
index 870be2a35e7..cb033487801 100644
--- a/root/static/scripts/edit/components/FormSubmit.js
+++ b/root/static/scripts/edit/components/FormSubmit.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 type Props = {
   +className?: string,
   +label: string,
@@ -21,7 +19,7 @@ const FormSubmit = ({
   label,
   name,
   value,
-}: Props): React.Element<'span'> => (
+}: Props): React$Element<'span'> => (
   <span className={'buttons' + (nonEmpty(className) ? ' ' + className : '')}>
     <button name={name} type="submit" value={value}>{label}</button>
   </span>
diff --git a/root/static/scripts/edit/components/GuessCaseIcon.js b/root/static/scripts/edit/components/GuessCaseIcon.js
index 5e66e4a058e..9522bb46752 100644
--- a/root/static/scripts/edit/components/GuessCaseIcon.js
+++ b/root/static/scripts/edit/components/GuessCaseIcon.js
@@ -7,13 +7,11 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import guessCaseIconUrl from '../../../images/icons/guesscase.32x32.png';
 
 const style = {float: 'left', margin: '1em'};
 
-const GuessCaseIcon = (): React.Element<'img'> => (
+const GuessCaseIcon = (): React$Element<'img'> => (
   <img
     alt=""
     src={guessCaseIconUrl}
diff --git a/root/static/scripts/edit/components/GuessCaseOptions.js b/root/static/scripts/edit/components/GuessCaseOptions.js
index 4b0bb1cfc0a..4d0a74d7036 100644
--- a/root/static/scripts/edit/components/GuessCaseOptions.js
+++ b/root/static/scripts/edit/components/GuessCaseOptions.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import expand2react from '../../common/i18n/expand2react.js';
 import bracketed from '../../common/utility/bracketed.js';
 import getBooleanCookie from '../../common/utility/getBooleanCookie.js';
@@ -81,7 +79,7 @@ const GuessCaseOptions = ({
   keepUpperCase,
   modeName,
   upperCaseRoman,
-}: PropsT): React.Element<'div'> => {
+}: PropsT): React$Element<'div'> => {
   function handleModeChange(event: SyntheticEvent<HTMLSelectElement>) {
     const newModeName = event.currentTarget.value;
 
diff --git a/root/static/scripts/edit/components/GuessCaseOptionsPopover.js b/root/static/scripts/edit/components/GuessCaseOptionsPopover.js
index 7c642a966b3..f0945871410 100644
--- a/root/static/scripts/edit/components/GuessCaseOptionsPopover.js
+++ b/root/static/scripts/edit/components/GuessCaseOptionsPopover.js
@@ -33,7 +33,7 @@ const GuessCaseOptionsPopover = (React.memo(({
   modeName,
   toggle,
   upperCaseRoman,
-}: Props): React.Element<typeof ButtonPopover> => {
+}: Props): React$Element<typeof ButtonPopover> => {
   const buttonRef = React.useRef<HTMLButtonElement | null>(null);
 
   const buildChildren = React.useCallback((
@@ -84,6 +84,6 @@ const GuessCaseOptionsPopover = (React.memo(({
       toggle={toggle}
     />
   );
-}): React.AbstractComponent<Props, void>);
+}): React$AbstractComponent<Props, void>);
 
 export default GuessCaseOptionsPopover;
diff --git a/root/static/scripts/edit/components/HelpIcon.js b/root/static/scripts/edit/components/HelpIcon.js
index 42695cfbddb..00be59d064c 100644
--- a/root/static/scripts/edit/components/HelpIcon.js
+++ b/root/static/scripts/edit/components/HelpIcon.js
@@ -7,12 +7,10 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Tooltip from './Tooltip.js';
 
 type PropsT = {
-  +content: React.Node,
+  +content: React$Node,
 };
 
 const ICON_STYLE = {
@@ -23,7 +21,7 @@ const ICON_STYLE = {
 
 const HelpIcon = ({
   content,
-}: PropsT): React.MixedElement => (
+}: PropsT): React$MixedElement => (
   <Tooltip
     content={content}
     target={
diff --git a/root/static/scripts/edit/components/HiddenField.js b/root/static/scripts/edit/components/HiddenField.js
index 8ede6ae0acd..cbf65b14f4f 100644
--- a/root/static/scripts/edit/components/HiddenField.js
+++ b/root/static/scripts/edit/components/HiddenField.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 type Props = {
   +field: ReadOnlyFieldT<number | string>,
 };
 
 const HiddenField = ({
   field,
-}: Props): React.Element<'input'> => (
+}: Props): React$Element<'input'> => (
   <input
     name={field.html_name}
     type="hidden"
diff --git a/root/static/scripts/edit/components/InformationIcon.js b/root/static/scripts/edit/components/InformationIcon.js
index 170529e2195..983a76ade3e 100644
--- a/root/static/scripts/edit/components/InformationIcon.js
+++ b/root/static/scripts/edit/components/InformationIcon.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import informationIconUrl from '../../../images/icons/information.png';
 
 type Props = {
@@ -16,7 +14,7 @@ type Props = {
   title?: string,
 };
 
-const InformationIcon = (props: Props): React.Element<'img'> => (
+const InformationIcon = (props: Props): React$Element<'img'> => (
   <img
     src={informationIconUrl}
     {...props}
diff --git a/root/static/scripts/edit/components/InlineSubmitButton.js b/root/static/scripts/edit/components/InlineSubmitButton.js
index da013f0936e..735b9efbc8d 100644
--- a/root/static/scripts/edit/components/InlineSubmitButton.js
+++ b/root/static/scripts/edit/components/InlineSubmitButton.js
@@ -15,7 +15,7 @@ type PropsT = {
 
 const InlineSubmitButton = ({
   label,
-}: PropsT): React.Element<typeof React.Fragment> => (
+}: PropsT): React$Element<typeof React.Fragment> => (
   <>
     {' '}
     <button type="submit">
diff --git a/root/static/scripts/edit/components/Multiselect.js b/root/static/scripts/edit/components/Multiselect.js
index c7d76be97bf..8ffb8613b4f 100644
--- a/root/static/scripts/edit/components/Multiselect.js
+++ b/root/static/scripts/edit/components/Multiselect.js
@@ -46,7 +46,7 @@ export type MultiselectValuePropsT<
   V: AutocompleteEntityItemT,
   VS: MultiselectValueStateT<V>,
 > = {
-  +buildExtraChildren?: ($Exact<VS>) => React.Node,
+  +buildExtraChildren?: ($Exact<VS>) => React$Node,
   +dispatch: (MultiselectActionT<V>) => void,
   +state: $Exact<VS>,
 };
@@ -66,7 +66,7 @@ export type MultiselectPropsT<
   S: MultiselectStateT<V, VS>,
 > = {
   +addLabel: string,
-  +buildExtraValueChildren?: ($Exact<VS>) => React.Node,
+  +buildExtraValueChildren?: ($Exact<VS>) => React$Node,
   +dispatch: (MultiselectActionT<V>) => void,
   +state: $Exact<S>,
 };
@@ -156,7 +156,7 @@ export function runReducer<
   }
 }
 
-type MultiselectValueComponentT = React.AbstractComponent<
+type MultiselectValueComponentT = React$AbstractComponent<
   MultiselectValuePropsT<
     AutocompleteEntityItemT,
     MultiselectValueStateT<AutocompleteEntityItemT>,
@@ -171,7 +171,7 @@ export const MultiselectValue: MultiselectValueComponentT = React.memo(<
   buildExtraChildren,
   dispatch,
   state,
-}: MultiselectValuePropsT<V, VS>): React.MixedElement => {
+}: MultiselectValuePropsT<V, VS>): React$MixedElement => {
   const autocompleteDispatch = React.useCallback(
     (action: AutocompleteActionT<V>) => {
       dispatch({
@@ -223,7 +223,7 @@ const Multiselect = (React.memo(<
   buildExtraValueChildren,
   dispatch,
   state,
-}: MultiselectPropsT<V, VS, S>): React.MixedElement => {
+}: MultiselectPropsT<V, VS, S>): React$MixedElement => {
   const handleAdd = React.useCallback(() => {
     dispatch({type: 'add-value'});
   }, [dispatch]);
@@ -236,7 +236,7 @@ const Multiselect = (React.memo(<
   const GenericMultiselectValue = (
     // $FlowIgnore[incompatible-cast]
     MultiselectValue:
-      React.AbstractComponent<
+      React$AbstractComponent<
         MultiselectValuePropsT<V, VS>,
         mixed,
       >
@@ -263,7 +263,7 @@ const Multiselect = (React.memo(<
       ) : null}
     </>
   );
-}): React.AbstractComponent<
+}): React$AbstractComponent<
   MultiselectPropsT<
     AutocompleteEntityItemT,
     MultiselectValueStateT<AutocompleteEntityItemT>,
diff --git a/root/static/scripts/edit/components/NewNotesAlertCheckbox.js b/root/static/scripts/edit/components/NewNotesAlertCheckbox.js
index 1d32a2cb627..0b60a36315b 100644
--- a/root/static/scripts/edit/components/NewNotesAlertCheckbox.js
+++ b/root/static/scripts/edit/components/NewNotesAlertCheckbox.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import setCookie from '../../common/utility/setCookie.js';
 
 type Props = {
@@ -17,7 +15,7 @@ type Props = {
 
 const NewNotesAlertCheckbox = ({
   checked,
-}: Props): React.Element<'p'> => {
+}: Props): React$Element<'p'> => {
   const handlePreferenceChange = (
     event: SyntheticMouseEvent<HTMLInputElement>,
   ) => {
@@ -44,5 +42,5 @@ export default (
   hydrate<Props>(
     'span.new-notes-alert-checkbox',
     NewNotesAlertCheckbox,
-  ): React.AbstractComponent<Props, void>
+  ): React$AbstractComponent<Props, void>
 );
diff --git a/root/static/scripts/edit/components/PartialDateInput.js b/root/static/scripts/edit/components/PartialDateInput.js
index ab94c368acc..16224565d03 100644
--- a/root/static/scripts/edit/components/PartialDateInput.js
+++ b/root/static/scripts/edit/components/PartialDateInput.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {isDateValid, isYearFourDigits} from '../utility/dates.js';
 import {applyPendingErrors} from '../utility/subfieldErrors.js';
 
@@ -101,7 +99,7 @@ type DatePartPropsT = {
   value?: StrOrNum,
 };
 
-const PartialDateInput = (props: Props): React.Element<'span'> => {
+const PartialDateInput = (props: Props): React$Element<'span'> => {
   const disabled = props.disabled ?? false;
   const field = props.field;
   const yearInputRef = props.yearInputRef;
diff --git a/root/static/scripts/edit/components/PossibleDuplicates.js b/root/static/scripts/edit/components/PossibleDuplicates.js
index e93d3c13fbf..5754adba4a9 100644
--- a/root/static/scripts/edit/components/PossibleDuplicates.js
+++ b/root/static/scripts/edit/components/PossibleDuplicates.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityLink from '../../common/components/EntityLink.js';
 
 type PropsT = {
@@ -21,7 +19,7 @@ const PossibleDuplicates = ({
   duplicates,
   name,
   onCheckboxChange,
-}: PropsT): React.Element<'div'> => (
+}: PropsT): React$Element<'div'> => (
   <div>
     <h3>{l('Possible Duplicates')}</h3>
     <p>{l('We found the following entities with very similar names:')}</p>
diff --git a/root/static/scripts/edit/components/ReleaseMergeStrategy.js b/root/static/scripts/edit/components/ReleaseMergeStrategy.js
index 454929690bd..1e0076efd51 100644
--- a/root/static/scripts/edit/components/ReleaseMergeStrategy.js
+++ b/root/static/scripts/edit/components/ReleaseMergeStrategy.js
@@ -238,4 +238,4 @@ const ReleaseMergeStrategy = ({
 export default (hydrate<Props>(
   'div.release-merge-strategy',
   ReleaseMergeStrategy,
-): React.AbstractComponent<Props, void>);
+): React$AbstractComponent<Props, void>);
diff --git a/root/static/scripts/edit/components/RemoveButton.js b/root/static/scripts/edit/components/RemoveButton.js
index 945e1c116d0..71aa017df48 100644
--- a/root/static/scripts/edit/components/RemoveButton.js
+++ b/root/static/scripts/edit/components/RemoveButton.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 type PropsT = {
   dataIndex?: number,
   onClick: (event: SyntheticEvent<HTMLInputElement>) => void,
@@ -19,7 +17,7 @@ const RemoveButton = ({
   dataIndex,
   onClick,
   title,
-}: PropsT): React.Element<'button'> => (
+}: PropsT): React$Element<'button'> => (
   <button
     className="nobutton icon remove-item"
     data-index={dataIndex}
diff --git a/root/static/scripts/edit/components/Tooltip.js b/root/static/scripts/edit/components/Tooltip.js
index 75ab114411a..d4e484dfe07 100644
--- a/root/static/scripts/edit/components/Tooltip.js
+++ b/root/static/scripts/edit/components/Tooltip.js
@@ -15,14 +15,14 @@
 import * as React from 'react';
 
 type TooltipProps = {
-  +content: React.Node,
-  +target: React.Node,
+  +content: React$Node,
+  +target: React$Node,
 };
 
 const Tooltip = ({
   content,
   target,
-}: TooltipProps): React.Element<'span'> => {
+}: TooltipProps): React$Element<'span'> => {
   const containerRef = React.useRef<HTMLSpanElement | null>(null);
 
   React.useEffect(() => {
diff --git a/root/static/scripts/edit/components/URLInputPopover.js b/root/static/scripts/edit/components/URLInputPopover.js
index 7f0ecb5b8dc..7c553463dfc 100644
--- a/root/static/scripts/edit/components/URLInputPopover.js
+++ b/root/static/scripts/edit/components/URLInputPopover.js
@@ -24,7 +24,7 @@ type PropsT = {
   validateLink: (LinkRelationshipT | LinkStateT) => ErrorT | null,
 };
 
-const URLInputPopover = (props: PropsT): React.MixedElement => {
+const URLInputPopover = (props: PropsT): React$MixedElement => {
   const popoverButtonRef = React.useRef<HTMLButtonElement | null>(null);
   const [isOpen, setIsOpen] = React.useState<boolean>(false);
   const [link, setLink] = React.useState<LinkRelationshipT>(props.link);
diff --git a/root/static/scripts/edit/components/edit/Diff.js b/root/static/scripts/edit/components/edit/Diff.js
index eec5cb4f8e3..c705c792ab3 100644
--- a/root/static/scripts/edit/components/edit/Diff.js
+++ b/root/static/scripts/edit/components/edit/Diff.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {DELETE, INSERT} from '../../utility/editDiff.js';
 
 import DiffSide from './DiffSide.js';
 
 export type DiffProps = {
-  +extraNew?: React.Node,
-  +extraOld?: React.Node,
+  +extraNew?: React$Node,
+  +extraOld?: React$Node,
   +label: string,
   +newText: string,
   +oldText: string,
@@ -33,7 +31,7 @@ const Diff = ({
   newText,
   oldText,
   split = '',
-}: Props): React.Element<'tr'> | null => (
+}: Props): React$Element<'tr'> | null => (
   oldText === newText ? null : (
     <tr>
       <th>{label}</th>
diff --git a/root/static/scripts/edit/components/edit/DiffSide.js b/root/static/scripts/edit/components/edit/DiffSide.js
index c096d6ee782..5b272dcf287 100644
--- a/root/static/scripts/edit/components/edit/DiffSide.js
+++ b/root/static/scripts/edit/components/edit/DiffSide.js
@@ -46,7 +46,7 @@ const DiffSide = ({
   newText,
   oldText,
   split = '',
-}: Props): React.MixedElement | string => {
+}: Props): React$MixedElement | string => {
   const stack = [];
   const splitMatch = new RegExp('^(?:' + split + ')$');
 
diff --git a/root/static/scripts/edit/components/edit/FullChangeDiff.js b/root/static/scripts/edit/components/edit/FullChangeDiff.js
index 98dfa1ebbed..e50742bc015 100644
--- a/root/static/scripts/edit/components/edit/FullChangeDiff.js
+++ b/root/static/scripts/edit/components/edit/FullChangeDiff.js
@@ -7,10 +7,8 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 type FullChangeDiffProps = {
-  +label: React.Node,
+  +label: React$Node,
   +newContent: React$Node,
   +oldContent: React$Node,
 };
@@ -19,7 +17,7 @@ const FullChangeDiff = ({
   label,
   newContent,
   oldContent,
-}: FullChangeDiffProps): React.Element<'tr'> | null => (
+}: FullChangeDiffProps): React$Element<'tr'> | null => (
   oldContent === newContent ? null : (
     <tr>
       <th>{label}</th>
diff --git a/root/static/scripts/edit/components/edit/RelationshipDiff.js b/root/static/scripts/edit/components/edit/RelationshipDiff.js
index c7a4caa9462..f938090f5c1 100644
--- a/root/static/scripts/edit/components/edit/RelationshipDiff.js
+++ b/root/static/scripts/edit/components/edit/RelationshipDiff.js
@@ -43,7 +43,7 @@ type Props = {
     entity: CoreEntityT,
     content: string,
     relationship: RelationshipT,
-  ) => React.MixedElement,
+  ) => React$MixedElement,
   newRelationship: RelationshipT,
   oldRelationship: RelationshipT,
 };
@@ -66,7 +66,7 @@ const RelationshipDiff = (React.memo(({
   newRelationship,
   oldRelationship,
   makeEntityLink = makeDescriptiveLink,
-}: Props): React.Element<typeof React.Fragment> => {
+}: Props): React$Element<typeof React.Fragment> => {
   const oldAttrs = keyBy(oldRelationship.attributes, getTypeId);
   const newAttrs = keyBy(newRelationship.attributes, getTypeId);
 
@@ -223,6 +223,6 @@ const RelationshipDiff = (React.memo(({
       </tr>
     </>
   );
-}): React.AbstractComponent<Props, void>);
+}): React$AbstractComponent<Props, void>);
 
 export default RelationshipDiff;
diff --git a/root/static/scripts/edit/components/edit/ReleaseEventsDiff.js b/root/static/scripts/edit/components/edit/ReleaseEventsDiff.js
index 6b12446be3c..88017250b39 100644
--- a/root/static/scripts/edit/components/edit/ReleaseEventsDiff.js
+++ b/root/static/scripts/edit/components/edit/ReleaseEventsDiff.js
@@ -79,7 +79,7 @@ type Props = {
 const ReleaseEventsDiff = ({
   newEvents,
   oldEvents,
-}: Props): React.Element<'tr'> => {
+}: Props): React$Element<'tr'> => {
   const oldEventsByCountry = keyBy(oldEvents, getCountryId);
   const newEventsByCountry = keyBy(newEvents, getCountryId);
 
diff --git a/root/static/scripts/edit/components/edit/WordDiff.js b/root/static/scripts/edit/components/edit/WordDiff.js
index 644c2bf86b7..7a189a73e01 100644
--- a/root/static/scripts/edit/components/edit/WordDiff.js
+++ b/root/static/scripts/edit/components/edit/WordDiff.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Diff, {type DiffProps} from './Diff.js';
 
 const WordDiff = ({
@@ -17,7 +15,7 @@ const WordDiff = ({
   label,
   newText,
   oldText,
-}: DiffProps): React.Element<typeof Diff> => (
+}: DiffProps): React$Element<typeof Diff> => (
   <Diff
     extraNew={extraNew}
     extraOld={extraOld}
diff --git a/root/static/scripts/edit/components/withLoadedTypeInfo.js b/root/static/scripts/edit/components/withLoadedTypeInfo.js
index d4ea169f380..a0a7a60d163 100644
--- a/root/static/scripts/edit/components/withLoadedTypeInfo.js
+++ b/root/static/scripts/edit/components/withLoadedTypeInfo.js
@@ -21,9 +21,9 @@ const typeInfoPromises = new Map<string, Promise<void>>();
 const loadedTypeInfo = new Set<string>();
 
 export default function withLoadedTypeInfo<-Config, +Instance = mixed>(
-  WrappedComponent: React.AbstractComponent<Config, Instance>,
+  WrappedComponent: React$AbstractComponent<Config, Instance>,
   typeInfoToLoad: $ReadOnlySet<string>,
-): React.AbstractComponent<Config, Instance> {
+): React$AbstractComponent<Config, Instance> {
   const ComponentWrapper = React.forwardRef((
     props: Config,
     ref:
@@ -157,9 +157,9 @@ export function withLoadedTypeInfoForRelationshipEditor<
   -Config,
   +Instance = mixed,
 >(
-  WrappedComponent: React.AbstractComponent<Config, Instance>,
+  WrappedComponent: React$AbstractComponent<Config, Instance>,
   extraTypeInfoToLoad?: $ReadOnlyArray<string> = [],
-): React.AbstractComponent<Config, Instance> {
+): React$AbstractComponent<Config, Instance> {
   return withLoadedTypeInfo(
     WrappedComponent,
     new Set([
diff --git a/root/static/scripts/edit/externalLinks.js b/root/static/scripts/edit/externalLinks.js
index 437e98ede1f..f9b8f21dd5d 100644
--- a/root/static/scripts/edit/externalLinks.js
+++ b/root/static/scripts/edit/externalLinks.js
@@ -894,7 +894,7 @@ export class _ExternalLinksEditor
     return Boolean(linkChanged || linkTypeChanged);
   }
 
-  render(): React.Element<'table'> {
+  render(): React$Element<'table'> {
     this.errorObservable(false);
 
     const linksArray = this.state.links;
@@ -1074,7 +1074,7 @@ const LinkTypeSelect = ({
   handleTypeChange,
   options,
   type,
-}: LinkTypeSelectPropsT): React.Element<'select'> => {
+}: LinkTypeSelectPropsT): React$Element<'select'> => {
   const optionAvailable = options.some(option => option.value === type);
   // If the selected type is not available, display it as placeholder
   const linkType = type ? linkedEntities.link_type[type] : null;
@@ -1112,7 +1112,7 @@ type TypeDescriptionProps = {
 };
 
 const TypeDescription =
-  (props: TypeDescriptionProps): React.Element<typeof HelpIcon> => {
+  (props: TypeDescriptionProps): React$Element<typeof HelpIcon> => {
     const linkType = props.type ? linkedEntities.link_type[props.type] : null;
     let typeDescription: Expand2ReactOutput = '';
 
@@ -1147,7 +1147,7 @@ type ExternalLinkRelationshipProps = {
 };
 
 const ExternalLinkRelationship =
-  (props: ExternalLinkRelationshipProps): React.Element<'tr'> => {
+  (props: ExternalLinkRelationshipProps): React$Element<'tr'> => {
     const {link, hasUrlError, highlight, urlMatchesType} = props;
     const linkType = link.type ? linkedEntities.link_type[link.type] : null;
     const backward = linkType && linkType.type1 > 'url';
@@ -1320,7 +1320,7 @@ export class ExternalLink extends React.Component<LinkProps> {
     setTimeout(() => target.style.backgroundColor = 'initial', 1000);
   }
 
-  render(): React.Element<typeof React.Fragment> {
+  render(): React$Element<typeof React.Fragment> {
     const props = this.props;
     const notEmpty = props.relationships.some(link => {
       return !isEmpty(link);
@@ -1532,7 +1532,7 @@ export class ExternalLink extends React.Component<LinkProps> {
 }
 
 export const ExternalLinksEditor:
-  React.AbstractComponent<LinksEditorProps, _ExternalLinksEditor> =
+  React$AbstractComponent<LinksEditorProps, _ExternalLinksEditor> =
   withLoadedTypeInfo<LinksEditorProps, _ExternalLinksEditor>(
     _ExternalLinksEditor,
     new Set(['link_type', 'link_attribute_type']),
diff --git a/root/static/scripts/edit/utility/diffArtistCredits.js b/root/static/scripts/edit/utility/diffArtistCredits.js
index ef76d8d9f81..77addefc68c 100644
--- a/root/static/scripts/edit/utility/diffArtistCredits.js
+++ b/root/static/scripts/edit/utility/diffArtistCredits.js
@@ -50,15 +50,15 @@ const ArtistLink = ({content, credit, nameVariation}: ArtistLinkProps) => (
 export default function diffArtistCredits(
   oldArtistCredit: ArtistCreditT,
   newArtistCredit: ArtistCreditT,
-): {new: React.Node, old: React.Node} {
+): {new: React$Node, old: React$Node} {
   const diffs = editDiff(
     oldArtistCredit.names,
     newArtistCredit.names,
     areArtistCreditNamesEqual,
   );
 
-  const oldNames: Array<React.Node> = [];
-  const newNames: Array<React.Node> = [];
+  const oldNames: Array<React$Node> = [];
+  const newNames: Array<React$Node> = [];
 
   for (let i = 0; i < diffs.length; i++) {
     const diff = diffs[i];
diff --git a/root/static/scripts/genre/components/GenreEditForm.js b/root/static/scripts/genre/components/GenreEditForm.js
index 23f5e2142b3..e84202ddf06 100644
--- a/root/static/scripts/genre/components/GenreEditForm.js
+++ b/root/static/scripts/genre/components/GenreEditForm.js
@@ -89,7 +89,7 @@ function reducer(state: StateT, action: ActionT): StateT {
 
 const GenreEditForm = ({
   form: initialForm,
-}: Props): React.Element<'form'> => {
+}: Props): React$Element<'form'> => {
   const $c = React.useContext(SanitizedCatalystContext);
 
   const [state, dispatch] = React.useReducer(
@@ -175,4 +175,4 @@ const GenreEditForm = ({
 export default (hydrate<Props>(
   'div.genre-edit-form',
   GenreEditForm,
-): React.AbstractComponent<Props, void>);
+): React$AbstractComponent<Props, void>);
diff --git a/root/static/scripts/main/components/ConfirmSeedButtons.js b/root/static/scripts/main/components/ConfirmSeedButtons.js
index 328e47c683b..6934a513a18 100644
--- a/root/static/scripts/main/components/ConfirmSeedButtons.js
+++ b/root/static/scripts/main/components/ConfirmSeedButtons.js
@@ -7,11 +7,9 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import DBDefs from '../../common/DBDefs-client.mjs';
 
-const ConfirmSeedButtons = (): React.MixedElement => (
+const ConfirmSeedButtons = (): React$MixedElement => (
   <>
     <button type="submit">
       {l('Continue')}
@@ -38,4 +36,4 @@ const ConfirmSeedButtons = (): React.MixedElement => (
 export default (hydrate(
   'span.buttons.confirm-seed',
   ConfirmSeedButtons,
-): React.AbstractComponent<{}, void>);
+): React$AbstractComponent<{}, void>);
diff --git a/root/static/scripts/recording/RecordingName.js b/root/static/scripts/recording/RecordingName.js
index deb7fb7caca..f6ee9a84961 100644
--- a/root/static/scripts/recording/RecordingName.js
+++ b/root/static/scripts/recording/RecordingName.js
@@ -38,7 +38,7 @@ function reducer(
 export const RecordingName = ({
   field,
   recording,
-}: Props): React.Element<typeof FormRowNameWithGuessCase> => {
+}: Props): React$Element<typeof FormRowNameWithGuessCase> => {
   /*
    * State must be moved higher up in the component hierarchy once more
    * of the page is converted to React.
@@ -68,4 +68,4 @@ export const RecordingName = ({
 export default (hydrate<Props>(
   'div.recording-name',
   RecordingName,
-): React.AbstractComponent<Props, void>);
+): React$AbstractComponent<Props, void>);
diff --git a/root/static/scripts/relationship-editor/components/DialogAttribute/BooleanAttribute.js b/root/static/scripts/relationship-editor/components/DialogAttribute/BooleanAttribute.js
index 042f67302eb..4a5d2cd9c5d 100644
--- a/root/static/scripts/relationship-editor/components/DialogAttribute/BooleanAttribute.js
+++ b/root/static/scripts/relationship-editor/components/DialogAttribute/BooleanAttribute.js
@@ -65,6 +65,6 @@ const BooleanAttribute = (React.memo(({
     {' '}
     {state.type.l_name}
   </label>
-)): React.AbstractComponent<PropsT>);
+)): React$AbstractComponent<PropsT, mixed>);
 
 export default BooleanAttribute;
diff --git a/root/static/scripts/relationship-editor/components/DialogAttribute/MultiselectAttribute.js b/root/static/scripts/relationship-editor/components/DialogAttribute/MultiselectAttribute.js
index 75b545c372f..615664332f7 100644
--- a/root/static/scripts/relationship-editor/components/DialogAttribute/MultiselectAttribute.js
+++ b/root/static/scripts/relationship-editor/components/DialogAttribute/MultiselectAttribute.js
@@ -172,7 +172,7 @@ export function reducer(
 const MultiselectAttribute = (React.memo<PropsT>(({
   state,
   dispatch,
-}: PropsT): React.MixedElement => {
+}: PropsT): React$MixedElement => {
   const linkTypeAttributeType = state.type;
   const addLabel = addAttributeLabels[linkTypeAttributeType.id];
 
@@ -219,7 +219,7 @@ const MultiselectAttribute = (React.memo<PropsT>(({
   const LinkAttrTypeMultiselect = (
     // $FlowIgnore
     Multiselect:
-      React.AbstractComponent<
+      React$AbstractComponent<
         MultiselectPropsT<
           LinkAttrTypeT,
           DialogMultiselectAttributeValueStateT,
@@ -239,6 +239,6 @@ const MultiselectAttribute = (React.memo<PropsT>(({
       state={state}
     />
   );
-}): React.AbstractComponent<PropsT, mixed>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 export default MultiselectAttribute;
diff --git a/root/static/scripts/relationship-editor/components/DialogAttribute/TextAttribute.js b/root/static/scripts/relationship-editor/components/DialogAttribute/TextAttribute.js
index baa3e104a9f..31e57c6fd8e 100644
--- a/root/static/scripts/relationship-editor/components/DialogAttribute/TextAttribute.js
+++ b/root/static/scripts/relationship-editor/components/DialogAttribute/TextAttribute.js
@@ -61,6 +61,6 @@ const TextAttribute = (React.memo(({
     type="text"
     value={state.textValue}
   />
-)): React.AbstractComponent<PropsT>);
+)): React$AbstractComponent<PropsT, mixed>);
 
 export default TextAttribute;
diff --git a/root/static/scripts/relationship-editor/components/DialogAttributes.js b/root/static/scripts/relationship-editor/components/DialogAttributes.js
index 48851fc2cc8..de51a805074 100644
--- a/root/static/scripts/relationship-editor/components/DialogAttributes.js
+++ b/root/static/scripts/relationship-editor/components/DialogAttributes.js
@@ -317,9 +317,9 @@ const wrapAttributeElement = (
     | DialogBooleanAttributeStateT
     | DialogMultiselectAttributeStateT
     | DialogTextAttributeStateT,
-  attributeElement: React.MixedElement,
+  attributeElement: React$MixedElement,
   isHelpVisible: boolean,
-): React.MixedElement => (
+): React$MixedElement => (
   <div
     className={
       'attribute-container ' +
@@ -345,7 +345,7 @@ const DialogAttributes = (React.memo<PropsT>(({
   dispatch,
   isHelpVisible,
   state,
-}: PropsT): React.MixedElement | null => {
+}: PropsT): React$MixedElement | null => {
   const booleanAttributeDispatch = React.useCallback((
     rootKey: number,
     action: DialogBooleanAttributeActionT,
@@ -380,12 +380,12 @@ const DialogAttributes = (React.memo<PropsT>(({
   }, [dispatch]);
 
   const attributesByControl: {
-    checkbox: Array<[DialogBooleanAttributeStateT, React.MixedElement]>,
+    checkbox: Array<[DialogBooleanAttributeStateT, React$MixedElement]>,
     multiselect: Array<[
       DialogMultiselectAttributeStateT,
-      React.MixedElement,
+      React$MixedElement,
     ]>,
-    text: Array<[DialogTextAttributeStateT, React.MixedElement]>,
+    text: Array<[DialogTextAttributeStateT, React$MixedElement]>,
   } = {
     checkbox: [],
     multiselect: [],
@@ -477,6 +477,6 @@ const DialogAttributes = (React.memo<PropsT>(({
       ))}
     </>
   );
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 export default DialogAttributes;
diff --git a/root/static/scripts/relationship-editor/components/DialogButtons.js b/root/static/scripts/relationship-editor/components/DialogButtons.js
index 7f57f1a8037..e240ebb8ce9 100644
--- a/root/static/scripts/relationship-editor/components/DialogButtons.js
+++ b/root/static/scripts/relationship-editor/components/DialogButtons.js
@@ -38,6 +38,6 @@ const DialogButtons = (React.memo<PropsT>(({
       </button>
     </div>
   </div>
-)): React.AbstractComponent<PropsT>);
+)): React$AbstractComponent<PropsT, mixed>);
 
 export default DialogButtons;
diff --git a/root/static/scripts/relationship-editor/components/DialogDatePeriod.js b/root/static/scripts/relationship-editor/components/DialogDatePeriod.js
index 2a1746c32a6..1fb592046e0 100644
--- a/root/static/scripts/relationship-editor/components/DialogDatePeriod.js
+++ b/root/static/scripts/relationship-editor/components/DialogDatePeriod.js
@@ -36,7 +36,7 @@ const DialogDatePeriod = (React.memo<PropsT>(({
   dispatch,
   isHelpVisible,
   state,
-}: PropsT): React.MixedElement | null => {
+}: PropsT): React$MixedElement | null => {
   const hooks = useDateRangeFieldset(dispatch);
 
   const beginDateField = state.field.begin_date;
@@ -116,6 +116,6 @@ const DialogDatePeriod = (React.memo<PropsT>(({
       ) : null}
     </>
   );
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 export default DialogDatePeriod;
diff --git a/root/static/scripts/relationship-editor/components/DialogEntityCredit.js b/root/static/scripts/relationship-editor/components/DialogEntityCredit.js
index 584c4872193..39df22d165a 100644
--- a/root/static/scripts/relationship-editor/components/DialogEntityCredit.js
+++ b/root/static/scripts/relationship-editor/components/DialogEntityCredit.js
@@ -72,7 +72,7 @@ const DialogEntityCredit = (React.memo<PropsT, void>(({
   linkType,
   state,
   targetType,
-}: PropsT): React.MixedElement => {
+}: PropsT): React$MixedElement => {
   const origCredit = React.useRef(state.creditedAs || '');
   const inputRef = React.useRef<HTMLInputElement | null>(null);
   const inputId = React.useId();
@@ -222,6 +222,6 @@ const DialogEntityCredit = (React.memo<PropsT, void>(({
       {changeCreditsSection}
     </div>
   );
-}): React.AbstractComponent<PropsT, void>);
+}): React$AbstractComponent<PropsT, void>);
 
 export default DialogEntityCredit;
diff --git a/root/static/scripts/relationship-editor/components/DialogLinkOrder.js b/root/static/scripts/relationship-editor/components/DialogLinkOrder.js
index 2a05037ebe9..400e44c2e86 100644
--- a/root/static/scripts/relationship-editor/components/DialogLinkOrder.js
+++ b/root/static/scripts/relationship-editor/components/DialogLinkOrder.js
@@ -23,7 +23,7 @@ type PropsT = {
 const DialogLinkOrder = (React.memo<PropsT>(({
   dispatch,
   linkOrder,
-}: PropsT): React.Element<'tr'> => {
+}: PropsT): React$Element<'tr'> => {
   const handleLinkOrderChange = React.useCallback((
     event: SyntheticEvent<HTMLInputElement>,
   ) => {
@@ -61,6 +61,6 @@ const DialogLinkOrder = (React.memo<PropsT>(({
       </td>
     </tr>
   );
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 export default DialogLinkOrder;
diff --git a/root/static/scripts/relationship-editor/components/DialogLinkType.js b/root/static/scripts/relationship-editor/components/DialogLinkType.js
index 4d59494cdbb..004590c01c8 100644
--- a/root/static/scripts/relationship-editor/components/DialogLinkType.js
+++ b/root/static/scripts/relationship-editor/components/DialogLinkType.js
@@ -270,7 +270,7 @@ const DialogLinkType = (React.memo<PropsT>(({
   source,
   state,
   targetType,
-}: PropsT): React.Element<'tr'> => {
+}: PropsT): React$Element<'tr'> => {
   const {
     autocomplete,
     error,
@@ -333,6 +333,6 @@ const DialogLinkType = (React.memo<PropsT>(({
       </td>
     </tr>
   );
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 export default DialogLinkType;
diff --git a/root/static/scripts/relationship-editor/components/DialogPreview.js b/root/static/scripts/relationship-editor/components/DialogPreview.js
index 4cced0f854b..8a2417c54d7 100644
--- a/root/static/scripts/relationship-editor/components/DialogPreview.js
+++ b/root/static/scripts/relationship-editor/components/DialogPreview.js
@@ -82,7 +82,7 @@ const DialogPreview = (React.memo<PropsT>(({
   source,
   newRelationship,
   oldRelationship,
-}: PropsT): React.MixedElement => {
+}: PropsT): React$MixedElement => {
   function changeDirection() {
     dispatch({type: 'change-direction'});
   }
@@ -121,7 +121,7 @@ const DialogPreview = (React.memo<PropsT>(({
   const relationshipPreview = (
     relationship: RelationshipStateT,
     className: string,
-    extraRows?: React.Node,
+    extraRows?: React$Node,
   ) => {
     const fullClassName = 'preview details' +
       (className ? ' ' + className : '');
@@ -238,6 +238,6 @@ const DialogPreview = (React.memo<PropsT>(({
       ) : null}
     </>
   );
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 export default DialogPreview;
diff --git a/root/static/scripts/relationship-editor/components/DialogSourceEntity.js b/root/static/scripts/relationship-editor/components/DialogSourceEntity.js
index 14d08d1f0c6..e90e6154f3c 100644
--- a/root/static/scripts/relationship-editor/components/DialogSourceEntity.js
+++ b/root/static/scripts/relationship-editor/components/DialogSourceEntity.js
@@ -101,7 +101,7 @@ const DialogSourceEntity = (React.memo<PropsT>(({
   source,
   state,
   targetType,
-}: PropsT): React.MixedElement => {
+}: PropsT): React$MixedElement => {
   const sourceType = source.entityType;
   return (
     <tr>
@@ -140,6 +140,6 @@ const DialogSourceEntity = (React.memo<PropsT>(({
       </td>
     </tr>
   );
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 export default DialogSourceEntity;
diff --git a/root/static/scripts/relationship-editor/components/DialogTargetEntity.js b/root/static/scripts/relationship-editor/components/DialogTargetEntity.js
index 67e8993b382..1036bee0c66 100644
--- a/root/static/scripts/relationship-editor/components/DialogTargetEntity.js
+++ b/root/static/scripts/relationship-editor/components/DialogTargetEntity.js
@@ -296,7 +296,7 @@ const TargetAutocomplete:
 
 const DialogTargetEntity = (React.memo<PropsT>((
   props: PropsT,
-): React.MixedElement => {
+): React$MixedElement => {
   const {
     backward,
     dispatch,
@@ -380,6 +380,6 @@ const DialogTargetEntity = (React.memo<PropsT>((
       </td>
     </tr>
   );
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 export default DialogTargetEntity;
diff --git a/root/static/scripts/relationship-editor/components/DialogTargetType.js b/root/static/scripts/relationship-editor/components/DialogTargetType.js
index 286af6560f3..42beedbfcc3 100644
--- a/root/static/scripts/relationship-editor/components/DialogTargetType.js
+++ b/root/static/scripts/relationship-editor/components/DialogTargetType.js
@@ -28,7 +28,7 @@ type PropsT = {
 
 const DialogTargetType = (React.memo<PropsT>((
   props: PropsT,
-): React.MixedElement => {
+): React$MixedElement => {
   const {
     dispatch,
     hasPreselectedTargetType,
@@ -73,6 +73,6 @@ const DialogTargetType = (React.memo<PropsT>((
       </td>
     </tr>
   );
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 export default DialogTargetType;
diff --git a/root/static/scripts/relationship-editor/components/RelationshipDialogContent.js b/root/static/scripts/relationship-editor/components/RelationshipDialogContent.js
index e3c66b943a0..8ce5109ffbb 100644
--- a/root/static/scripts/relationship-editor/components/RelationshipDialogContent.js
+++ b/root/static/scripts/relationship-editor/components/RelationshipDialogContent.js
@@ -574,11 +574,11 @@ const AttributesSection = (React.memo<AttributesSectionPropsT>(({
       </table>
     </>
   ) : null;
-}): React.AbstractComponent<AttributesSectionPropsT, mixed>);
+}): React$AbstractComponent<AttributesSectionPropsT, mixed>);
 
 const RelationshipDialogContent = (React.memo<PropsT>((
   props: PropsT,
-): React.MixedElement => {
+): React$MixedElement => {
   const {
     batchSelectionCount,
     closeDialog,
@@ -1021,7 +1021,7 @@ const RelationshipDialogContent = (React.memo<PropsT>((
       />
     </div>
   );
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 function getBatchSelectionMessage(sourceType: CoreEntityTypeT) {
   switch (sourceType) {
diff --git a/root/static/scripts/relationship-editor/components/RelationshipEditor.js b/root/static/scripts/relationship-editor/components/RelationshipEditor.js
index 53d7f6652d4..911b0569811 100644
--- a/root/static/scripts/relationship-editor/components/RelationshipEditor.js
+++ b/root/static/scripts/relationship-editor/components/RelationshipEditor.js
@@ -543,10 +543,10 @@ type ErrorMessagePropsT = {
 };
 
 export const ErrorMessage:
-  React.AbstractComponent<ErrorMessagePropsT, mixed> =
+  React$AbstractComponent<ErrorMessagePropsT, mixed> =
   React.memo<ErrorMessagePropsT>(({
     error,
-  }: ErrorMessagePropsT): React.MixedElement => (
+  }: ErrorMessagePropsT): React$MixedElement => (
     <div className="error">
       <strong className="error">
         {l('Oops, something went wrong!')}
@@ -560,7 +560,7 @@ export const ErrorMessage:
 
 const RelationshipEditor = (
   props: PropsT,
-): React.Element<'fieldset'> | null => {
+): React$Element<'fieldset'> | null => {
   const {
     dispatch,
     formName,
diff --git a/root/static/scripts/relationship-editor/components/RelationshipEditorWrapper.js b/root/static/scripts/relationship-editor/components/RelationshipEditorWrapper.js
index 79294c1add2..69852295a4c 100644
--- a/root/static/scripts/relationship-editor/components/RelationshipEditorWrapper.js
+++ b/root/static/scripts/relationship-editor/components/RelationshipEditorWrapper.js
@@ -35,7 +35,7 @@ import RelationshipEditor, {
 type PropsT = InitialStateArgsT;
 
 let RelationshipEditorWrapper:
-  React.AbstractComponent<PropsT, void> =
+  React$AbstractComponent<PropsT, void> =
 (props: PropsT) => {
   const [state, dispatch] = React.useReducer(
     reducer,
diff --git a/root/static/scripts/relationship-editor/components/RelationshipItem.js b/root/static/scripts/relationship-editor/components/RelationshipItem.js
index f23faae4dd4..67875795bbe 100644
--- a/root/static/scripts/relationship-editor/components/RelationshipItem.js
+++ b/root/static/scripts/relationship-editor/components/RelationshipItem.js
@@ -71,7 +71,7 @@ const RelationshipItem = (React.memo<PropsT>(({
   releaseHasUnloadedTracks,
   source,
   track,
-}: PropsT): React.MixedElement => {
+}: PropsT): React$MixedElement => {
   const backward = isRelationshipBackward(relationship, source);
   const target: CoreEntityT = backward
     ? relationship.entity0
@@ -311,7 +311,7 @@ const RelationshipItem = (React.memo<PropsT>(({
       ) : null}
     </>
   );
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 function getRelationshipStyling(relationship: RelationshipStateT) {
   return 'rel-' + getRelationshipStatusName(relationship);
diff --git a/root/static/scripts/relationship-editor/components/RelationshipLinkTypeGroup.js b/root/static/scripts/relationship-editor/components/RelationshipLinkTypeGroup.js
index cda1d2ec3f6..88e94d0f892 100644
--- a/root/static/scripts/relationship-editor/components/RelationshipLinkTypeGroup.js
+++ b/root/static/scripts/relationship-editor/components/RelationshipLinkTypeGroup.js
@@ -60,6 +60,6 @@ const RelationshipLinkTypeGroup = (React.memo<PropsT>(({
     );
   }
   return elements;
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 export default RelationshipLinkTypeGroup;
diff --git a/root/static/scripts/relationship-editor/components/RelationshipPhraseGroup.js b/root/static/scripts/relationship-editor/components/RelationshipPhraseGroup.js
index 610453344b3..d14bb1b78f1 100644
--- a/root/static/scripts/relationship-editor/components/RelationshipPhraseGroup.js
+++ b/root/static/scripts/relationship-editor/components/RelationshipPhraseGroup.js
@@ -315,6 +315,6 @@ const RelationshipPhraseGroup = (React.memo<PropsT>(({
       ) : null}
     </>
   ) : null;
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 export default RelationshipPhraseGroup;
diff --git a/root/static/scripts/relationship-editor/components/RelationshipTargetTypeGroup.js b/root/static/scripts/relationship-editor/components/RelationshipTargetTypeGroup.js
index bc62f1f2b57..5635947c2da 100644
--- a/root/static/scripts/relationship-editor/components/RelationshipTargetTypeGroup.js
+++ b/root/static/scripts/relationship-editor/components/RelationshipTargetTypeGroup.js
@@ -63,6 +63,6 @@ const RelationshipTargetTypeGroup = (React.memo<Props>(({
     );
   }
   return elements;
-}): React.AbstractComponent<Props>);
+}): React$AbstractComponent<Props, mixed>);
 
 export default RelationshipTargetTypeGroup;
diff --git a/root/static/scripts/relationship-editor/components/RelationshipTargetTypeGroups.js b/root/static/scripts/relationship-editor/components/RelationshipTargetTypeGroups.js
index e5234da0e1d..abf74bfa73b 100644
--- a/root/static/scripts/relationship-editor/components/RelationshipTargetTypeGroups.js
+++ b/root/static/scripts/relationship-editor/components/RelationshipTargetTypeGroups.js
@@ -43,7 +43,7 @@ const RelationshipTargetTypeGroups = (React.memo<PropsT>(({
   source,
   targetTypeGroups,
   track,
-}: PropsT): React.MixedElement => {
+}: PropsT): React$MixedElement => {
   const addButtonRef = React.useRef<HTMLButtonElement | null>(null);
 
   const buildPopoverContent = useAddRelationshipDialogContent({
@@ -124,6 +124,6 @@ const RelationshipTargetTypeGroups = (React.memo<PropsT>(({
       </tbody>
     </table>
   );
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 export default RelationshipTargetTypeGroups;
diff --git a/root/static/scripts/relationship-editor/hooks/useRelationshipDialogContent.js b/root/static/scripts/relationship-editor/hooks/useRelationshipDialogContent.js
index 004757e28c4..39dc358b14f 100644
--- a/root/static/scripts/relationship-editor/hooks/useRelationshipDialogContent.js
+++ b/root/static/scripts/relationship-editor/hooks/useRelationshipDialogContent.js
@@ -62,7 +62,7 @@ export default function useRelationshipDialogContent(
   }>,
 ): (
   closeAndReturnFocus: () => void,
-) => React.MixedElement {
+) => React$MixedElement {
   const {
     batchSelectionCount,
     dispatch,
@@ -143,7 +143,7 @@ export function useAddRelationshipDialogContent(
   }>,
 ): (
   closeAndReturnFocus: () => void,
-) => React.MixedElement {
+) => React$MixedElement {
   const {
     backward,
     buildNewRelationshipData,
diff --git a/root/static/scripts/release/components/BatchCreateWorksDialog.js b/root/static/scripts/release/components/BatchCreateWorksDialog.js
index d870642c467..3d8106dce2f 100644
--- a/root/static/scripts/release/components/BatchCreateWorksDialog.js
+++ b/root/static/scripts/release/components/BatchCreateWorksDialog.js
@@ -128,7 +128,7 @@ const BatchCreateWorksDialogContent = React.memo<
 >(({
   closeDialog,
   sourceDispatch,
-}: BatchCreateWorksDialogContentPropsT): React.Element<'div'> => {
+}: BatchCreateWorksDialogContentPropsT): React$Element<'div'> => {
   const [state, dispatch] = React.useReducer(
     reducer,
     null,
@@ -252,7 +252,7 @@ export const BatchCreateWorksButtonPopover = (React.memo<
   dispatch,
   isDisabled,
   isOpen,
-}: BatchCreateWorksButtonPopoverPropsT): React.MixedElement => {
+}: BatchCreateWorksButtonPopoverPropsT): React$MixedElement => {
   const addButtonRef = React.useRef<HTMLButtonElement | null>(null);
 
   const setOpen = React.useCallback((open: boolean) => {
@@ -306,4 +306,4 @@ export const BatchCreateWorksButtonPopover = (React.memo<
       }
     />
   );
-}): React.AbstractComponent<BatchCreateWorksButtonPopoverPropsT, mixed>);
+}): React$AbstractComponent<BatchCreateWorksButtonPopoverPropsT, mixed>);
diff --git a/root/static/scripts/release/components/EditWorkDialog.js b/root/static/scripts/release/components/EditWorkDialog.js
index f1041e00795..9b20c9a0b80 100644
--- a/root/static/scripts/release/components/EditWorkDialog.js
+++ b/root/static/scripts/release/components/EditWorkDialog.js
@@ -95,7 +95,7 @@ type EditWorkDialogPropsT = {
   +work: WorkT,
 };
 
-const EditWorkDialog: React.AbstractComponent<
+const EditWorkDialog: React$AbstractComponent<
   EditWorkDialogPropsT,
   mixed,
 > = React.memo<
@@ -104,7 +104,7 @@ const EditWorkDialog: React.AbstractComponent<
   closeDialog,
   rootDispatch,
   work,
-}: EditWorkDialogPropsT): React.MixedElement => {
+}: EditWorkDialogPropsT): React$MixedElement => {
   const [state, dispatch] = React.useReducer(
     reducer,
     work,
diff --git a/root/static/scripts/release/components/MediumRelationshipEditor.js b/root/static/scripts/release/components/MediumRelationshipEditor.js
index b118fdb974e..fd21cebe27e 100644
--- a/root/static/scripts/release/components/MediumRelationshipEditor.js
+++ b/root/static/scripts/release/components/MediumRelationshipEditor.js
@@ -198,6 +198,6 @@ const MediumRelationshipEditor = (React.memo<PropsT>(({
       </tbody>
     </>
   );
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 export default MediumRelationshipEditor;
diff --git a/root/static/scripts/release/components/MediumTable.js b/root/static/scripts/release/components/MediumTable.js
index 2f5bf7c0a0c..3f83b639629 100644
--- a/root/static/scripts/release/components/MediumTable.js
+++ b/root/static/scripts/release/components/MediumTable.js
@@ -146,6 +146,6 @@ const MediumTable = (React.memo<PropsT>(({
       </tbody>
     </table>
   );
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 export default MediumTable;
diff --git a/root/static/scripts/release/components/MediumToolbox.js b/root/static/scripts/release/components/MediumToolbox.js
index f322e39e57e..ffcd09a44ce 100644
--- a/root/static/scripts/release/components/MediumToolbox.js
+++ b/root/static/scripts/release/components/MediumToolbox.js
@@ -25,7 +25,7 @@ export const ToggleAllMediumsButtons = (React.memo<
 >(({
   dispatch,
   mediums,
-}: ToggleAllMediumsButtonsPropsT): React.MixedElement => (
+}: ToggleAllMediumsButtonsPropsT): React$MixedElement => (
   <>
     <button
       className="btn-link"
@@ -57,7 +57,7 @@ export const ToggleAllMediumsButtons = (React.memo<
       {l('Collapse all mediums')}
     </button>
   </>
-)): React.AbstractComponent<ToggleAllMediumsButtonsPropsT>);
+)): React$AbstractComponent<ToggleAllMediumsButtonsPropsT, mixed>);
 
 type MediumToolboxPropsT = {
   +creditsMode: CreditsModeT,
@@ -69,7 +69,7 @@ const MediumToolbox = (React.memo<MediumToolboxPropsT>(({
   creditsMode,
   dispatch,
   mediums,
-}: MediumToolboxPropsT): React.Element<'span'> => (
+}: MediumToolboxPropsT): React$Element<'span'> => (
   <span id="medium-toolbox">
     {mediums.length > 1 ? (
       <>
@@ -93,6 +93,6 @@ const MediumToolbox = (React.memo<MediumToolboxPropsT>(({
         : l('Display Credits at Bottom')}
     </button>
   </span>
-)): React.AbstractComponent<MediumToolboxPropsT>);
+)): React$AbstractComponent<MediumToolboxPropsT, mixed>);
 
 export default MediumToolbox;
diff --git a/root/static/scripts/release/components/MediumTrackRow.js b/root/static/scripts/release/components/MediumTrackRow.js
index 4e69a3fee51..765d647eec5 100644
--- a/root/static/scripts/release/components/MediumTrackRow.js
+++ b/root/static/scripts/release/components/MediumTrackRow.js
@@ -89,6 +89,6 @@ const MediumTrackRow = (React.memo<PropsT>(({
       </td>
     </tr>
   );
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 export default MediumTrackRow;
diff --git a/root/static/scripts/release/components/RelationshipEditorBatchTools.js b/root/static/scripts/release/components/RelationshipEditorBatchTools.js
index 94470b9625d..2a742e33367 100644
--- a/root/static/scripts/release/components/RelationshipEditorBatchTools.js
+++ b/root/static/scripts/release/components/RelationshipEditorBatchTools.js
@@ -133,7 +133,7 @@ const RelationshipEditorBatchTools = (React.memo<PropsT>(({
   recordingSelectionCount,
   releaseHasUnloadedTracks,
   workSelectionCount,
-}: PropsT): React.Element<'table'> => {
+}: PropsT): React$Element<'table'> => {
   return (
     <table id="batch-tools">
       <tbody>
@@ -186,6 +186,6 @@ const RelationshipEditorBatchTools = (React.memo<PropsT>(({
       </tbody>
     </table>
   );
-}): React.AbstractComponent<PropsT>);
+}): React$AbstractComponent<PropsT, mixed>);
 
 export default RelationshipEditorBatchTools;
diff --git a/root/static/scripts/release/components/ReleaseRelationshipEditor.js b/root/static/scripts/release/components/ReleaseRelationshipEditor.js
index 91d9467ada6..b8f51ad0e95 100644
--- a/root/static/scripts/release/components/ReleaseRelationshipEditor.js
+++ b/root/static/scripts/release/components/ReleaseRelationshipEditor.js
@@ -1694,8 +1694,8 @@ const ReleaseGroupRelationshipSection = React.memo(({
   );
 });
 
-let ReleaseRelationshipEditor: React.AbstractComponent<{}, void> = (
-): React.MixedElement => {
+let ReleaseRelationshipEditor: React$AbstractComponent<{}, void> = (
+): React$MixedElement => {
   const [state, dispatch] = React.useReducer(
     reducer,
     null,
diff --git a/root/static/scripts/release/components/TrackRelationshipEditor.js b/root/static/scripts/release/components/TrackRelationshipEditor.js
index c6c14b97dbf..c4f89e97373 100644
--- a/root/static/scripts/release/components/TrackRelationshipEditor.js
+++ b/root/static/scripts/release/components/TrackRelationshipEditor.js
@@ -96,7 +96,7 @@ type RelatedWorkHeadingPropsT = {
   +dispatch: (ReleaseRelationshipEditorActionT) => void,
   +isRemoved: boolean,
   +isSelected: boolean,
-  +removeWorkButton: React.MixedElement,
+  +removeWorkButton: React$MixedElement,
   +work: WorkT,
 };
 
@@ -117,7 +117,7 @@ const RelatedWorkHeading = ({
     });
   }, [dispatch, work]);
 
-  let workLink: React.MixedElement = <WorkLink work={work} />;
+  let workLink: React$MixedElement = <WorkLink work={work} />;
   if (isRemoved) {
     workLink = (
       <span className="rel-remove">
@@ -525,7 +525,7 @@ const TrackRelationshipEditor = (React.memo<TrackRelationshipEditorPropsT>(({
       />
     </tr>
   );
-}): React.AbstractComponent<TrackRelationshipEditorPropsT>);
+}): React$AbstractComponent<TrackRelationshipEditorPropsT, mixed>);
 
 TrackRelationshipEditor.displayName = 'TrackRelationshipEditor';
 
diff --git a/root/static/scripts/release/components/TracklistAndCredits.js b/root/static/scripts/release/components/TracklistAndCredits.js
index 5bab3e205b0..e4eeeddc2fe 100644
--- a/root/static/scripts/release/components/TracklistAndCredits.js
+++ b/root/static/scripts/release/components/TracklistAndCredits.js
@@ -414,4 +414,4 @@ const TracklistAndCredits = React.memo<PropsT>((props: PropsT) => {
 export default (hydrate<PropsT>(
   'div.tracklist-and-credits',
   TracklistAndCredits,
-): React.AbstractComponent<PropsT>);
+): React$AbstractComponent<PropsT, void>);
diff --git a/root/static/scripts/release/components/WorkLanguageMultiselect.js b/root/static/scripts/release/components/WorkLanguageMultiselect.js
index 145b81fdd91..786dbd28700 100644
--- a/root/static/scripts/release/components/WorkLanguageMultiselect.js
+++ b/root/static/scripts/release/components/WorkLanguageMultiselect.js
@@ -119,7 +119,7 @@ type WorkLanguageMultiselectPropsT = {
 const LanguageMultiselect = (
   // $FlowIgnore
   Multiselect:
-    React.AbstractComponent<
+    React$AbstractComponent<
       MultiselectPropsT<
         LanguageT,
         MultiselectLanguageValueStateT,
@@ -137,7 +137,7 @@ const WorkLanguageMultiselect: React$AbstractComponent<
 >(({
   dispatch,
   state,
-}: WorkLanguageMultiselectPropsT): React.MixedElement => (
+}: WorkLanguageMultiselectPropsT): React$MixedElement => (
   <tr>
     <td className="section">
       {addColonText(l('Lyrics Languages'))}
diff --git a/root/static/scripts/release/components/WorkTypeSelect.js b/root/static/scripts/release/components/WorkTypeSelect.js
index 1c523f2e4f8..678b8c69cdc 100644
--- a/root/static/scripts/release/components/WorkTypeSelect.js
+++ b/root/static/scripts/release/components/WorkTypeSelect.js
@@ -30,7 +30,7 @@ type WorkTypeSelectPropsT = {
   +workType: number | null,
 };
 
-const WorkTypeSelect: React.AbstractComponent<
+const WorkTypeSelect: React$AbstractComponent<
   WorkTypeSelectPropsT,
   mixed,
 > = React.memo<WorkTypeSelectPropsT>(({
diff --git a/root/static/scripts/series/components/SeriesRelationshipEditor.js b/root/static/scripts/series/components/SeriesRelationshipEditor.js
index 40b9cc54929..07e79458906 100644
--- a/root/static/scripts/series/components/SeriesRelationshipEditor.js
+++ b/root/static/scripts/series/components/SeriesRelationshipEditor.js
@@ -43,7 +43,7 @@ function getSeriesType(typeId: number | null): SeriesTypeT | null {
 }
 
 let SeriesRelationshipEditor:
-  React.AbstractComponent<PropsT, void> =
+  React$AbstractComponent<PropsT, void> =
 (props: PropsT) => {
   const [state, dispatch] = React.useReducer(
     reducer,
diff --git a/root/static/scripts/url/components/UrlRelationshipEditor.js b/root/static/scripts/url/components/UrlRelationshipEditor.js
index c3339b67144..5820e27ba4b 100644
--- a/root/static/scripts/url/components/UrlRelationshipEditor.js
+++ b/root/static/scripts/url/components/UrlRelationshipEditor.js
@@ -25,7 +25,7 @@ import useEntityNameFromField
 type PropsT = InitialStateArgsT;
 
 let UrlRelationshipEditor:
-  React.AbstractComponent<PropsT, void> =
+  React$AbstractComponent<PropsT, void> =
 (props: PropsT) => {
   const [state, dispatch] = React.useReducer(
     reducer,
diff --git a/root/statistics/Countries.js b/root/statistics/Countries.js
index 5248b6edbec..689f7c0b31a 100644
--- a/root/statistics/Countries.js
+++ b/root/statistics/Countries.js
@@ -34,7 +34,7 @@ type CountryStatT = {
 const Countries = ({
   countryStats,
   dateCollected,
-}: CountriesStatsT): React.Element<typeof StatisticsLayout> => {
+}: CountriesStatsT): React$Element<typeof StatisticsLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <StatisticsLayout fullWidth page="countries" title={l('Countries')}>
diff --git a/root/statistics/CoverArt.js b/root/statistics/CoverArt.js
index dbcb124f035..65af1e618d7 100644
--- a/root/statistics/CoverArt.js
+++ b/root/statistics/CoverArt.js
@@ -61,7 +61,7 @@ const CoverArt = ({
   releaseFormatStats,
   stats,
   typeStats,
-}: CoverArtStatsT): React.Element<typeof StatisticsLayout> => {
+}: CoverArtStatsT): React$Element<typeof StatisticsLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <StatisticsLayout fullWidth page="coverart" title={l('Cover Art')}>
diff --git a/root/statistics/Editors.js b/root/statistics/Editors.js
index ad1fdd4ea69..6c9652a879c 100644
--- a/root/statistics/Editors.js
+++ b/root/statistics/Editors.js
@@ -94,7 +94,7 @@ const Editors = ({
   topRecentlyActiveEditors,
   topRecentlyActiveVoters,
   topVoters,
-}: EditorsStatsT): React.Element<typeof StatisticsLayout> => (
+}: EditorsStatsT): React$Element<typeof StatisticsLayout> => (
   <StatisticsLayout fullWidth page="editors" title={l('Editors')}>
     <p>
       {texp.l('Last updated: {date}', {date: dateCollected})}
diff --git a/root/statistics/Edits.js b/root/statistics/Edits.js
index e60660933ff..e23770d3938 100644
--- a/root/statistics/Edits.js
+++ b/root/statistics/Edits.js
@@ -32,7 +32,7 @@ const Edits = ({
   dateCollected,
   stats,
   statsByCategory,
-}: EditsStatsT): React.Element<typeof StatisticsLayout> => {
+}: EditsStatsT): React$Element<typeof StatisticsLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <StatisticsLayout fullWidth page="edits" title={l('Edits')}>
diff --git a/root/statistics/Formats.js b/root/statistics/Formats.js
index 770794be818..23ccb707d1a 100644
--- a/root/statistics/Formats.js
+++ b/root/statistics/Formats.js
@@ -36,7 +36,7 @@ const Formats = ({
   dateCollected,
   formatStats,
   stats,
-}: FormatsStatsT): React.Element<typeof StatisticsLayout> => {
+}: FormatsStatsT): React$Element<typeof StatisticsLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <StatisticsLayout
diff --git a/root/statistics/Index.js b/root/statistics/Index.js
index 294319be124..330d0b17157 100644
--- a/root/statistics/Index.js
+++ b/root/statistics/Index.js
@@ -50,7 +50,7 @@ const Index = ({
   statuses,
   workAttributeTypes,
   workTypes,
-}: MainStatsT): React.Element<typeof StatisticsLayout> => {
+}: MainStatsT): React$Element<typeof StatisticsLayout> => {
   const $c = React.useContext(CatalystContext);
 
   const nonGroupCount = stats['count.artist.type.null'] +
diff --git a/root/statistics/LanguagesScripts.js b/root/statistics/LanguagesScripts.js
index fcb18c993f9..b9c491e20be 100644
--- a/root/statistics/LanguagesScripts.js
+++ b/root/statistics/LanguagesScripts.js
@@ -41,7 +41,7 @@ const LanguagesScripts = ({
   dateCollected,
   languageStats,
   scriptStats,
-}: LanguagesScriptsStatsT): React.Element<typeof StatisticsLayout> => {
+}: LanguagesScriptsStatsT): React$Element<typeof StatisticsLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <StatisticsLayout
diff --git a/root/statistics/NoStatistics.js b/root/statistics/NoStatistics.js
index d77e3925aca..f17081b1633 100644
--- a/root/statistics/NoStatistics.js
+++ b/root/statistics/NoStatistics.js
@@ -7,13 +7,11 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {l_statistics as l} from '../static/scripts/common/i18n/statistics.js';
 
 import StatisticsLayout from './StatisticsLayout.js';
 
-const NoStatistics = (): React.Element<typeof StatisticsLayout> => (
+const NoStatistics = (): React$Element<typeof StatisticsLayout> => (
   <StatisticsLayout fullWidth page="index" title={l('No Statistics')}>
     <h2>{l('No Statistics')}</h2>
     <p>
diff --git a/root/statistics/Relationships.js b/root/statistics/Relationships.js
index 849ef89b2f3..bc6cd8585da 100644
--- a/root/statistics/Relationships.js
+++ b/root/statistics/Relationships.js
@@ -50,7 +50,7 @@ const TypeRows = ({
   parent,
   stats,
   type,
-}: TypeRowsPropsT): React.MixedElement => {
+}: TypeRowsPropsT): React$MixedElement => {
   const $c = React.useContext(CatalystContext);
   return (
     <>
@@ -96,7 +96,7 @@ const Relationships = ({
   dateCollected,
   stats,
   types,
-}: RelationshipsStatsT): React.Element<typeof StatisticsLayout> => {
+}: RelationshipsStatsT): React$Element<typeof StatisticsLayout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <StatisticsLayout
diff --git a/root/statistics/StatisticsLayout.js b/root/statistics/StatisticsLayout.js
index 2abe9700599..2cc95c94ce9 100644
--- a/root/statistics/StatisticsLayout.js
+++ b/root/statistics/StatisticsLayout.js
@@ -8,8 +8,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Tabs from '../components/Tabs.js';
 import Layout from '../layout/index.js';
 import {unwrapNl} from '../static/scripts/common/i18n.js';
@@ -18,10 +16,10 @@ import {l_statistics as l, N_l_statistics as N_l}
 import statisticsLessUrl from '../static/styles/statistics.less';
 
 type StatisticsLayoutPropsT = {
-  +children: React.Node,
+  +children: React$Node,
   +fullWidth: boolean,
   +page: string,
-  +sidebar?: ?React.Node,
+  +sidebar?: ?React$Node,
   +title: string,
 };
 
@@ -94,7 +92,7 @@ const StatisticsLayout = ({
   page,
   sidebar,
   title,
-}: StatisticsLayoutPropsT): React.Element<typeof Layout> => {
+}: StatisticsLayoutPropsT): React$Element<typeof Layout> => {
   const htmlTitle = hyphenateTitle(l('Database Statistics'), title);
   return (
     <Layout
diff --git a/root/statistics/utilities.js b/root/statistics/utilities.js
index 6fa4bf1d184..7a3aa09976c 100644
--- a/root/statistics/utilities.js
+++ b/root/statistics/utilities.js
@@ -8,8 +8,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import timelineIconUrl
   from '../static/images/icons/timeline.png';
 
@@ -36,7 +34,7 @@ export function formatCount($c: CatalystContextT, num: ?number): string {
 
 export const TimelineLink = ({
   statName,
-}: {statName: string}): React.Element<'a'> => (
+}: {statName: string}): React$Element<'a'> => (
   <a
     href={'/statistics/timeline/' + encodeURIComponent(statName)}
     title={l('See on timeline')}
diff --git a/root/tag/EntityList.js b/root/tag/EntityList.js
index 9197621e9c2..d02877775d0 100644
--- a/root/tag/EntityList.js
+++ b/root/tag/EntityList.js
@@ -136,7 +136,7 @@ export const EntityListContent = ({
   showVotesSelect = false,
   tag,
   user,
-}: EntityListContentProps): React.Element<typeof React.Fragment> => {
+}: EntityListContentProps): React$Element<typeof React.Fragment> => {
   const $c = React.useContext(CatalystContext);
   return (
     <>
@@ -177,7 +177,7 @@ const EntityList = ({
   page,
   pager,
   tag,
-}: EntityListProps): React.Element<typeof TagLayout> => (
+}: EntityListProps): React$Element<typeof TagLayout> => (
   <TagLayout page={page} tag={tag}>
     <EntityListContent
       entityTags={entityTags}
diff --git a/root/tag/NotFound.js b/root/tag/NotFound.js
index ad91b9bbd04..e87fcaa42e9 100644
--- a/root/tag/NotFound.js
+++ b/root/tag/NotFound.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import NotFound from '../components/NotFound.js';
 
 type Props = {
   +tag: string,
 };
 
-const TagNotFound = ({tag}: Props): React.Element<typeof NotFound> => (
+const TagNotFound = ({tag}: Props): React$Element<typeof NotFound> => (
   <NotFound title={l('Tag Not Used')}>
     <p>
       {texp.l(
diff --git a/root/tag/TagCloud.js b/root/tag/TagCloud.js
index 7a3ce4b8b2f..15dc8e096d6 100644
--- a/root/tag/TagCloud.js
+++ b/root/tag/TagCloud.js
@@ -96,7 +96,7 @@ const TagCloud = ({
   showList = false,
   tagMaxCount,
   tags,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const $c = React.useContext(CatalystContext);
   return (
     <Layout fullWidth title={l('Tags')}>
diff --git a/root/tag/TagIndex.js b/root/tag/TagIndex.js
index 58739dccdfe..b7b199bece9 100644
--- a/root/tag/TagIndex.js
+++ b/root/tag/TagIndex.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import TagEntitiesList from '../components/TagEntitiesList.js';
 import EntityLink
   from '../static/scripts/common/components/EntityLink.js';
@@ -29,7 +27,7 @@ type Props = {
   },
 };
 
-const TagIndex = (props: Props): React.Element<typeof TagLayout> => {
+const TagIndex = (props: Props): React$Element<typeof TagLayout> => {
   const genre = props.tag.genre;
   return (
     <TagLayout page="" tag={props.tag}>
diff --git a/root/tag/TagLayout.js b/root/tag/TagLayout.js
index c92f55997bb..8dfe3ac2096 100644
--- a/root/tag/TagLayout.js
+++ b/root/tag/TagLayout.js
@@ -7,14 +7,12 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Tabs from '../components/Tabs.js';
 import Layout from '../layout/index.js';
 import TagLink from '../static/scripts/common/components/TagLink.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +page: string,
   +tag: TagT,
   +title?: string,
@@ -40,7 +38,7 @@ const TagLayout = ({
   page,
   tag,
   title,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout
     fullWidth
     title={
diff --git a/root/taglookup/ArtistResults.js b/root/taglookup/ArtistResults.js
index 3c2b4fb2204..497022796df 100644
--- a/root/taglookup/ArtistResults.js
+++ b/root/taglookup/ArtistResults.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {ArtistResultsInline} from '../search/components/ArtistResults.js';
 
 import TagLookupResults from './Results.js';
@@ -16,7 +14,7 @@ import type {TagLookupResultsPropsT} from './types.js';
 
 const TagLookupArtistResults = (
   props: TagLookupResultsPropsT<ArtistT>,
-): React.Element<typeof TagLookupResults> => (
+): React$Element<typeof TagLookupResults> => (
   <TagLookupResults {...props}>
     <ArtistResultsInline
       pager={props.pager}
diff --git a/root/taglookup/Form.js b/root/taglookup/Form.js
index 444288fd570..ce51da07ca7 100644
--- a/root/taglookup/Form.js
+++ b/root/taglookup/Form.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import FormRow from '../static/scripts/edit/components/FormRow.js';
 import FormRowText from '../static/scripts/edit/components/FormRowText.js';
 import FormRowTextLong
@@ -19,7 +17,7 @@ type Props = {
   +form: TagLookupFormT,
 };
 
-const TagLookupForm = ({form}: Props): React.Element<'div'> => (
+const TagLookupForm = ({form}: Props): React$Element<'div'> => (
   <div className="searchform">
     <form action="/taglookup/index" method="get">
       <FormRowTextLong
diff --git a/root/taglookup/Index.js b/root/taglookup/Index.js
index 568b2d28d51..4f6cde6c5fc 100644
--- a/root/taglookup/Index.js
+++ b/root/taglookup/Index.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 
 import TagLookupForm from './Form.js';
 import TagLookupNagSection from './Nag.js';
 import type {TagLookupPropsT} from './types.js';
 
-const TagLookup = (props: TagLookupPropsT): React.Element<typeof Layout> => (
+const TagLookup = (props: TagLookupPropsT): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Tag Lookup')}>
     <div className="content">
       <h1>{l('Tag Lookup')}</h1>
diff --git a/root/taglookup/Nag.js b/root/taglookup/Nag.js
index d0ae9ef0884..9c41e5db94c 100644
--- a/root/taglookup/Nag.js
+++ b/root/taglookup/Nag.js
@@ -7,9 +7,7 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
-const TagLookupNagSection = (): React.Element<'div'> => (
+const TagLookupNagSection = (): React$Element<'div'> => (
   <div className="nagpanel">
     <p>
       {l('The users make MusicBrainz happen and we appreciate your help!')}
diff --git a/root/taglookup/NotFound.js b/root/taglookup/NotFound.js
index eabf7a460c8..87cbfa365b8 100644
--- a/root/taglookup/NotFound.js
+++ b/root/taglookup/NotFound.js
@@ -7,11 +7,9 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import NotFound from '../components/NotFound.js';
 
-const TagLookupNotFound = (): React.Element<typeof NotFound> => (
+const TagLookupNotFound = (): React$Element<typeof NotFound> => (
   <NotFound title={l('Tag Lookup Error')}>
     <p>
       {l(
diff --git a/root/taglookup/RecordingResults.js b/root/taglookup/RecordingResults.js
index b174d9a7c8e..6eeb345e30a 100644
--- a/root/taglookup/RecordingResults.js
+++ b/root/taglookup/RecordingResults.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {RecordingResultsInline}
   from '../search/components/RecordingResults.js';
 
@@ -17,7 +15,7 @@ import type {TagLookupResultsPropsT} from './types.js';
 
 const TagLookupRecordingResults = (
   props: TagLookupResultsPropsT<RecordingWithArtistCreditT>,
-): React.Element<typeof TagLookupResults> => (
+): React$Element<typeof TagLookupResults> => (
   <TagLookupResults {...props}>
     <RecordingResultsInline
       pager={props.pager}
diff --git a/root/taglookup/ReleaseResults.js b/root/taglookup/ReleaseResults.js
index 9147320e1d3..d7db6ce51d8 100644
--- a/root/taglookup/ReleaseResults.js
+++ b/root/taglookup/ReleaseResults.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import {ReleaseResultsInline} from '../search/components/ReleaseResults.js';
 
 import TagLookupResults from './Results.js';
@@ -16,7 +14,7 @@ import type {TagLookupResultsPropsT} from './types.js';
 
 const TagLookupReleaseResults = (
   props: TagLookupResultsPropsT<ReleaseT>,
-): React.Element<typeof TagLookupResults> => (
+): React$Element<typeof TagLookupResults> => (
   <TagLookupResults {...props}>
     <ReleaseResultsInline
       pager={props.pager}
diff --git a/root/taglookup/Results.js b/root/taglookup/Results.js
index 544ed105b58..029664b7b0c 100644
--- a/root/taglookup/Results.js
+++ b/root/taglookup/Results.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 
 import TagLookupForm from './Form.js';
@@ -17,7 +15,7 @@ import type {TagLookupResultsPropsT} from './types.js';
 
 const TagLookupResults = <T>(
   props: TagLookupResultsPropsT<T>,
-): React.Element<typeof Layout> => (
+): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Tag Lookup Results')}>
     <div className="content">
       <h1>{l('Tag Lookup Results')}</h1>
diff --git a/root/url/UrlHeader.js b/root/url/UrlHeader.js
index 37da4d78300..fec561fffba 100644
--- a/root/url/UrlHeader.js
+++ b/root/url/UrlHeader.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityHeader from '../components/EntityHeader.js';
 import EntityLink from '../static/scripts/common/components/EntityLink.js';
 
@@ -20,7 +18,7 @@ type Props = {
 const UrlHeader = ({
   url,
   page,
-}: Props): React.Element<typeof EntityHeader> => (
+}: Props): React$Element<typeof EntityHeader> => (
   <EntityHeader
     entity={url}
     headerClass="urlheader"
diff --git a/root/url/UrlIndex.js b/root/url/UrlIndex.js
index 3bb794888d0..de5817835c1 100644
--- a/root/url/UrlIndex.js
+++ b/root/url/UrlIndex.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Relationships
   from '../static/scripts/common/components/Relationships.js';
 import isGreyedOut from '../static/scripts/url/utility/isGreyedOut.js';
@@ -19,7 +17,7 @@ type Props = {
   +url: UrlT,
 };
 
-const UrlIndex = ({url}: Props): React.Element<typeof UrlLayout> => (
+const UrlIndex = ({url}: Props): React$Element<typeof UrlLayout> => (
   <UrlLayout entity={url} page="index" title={l('URL Information')}>
     <h2 className="url-details">{l('URL Details')}</h2>
     <table className="details">
diff --git a/root/url/UrlLayout.js b/root/url/UrlLayout.js
index b8c6958e91b..5add9782b28 100644
--- a/root/url/UrlLayout.js
+++ b/root/url/UrlLayout.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import UrlSidebar from '../layout/components/sidebar/UrlSidebar.js';
 import Layout from '../layout/index.js';
 
 import UrlHeader from './UrlHeader.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +entity: UrlT,
   +fullWidth?: boolean,
   +page: string,
@@ -28,7 +26,7 @@ const UrlLayout = ({
   fullWidth = false,
   page,
   title,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout title={title}>
     <div id="content">
       <UrlHeader page={page} url={url} />
diff --git a/root/user/PrivilegedUsers.js b/root/user/PrivilegedUsers.js
index 2a5e40d49df..ec59c5ef622 100644
--- a/root/user/PrivilegedUsers.js
+++ b/root/user/PrivilegedUsers.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 
 import UserInlineList from './components/UserInlineList.js';
@@ -31,7 +29,7 @@ const PrivilegedUsers = ({
   locationEditors,
   relationshipEditors,
   transclusionEditors,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Privileged user accounts')}>
     <div id="content">
       <h1>{l('Privileged user accounts')}</h1>
diff --git a/root/user/ReportUser.js b/root/user/ReportUser.js
index 7eb9755c2eb..ee78728005e 100644
--- a/root/user/ReportUser.js
+++ b/root/user/ReportUser.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import UserAccountLayout, {
   type AccountLayoutUserT,
 } from '../components/UserAccountLayout.js';
@@ -78,7 +76,7 @@ const reportReasonOptions = {
 const ReportUser = ({
   form,
   user,
-}: Props): React.Element<typeof UserAccountLayout> => (
+}: Props): React$Element<typeof UserAccountLayout> => (
   <UserAccountLayout
     entity={user}
     page="report"
diff --git a/root/user/UserCollections.js b/root/user/UserCollections.js
index ae7040b713d..6972115c837 100644
--- a/root/user/UserCollections.js
+++ b/root/user/UserCollections.js
@@ -166,7 +166,7 @@ const UserCollections = ({
   ownCollections,
   collaborativeCollections,
   user,
-}: Props): React.Element<typeof UserAccountLayout> => {
+}: Props): React$Element<typeof UserAccountLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   const activeUser = $c.user;
   const viewingOwnProfile = !!(activeUser && activeUser.id === user.id);
diff --git a/root/user/UserEdits.js b/root/user/UserEdits.js
index c9233273b89..a51a7028b1b 100644
--- a/root/user/UserEdits.js
+++ b/root/user/UserEdits.js
@@ -30,7 +30,7 @@ const UserEdits = ({
   refineUrlArgs,
   user,
   voter,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   const titleParam = {name: user.name};
   const headingParam = {name: <EditorLink editor={user} />};
diff --git a/root/user/UserMessage.js b/root/user/UserMessage.js
index de37467ff44..27eb7526d08 100644
--- a/root/user/UserMessage.js
+++ b/root/user/UserMessage.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import StatusPage from '../components/StatusPage.js';
 import expand2react from '../static/scripts/common/i18n/expand2react.js';
 
@@ -20,7 +18,7 @@ type Props = {
 const UserMessage = ({
   message,
   title,
-}: Props): React.Element<typeof StatusPage> => (
+}: Props): React$Element<typeof StatusPage> => (
   <StatusPage title={title}>
     <p>{expand2react(message)}</p>
   </StatusPage>
diff --git a/root/user/UserProfile.js b/root/user/UserProfile.js
index 572e1552567..aba4963cd69 100644
--- a/root/user/UserProfile.js
+++ b/root/user/UserProfile.js
@@ -112,7 +112,7 @@ function generateUserTypesList(
 }
 
 type UserProfilePropertyProps = {
-  +children: React.Node,
+  +children: React$Node,
   +className?: string,
   +name: string,
 };
@@ -855,7 +855,7 @@ const UserProfile = ({
   user,
   votes,
   addedEntities,
-}: UserProfileProps): React.Element<typeof UserAccountLayout> => {
+}: UserProfileProps): React$Element<typeof UserAccountLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   const viewingOwnProfile = $c.user != null && $c.user.id === user.id;
   const adminViewing = $c.user != null && isAccountAdmin($c.user);
diff --git a/root/user/UserSubscriptions.js b/root/user/UserSubscriptions.js
index e02813a3c47..583e38dd682 100644
--- a/root/user/UserSubscriptions.js
+++ b/root/user/UserSubscriptions.js
@@ -37,7 +37,7 @@ type UserSubscriptionsTableProps = {
 const UserSubscriptionsTable = ({
   entities,
   viewingOwnProfile,
-}: UserSubscriptionsTableProps): React.Element<'table'> => (
+}: UserSubscriptionsTableProps): React$Element<'table'> => (
   <table className="tbl">
     <thead>
       <tr>
@@ -77,7 +77,7 @@ const UserSubscriptionsSection = ({
   entities,
   pager,
   viewingOwnProfile,
-}: UserSubscriptionsSectionProps): React.Element<typeof PaginatedResults> => (
+}: UserSubscriptionsSectionProps): React$Element<typeof PaginatedResults> => (
   viewingOwnProfile ? (
     <PaginatedResults pager={pager}>
       <form action={action} method="post">
@@ -125,7 +125,7 @@ const UserSubscriptions = ({
   type,
   user,
   visiblePrivateCollections,
-}: UserSubscriptionsProps): React.Element<typeof UserAccountLayout> => {
+}: UserSubscriptionsProps): React$Element<typeof UserAccountLayout> => {
   const $c = React.useContext(SanitizedCatalystContext);
   const viewingOwnProfile = Boolean($c.user && $c.user.id === user.id);
   const isAdminViewingPrivate = Boolean(
diff --git a/root/user/UserTag.js b/root/user/UserTag.js
index e91c379df93..cd1a94e9658 100644
--- a/root/user/UserTag.js
+++ b/root/user/UserTag.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import TagEntitiesList from '../components/TagEntitiesList.js';
 import UserAccountLayout, {type AccountLayoutUserT}
   from '../components/UserAccountLayout.js';
@@ -36,7 +34,7 @@ const UserTag = ({
   tag,
   taggedEntities,
   user,
-}: Props): React.Element<typeof UserAccountLayout> => (
+}: Props): React$Element<typeof UserAccountLayout> => (
   <UserAccountLayout entity={user} page="tags">
     <nav className="breadcrumb">
       <ol>
diff --git a/root/user/UserTagEntity.js b/root/user/UserTagEntity.js
index f5419c495ec..196901d45f5 100644
--- a/root/user/UserTagEntity.js
+++ b/root/user/UserTagEntity.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import UserAccountLayout, {type AccountLayoutUserT}
   from '../components/UserAccountLayout.js';
 import {
@@ -49,7 +47,7 @@ const UserTagEntity = ({
   showDownvoted = false,
   tag,
   user,
-}: UserTagEntityProps): React.Element<typeof UserAccountLayout> => (
+}: UserTagEntityProps): React$Element<typeof UserAccountLayout> => (
   <UserAccountLayout entity={user} page="tags">
     <nav className="breadcrumb">
       <ol>
diff --git a/root/user/UserTagList.js b/root/user/UserTagList.js
index 2dc3bc51cc7..5a9547e61b4 100644
--- a/root/user/UserTagList.js
+++ b/root/user/UserTagList.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import UserAccountLayout, {
   type AccountLayoutUserT,
 } from '../components/UserAccountLayout.js';
@@ -59,7 +57,7 @@ const UserTagList = ({
   sortBy,
   tags,
   user,
-}: Props): React.Element<typeof UserAccountLayout> => (
+}: Props): React$Element<typeof UserAccountLayout> => (
   <UserAccountLayout entity={user} page="tags" title={l('Tags')}>
     <h2>
       {getTagListHeading(user.name, showDownvoted)}
diff --git a/root/user/components/UserInlineList.js b/root/user/components/UserInlineList.js
index 0ad315e32a3..964e36c33d0 100644
--- a/root/user/components/UserInlineList.js
+++ b/root/user/components/UserInlineList.js
@@ -8,8 +8,6 @@
  * later version: http://www.gnu.org/license/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EditorLink from '../../static/scripts/common/components/EditorLink.js';
 import commaOnlyList from '../../static/scripts/common/i18n/commaOnlyList.js';
 
@@ -17,7 +15,7 @@ type Props = {
   +editors: $ReadOnlyArray<EditorT>,
 };
 
-const UserInlineList = ({editors}: Props): React.Element<'p'> => (
+const UserInlineList = ({editors}: Props): React$Element<'p'> => (
   <p>
     {editors.length ? (
       commaOnlyList(
diff --git a/root/utility/buildTab.js b/root/utility/buildTab.js
index 57b3656ca23..7577c118eeb 100644
--- a/root/utility/buildTab.js
+++ b/root/utility/buildTab.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 const buildTab = (
   page?: string,
   title: string,
   path: string,
   tabPage: string,
   className?: string,
-): React.Element<'li'> => {
+): React$Element<'li'> => {
   const isSelected = tabPage === page;
   const passedClass = nonEmpty(className) ? className : null;
   const tabClass = isSelected && nonEmpty(passedClass)
diff --git a/root/utility/hydrate.js b/root/utility/hydrate.js
index cbbd8cae4a3..b4dc8ca8651 100644
--- a/root/utility/hydrate.js
+++ b/root/utility/hydrate.js
@@ -101,9 +101,9 @@ export default function hydrate<
   SanitizedConfig = Config,
 >(
   containerSelector: string,
-  Component: React.AbstractComponent<Config | SanitizedConfig>,
+  Component: React$AbstractComponent<Config | SanitizedConfig, void>,
   mungeProps?: (Config) => SanitizedConfig,
-): React.AbstractComponent<Config, void> {
+): React$AbstractComponent<Config, void> {
   const [containerTag, ...classes] = containerSelector.split('.');
   if (typeof document !== 'undefined') {
     // This should only run on the client.
diff --git a/root/vote/VotingIndex.js b/root/vote/VotingIndex.js
index 73d219276da..5358a1bb7d7 100644
--- a/root/vote/VotingIndex.js
+++ b/root/vote/VotingIndex.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import Layout from '../layout/index.js';
 
 type VotingGuideRowProps = {
@@ -42,7 +40,7 @@ const VotingGuideRow = ({
   );
 };
 
-const VotingIndex = (): React.Element<typeof Layout> => (
+const VotingIndex = (): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Voting suggestions')}>
     <div id="content">
       <h1>{l('Voting suggestions')}</h1>
diff --git a/root/work/WorkHeader.js b/root/work/WorkHeader.js
index a7e0daa4747..a9a888507bd 100644
--- a/root/work/WorkHeader.js
+++ b/root/work/WorkHeader.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import EntityHeader from '../components/EntityHeader.js';
 import localizeTypeNameForEntity
   from '../static/scripts/common/i18n/localizeTypeNameForEntity.js';
@@ -21,7 +19,7 @@ type Props = {
 const WorkHeader = ({
   work,
   page,
-}: Props): React.Element<typeof EntityHeader> => (
+}: Props): React$Element<typeof EntityHeader> => (
   <EntityHeader
     entity={work}
     headerClass="workheader"
diff --git a/root/work/WorkIndex.js b/root/work/WorkIndex.js
index bc19bb44e8b..04c6a4e3d11 100644
--- a/root/work/WorkIndex.js
+++ b/root/work/WorkIndex.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import CleanupBanner from '../components/CleanupBanner.js';
 import RelationshipsTable from '../components/RelationshipsTable.js';
 import * as manifest from '../static/manifest.mjs';
@@ -36,7 +34,7 @@ const WorkIndex = ({
   pager,
   wikipediaExtract,
   work,
-}: Props): React.Element<typeof WorkLayout> => (
+}: Props): React$Element<typeof WorkLayout> => (
   <WorkLayout entity={work} page="index">
     {eligibleForCleanup ? (
       <CleanupBanner entityType="work" />
diff --git a/root/work/WorkLayout.js b/root/work/WorkLayout.js
index 45d5c6f987d..911d4fad0c0 100644
--- a/root/work/WorkLayout.js
+++ b/root/work/WorkLayout.js
@@ -7,15 +7,13 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import WorkSidebar from '../layout/components/sidebar/WorkSidebar.js';
 import Layout from '../layout/index.js';
 
 import WorkHeader from './WorkHeader.js';
 
 type Props = {
-  +children: React.Node,
+  +children: React$Node,
   +entity: WorkT,
   +fullWidth?: boolean,
   +page: string,
@@ -28,7 +26,7 @@ const WorkLayout = ({
   fullWidth = false,
   page,
   title,
-}: Props): React.Element<typeof Layout> => {
+}: Props): React$Element<typeof Layout> => {
   const mainTitle = texp.l('{type} “{work}”', {
     type: nonEmpty(work.typeName)
       ? lp_attributes(work.typeName, 'work_type')
diff --git a/root/work/WorkMerge.js b/root/work/WorkMerge.js
index 69aaef04329..dad12f1f505 100644
--- a/root/work/WorkMerge.js
+++ b/root/work/WorkMerge.js
@@ -7,8 +7,6 @@
  * later version: http://www.gnu.org/licenses/gpl-2.0.txt
  */
 
-import * as React from 'react';
-
 import WorkList from '../components/list/WorkList.js';
 import Layout from '../layout/index.js';
 import sortByEntityName
@@ -28,7 +26,7 @@ const WorkMerge = ({
   form,
   iswcsDiffer = false,
   toMerge,
-}: Props): React.Element<typeof Layout> => (
+}: Props): React$Element<typeof Layout> => (
   <Layout fullWidth title={l('Merge works')}>
     <div id="content">
       <h1>{l('Merge works')}</h1>