diff --git a/package.json b/package.json
index 719bc1095ae..ebdd5d1a668 100644
--- a/package.json
+++ b/package.json
@@ -52,8 +52,8 @@
   "resolutions": {
     "typescript": "^5.6.3",
     "hoist-non-react-statics": "^3.3.0",
-    "@types/react": "16.9.11",
-    "@types/react-dom": "16.9.4",
+    "@types/react": "17.0.2",
+    "@types/react-dom": "17.0.2",
     "immutable": "3.8.2",
     "clean-css": "^5.2.2",
     "node-forge": "^1.2.1",
@@ -120,7 +120,7 @@
     "raw-loader": "^4.0.2",
     "relay-compiler": "^18.0.0",
     "relay-config": "^12.0.1",
-    "sucrase": "^3.32.0",
+    "sucrase": "^3.35.0",
     "tailwindcss": "^3.2.7",
     "terser-webpack-plugin": "^5.3.9",
     "ts-loader": "9.2.6",
diff --git a/packages/client/Root.tsx b/packages/client/Root.tsx
index 5fd3fac022d..e82936cbe23 100644
--- a/packages/client/Root.tsx
+++ b/packages/client/Root.tsx
@@ -1,5 +1,4 @@
 import * as Tooltip from '@radix-ui/react-tooltip'
-import React from 'react'
 import {BrowserRouter as Router} from 'react-router-dom'
 import Action from './components/Action/Action'
 import AtmosphereProvider from './components/AtmosphereProvider/AtmosphereProvider'
diff --git a/packages/client/client.tsx b/packages/client/client.tsx
index 780d7bb8d7c..b576abd9d9a 100644
--- a/packages/client/client.tsx
+++ b/packages/client/client.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import {render} from 'react-dom'
 import Root from './Root'
 import './scrollIntoViewIfNeeded'
diff --git a/packages/client/components/Action/Action.tsx b/packages/client/components/Action/Action.tsx
index 037263b1ba9..239f4b5d3b1 100644
--- a/packages/client/components/Action/Action.tsx
+++ b/packages/client/components/Action/Action.tsx
@@ -1,4 +1,4 @@
-import React, {lazy, memo, Suspense} from 'react'
+import {lazy, memo, Suspense} from 'react'
 import 'react-day-picker/dist/style.css'
 import {Route, Switch} from 'react-router'
 import useServiceWorkerUpdater from '../../hooks/useServiceWorkerUpdater'
diff --git a/packages/client/components/ActionMeeting.tsx b/packages/client/components/ActionMeeting.tsx
index 9ec5ad872ca..1c8f0e54412 100644
--- a/packages/client/components/ActionMeeting.tsx
+++ b/packages/client/components/ActionMeeting.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {ReactElement, Suspense, useEffect} from 'react'
+import {ReactElement, Suspense, useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {ActionMeeting_meeting$key} from '~/__generated__/ActionMeeting_meeting.graphql'
 import {NewMeetingPhaseTypeEnum} from '../__generated__/ActionMeeting_meeting.graphql'
diff --git a/packages/client/components/ActionMeetingAgendaItems.tsx b/packages/client/components/ActionMeetingAgendaItems.tsx
index 4e1f05ca4e3..87356c7c315 100644
--- a/packages/client/components/ActionMeetingAgendaItems.tsx
+++ b/packages/client/components/ActionMeetingAgendaItems.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useRef} from 'react'
+import {useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {ActionMeetingAgendaItems_meeting$key} from '~/__generated__/ActionMeetingAgendaItems_meeting.graphql'
 import useBreakpoint from '~/hooks/useBreakpoint'
diff --git a/packages/client/components/ActionMeetingFirstCall.tsx b/packages/client/components/ActionMeetingFirstCall.tsx
index 0b52fd29098..5f03d42539a 100644
--- a/packages/client/components/ActionMeetingFirstCall.tsx
+++ b/packages/client/components/ActionMeetingFirstCall.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ActionMeetingFirstCall_meeting$key} from '../__generated__/ActionMeetingFirstCall_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/ActionMeetingLastCall.tsx b/packages/client/components/ActionMeetingLastCall.tsx
index 787adec1056..b9244c269b3 100644
--- a/packages/client/components/ActionMeetingLastCall.tsx
+++ b/packages/client/components/ActionMeetingLastCall.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import EndCheckInMutation from '~/mutations/EndCheckInMutation'
 import {ActionMeetingLastCall_meeting$key} from '../__generated__/ActionMeetingLastCall_meeting.graphql'
diff --git a/packages/client/components/ActionMeetingSidebar.tsx b/packages/client/components/ActionMeetingSidebar.tsx
index c91e69301c0..a6470ef2b78 100644
--- a/packages/client/components/ActionMeetingSidebar.tsx
+++ b/packages/client/components/ActionMeetingSidebar.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {Fragment} from 'react'
+import {Fragment} from 'react'
 import {useFragment} from 'react-relay'
 import {
   ActionMeetingSidebar_meeting$key,
diff --git a/packages/client/components/ActionMeetingUpdates.tsx b/packages/client/components/ActionMeetingUpdates.tsx
index 7308a6e10bb..4211f6c28a5 100644
--- a/packages/client/components/ActionMeetingUpdates.tsx
+++ b/packages/client/components/ActionMeetingUpdates.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {ActionMeetingUpdates_meeting$key} from '../__generated__/ActionMeetingUpdates_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/ActionMeetingUpdatesPrompt.tsx b/packages/client/components/ActionMeetingUpdatesPrompt.tsx
index 34059e68295..40787578e2f 100644
--- a/packages/client/components/ActionMeetingUpdatesPrompt.tsx
+++ b/packages/client/components/ActionMeetingUpdatesPrompt.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ActionMeetingUpdatesPrompt_meeting$key} from '../__generated__/ActionMeetingUpdatesPrompt_meeting.graphql'
 import ActionMeetingUpdatesPromptTeamHelpText from '../modules/meeting/components/ActionMeetingUpdatesPromptTeamHelpText'
diff --git a/packages/client/components/ActionSidebarAgendaItemsSection.tsx b/packages/client/components/ActionSidebarAgendaItemsSection.tsx
index b8507dc7eab..4063bf42a36 100644
--- a/packages/client/components/ActionSidebarAgendaItemsSection.tsx
+++ b/packages/client/components/ActionSidebarAgendaItemsSection.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ActionSidebarAgendaItemsSection_meeting$key} from '../__generated__/ActionSidebarAgendaItemsSection_meeting.graphql'
 import useGotoStageId from '../hooks/useGotoStageId'
diff --git a/packages/client/components/ActionSidebarPhaseListItemChildren.tsx b/packages/client/components/ActionSidebarPhaseListItemChildren.tsx
index 5e516423f30..47acae904ef 100644
--- a/packages/client/components/ActionSidebarPhaseListItemChildren.tsx
+++ b/packages/client/components/ActionSidebarPhaseListItemChildren.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ActionSidebarPhaseListItemChildren_meeting$key} from '~/__generated__/ActionSidebarPhaseListItemChildren_meeting.graphql'
 import {NewMeetingPhaseTypeEnum} from '../__generated__/ActionSidebarAgendaItemsSection_meeting.graphql'
diff --git a/packages/client/components/ActivityLibrary/AISearch.tsx b/packages/client/components/ActivityLibrary/AISearch.tsx
index 46dd650ede4..4bb9f9e7cc7 100644
--- a/packages/client/components/ActivityLibrary/AISearch.tsx
+++ b/packages/client/components/ActivityLibrary/AISearch.tsx
@@ -1,4 +1,5 @@
-import React, {useState} from 'react'
+import * as React from 'react'
+import {useState} from 'react'
 import {GetTemplateSuggestionMutation$data} from '../../__generated__/GetTemplateSuggestionMutation.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import useMutationProps from '../../hooks/useMutationProps'
diff --git a/packages/client/components/ActivityLibrary/ActivityBadge.tsx b/packages/client/components/ActivityLibrary/ActivityBadge.tsx
index 8083fd9460b..0196104388b 100644
--- a/packages/client/components/ActivityLibrary/ActivityBadge.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityBadge.tsx
@@ -1,5 +1,5 @@
 import clsx from 'clsx'
-import React from 'react'
+import * as React from 'react'
 
 interface Props {
   className?: string
diff --git a/packages/client/components/ActivityLibrary/ActivityCard.tsx b/packages/client/components/ActivityLibrary/ActivityCard.tsx
index 9ed5362fca2..575c816f2fc 100644
--- a/packages/client/components/ActivityLibrary/ActivityCard.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityCard.tsx
@@ -1,6 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import React, {PropsWithChildren, useEffect, useRef, useState} from 'react'
+import * as React from 'react'
+import {PropsWithChildren, useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {twMerge} from 'tailwind-merge'
 import {ActivityCard_template$key} from '../../__generated__/ActivityCard_template.graphql'
diff --git a/packages/client/components/ActivityLibrary/ActivityCardFavorite.tsx b/packages/client/components/ActivityLibrary/ActivityCardFavorite.tsx
index 7170bb22b03..2854955ff88 100644
--- a/packages/client/components/ActivityLibrary/ActivityCardFavorite.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityCardFavorite.tsx
@@ -1,7 +1,7 @@
 import {Favorite} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import React from 'react'
+import * as React from 'react'
 import {useFragment} from 'react-relay'
 import {ActivityCardFavorite_user$key} from '../../__generated__/ActivityCardFavorite_user.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
index 3823d413e8b..6d071be850c 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
@@ -1,6 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import React, {useEffect, useState} from 'react'
+import {useEffect, useState} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {Redirect, useHistory} from 'react-router'
 import {Link} from 'react-router-dom'
diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsBadge.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsBadge.tsx
index 30c0a67fa7f..1991ae04407 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsBadge.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsBadge.tsx
@@ -1,5 +1,5 @@
 import clsx from 'clsx'
-import React from 'react'
+import * as React from 'react'
 
 interface Props {
   className?: string
diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsBadges.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsBadges.tsx
index f87ac4ca88c..1b88e6e501c 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsBadges.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsBadges.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ActivityDetailsBadges_template$key} from '~/__generated__/ActivityDetailsBadges_template.graphql'
 import ActivityDetailsBadge from './ActivityDetailsBadge'
diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsCategoryBadge.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsCategoryBadge.tsx
index 299cc6525f1..09aee87bc26 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsCategoryBadge.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsCategoryBadge.tsx
@@ -2,7 +2,6 @@ import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown'
 import * as DropdownMenu from '@radix-ui/react-dropdown-menu'
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ActivityDetailsCategoryBadge_template$key} from '~/__generated__/ActivityDetailsCategoryBadge_template.graphql'
 import useTemplateCategoryMutation from '../../../mutations/UpdateTemplateCategoryMutation'
diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsRoute.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsRoute.tsx
index d39a617d838..64237358cf4 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsRoute.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsRoute.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {Redirect} from 'react-router'
 import activityDetailsQuery, {
   ActivityDetailsQuery
diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx
index c867489d298..49b07c1f31d 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx
@@ -1,7 +1,8 @@
 import {ContentCopy} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import React, {useCallback, useEffect, useState} from 'react'
+import * as React from 'react'
+import {useCallback, useEffect, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {useHistory} from 'react-router'
 import {MeetingTypeEnum} from '~/__generated__/ActivityDetailsQuery.graphql'
diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/components/DetailsBadge.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/components/DetailsBadge.tsx
index 48509a1bb24..f320dac8ce8 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/components/DetailsBadge.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/components/DetailsBadge.tsx
@@ -1,5 +1,5 @@
 import clsx from 'clsx'
-import React from 'react'
+import * as React from 'react'
 
 interface DetailsBadgeProps {
   className?: string
diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/components/IntegrationsTip.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/components/IntegrationsTip.tsx
index 27e33d76790..3d228bbe100 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/components/IntegrationsTip.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/components/IntegrationsTip.tsx
@@ -1,5 +1,5 @@
 import clsx from 'clsx'
-import React from 'react'
+import * as React from 'react'
 import AzureDevOpsSVG from '../../../AzureDevOpsSVG'
 import GitHubSVG from '../../../GitHubSVG'
 import GitLabSVG from '../../../GitLabSVG'
diff --git a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
index ff970cf3d63..94ba22ca365 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
@@ -2,7 +2,7 @@ import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown'
 import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp'
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import React, {useEffect, useRef, useState} from 'react'
+import {useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {useHistory} from 'react-router'
 import {RRule} from 'rrule'
diff --git a/packages/client/components/ActivityLibrary/ActivityGrid.tsx b/packages/client/components/ActivityLibrary/ActivityGrid.tsx
index 2564d542746..4af15cd2f39 100644
--- a/packages/client/components/ActivityLibrary/ActivityGrid.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityGrid.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {Link} from 'react-router-dom'
 import {ActivityGrid_user$key} from '../../__generated__/ActivityGrid_user.graphql'
diff --git a/packages/client/components/ActivityLibrary/ActivityLibrary.tsx b/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
index 219cdc8139e..4c9114c897b 100644
--- a/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
@@ -1,7 +1,7 @@
 import * as ScrollArea from '@radix-ui/react-scroll-area'
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import React, {Fragment, useEffect, useMemo} from 'react'
+import {Fragment, useEffect, useMemo, useState} from 'react'
 import {
   PreloadedQuery,
   commitLocalUpdate,
@@ -229,7 +229,7 @@ export const ActivityLibrary = (props: Props) => {
   const {availableTemplates, organizations} = viewer
   const hasAITemplateFeatureFlag = organizations.some((org) => org.hasAITemplateFlag)
 
-  const [isSearching, setIsSearching] = React.useState(true)
+  const [isSearching, setIsSearching] = useState(true)
   const [templateSearch, refetchTemplateSearch] = useRefetchableFragment<
     ActivityLibraryTemplateSearchRefetchQuery,
     ActivityLibraryTemplateSearch_query$key
diff --git a/packages/client/components/ActivityLibrary/ActivityLibraryCardDescription.tsx b/packages/client/components/ActivityLibrary/ActivityLibraryCardDescription.tsx
index c4aeb76fe23..ab0c5c0093b 100644
--- a/packages/client/components/ActivityLibrary/ActivityLibraryCardDescription.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityLibraryCardDescription.tsx
@@ -1,7 +1,6 @@
 import * as ScrollArea from '@radix-ui/react-scroll-area'
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import React from 'react'
 import {
   ActivityLibraryCardDescription_template$data,
   ActivityLibraryCardDescription_template$key
diff --git a/packages/client/components/ActivityLibrary/ActivityLibraryEmptyState.tsx b/packages/client/components/ActivityLibrary/ActivityLibraryEmptyState.tsx
index deab5992589..72ddbdd47d1 100644
--- a/packages/client/components/ActivityLibrary/ActivityLibraryEmptyState.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityLibraryEmptyState.tsx
@@ -1,5 +1,4 @@
 import FavoriteIcon from '@mui/icons-material/Favorite'
-import React from 'react'
 import favoriteImg from '../../../../static/images/illustrations/favorite-empty-state.png'
 import halloweenRetrospectiveTemplate from '../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png'
 import {AllCategoryID, QUICK_START_CATEGORY_ID} from './Categories'
diff --git a/packages/client/components/ActivityLibrary/ActivityLibraryRoute.tsx b/packages/client/components/ActivityLibrary/ActivityLibraryRoute.tsx
index 30e1e25edf0..25d451fcfe9 100644
--- a/packages/client/components/ActivityLibrary/ActivityLibraryRoute.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityLibraryRoute.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import activityLibraryQuery, {
   ActivityLibraryQuery
 } from '~/__generated__/ActivityLibraryQuery.graphql'
diff --git a/packages/client/components/ActivityLibrary/ActivityLibraryRoutes.tsx b/packages/client/components/ActivityLibrary/ActivityLibraryRoutes.tsx
index e191e20929d..333e5a97209 100644
--- a/packages/client/components/ActivityLibrary/ActivityLibraryRoutes.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityLibraryRoutes.tsx
@@ -1,4 +1,4 @@
-import React, {lazy} from 'react'
+import {lazy} from 'react'
 import {Route, Switch, useRouteMatch} from 'react-router'
 import useSubscription from '../../hooks/useSubscription'
 import NotificationSubscription from '../../subscriptions/NotificationSubscription'
diff --git a/packages/client/components/ActivityLibrary/Categories.tsx b/packages/client/components/ActivityLibrary/Categories.tsx
index 6e6c463ace1..d16f467f0f7 100644
--- a/packages/client/components/ActivityLibrary/Categories.tsx
+++ b/packages/client/components/ActivityLibrary/Categories.tsx
@@ -1,5 +1,4 @@
 import FavoriteIcon from '@mui/icons-material/Favorite'
-import React from 'react'
 import {MeetingTypeEnum} from '../../__generated__/MeetingSelectorQuery.graphql'
 import {CardTheme} from './ActivityCard'
 
diff --git a/packages/client/components/ActivityLibrary/CreateActivityCard.tsx b/packages/client/components/ActivityLibrary/CreateActivityCard.tsx
index ee0cf0c248d..cb4c65ea20c 100644
--- a/packages/client/components/ActivityLibrary/CreateActivityCard.tsx
+++ b/packages/client/components/ActivityLibrary/CreateActivityCard.tsx
@@ -1,6 +1,5 @@
 import {Add as AddIcon} from '@mui/icons-material'
 import clsx from 'clsx'
-import React from 'react'
 import {Link} from 'react-router-dom'
 
 import {ActivityCard} from './ActivityCard'
diff --git a/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx b/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx
index 8017e115b63..e4c612baf4d 100644
--- a/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx
+++ b/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx
@@ -1,7 +1,8 @@
 import * as RadioGroup from '@radix-ui/react-radio-group'
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import React, {ComponentPropsWithoutRef, useState} from 'react'
+import * as React from 'react'
+import {ComponentPropsWithoutRef, useState} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {useHistory} from 'react-router'
 import {Link} from 'react-router-dom'
diff --git a/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivityRoute.tsx b/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivityRoute.tsx
index db7adca350d..c0f3a885874 100644
--- a/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivityRoute.tsx
+++ b/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivityRoute.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 
 import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
 import {Loader} from '../../../utils/relay/renderLoader'
diff --git a/packages/client/components/ActivityLibrary/ScheduleMeetingButton.tsx b/packages/client/components/ActivityLibrary/ScheduleMeetingButton.tsx
index dda2754f057..1677d430c6f 100644
--- a/packages/client/components/ActivityLibrary/ScheduleMeetingButton.tsx
+++ b/packages/client/components/ActivityLibrary/ScheduleMeetingButton.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {RRule} from 'rrule'
 import {ScheduleMeetingButton_team$key} from '~/__generated__/ScheduleMeetingButton_team.graphql'
diff --git a/packages/client/components/ActivityLibrary/SearchBar.tsx b/packages/client/components/ActivityLibrary/SearchBar.tsx
index 1af0307f978..1f794951a03 100644
--- a/packages/client/components/ActivityLibrary/SearchBar.tsx
+++ b/packages/client/components/ActivityLibrary/SearchBar.tsx
@@ -1,5 +1,5 @@
 import {Search as SearchIcon} from '@mui/icons-material'
-import React, {ChangeEvent} from 'react'
+import {ChangeEvent} from 'react'
 
 interface Props {
   searchQuery: string
diff --git a/packages/client/components/ActivityLibrary/TeamPickerModal.tsx b/packages/client/components/ActivityLibrary/TeamPickerModal.tsx
index ab5943f93bd..b1d41f6d2c5 100644
--- a/packages/client/components/ActivityLibrary/TeamPickerModal.tsx
+++ b/packages/client/components/ActivityLibrary/TeamPickerModal.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useState} from 'react'
+import {useEffect, useState} from 'react'
 
 import clsx from 'clsx'
 import {useFragment} from 'react-relay'
diff --git a/packages/client/components/AddPollButton.tsx b/packages/client/components/AddPollButton.tsx
index 4d3ecae86cc..df3c718d224 100644
--- a/packages/client/components/AddPollButton.tsx
+++ b/packages/client/components/AddPollButton.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {PollOutlined} from '@mui/icons-material'
-import React from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import PlainButton from './PlainButton/PlainButton'
 
diff --git a/packages/client/components/AddTaskButton.tsx b/packages/client/components/AddTaskButton.tsx
index 38bc9ff6056..e57cc3a86d4 100644
--- a/packages/client/components/AddTaskButton.tsx
+++ b/packages/client/components/AddTaskButton.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {TaskAltOutlined} from '@mui/icons-material'
-import React from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import PlainButton from './PlainButton/PlainButton'
 
diff --git a/packages/client/components/AddTaskButton/AddTaskButton.tsx b/packages/client/components/AddTaskButton/AddTaskButton.tsx
index e2c82745fb4..ad71491de2d 100644
--- a/packages/client/components/AddTaskButton/AddTaskButton.tsx
+++ b/packages/client/components/AddTaskButton/AddTaskButton.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
-import React, {forwardRef, Ref} from 'react'
+import * as React from 'react'
+import {forwardRef, Ref} from 'react'
 import IconLabel from '../IconLabel'
 import RaisedButton from '../RaisedButton'
 
diff --git a/packages/client/components/AddTeamDialog.tsx b/packages/client/components/AddTeamDialog.tsx
index 0ce695761fe..2c5a1876379 100644
--- a/packages/client/components/AddTeamDialog.tsx
+++ b/packages/client/components/AddTeamDialog.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay'
 import useRouter from '~/hooks/useRouter'
 import AddTeamMutation from '~/mutations/AddTeamMutation'
diff --git a/packages/client/components/AddTeamDialogRoot.tsx b/packages/client/components/AddTeamDialogRoot.tsx
index cd5be060bef..acca7c19500 100644
--- a/packages/client/components/AddTeamDialogRoot.tsx
+++ b/packages/client/components/AddTeamDialogRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import addTeamDialogQuery, {AddTeamDialogQuery} from '../__generated__/AddTeamDialogQuery.graphql'
 import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import {Loader} from '../utils/relay/renderLoader'
diff --git a/packages/client/components/AddTeamMemberAvatarButton.tsx b/packages/client/components/AddTeamMemberAvatarButton.tsx
index 8aeacbd0fa4..be11c66836f 100644
--- a/packages/client/components/AddTeamMemberAvatarButton.tsx
+++ b/packages/client/components/AddTeamMemberAvatarButton.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {PersonAdd} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
 import {AddTeamMemberAvatarButton_teamMembers$key} from '../__generated__/AddTeamMemberAvatarButton_teamMembers.graphql'
diff --git a/packages/client/components/AddTeamMemberModal.tsx b/packages/client/components/AddTeamMemberModal.tsx
index 6770998353a..7914f70b31e 100644
--- a/packages/client/components/AddTeamMemberModal.tsx
+++ b/packages/client/components/AddTeamMemberModal.tsx
@@ -1,7 +1,8 @@
 import styled from '@emotion/styled'
 import {Error as ErrorIcon, Warning} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import * as React from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useMutationProps from '~/hooks/useMutationProps'
diff --git a/packages/client/components/AddTeamMemberModalDemo.tsx b/packages/client/components/AddTeamMemberModalDemo.tsx
index aeafa97c122..1541f321bb5 100644
--- a/packages/client/components/AddTeamMemberModalDemo.tsx
+++ b/packages/client/components/AddTeamMemberModalDemo.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import modalTeamInvitePng from '../../../static/images/illustrations/illus-modal-team-invite.png'
 import hasToken from '../utils/hasToken'
 import DemoCreateAccountPrimaryButton from './DemoCreateAccountPrimaryButton'
diff --git a/packages/client/components/AddTeamMemberModalSuccess.tsx b/packages/client/components/AddTeamMemberModalSuccess.tsx
index 2831e89ce27..6112bab8c80 100644
--- a/packages/client/components/AddTeamMemberModalSuccess.tsx
+++ b/packages/client/components/AddTeamMemberModalSuccess.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {Component} from 'react'
+import {Component} from 'react'
 import DialogContainer from './DialogContainer'
 import DialogContent from './DialogContent'
 import DialogTitle from './DialogTitle'
diff --git a/packages/client/components/AddToAzureMenuItem.tsx b/packages/client/components/AddToAzureMenuItem.tsx
index 76fe597cac9..e658919bd1f 100644
--- a/packages/client/components/AddToAzureMenuItem.tsx
+++ b/packages/client/components/AddToAzureMenuItem.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import {useFragment} from 'react-relay'
 import {AddToAzureMenuItem_AzureIntegration$key} from '../__generated__/AddToAzureMenuItem_AzureIntegration.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/AddToGitHubMenuItem.tsx b/packages/client/components/AddToGitHubMenuItem.tsx
index 94e381b6f35..c051b52b793 100644
--- a/packages/client/components/AddToGitHubMenuItem.tsx
+++ b/packages/client/components/AddToGitHubMenuItem.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuMutationProps} from '../hooks/useMutationProps'
 import {ICON_SIZE} from '../styles/typographyV2'
diff --git a/packages/client/components/AddToGitLabMenuItem.tsx b/packages/client/components/AddToGitLabMenuItem.tsx
index 2cc793f704a..05b06b4a646 100644
--- a/packages/client/components/AddToGitLabMenuItem.tsx
+++ b/packages/client/components/AddToGitLabMenuItem.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import {useFragment} from 'react-relay'
 import GitLabClientManager from '~/utils/GitLabClientManager'
 import {AddToGitLabMenuItem_GitLabIntegration$key} from '../__generated__/AddToGitLabMenuItem_GitLabIntegration.graphql'
diff --git a/packages/client/components/AddToJiraMenuItem.tsx b/packages/client/components/AddToJiraMenuItem.tsx
index b1316541764..8821874af7b 100644
--- a/packages/client/components/AddToJiraMenuItem.tsx
+++ b/packages/client/components/AddToJiraMenuItem.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuMutationProps} from '../hooks/useMutationProps'
 import {ICON_SIZE} from '../styles/typographyV2'
diff --git a/packages/client/components/AdhocTeamMultiSelect/AdhocTeamMultiSelect.tsx b/packages/client/components/AdhocTeamMultiSelect/AdhocTeamMultiSelect.tsx
index ffb6e8585cd..f906233c11a 100644
--- a/packages/client/components/AdhocTeamMultiSelect/AdhocTeamMultiSelect.tsx
+++ b/packages/client/components/AdhocTeamMultiSelect/AdhocTeamMultiSelect.tsx
@@ -1,7 +1,7 @@
 import {useAutocomplete} from '@mui/base/AutocompleteUnstyled'
 import CheckIcon from '@mui/icons-material/Check'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 
 import {Send as SendIcon} from '@mui/icons-material'
@@ -44,7 +44,7 @@ const autocompleteEmail = (input: string, domain: string) => {
 
 export const AdhocTeamMultiSelect = (props: Props) => {
   const {viewerRef, onChange, value, multiple = true} = props
-  const [error, setError] = React.useState<string | null>(null)
+  const [error, setError] = useState<string | null>(null)
 
   const viewer = useFragment(
     graphql`
diff --git a/packages/client/components/AndroidEditorFallback.tsx b/packages/client/components/AndroidEditorFallback.tsx
index b5d5b0c5d2d..83daad665f2 100644
--- a/packages/client/components/AndroidEditorFallback.tsx
+++ b/packages/client/components/AndroidEditorFallback.tsx
@@ -1,6 +1,7 @@
 import styled from '@emotion/styled'
 import {EditorState} from 'draft-js'
-import React, {ChangeEvent, ClipboardEvent, RefObject, useEffect, useState} from 'react'
+import * as React from 'react'
+import {ChangeEvent, ClipboardEvent, RefObject, useEffect, useState} from 'react'
 import TextArea from 'react-textarea-autosize'
 import {PALETTE} from '../styles/paletteV3'
 import {Card, Gutters} from '../types/constEnums'
diff --git a/packages/client/components/ArchiveTaskRoot.tsx b/packages/client/components/ArchiveTaskRoot.tsx
index 6a2fcd6ef5a..593404030ac 100644
--- a/packages/client/components/ArchiveTaskRoot.tsx
+++ b/packages/client/components/ArchiveTaskRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import useDocumentTitle from '~/hooks/useDocumentTitle'
 import TeamArchive from '~/modules/teamDashboard/components/TeamArchive/TeamArchive'
 import teamArchiveQuery, {TeamArchiveQuery} from '../__generated__/TeamArchiveQuery.graphql'
diff --git a/packages/client/components/ArchiveTaskUserRoot.tsx b/packages/client/components/ArchiveTaskUserRoot.tsx
index 9707ac9f96e..a9edb0f9d6b 100644
--- a/packages/client/components/ArchiveTaskUserRoot.tsx
+++ b/packages/client/components/ArchiveTaskUserRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import TeamArchive from '~/modules/teamDashboard/components/TeamArchive/TeamArchive'
 import UserTasksHeader from '~/modules/userDashboard/components/UserTasksHeader/UserTasksHeader'
 import teamArchiveQuery, {TeamArchiveQuery} from '../__generated__/TeamArchiveQuery.graphql'
diff --git a/packages/client/components/AtlassianConfigMenu.tsx b/packages/client/components/AtlassianConfigMenu.tsx
index 4295bc3cae9..cb0747b07f1 100644
--- a/packages/client/components/AtlassianConfigMenu.tsx
+++ b/packages/client/components/AtlassianConfigMenu.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuProps} from '../hooks/useMenu'
 import {MenuMutationProps} from '../hooks/useMutationProps'
diff --git a/packages/client/components/AtmosphereProvider/AtmosphereProvider.tsx b/packages/client/components/AtmosphereProvider/AtmosphereProvider.tsx
index a95893dc6f2..6e974b3ab82 100644
--- a/packages/client/components/AtmosphereProvider/AtmosphereProvider.tsx
+++ b/packages/client/components/AtmosphereProvider/AtmosphereProvider.tsx
@@ -1,4 +1,4 @@
-import React, {Component, ReactNode} from 'react'
+import {Component, ReactNode} from 'react'
 import {RelayEnvironmentProvider} from 'react-relay'
 import Atmosphere from '../../Atmosphere'
 import TLocalAtmosphere from '../../modules/demo/LocalAtmosphere'
diff --git a/packages/client/components/AtmosphereProvider/PortalProvider.tsx b/packages/client/components/AtmosphereProvider/PortalProvider.tsx
index 4a25993d32e..fdaee57a0b6 100644
--- a/packages/client/components/AtmosphereProvider/PortalProvider.tsx
+++ b/packages/client/components/AtmosphereProvider/PortalProvider.tsx
@@ -1,9 +1,9 @@
-import React, {ReactNode, useRef} from 'react'
+import {createContext, ReactNode, useRef} from 'react'
 import {createPortal} from 'react-dom'
 import useForceUpdate from '../../hooks/useForceUpdate'
 
 export type SetPortal = (id: string, portal: ReactNode) => void
-export const PortalContext = React.createContext((() => {
+export const PortalContext = createContext((() => {
   /* noop */
 }) as SetPortal)
 
diff --git a/packages/client/components/AuthPage/Header.tsx b/packages/client/components/AuthPage/Header.tsx
index b96c07da245..37bf4ed55bd 100644
--- a/packages/client/components/AuthPage/Header.tsx
+++ b/packages/client/components/AuthPage/Header.tsx
@@ -3,7 +3,6 @@
  *
  */
 import styled from '@emotion/styled'
-import React from 'react'
 import {Link} from 'react-router-dom'
 import {PALETTE} from '../../styles/paletteV3'
 import parabolLogo from '../../styles/theme/images/brand/lockup_color_mark_white_type.svg'
diff --git a/packages/client/components/AuthPrivacyFooter.tsx b/packages/client/components/AuthPrivacyFooter.tsx
index 318ba1cf6c1..753a790e4d4 100644
--- a/packages/client/components/AuthPrivacyFooter.tsx
+++ b/packages/client/components/AuthPrivacyFooter.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {PALETTE} from '../styles/paletteV3'
 
 const color = PALETTE.SKY_500
diff --git a/packages/client/components/AuthProvider.tsx b/packages/client/components/AuthProvider.tsx
index 52181bafd36..786c099b18f 100644
--- a/packages/client/components/AuthProvider.tsx
+++ b/packages/client/components/AuthProvider.tsx
@@ -1,4 +1,4 @@
-import React, {useEffect, useState} from 'react'
+import {useEffect, useState} from 'react'
 import DialogContent from './DialogContent'
 import DialogTitle from './DialogTitle'
 import InviteDialog from './InviteDialog'
diff --git a/packages/client/components/AuthenticationPage.tsx b/packages/client/components/AuthenticationPage.tsx
index c89eb2c9be2..7b749aeb609 100644
--- a/packages/client/components/AuthenticationPage.tsx
+++ b/packages/client/components/AuthenticationPage.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import useCanonical from '~/hooks/useCanonical'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useDocumentTitle from '../hooks/useDocumentTitle'
diff --git a/packages/client/components/Avatar/Avatar.tsx b/packages/client/components/Avatar/Avatar.tsx
index ef086097822..3a0f9b2bac5 100644
--- a/packages/client/components/Avatar/Avatar.tsx
+++ b/packages/client/components/Avatar/Avatar.tsx
@@ -1,5 +1,6 @@
 import clsx from 'clsx'
-import React, {forwardRef} from 'react'
+import * as React from 'react'
+import {forwardRef} from 'react'
 import defaultUserAvatar from '../../styles/theme/images/avatar-user.svg'
 import {Avatar as AvatarRoot} from '../../ui/Avatar/Avatar'
 import {AvatarFallback} from '../../ui/Avatar/AvatarFallback'
diff --git a/packages/client/components/AvatarBadge/AvatarBadge.tsx b/packages/client/components/AvatarBadge/AvatarBadge.tsx
index da326208382..c68e58faee5 100644
--- a/packages/client/components/AvatarBadge/AvatarBadge.tsx
+++ b/packages/client/components/AvatarBadge/AvatarBadge.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import srOnly from '../../styles/helpers/srOnly'
 import {PALETTE} from '../../styles/paletteV3'
 
diff --git a/packages/client/components/AvatarInput.tsx b/packages/client/components/AvatarInput.tsx
index 84c4e34a7bb..713b4c28380 100644
--- a/packages/client/components/AvatarInput.tsx
+++ b/packages/client/components/AvatarInput.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
-import React, {Component, lazy, Suspense} from 'react'
+import * as React from 'react'
+import {Component, lazy, Suspense} from 'react'
 import RaisedButton from './RaisedButton'
 import StyledError from './StyledError'
 
diff --git a/packages/client/components/AvatarList.tsx b/packages/client/components/AvatarList.tsx
index f90b9e14d11..39baac06702 100644
--- a/packages/client/components/AvatarList.tsx
+++ b/packages/client/components/AvatarList.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {ReactElement, useLayoutEffect, useRef, useState} from 'react'
+import {ReactElement, useLayoutEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import useResizeObserver from '~/hooks/useResizeObserver'
 import {AvatarList_users$key} from '../__generated__/AvatarList_users.graphql'
diff --git a/packages/client/components/AvatarListUser.tsx b/packages/client/components/AvatarListUser.tsx
index 668fcde44b0..c0f7fd11543 100644
--- a/packages/client/components/AvatarListUser.tsx
+++ b/packages/client/components/AvatarListUser.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TransitionStatus} from '~/hooks/useTransition'
 import {AvatarListUser_user$key} from '../__generated__/AvatarListUser_user.graphql'
diff --git a/packages/client/components/AzureDevOpsConfigMenu.tsx b/packages/client/components/AzureDevOpsConfigMenu.tsx
index ad035752e25..ccb712f7d7d 100644
--- a/packages/client/components/AzureDevOpsConfigMenu.tsx
+++ b/packages/client/components/AzureDevOpsConfigMenu.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuProps} from '../hooks/useMenu'
 import {MenuMutationProps} from '../hooks/useMutationProps'
diff --git a/packages/client/components/AzureDevOpsFieldDimensionDropdown.tsx b/packages/client/components/AzureDevOpsFieldDimensionDropdown.tsx
index 2ffa721ed59..64a64ffbce1 100644
--- a/packages/client/components/AzureDevOpsFieldDimensionDropdown.tsx
+++ b/packages/client/components/AzureDevOpsFieldDimensionDropdown.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {ExpandMore} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
 import {AzureDevOpsFieldDimensionDropdown_stage$key} from '../__generated__/AzureDevOpsFieldDimensionDropdown_stage.graphql'
diff --git a/packages/client/components/AzureDevOpsFieldMenu.tsx b/packages/client/components/AzureDevOpsFieldMenu.tsx
index dd399c6eb8f..f0f4af46d31 100644
--- a/packages/client/components/AzureDevOpsFieldMenu.tsx
+++ b/packages/client/components/AzureDevOpsFieldMenu.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {AzureDevOpsFieldMenu_stage$key} from '../__generated__/AzureDevOpsFieldMenu_stage.graphql'
diff --git a/packages/client/components/AzureDevOpsSVG.tsx b/packages/client/components/AzureDevOpsSVG.tsx
index b30310e0c27..66752e3776c 100644
--- a/packages/client/components/AzureDevOpsSVG.tsx
+++ b/packages/client/components/AzureDevOpsSVG.tsx
@@ -1,8 +1,8 @@
-import React from 'react'
+import {memo} from 'react'
 
 // Can multiply 24(n) for standard MD sizes eg. 24(2) = 48
 
-const AzureDevOpsSVG = React.memo(() => {
+const AzureDevOpsSVG = memo(() => {
   return (
     <svg width='24' height='24' viewBox='0 0 16 16' fill='none' xmlns='http://www.w3.org/2000/svg'>
       <defs>
diff --git a/packages/client/components/AzureDevOpsScopingSearchBar.tsx b/packages/client/components/AzureDevOpsScopingSearchBar.tsx
index 57ae76f6966..cf34f8019b5 100644
--- a/packages/client/components/AzureDevOpsScopingSearchBar.tsx
+++ b/packages/client/components/AzureDevOpsScopingSearchBar.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {Search} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {AzureDevOpsScopingSearchBar_meeting$key} from '../__generated__/AzureDevOpsScopingSearchBar_meeting.graphql'
 import {PALETTE} from '../styles/paletteV3'
diff --git a/packages/client/components/AzureDevOpsScopingSearchFilterMenu.tsx b/packages/client/components/AzureDevOpsScopingSearchFilterMenu.tsx
index 395c4f67930..6f67cfb1424 100644
--- a/packages/client/components/AzureDevOpsScopingSearchFilterMenu.tsx
+++ b/packages/client/components/AzureDevOpsScopingSearchFilterMenu.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {
diff --git a/packages/client/components/AzureDevOpsScopingSearchFilterToggle.tsx b/packages/client/components/AzureDevOpsScopingSearchFilterToggle.tsx
index f819a12761f..4cd76c0e5fa 100644
--- a/packages/client/components/AzureDevOpsScopingSearchFilterToggle.tsx
+++ b/packages/client/components/AzureDevOpsScopingSearchFilterToggle.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {FilterList} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {MenuPosition} from '~/hooks/useCoords'
 import useMenu from '~/hooks/useMenu'
diff --git a/packages/client/components/AzureDevOpsScopingSearchInput.tsx b/packages/client/components/AzureDevOpsScopingSearchInput.tsx
index d2e6864b596..2426efb9dc7 100644
--- a/packages/client/components/AzureDevOpsScopingSearchInput.tsx
+++ b/packages/client/components/AzureDevOpsScopingSearchInput.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {Close} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
+import * as React from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
 import Atmosphere from '../Atmosphere'
diff --git a/packages/client/components/AzureDevOpsScopingSearchResults.tsx b/packages/client/components/AzureDevOpsScopingSearchResults.tsx
index cf646965d44..f95510aa1f2 100644
--- a/packages/client/components/AzureDevOpsScopingSearchResults.tsx
+++ b/packages/client/components/AzureDevOpsScopingSearchResults.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay'
 import useGetUsedServiceTaskIds from '~/hooks/useGetUsedServiceTaskIds'
 import MockScopingList from '~/modules/meeting/components/MockScopingList'
diff --git a/packages/client/components/AzureDevOpsScopingSearchResultsRoot.tsx b/packages/client/components/AzureDevOpsScopingSearchResultsRoot.tsx
index 52637c5e284..dea9855e04d 100644
--- a/packages/client/components/AzureDevOpsScopingSearchResultsRoot.tsx
+++ b/packages/client/components/AzureDevOpsScopingSearchResultsRoot.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import MockScopingList from '~/modules/meeting/components/MockScopingList'
 import azureDevOpsScopingSearchResultsQuery, {
diff --git a/packages/client/components/AzureDevOpsScopingSelectAllIssues.tsx b/packages/client/components/AzureDevOpsScopingSelectAllIssues.tsx
index bec857e9393..efde053f7d3 100644
--- a/packages/client/components/AzureDevOpsScopingSelectAllIssues.tsx
+++ b/packages/client/components/AzureDevOpsScopingSelectAllIssues.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useUnusedRecords from '~/hooks/useUnusedRecords'
 import {AzureDevOpsScopingSelectAllIssues_workItems$key} from '../__generated__/AzureDevOpsScopingSelectAllIssues_workItems.graphql'
diff --git a/packages/client/components/BackButton.tsx b/packages/client/components/BackButton.tsx
index 2fe7bf1a6ed..89d018357e9 100644
--- a/packages/client/components/BackButton.tsx
+++ b/packages/client/components/BackButton.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {ArrowBack} from '@mui/icons-material'
-import React from 'react'
 import {Link} from 'react-router-dom'
 import {PALETTE} from '~/styles/paletteV3'
 import FlatButton from './FlatButton'
diff --git a/packages/client/components/BaseButton.tsx b/packages/client/components/BaseButton.tsx
index b505e4af7af..83b02ca4279 100644
--- a/packages/client/components/BaseButton.tsx
+++ b/packages/client/components/BaseButton.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
-import React, {forwardRef, ReactNode, Ref, useState} from 'react'
+import * as React from 'react'
+import {forwardRef, ReactNode, Ref, useState} from 'react'
 import {Elevation} from '../styles/elevation'
 import ui from '../styles/ui'
 import PlainButton, {PlainButtonProps} from './PlainButton/PlainButton'
diff --git a/packages/client/components/BeginDemoModal.tsx b/packages/client/components/BeginDemoModal.tsx
index 41d078a52d3..ffeaa9b0abc 100644
--- a/packages/client/components/BeginDemoModal.tsx
+++ b/packages/client/components/BeginDemoModal.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {Chat} from '@mui/icons-material'
-import React from 'react'
 import {PALETTE} from '../styles/paletteV3'
 import DialogContainer from './DialogContainer'
 import PrimaryButton from './PrimaryButton'
diff --git a/packages/client/components/BottomControlBarProgress.tsx b/packages/client/components/BottomControlBarProgress.tsx
index 1f96d6f44e2..14d021b5abb 100644
--- a/packages/client/components/BottomControlBarProgress.tsx
+++ b/packages/client/components/BottomControlBarProgress.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import CircularProgress from './CircularProgress'
 
diff --git a/packages/client/components/BottomControlBarReady.tsx b/packages/client/components/BottomControlBarReady.tsx
index a1291de032e..88661875a4a 100644
--- a/packages/client/components/BottomControlBarReady.tsx
+++ b/packages/client/components/BottomControlBarReady.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {ArrowForward, CheckCircle, CheckCircleOutline} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {BottomControlBarReady_meeting$key} from '~/__generated__/BottomControlBarReady_meeting.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
diff --git a/packages/client/components/BottomControlBarRejoin.tsx b/packages/client/components/BottomControlBarRejoin.tsx
index cadd8e2c509..5a82cee002b 100644
--- a/packages/client/components/BottomControlBarRejoin.tsx
+++ b/packages/client/components/BottomControlBarRejoin.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import {TransitionStatus} from '~/hooks/useTransition'
 import BottomNavControl from './BottomNavControl'
 import BottomNavIconLabel from './BottomNavIconLabel'
diff --git a/packages/client/components/BottomControlBarTips.tsx b/packages/client/components/BottomControlBarTips.tsx
index fa8873ae2ae..1c98475f8ad 100644
--- a/packages/client/components/BottomControlBarTips.tsx
+++ b/packages/client/components/BottomControlBarTips.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {BottomControlBarTips_meeting$key} from '~/__generated__/BottomControlBarTips_meeting.graphql'
 import {MenuPosition} from '~/hooks/useCoords'
diff --git a/packages/client/components/BottomNavIconLabel.tsx b/packages/client/components/BottomNavIconLabel.tsx
index 97d0d5498f4..973e1d1e38d 100644
--- a/packages/client/components/BottomNavIconLabel.tsx
+++ b/packages/client/components/BottomNavIconLabel.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {Event, HelpOutline, PersonPinCircleOutlined, TimerOutlined} from '@mui/icons-material'
-import React, {ReactNode, Ref, forwardRef} from 'react'
+import {ReactNode, Ref, forwardRef} from 'react'
 import {PALETTE} from '../styles/paletteV3'
 
 const paletteColors = {
diff --git a/packages/client/components/CardsSVG.tsx b/packages/client/components/CardsSVG.tsx
index 133437f74b2..6b44a25b204 100644
--- a/packages/client/components/CardsSVG.tsx
+++ b/packages/client/components/CardsSVG.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 const CardsSVG = () => {
   return (
     <svg width='24' height='24' viewBox='0 0 22 20' fill='none' xmlns='http://www.w3.org/2000/svg'>
diff --git a/packages/client/components/Checkbox.tsx b/packages/client/components/Checkbox.tsx
index a319fa4a5b2..a049728bc0f 100644
--- a/packages/client/components/Checkbox.tsx
+++ b/packages/client/components/Checkbox.tsx
@@ -1,6 +1,6 @@
 import {CheckBox, CheckBoxOutlineBlank, IndeterminateCheckBox} from '@mui/icons-material'
 import clsx from 'clsx'
-import React from 'react'
+import * as React from 'react'
 
 interface Props {
   active: boolean | null
diff --git a/packages/client/components/CircularProgress.tsx b/packages/client/components/CircularProgress.tsx
index e930d64e298..f7771b32790 100644
--- a/packages/client/components/CircularProgress.tsx
+++ b/packages/client/components/CircularProgress.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {BezierCurve} from '~/types/constEnums'
 
 const SVG = styled('svg')<{radius: number}>(({radius}) => ({
diff --git a/packages/client/components/CommentAuthorOptionsButton.tsx b/packages/client/components/CommentAuthorOptionsButton.tsx
index abb12e18760..216f75ef658 100644
--- a/packages/client/components/CommentAuthorOptionsButton.tsx
+++ b/packages/client/components/CommentAuthorOptionsButton.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {MoreVert} from '@mui/icons-material'
-import React from 'react'
 import {MenuPosition} from '~/hooks/useCoords'
 import useMenu from '~/hooks/useMenu'
 import {PALETTE} from '~/styles/paletteV3'
diff --git a/packages/client/components/CommentAuthorOptionsDropdown.tsx b/packages/client/components/CommentAuthorOptionsDropdown.tsx
index 2470bbc6f13..7e9671a86e5 100644
--- a/packages/client/components/CommentAuthorOptionsDropdown.tsx
+++ b/packages/client/components/CommentAuthorOptionsDropdown.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import DeleteCommentMutation from '~/mutations/DeleteCommentMutation'
 import {MenuProps} from '../hooks/useMenu'
diff --git a/packages/client/components/CommentingStatusText.tsx b/packages/client/components/CommentingStatusText.tsx
index 0454512c531..8a7fc2d3b8a 100644
--- a/packages/client/components/CommentingStatusText.tsx
+++ b/packages/client/components/CommentingStatusText.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {PALETTE} from '../styles/paletteV3'
 import Ellipsis from './Ellipsis/Ellipsis'
 
diff --git a/packages/client/components/Confetti.tsx b/packages/client/components/Confetti.tsx
index 43979979049..6f53e2709d0 100644
--- a/packages/client/components/Confetti.tsx
+++ b/packages/client/components/Confetti.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import DOMConfetti from 'react-dom-confetti'
 import {PALETTE} from '../styles/paletteV3'
 
diff --git a/packages/client/components/CopyLink.tsx b/packages/client/components/CopyLink.tsx
index a6e3fd7b3bb..feba562c5a7 100644
--- a/packages/client/components/CopyLink.tsx
+++ b/packages/client/components/CopyLink.tsx
@@ -1,4 +1,4 @@
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import CopyToClipboard from 'react-copy-to-clipboard'
 import {MenuPosition} from '../hooks/useCoords'
 import useTooltip from '../hooks/useTooltip'
diff --git a/packages/client/components/CreditCardIcon.tsx b/packages/client/components/CreditCardIcon.tsx
index f917d7e6b6a..5206162177b 100644
--- a/packages/client/components/CreditCardIcon.tsx
+++ b/packages/client/components/CreditCardIcon.tsx
@@ -1,6 +1,5 @@
 import {keyframes} from '@emotion/core'
 import styled from '@emotion/styled'
-import React from 'react'
 import ccAmex from '../../../static/images/creditCards/cc-amex-brands.svg'
 import ccDiners from '../../../static/images/creditCards/cc-diners-club-brands.svg'
 import ccDiscover from '../../../static/images/creditCards/cc-discover-brands.svg'
diff --git a/packages/client/components/DashFilterToggle/DashFilterToggle.tsx b/packages/client/components/DashFilterToggle/DashFilterToggle.tsx
index 155621b2ebc..8ee94aa2bbe 100644
--- a/packages/client/components/DashFilterToggle/DashFilterToggle.tsx
+++ b/packages/client/components/DashFilterToggle/DashFilterToggle.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {FilterList, Group, Person} from '@mui/icons-material'
-import React, {Ref, forwardRef} from 'react'
+import {Ref, forwardRef} from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import LinkButton from '../LinkButton'
 
diff --git a/packages/client/components/DashNavControl/DashNavControl.tsx b/packages/client/components/DashNavControl/DashNavControl.tsx
index d82b5ae4c53..30961f21de6 100644
--- a/packages/client/components/DashNavControl/DashNavControl.tsx
+++ b/packages/client/components/DashNavControl/DashNavControl.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {PALETTE} from '../../styles/paletteV3'
 import IconLabel from '../IconLabel'
 import LinkButton from '../LinkButton'
diff --git a/packages/client/components/DashNavList/DashNavList.tsx b/packages/client/components/DashNavList/DashNavList.tsx
index 5515e40a959..5bd00159117 100644
--- a/packages/client/components/DashNavList/DashNavList.tsx
+++ b/packages/client/components/DashNavList/DashNavList.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {ManageAccounts} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {DashNavList_organization$key} from '../../__generated__/DashNavList_organization.graphql'
 import {TierEnum} from '../../__generated__/OrganizationSubscription.graphql'
diff --git a/packages/client/components/DashNavList/DashNavListTeams.tsx b/packages/client/components/DashNavList/DashNavListTeams.tsx
index 39dfba9799b..af2df8dcddc 100644
--- a/packages/client/components/DashNavList/DashNavListTeams.tsx
+++ b/packages/client/components/DashNavList/DashNavListTeams.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {DashNavListTeams_organization$key} from '../../__generated__/DashNavListTeams_organization.graphql'
 import {PALETTE} from '../../styles/paletteV3'
diff --git a/packages/client/components/DashNavList/PublicTeamItem.tsx b/packages/client/components/DashNavList/PublicTeamItem.tsx
index 3fad783ac63..2b4aeb5c3b1 100644
--- a/packages/client/components/DashNavList/PublicTeamItem.tsx
+++ b/packages/client/components/DashNavList/PublicTeamItem.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {PublicTeamItem_team$key} from '../../__generated__/PublicTeamItem_team.graphql'
 import {PushInvitationMutation$data} from '../../__generated__/PushInvitationMutation.graphql'
diff --git a/packages/client/components/DashNavList/PublicTeamsModal.tsx b/packages/client/components/DashNavList/PublicTeamsModal.tsx
index a3e77fe6b57..468a506ee13 100644
--- a/packages/client/components/DashNavList/PublicTeamsModal.tsx
+++ b/packages/client/components/DashNavList/PublicTeamsModal.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
+import {Fragment} from 'react'
 import {useFragment} from 'react-relay'
 import {PublicTeamsModal_team$key} from '../../__generated__/PublicTeamsModal_team.graphql'
 import {Dialog} from '../../ui/Dialog/Dialog'
@@ -40,10 +40,10 @@ const PublicTeamsModal = (props: Props) => {
         </DialogDescription>
         <hr className='my-2 border-t border-slate-300' />
         {publicTeams.map((team, index) => (
-          <React.Fragment key={team.id}>
+          <Fragment key={team.id}>
             <PublicTeamItem teamRef={team} />
             {index < publicTeams.length - 1 && <hr className='my-2 border-t border-slate-300' />}
-          </React.Fragment>
+          </Fragment>
         ))}
       </DialogContent>
     </Dialog>
diff --git a/packages/client/components/DashTopBar.tsx b/packages/client/components/DashTopBar.tsx
index 691afb835db..90162f5c3b9 100644
--- a/packages/client/components/DashTopBar.tsx
+++ b/packages/client/components/DashTopBar.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {Menu} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {DashTopBar_query$key} from '~/__generated__/DashTopBar_query.graphql'
 import useRouter from '~/hooks/useRouter'
diff --git a/packages/client/components/Dashboard.tsx b/packages/client/components/Dashboard.tsx
index a682674599e..f0c33d40c31 100644
--- a/packages/client/components/Dashboard.tsx
+++ b/packages/client/components/Dashboard.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {lazy, useRef} from 'react'
+import {lazy, useRef} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {Route, Switch} from 'react-router'
 import useBreakpoint from '~/hooks/useBreakpoint'
diff --git a/packages/client/components/Dashboard/DashModal.tsx b/packages/client/components/Dashboard/DashModal.tsx
index 0355f87ac64..6f8b8293b4e 100644
--- a/packages/client/components/Dashboard/DashModal.tsx
+++ b/packages/client/components/Dashboard/DashModal.tsx
@@ -1,6 +1,7 @@
 import {keyframes} from '@emotion/core'
 import styled from '@emotion/styled'
-import React, {ReactNode} from 'react'
+import * as React from 'react'
+import {ReactNode} from 'react'
 import {DECELERATE} from '../../styles/animation'
 import {modalShadow} from '../../styles/elevation'
 import {PALETTE} from '../../styles/paletteV3'
diff --git a/packages/client/components/Dashboard/DashSidebar.tsx b/packages/client/components/Dashboard/DashSidebar.tsx
index 4979587e1c4..287f664c9cb 100644
--- a/packages/client/components/Dashboard/DashSidebar.tsx
+++ b/packages/client/components/Dashboard/DashSidebar.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {useRouteMatch} from 'react-router'
 import {DashSidebar_viewer$key} from '../../__generated__/DashSidebar_viewer.graphql'
diff --git a/packages/client/components/Dashboard/LeftDashNavItem.tsx b/packages/client/components/Dashboard/LeftDashNavItem.tsx
index 757dc104e7c..34894df4e76 100644
--- a/packages/client/components/Dashboard/LeftDashNavItem.tsx
+++ b/packages/client/components/Dashboard/LeftDashNavItem.tsx
@@ -17,7 +17,6 @@ import {
   Warning,
   WorkOutline
 } from '@mui/icons-material'
-import React from 'react'
 import {useHistory, useRouteMatch} from 'react-router'
 import PlainButton from '~/components/PlainButton/PlainButton'
 import {PALETTE} from '~/styles/paletteV3'
diff --git a/packages/client/components/Dashboard/LeftDashNavParabol.tsx b/packages/client/components/Dashboard/LeftDashNavParabol.tsx
index f9bd0d68df0..bd9719400ee 100644
--- a/packages/client/components/Dashboard/LeftDashNavParabol.tsx
+++ b/packages/client/components/Dashboard/LeftDashNavParabol.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import PlainButton from '~/components/PlainButton/PlainButton'
 import {PALETTE} from '~/styles/paletteV3'
 import {NavSidebar} from '~/types/constEnums'
diff --git a/packages/client/components/Dashboard/MobileDashSidebar.tsx b/packages/client/components/Dashboard/MobileDashSidebar.tsx
index 1a0898d2932..8b31ea4aea7 100644
--- a/packages/client/components/Dashboard/MobileDashSidebar.tsx
+++ b/packages/client/components/Dashboard/MobileDashSidebar.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {useRouteMatch} from 'react-router'
 import {DashSidebar_viewer$key} from '../../__generated__/DashSidebar_viewer.graphql'
diff --git a/packages/client/components/DashboardAvatars/DashboardAvatar.tsx b/packages/client/components/DashboardAvatars/DashboardAvatar.tsx
index 8046f0ce813..bb9cf06f145 100644
--- a/packages/client/components/DashboardAvatars/DashboardAvatar.tsx
+++ b/packages/client/components/DashboardAvatars/DashboardAvatar.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {DashboardAvatar_teamMember$key} from '../../__generated__/DashboardAvatar_teamMember.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
diff --git a/packages/client/components/DashboardAvatars/DashboardAvatars.tsx b/packages/client/components/DashboardAvatars/DashboardAvatars.tsx
index acfe2337256..01f24a686c2 100644
--- a/packages/client/components/DashboardAvatars/DashboardAvatars.tsx
+++ b/packages/client/components/DashboardAvatars/DashboardAvatars.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {Breakpoint, ElementHeight, ElementWidth} from '~/types/constEnums'
 import fromTeamMemberId from '~/utils/relay/fromTeamMemberId'
diff --git a/packages/client/components/DashboardAvatars/TeamMemberAvatarMenu.tsx b/packages/client/components/DashboardAvatars/TeamMemberAvatarMenu.tsx
index 5433494085e..5d0cfccf913 100644
--- a/packages/client/components/DashboardAvatars/TeamMemberAvatarMenu.tsx
+++ b/packages/client/components/DashboardAvatars/TeamMemberAvatarMenu.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {TeamMemberAvatarMenu_teamMember$key} from '../../__generated__/TeamMemberAvatarMenu_teamMember.graphql'
diff --git a/packages/client/components/DashboardRoot.tsx b/packages/client/components/DashboardRoot.tsx
index e2366c7d517..3f6ca5029de 100644
--- a/packages/client/components/DashboardRoot.tsx
+++ b/packages/client/components/DashboardRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {withRouter} from 'react-router-dom'
 import dashboardQuery, {DashboardQuery} from '../__generated__/DashboardQuery.graphql'
 import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
diff --git a/packages/client/components/DeckActivityAvatars.tsx b/packages/client/components/DeckActivityAvatars.tsx
index 3f1c104a3db..876cddf43f6 100644
--- a/packages/client/components/DeckActivityAvatars.tsx
+++ b/packages/client/components/DeckActivityAvatars.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {DeckActivityAvatars_stage$key} from '../__generated__/DeckActivityAvatars_stage.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/DelayUnmount.tsx b/packages/client/components/DelayUnmount.tsx
index 87e44adbeb6..9ce576e423c 100644
--- a/packages/client/components/DelayUnmount.tsx
+++ b/packages/client/components/DelayUnmount.tsx
@@ -1,4 +1,4 @@
-import React, {Component, ComponentClass, ReactNode} from 'react'
+import {Component, ComponentClass, ReactNode} from 'react'
 import DelayUnmountShrinkAndScale from './DelayUnmountShrinkAndScale'
 
 enum TransitionState {
diff --git a/packages/client/components/DeleteAccount.tsx b/packages/client/components/DeleteAccount.tsx
index 16f09d7b419..15ed192b021 100644
--- a/packages/client/components/DeleteAccount.tsx
+++ b/packages/client/components/DeleteAccount.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import useModal from '../hooks/useModal'
 import {PALETTE} from '../styles/paletteV3'
 import lazyPreload from '../utils/lazyPreload'
diff --git a/packages/client/components/DeleteAccountModal.tsx b/packages/client/components/DeleteAccountModal.tsx
index 96d128bfc36..abf7b65bcb0 100644
--- a/packages/client/components/DeleteAccountModal.tsx
+++ b/packages/client/components/DeleteAccountModal.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
-import React, {useState} from 'react'
+import * as React from 'react'
+import {useState} from 'react'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import DeleteUserMutation from '../mutations/DeleteUserMutation'
 import {ExternalLinks, LocalStorageKey} from '../types/constEnums'
diff --git a/packages/client/components/DeleteTeamDialog.tsx b/packages/client/components/DeleteTeamDialog.tsx
index d940674c070..503297af300 100644
--- a/packages/client/components/DeleteTeamDialog.tsx
+++ b/packages/client/components/DeleteTeamDialog.tsx
@@ -1,4 +1,4 @@
-import React, {useState} from 'react'
+import {useState} from 'react'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import useRouter from '../hooks/useRouter'
diff --git a/packages/client/components/DemoCreateAccountButton.tsx b/packages/client/components/DemoCreateAccountButton.tsx
index 38ee035222c..be92a5b3462 100644
--- a/packages/client/components/DemoCreateAccountButton.tsx
+++ b/packages/client/components/DemoCreateAccountButton.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {RouteComponentProps, withRouter} from 'react-router-dom'
 import useBreakpoint from '../hooks/useBreakpoint'
 import {meetingAvatarMediaQueries} from '../styles/meeting'
diff --git a/packages/client/components/DemoCreateAccountPrimaryButton.tsx b/packages/client/components/DemoCreateAccountPrimaryButton.tsx
index bde84c52a45..6d5c397d1ec 100644
--- a/packages/client/components/DemoCreateAccountPrimaryButton.tsx
+++ b/packages/client/components/DemoCreateAccountPrimaryButton.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import {RouteComponentProps, withRouter} from 'react-router-dom'
 import hasToken from '../utils/hasToken'
 import PrimaryButton from './PrimaryButton'
diff --git a/packages/client/components/DemoMeeting.tsx b/packages/client/components/DemoMeeting.tsx
index dc90e3a5f69..95666444147 100644
--- a/packages/client/components/DemoMeeting.tsx
+++ b/packages/client/components/DemoMeeting.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import useCanonical from '~/hooks/useCanonical'
 import useMetaTagContent from '../hooks/useMetaTagContent'
 import AtmosphereProvider from './AtmosphereProvider/AtmosphereProvider'
diff --git a/packages/client/components/DemoMeetingCard.tsx b/packages/client/components/DemoMeetingCard.tsx
index 36892c5c372..8e7b80d77ab 100644
--- a/packages/client/components/DemoMeetingCard.tsx
+++ b/packages/client/components/DemoMeetingCard.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {useCallback} from 'react'
+import {useCallback} from 'react'
 import {Link} from 'react-router-dom'
 import retrospective from '../../../static/images/illustrations/retrospective.png'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/DemoMeetingRoot.tsx b/packages/client/components/DemoMeetingRoot.tsx
index 932301106e5..58e51d75ec6 100644
--- a/packages/client/components/DemoMeetingRoot.tsx
+++ b/packages/client/components/DemoMeetingRoot.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useLazyLoadQuery} from 'react-relay'
 import MeetingSubscription from '~/subscriptions/MeetingSubscription'
 import {DemoMeetingRootQuery} from '../__generated__/DemoMeetingRootQuery.graphql'
diff --git a/packages/client/components/DemoSummary.tsx b/packages/client/components/DemoSummary.tsx
index ce3ab0c4fae..d6867b6d087 100644
--- a/packages/client/components/DemoSummary.tsx
+++ b/packages/client/components/DemoSummary.tsx
@@ -1,4 +1,4 @@
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import useCanonical from '~/hooks/useCanonical'
 import NewMeetingSummaryRoot from '../modules/summary/components/NewMeetingSummaryRoot'
 import AtmosphereProvider from './AtmosphereProvider/AtmosphereProvider'
diff --git a/packages/client/components/DetailAction.tsx b/packages/client/components/DetailAction.tsx
index d804372bee3..a90e058ee25 100644
--- a/packages/client/components/DetailAction.tsx
+++ b/packages/client/components/DetailAction.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {ContentCopy, Delete, Edit} from '@mui/icons-material'
-import React from 'react'
+import * as React from 'react'
 import {MenuPosition} from '../hooks/useCoords'
 import useTooltip from '../hooks/useTooltip'
 import {PALETTE} from '../styles/paletteV3'
diff --git a/packages/client/components/DiscussPhaseReflectionGrid.tsx b/packages/client/components/DiscussPhaseReflectionGrid.tsx
index 0189bc882ee..dbe6b559dde 100644
--- a/packages/client/components/DiscussPhaseReflectionGrid.tsx
+++ b/packages/client/components/DiscussPhaseReflectionGrid.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useRef} from 'react'
+import {useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {DiscussPhaseReflectionGrid_meeting$key} from '~/__generated__/DiscussPhaseReflectionGrid_meeting.graphql'
 import {useCoverable} from '~/hooks/useControlBarCovers'
diff --git a/packages/client/components/DiscussPhaseSqueeze.tsx b/packages/client/components/DiscussPhaseSqueeze.tsx
index 523b541a6be..2653f78ffa4 100644
--- a/packages/client/components/DiscussPhaseSqueeze.tsx
+++ b/packages/client/components/DiscussPhaseSqueeze.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {DiscussPhaseSqueeze_meeting$key} from '~/__generated__/DiscussPhaseSqueeze_meeting.graphql'
 import {DiscussPhaseSqueeze_organization$key} from '~/__generated__/DiscussPhaseSqueeze_organization.graphql'
diff --git a/packages/client/components/DiscussionMentioned.tsx b/packages/client/components/DiscussionMentioned.tsx
index 1fd1cab6386..14159daca1e 100644
--- a/packages/client/components/DiscussionMentioned.tsx
+++ b/packages/client/components/DiscussionMentioned.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import {Editor} from 'draft-js'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import NotificationAction from '~/components/NotificationAction'
 import {DiscussionMentioned_notification$key} from '../__generated__/DiscussionMentioned_notification.graphql'
diff --git a/packages/client/components/DiscussionThread.tsx b/packages/client/components/DiscussionThread.tsx
index 35b400a19e5..812a820e67d 100644
--- a/packages/client/components/DiscussionThread.tsx
+++ b/packages/client/components/DiscussionThread.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {ReactNode, RefObject, useMemo, useRef} from 'react'
+import {ReactNode, RefObject, useMemo, useRef} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {useCoverable} from '~/hooks/useControlBarCovers'
diff --git a/packages/client/components/DiscussionThreadInput.tsx b/packages/client/components/DiscussionThreadInput.tsx
index c9ed94f2e90..b7bc37ad395 100644
--- a/packages/client/components/DiscussionThreadInput.tsx
+++ b/packages/client/components/DiscussionThreadInput.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import {ContentState, convertToRaw, EditorState} from 'draft-js'
-import React, {forwardRef, RefObject, useEffect, useState} from 'react'
+import {forwardRef, RefObject, useEffect, useState} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {DiscussionThreadInput_discussion$key} from '~/__generated__/DiscussionThreadInput_discussion.graphql'
 import {DiscussionThreadInput_viewer$key} from '~/__generated__/DiscussionThreadInput_viewer.graphql'
diff --git a/packages/client/components/DiscussionThreadList.tsx b/packages/client/components/DiscussionThreadList.tsx
index e13fa04e9df..ff1fe0034bf 100644
--- a/packages/client/components/DiscussionThreadList.tsx
+++ b/packages/client/components/DiscussionThreadList.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {forwardRef, ReactNode, RefObject} from 'react'
+import {forwardRef, ReactNode, RefObject} from 'react'
 import {useFragment} from 'react-relay'
 import {DiscussionThreadList_discussion$key} from '~/__generated__/DiscussionThreadList_discussion.graphql'
 import {DiscussionThreadList_threadables$key} from '~/__generated__/DiscussionThreadList_threadables.graphql'
diff --git a/packages/client/components/DiscussionThreadListEmptyState.tsx b/packages/client/components/DiscussionThreadListEmptyState.tsx
index 73b7c826b35..ad93c002b9d 100644
--- a/packages/client/components/DiscussionThreadListEmptyState.tsx
+++ b/packages/client/components/DiscussionThreadListEmptyState.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery'
 import EmptyDiscussionIllustration from '../../../static/images/illustrations/discussions.png'
diff --git a/packages/client/components/DiscussionThreadListEmptyTranscriptState.tsx b/packages/client/components/DiscussionThreadListEmptyTranscriptState.tsx
index c9b7a53a874..42649e6b3f8 100644
--- a/packages/client/components/DiscussionThreadListEmptyTranscriptState.tsx
+++ b/packages/client/components/DiscussionThreadListEmptyTranscriptState.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {DiscussionThreadListEmptyTranscriptState_meeting$key} from '~/__generated__/DiscussionThreadListEmptyTranscriptState_meeting.graphql'
 import {PALETTE} from '~/styles/paletteV3'
diff --git a/packages/client/components/DiscussionThreadRoot.tsx b/packages/client/components/DiscussionThreadRoot.tsx
index d7d7d0d011d..12291ac3075 100644
--- a/packages/client/components/DiscussionThreadRoot.tsx
+++ b/packages/client/components/DiscussionThreadRoot.tsx
@@ -1,4 +1,4 @@
-import React, {ReactNode, RefObject, Suspense} from 'react'
+import {ReactNode, RefObject, Suspense} from 'react'
 import discussionThreadQuery, {
   DiscussionThreadQuery
 } from '../__generated__/DiscussionThreadQuery.graphql'
diff --git a/packages/client/components/DropdownMenuIconItemLabel.tsx b/packages/client/components/DropdownMenuIconItemLabel.tsx
index 8771daf51ec..4e25dce399c 100644
--- a/packages/client/components/DropdownMenuIconItemLabel.tsx
+++ b/packages/client/components/DropdownMenuIconItemLabel.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {Business, Group, Public} from '@mui/icons-material'
-import React from 'react'
 import {PALETTE} from '../styles/paletteV3'
 
 const Label = styled('span')({
diff --git a/packages/client/components/DropdownMenuToggle.tsx b/packages/client/components/DropdownMenuToggle.tsx
index 03f94b5e093..4a7bd26a158 100644
--- a/packages/client/components/DropdownMenuToggle.tsx
+++ b/packages/client/components/DropdownMenuToggle.tsx
@@ -1,7 +1,7 @@
 /* DEPRECATED. SEE DropdownToggleV2 */
 import styled from '@emotion/styled'
 import {ExpandMore} from '@mui/icons-material'
-import React, {forwardRef, ReactElement, Ref} from 'react'
+import {forwardRef, ReactElement, Ref} from 'react'
 import useMenu from '../hooks/useMenu'
 import makeFieldColorPalette from '../styles/helpers/makeFieldColorPalette'
 import {PALETTE} from '../styles/paletteV3'
diff --git a/packages/client/components/DueDatePicker.tsx b/packages/client/components/DueDatePicker.tsx
index 62544916bbe..1c961aaf268 100644
--- a/packages/client/components/DueDatePicker.tsx
+++ b/packages/client/components/DueDatePicker.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {DayModifiers, DayPicker} from 'react-day-picker'
 import {useFragment} from 'react-relay'
 import {DueDatePicker_task$key} from '../__generated__/DueDatePicker_task.graphql'
diff --git a/packages/client/components/DueDateToggle.tsx b/packages/client/components/DueDateToggle.tsx
index 049c918713c..24ad73f8477 100644
--- a/packages/client/components/DueDateToggle.tsx
+++ b/packages/client/components/DueDateToggle.tsx
@@ -2,7 +2,6 @@ import styled from '@emotion/styled'
 import {AccessTime} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import ms from 'ms'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useTooltip from '~/hooks/useTooltip'
 import {DueDateToggle_task$key} from '../__generated__/DueDateToggle_task.graphql'
diff --git a/packages/client/components/EditGitHubLabelTemplateModal.tsx b/packages/client/components/EditGitHubLabelTemplateModal.tsx
index 92dd6fd1257..8f1b32464a9 100644
--- a/packages/client/components/EditGitHubLabelTemplateModal.tsx
+++ b/packages/client/components/EditGitHubLabelTemplateModal.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import useForm from '../hooks/useForm'
 import DialogContainer from './DialogContainer'
diff --git a/packages/client/components/EditableAvatar/EditableAvatar.tsx b/packages/client/components/EditableAvatar/EditableAvatar.tsx
index b9f118b9e53..84a4add6127 100644
--- a/packages/client/components/EditableAvatar/EditableAvatar.tsx
+++ b/packages/client/components/EditableAvatar/EditableAvatar.tsx
@@ -1,6 +1,5 @@
 import {Edit as EditIcon} from '@mui/icons-material'
 import clsx from 'clsx'
-import React from 'react'
 import Avatar from '../Avatar/Avatar'
 
 interface Props {
diff --git a/packages/client/components/EditableOrgName.tsx b/packages/client/components/EditableOrgName.tsx
index 2bcde367f44..5e2a5e16299 100644
--- a/packages/client/components/EditableOrgName.tsx
+++ b/packages/client/components/EditableOrgName.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {EditableOrgName_organization$key} from '../__generated__/EditableOrgName_organization.graphql'
diff --git a/packages/client/components/EditableText.tsx b/packages/client/components/EditableText.tsx
index 747bef428c4..8436ad1246d 100644
--- a/packages/client/components/EditableText.tsx
+++ b/packages/client/components/EditableText.tsx
@@ -1,6 +1,7 @@
 import styled from '@emotion/styled'
 import {Edit} from '@mui/icons-material'
-import React, {forwardRef, useEffect, useRef, useState} from 'react'
+import * as React from 'react'
+import {forwardRef, useEffect, useRef, useState} from 'react'
 import TextAreaAutoSize from 'react-textarea-autosize'
 import {PALETTE} from '../styles/paletteV3'
 import {FONT_FAMILY} from '../styles/typographyV2'
diff --git a/packages/client/components/EditingStatus/EditingStatus.tsx b/packages/client/components/EditingStatus/EditingStatus.tsx
index 34b89a41a0d..e30e81e34fb 100644
--- a/packages/client/components/EditingStatus/EditingStatus.tsx
+++ b/packages/client/components/EditingStatus/EditingStatus.tsx
@@ -1,6 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {ReactNode, useState} from 'react'
+import * as React from 'react'
+import {ReactNode, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {EditingStatus_task$key} from '~/__generated__/EditingStatus_task.graphql'
 import {MenuPosition} from '~/hooks/useCoords'
diff --git a/packages/client/components/EditingStatus/EditingStatusText.tsx b/packages/client/components/EditingStatus/EditingStatusText.tsx
index 594bf5d38d8..7d95616abe6 100644
--- a/packages/client/components/EditingStatus/EditingStatusText.tsx
+++ b/packages/client/components/EditingStatus/EditingStatusText.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {useCallback, useEffect, useRef, useState} from 'react'
+import {useCallback, useEffect, useRef, useState} from 'react'
 import relativeDate from '../../utils/date/relativeDate'
 import getRefreshPeriod from '../../utils/getRefreshPeriod'
 import Ellipsis from '../Ellipsis/Ellipsis'
diff --git a/packages/client/components/EditorHelpModal/EditorHelpModal.tsx b/packages/client/components/EditorHelpModal/EditorHelpModal.tsx
index 58021713021..b91c9412341 100644
--- a/packages/client/components/EditorHelpModal/EditorHelpModal.tsx
+++ b/packages/client/components/EditorHelpModal/EditorHelpModal.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import UserAgent from 'fbjs/lib/UserAgent'
-import React from 'react'
 import {PALETTE} from '../../styles/paletteV3'
 import {Radius} from '../../types/constEnums'
 import IconButton from '../IconButton'
diff --git a/packages/client/components/EditorInputWrapper.tsx b/packages/client/components/EditorInputWrapper.tsx
index f1ac2701673..df19f1e0763 100644
--- a/packages/client/components/EditorInputWrapper.tsx
+++ b/packages/client/components/EditorInputWrapper.tsx
@@ -7,7 +7,8 @@ import {
   EditorState,
   getDefaultKeyBinding
 } from 'draft-js'
-import React, {MutableRefObject, Suspense, useRef} from 'react'
+import * as React from 'react'
+import {MutableRefObject, Suspense, useRef} from 'react'
 import useKeyboardShortcuts from '../hooks/useKeyboardShortcuts'
 import useMarkdown from '../hooks/useMarkdown'
 import {SetEditorState} from '../types/draft'
diff --git a/packages/client/components/EditorLinkChanger/EditorLinkChangerDraftjs.tsx b/packages/client/components/EditorLinkChanger/EditorLinkChangerDraftjs.tsx
index 78eaf17fc68..c50363c2008 100644
--- a/packages/client/components/EditorLinkChanger/EditorLinkChangerDraftjs.tsx
+++ b/packages/client/components/EditorLinkChanger/EditorLinkChangerDraftjs.tsx
@@ -1,5 +1,5 @@
 import {ContentState, EditorState, Modifier, SelectionState} from 'draft-js'
-import React, {RefObject} from 'react'
+import {RefObject} from 'react'
 import {UseTaskChild} from '../../hooks/useTaskChildFocus'
 import {BBox} from '../../types/animations'
 import completeEntity from '../../utils/draftjs/completeEntity'
diff --git a/packages/client/components/EditorLinkChanger/EditorLinkChangerModal.tsx b/packages/client/components/EditorLinkChanger/EditorLinkChangerModal.tsx
index 8df07d7a530..748e5f5955a 100644
--- a/packages/client/components/EditorLinkChanger/EditorLinkChangerModal.tsx
+++ b/packages/client/components/EditorLinkChanger/EditorLinkChangerModal.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
-import React, {useEffect} from 'react'
+import * as React from 'react'
+import {useEffect} from 'react'
 import {MenuPosition} from '../../hooks/useCoords'
 import useForm from '../../hooks/useForm'
 import useMenu from '../../hooks/useMenu'
diff --git a/packages/client/components/EditorLinkChanger/EditorLinkChangerTipTap.tsx b/packages/client/components/EditorLinkChanger/EditorLinkChangerTipTap.tsx
index 5101445ac4e..0a3f8f1d2c5 100644
--- a/packages/client/components/EditorLinkChanger/EditorLinkChangerTipTap.tsx
+++ b/packages/client/components/EditorLinkChanger/EditorLinkChangerTipTap.tsx
@@ -1,5 +1,5 @@
 import {Editor} from '@tiptap/react'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {BBox} from '~/types/animations'
 import EditorLinkChangerModal from './EditorLinkChangerModal'
 
diff --git a/packages/client/components/EditorLinkViewer/EditorLinkViewer.tsx b/packages/client/components/EditorLinkViewer/EditorLinkViewer.tsx
index 707eb37ac3b..92319c56d10 100644
--- a/packages/client/components/EditorLinkViewer/EditorLinkViewer.tsx
+++ b/packages/client/components/EditorLinkViewer/EditorLinkViewer.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {MenuPosition} from '../../hooks/useCoords'
 import useMenu from '../../hooks/useMenu'
 import textOverflow from '../../styles/helpers/textOverflow'
diff --git a/packages/client/components/EditorLinkViewer/EditorLinkViewerDraft.tsx b/packages/client/components/EditorLinkViewer/EditorLinkViewerDraft.tsx
index 0af383decb4..fa33f17ee4a 100644
--- a/packages/client/components/EditorLinkViewer/EditorLinkViewerDraft.tsx
+++ b/packages/client/components/EditorLinkViewer/EditorLinkViewerDraft.tsx
@@ -1,5 +1,4 @@
 import {EditorState} from 'draft-js'
-import React from 'react'
 import {BBox} from '../../types/animations'
 import removeLink from '../../utils/draftjs/removeLink'
 import EditorLinkViewer from './EditorLinkViewer'
diff --git a/packages/client/components/EditorLinkViewer/EditorLinkViewerTipTap.tsx b/packages/client/components/EditorLinkViewer/EditorLinkViewerTipTap.tsx
index 056595acfb3..e87a693876b 100644
--- a/packages/client/components/EditorLinkViewer/EditorLinkViewerTipTap.tsx
+++ b/packages/client/components/EditorLinkViewer/EditorLinkViewerTipTap.tsx
@@ -1,5 +1,4 @@
 import {Editor} from '@tiptap/react'
-import React from 'react'
 import {BBox} from '../../types/animations'
 import EditorLinkViewer from './EditorLinkViewer'
 
diff --git a/packages/client/components/EditorSuggestions/EditorSuggestions.tsx b/packages/client/components/EditorSuggestions/EditorSuggestions.tsx
index dc519af891d..097527d5dee 100644
--- a/packages/client/components/EditorSuggestions/EditorSuggestions.tsx
+++ b/packages/client/components/EditorSuggestions/EditorSuggestions.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
-import React, {useLayoutEffect} from 'react'
+import * as React from 'react'
+import {useLayoutEffect} from 'react'
 import {MenuPosition} from '../../hooks/useCoords'
 import useMenu from '../../hooks/useMenu'
 import {PALETTE} from '../../styles/paletteV3'
diff --git a/packages/client/components/Ellipsis/Ellipsis.tsx b/packages/client/components/Ellipsis/Ellipsis.tsx
index a5de77b3982..f55a33d5c95 100644
--- a/packages/client/components/Ellipsis/Ellipsis.tsx
+++ b/packages/client/components/Ellipsis/Ellipsis.tsx
@@ -1,6 +1,5 @@
 import {keyframes} from '@emotion/core'
 import styled from '@emotion/styled'
-import React from 'react'
 
 const keyframesOpacity = keyframes`
   0% {
diff --git a/packages/client/components/EmailInputField.tsx b/packages/client/components/EmailInputField.tsx
index 6f981fd7f18..4e431623e68 100644
--- a/packages/client/components/EmailInputField.tsx
+++ b/packages/client/components/EmailInputField.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React from 'react'
+import * as React from 'react'
 import UnderlineInput from './InputField/UnderlineInput'
 import TinyLabel from './TinyLabel'
 
diff --git a/packages/client/components/EmailNotifications.tsx b/packages/client/components/EmailNotifications.tsx
index 077bd47ea45..06e0ed543eb 100644
--- a/packages/client/components/EmailNotifications.tsx
+++ b/packages/client/components/EmailNotifications.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {EmailNotifications_viewer$key} from '../__generated__/EmailNotifications_viewer.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/EmailPasswordAuthForm.tsx b/packages/client/components/EmailPasswordAuthForm.tsx
index 0a473a05dff..7c64424bff9 100644
--- a/packages/client/components/EmailPasswordAuthForm.tsx
+++ b/packages/client/components/EmailPasswordAuthForm.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
-import React, {forwardRef, useEffect, useImperativeHandle, useState} from 'react'
+import * as React from 'react'
+import {forwardRef, useEffect, useImperativeHandle, useState} from 'react'
 import Atmosphere from '../Atmosphere'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useForm from '../hooks/useForm'
diff --git a/packages/client/components/EmojiMenu.tsx b/packages/client/components/EmojiMenu.tsx
index 96f61e803cf..42975dde591 100644
--- a/packages/client/components/EmojiMenu.tsx
+++ b/packages/client/components/EmojiMenu.tsx
@@ -1,4 +1,4 @@
-import React, {Component, Ref} from 'react'
+import {Component, Ref} from 'react'
 import stringScore from 'string-score'
 import {MenuProps} from '../hooks/useMenu'
 import emojiArray from '../utils/emojiArray'
diff --git a/packages/client/components/EndMeetingButton.tsx b/packages/client/components/EndMeetingButton.tsx
index 5d11883ab68..ce04aba2ba2 100644
--- a/packages/client/components/EndMeetingButton.tsx
+++ b/packages/client/components/EndMeetingButton.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {Flag} from '@mui/icons-material'
-import React, {forwardRef, Ref} from 'react'
+import {forwardRef, Ref} from 'react'
 import {TransitionStatus} from '~/hooks/useTransition'
 import EndCheckInMutation from '~/mutations/EndCheckInMutation'
 import EndRetrospectiveMutation from '~/mutations/EndRetrospectiveMutation'
diff --git a/packages/client/components/ErrorAlert/ErrorAlert.tsx b/packages/client/components/ErrorAlert/ErrorAlert.tsx
index b12d9164062..b5f8cb29acb 100644
--- a/packages/client/components/ErrorAlert/ErrorAlert.tsx
+++ b/packages/client/components/ErrorAlert/ErrorAlert.tsx
@@ -6,7 +6,6 @@
  */
 import styled from '@emotion/styled'
 import {Warning} from '@mui/icons-material'
-import React from 'react'
 import {PALETTE} from '../../styles/paletteV3'
 import {Radius} from '../../types/constEnums'
 
diff --git a/packages/client/components/ErrorBoundary.tsx b/packages/client/components/ErrorBoundary.tsx
index a7cf73a5583..e6ead94dbcd 100644
--- a/packages/client/components/ErrorBoundary.tsx
+++ b/packages/client/components/ErrorBoundary.tsx
@@ -1,5 +1,5 @@
 import * as Sentry from '@sentry/browser'
-import React, {Component, ErrorInfo, ReactNode} from 'react'
+import {Component, ErrorInfo, ReactNode} from 'react'
 import Atmosphere from '~/Atmosphere'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import SendClientSideEvent from '~/utils/SendClientSideEvent'
diff --git a/packages/client/components/ErrorComponent/ErrorComponent.tsx b/packages/client/components/ErrorComponent/ErrorComponent.tsx
index 2feb391a3b0..84b27fff344 100644
--- a/packages/client/components/ErrorComponent/ErrorComponent.tsx
+++ b/packages/client/components/ErrorComponent/ErrorComponent.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import PrimaryButton from '~/components/PrimaryButton'
 import ReportErrorFeedback from '~/components/ReportErrorFeedback'
 import useModal from '~/hooks/useModal'
diff --git a/packages/client/components/EstimateDimensionColumn.tsx b/packages/client/components/EstimateDimensionColumn.tsx
index 2bd2ae39fa1..757d45ff02f 100644
--- a/packages/client/components/EstimateDimensionColumn.tsx
+++ b/packages/client/components/EstimateDimensionColumn.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useMutationProps from '~/hooks/useMutationProps'
 import {EstimateDimensionColumn_meeting$key} from '../__generated__/EstimateDimensionColumn_meeting.graphql'
diff --git a/packages/client/components/EstimatePhaseArea.tsx b/packages/client/components/EstimatePhaseArea.tsx
index 2af1cfdf9ca..3b15182c11e 100644
--- a/packages/client/components/EstimatePhaseArea.tsx
+++ b/packages/client/components/EstimatePhaseArea.tsx
@@ -1,6 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useRef} from 'react'
+import * as React from 'react'
+import {useRef} from 'react'
 import {useFragment} from 'react-relay'
 import SwipeableViews from 'react-swipeable-views'
 import {EstimatePhaseArea_meeting$key} from '~/__generated__/EstimatePhaseArea_meeting.graphql'
diff --git a/packages/client/components/EstimatePhaseDiscussionDrawer.tsx b/packages/client/components/EstimatePhaseDiscussionDrawer.tsx
index e8cfd92bfbe..03f80f22576 100644
--- a/packages/client/components/EstimatePhaseDiscussionDrawer.tsx
+++ b/packages/client/components/EstimatePhaseDiscussionDrawer.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {Close} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {EstimatePhaseDiscussionDrawer_meeting$key} from '~/__generated__/EstimatePhaseDiscussionDrawer_meeting.graphql'
 import {desktopSidebarShadow} from '~/styles/elevation'
diff --git a/packages/client/components/EstimatePhaseEmptyState.tsx b/packages/client/components/EstimatePhaseEmptyState.tsx
index 8bbe5a6c8af..a527f815699 100644
--- a/packages/client/components/EstimatePhaseEmptyState.tsx
+++ b/packages/client/components/EstimatePhaseEmptyState.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import MeetingCopy from '~/modules/meeting/components/MeetingCopy/MeetingCopy'
 import MeetingPhaseHeading from '~/modules/meeting/components/MeetingPhaseHeading/MeetingPhaseHeading'
 import StyledLink from './StyledLink'
diff --git a/packages/client/components/EventTypeFilterMenuItemLabel.tsx b/packages/client/components/EventTypeFilterMenuItemLabel.tsx
index 6455726166d..b8702040115 100644
--- a/packages/client/components/EventTypeFilterMenuItemLabel.tsx
+++ b/packages/client/components/EventTypeFilterMenuItemLabel.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import {TimelineEventEnum} from '../__generated__/MyDashboardTimelineQuery.graphql'
 import {FilterLabels} from '../types/constEnums'
 import {
diff --git a/packages/client/components/ExportToCSVButton.tsx b/packages/client/components/ExportToCSVButton.tsx
index 05193f57939..ad11c197349 100644
--- a/packages/client/components/ExportToCSVButton.tsx
+++ b/packages/client/components/ExportToCSVButton.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
-import React from 'react'
 import {ExternalLinks} from '../types/constEnums'
 import {CorsOptions} from '../types/cors'
 import PlainButton from './PlainButton/PlainButton'
diff --git a/packages/client/components/ExternalLink.tsx b/packages/client/components/ExternalLink.tsx
index c00c031aee8..1dd3a58dae9 100644
--- a/packages/client/components/ExternalLink.tsx
+++ b/packages/client/components/ExternalLink.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 export interface ExternalLinkProps {
   className?: string
   copy: string
diff --git a/packages/client/components/Facilitator.tsx b/packages/client/components/Facilitator.tsx
index 6dda905aa63..c094e696f2e 100644
--- a/packages/client/components/Facilitator.tsx
+++ b/packages/client/components/Facilitator.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {MoreVert} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {Facilitator_meeting$key} from '~/__generated__/Facilitator_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/FacilitatorMenu.tsx b/packages/client/components/FacilitatorMenu.tsx
index 4a6322d4d26..3e780c74ceb 100644
--- a/packages/client/components/FacilitatorMenu.tsx
+++ b/packages/client/components/FacilitatorMenu.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {FacilitatorMenu_meeting$key} from '../__generated__/FacilitatorMenu_meeting.graphql'
 import Menu from '../components/Menu'
diff --git a/packages/client/components/FieldLabel/FieldLabel.tsx b/packages/client/components/FieldLabel/FieldLabel.tsx
index 8acbd74906b..4b90237a570 100644
--- a/packages/client/components/FieldLabel/FieldLabel.tsx
+++ b/packages/client/components/FieldLabel/FieldLabel.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import ui from '../../styles/ui'
 import LabelHeading from '../LabelHeading/LabelHeading'
 
diff --git a/packages/client/components/FilterButton.tsx b/packages/client/components/FilterButton.tsx
index 16ea10bb0e4..35597d01062 100644
--- a/packages/client/components/FilterButton.tsx
+++ b/packages/client/components/FilterButton.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {FilterList} from '@mui/icons-material'
-import React, {forwardRef, Ref} from 'react'
+import {forwardRef, Ref} from 'react'
 import {PALETTE} from '../styles/paletteV3'
 import FlatButton from './FlatButton'
 
diff --git a/packages/client/components/FlatButton.tsx b/packages/client/components/FlatButton.tsx
index aec45c11895..b21b5fd36c1 100644
--- a/packages/client/components/FlatButton.tsx
+++ b/packages/client/components/FlatButton.tsx
@@ -1,6 +1,7 @@
 // DEPRECATED use packages/client/ui/Button/Button.tsx with variant='flat'
 import styled from '@emotion/styled'
-import React, {ReactNode} from 'react'
+import * as React from 'react'
+import {ReactNode} from 'react'
 import {PALETTE} from '../styles/paletteV3'
 import {Radius} from '../types/constEnums'
 import BaseButton, {BaseButtonProps} from './BaseButton'
diff --git a/packages/client/components/FlatPrimaryButton.tsx b/packages/client/components/FlatPrimaryButton.tsx
index 54a52603720..846531f20d6 100644
--- a/packages/client/components/FlatPrimaryButton.tsx
+++ b/packages/client/components/FlatPrimaryButton.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import {Radius} from '~/types/constEnums'
 import BaseButton, {BaseButtonProps} from './BaseButton'
diff --git a/packages/client/components/FloatingActionButton.tsx b/packages/client/components/FloatingActionButton.tsx
index de241f90bdf..da41043d80e 100644
--- a/packages/client/components/FloatingActionButton.tsx
+++ b/packages/client/components/FloatingActionButton.tsx
@@ -1,4 +1,4 @@
-import React, {forwardRef, Ref} from 'react'
+import {forwardRef, Ref} from 'react'
 import {Elevation} from '../styles/elevation'
 import RaisedButton, {RaisedButtonProps} from './RaisedButton'
 
diff --git a/packages/client/components/ForgotPasswordOneClick.tsx b/packages/client/components/ForgotPasswordOneClick.tsx
index f169888af18..bfc97b82317 100644
--- a/packages/client/components/ForgotPasswordOneClick.tsx
+++ b/packages/client/components/ForgotPasswordOneClick.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useMutationProps from '~/hooks/useMutationProps'
 import EmailPasswordResetMutation from '~/mutations/EmailPasswordResetMutation'
diff --git a/packages/client/components/ForgotPasswordPage.tsx b/packages/client/components/ForgotPasswordPage.tsx
index 2cd4ba87514..acbb6aad51e 100644
--- a/packages/client/components/ForgotPasswordPage.tsx
+++ b/packages/client/components/ForgotPasswordPage.tsx
@@ -3,7 +3,7 @@
  *
  */
 import styled from '@emotion/styled'
-import React from 'react'
+import * as React from 'react'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useForm from '../hooks/useForm'
 import useMutationProps from '../hooks/useMutationProps'
diff --git a/packages/client/components/GcalConfigMenu.tsx b/packages/client/components/GcalConfigMenu.tsx
index f003f495621..41bfdaaa5b1 100644
--- a/packages/client/components/GcalConfigMenu.tsx
+++ b/packages/client/components/GcalConfigMenu.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuProps} from '../hooks/useMenu'
 import {MenuMutationProps} from '../hooks/useMutationProps'
diff --git a/packages/client/components/GenericAuthentication.tsx b/packages/client/components/GenericAuthentication.tsx
index f790c4eeadc..64aca2b20e4 100644
--- a/packages/client/components/GenericAuthentication.tsx
+++ b/packages/client/components/GenericAuthentication.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {useRef} from 'react'
+import {useRef} from 'react'
 import useRouter from '../hooks/useRouter'
 import {ForgotPasswordResType} from '../mutations/EmailPasswordResetMutation'
 import {PALETTE} from '../styles/paletteV3'
diff --git a/packages/client/components/GiftSVG.tsx b/packages/client/components/GiftSVG.tsx
index 722510fc3e6..f08f42bc869 100644
--- a/packages/client/components/GiftSVG.tsx
+++ b/packages/client/components/GiftSVG.tsx
@@ -1,7 +1,7 @@
 import {PALETTE} from 'parabol-client/styles/paletteV3'
-import React from 'react'
+import {memo} from 'react'
 
-const GiftSVG = React.memo(() => {
+const GiftSVG = memo(() => {
   return (
     <svg
       xmlns='http://www.w3.org/2000/svg'
diff --git a/packages/client/components/GitHubConfigMenu.tsx b/packages/client/components/GitHubConfigMenu.tsx
index 7199a181511..3212c9481f4 100644
--- a/packages/client/components/GitHubConfigMenu.tsx
+++ b/packages/client/components/GitHubConfigMenu.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuProps} from '../hooks/useMenu'
 import {MenuMutationProps} from '../hooks/useMutationProps'
diff --git a/packages/client/components/GitHubFieldDimensionDropdown.tsx b/packages/client/components/GitHubFieldDimensionDropdown.tsx
index ddeae024e74..13553514960 100644
--- a/packages/client/components/GitHubFieldDimensionDropdown.tsx
+++ b/packages/client/components/GitHubFieldDimensionDropdown.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {ExpandMore} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
 import {GitHubFieldDimensionDropdown_stage$key} from '../__generated__/GitHubFieldDimensionDropdown_stage.graphql'
diff --git a/packages/client/components/GitHubFieldMenu.tsx b/packages/client/components/GitHubFieldMenu.tsx
index 2d984a45bf8..6708c72f2d1 100644
--- a/packages/client/components/GitHubFieldMenu.tsx
+++ b/packages/client/components/GitHubFieldMenu.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled-base'
 import {Edit} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
+import * as React from 'react'
 import {useFragment} from 'react-relay'
 import {GitHubFieldMenu_stage$key} from '../__generated__/GitHubFieldMenu_stage.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/GitHubRepoSearchFilterMenu.tsx b/packages/client/components/GitHubRepoSearchFilterMenu.tsx
index 4ca35ff2cb5..ba715e4a551 100644
--- a/packages/client/components/GitHubRepoSearchFilterMenu.tsx
+++ b/packages/client/components/GitHubRepoSearchFilterMenu.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {GitHubRepoSearchFilterMenu_teamMember$key} from '../__generated__/GitHubRepoSearchFilterMenu_teamMember.graphql'
 import useGetRepoContributions from '../hooks/useGetRepoContributions'
diff --git a/packages/client/components/GitHubSVG.tsx b/packages/client/components/GitHubSVG.tsx
index f04bf5ecc6b..1b3e089146e 100644
--- a/packages/client/components/GitHubSVG.tsx
+++ b/packages/client/components/GitHubSVG.tsx
@@ -1,8 +1,8 @@
-import React from 'react'
+import {memo} from 'react'
 
 // Can multiply 24(n) for standard MD sizes eg. 24(2) = 48
 
-const GitHubSVG = React.memo(() => {
+const GitHubSVG = memo(() => {
   return (
     <svg width='24' height='24' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg'>
       <path
diff --git a/packages/client/components/GitHubScopingSearchBar.tsx b/packages/client/components/GitHubScopingSearchBar.tsx
index 422aaabbb41..4a5f47eea49 100644
--- a/packages/client/components/GitHubScopingSearchBar.tsx
+++ b/packages/client/components/GitHubScopingSearchBar.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {GitHubScopingSearchBar_meeting$key} from '../__generated__/GitHubScopingSearchBar_meeting.graphql'
 import {SprintPokerDefaults} from '../types/constEnums'
diff --git a/packages/client/components/GitHubScopingSearchFilterMenu.tsx b/packages/client/components/GitHubScopingSearchFilterMenu.tsx
index ae97624b714..59db4e71bb0 100644
--- a/packages/client/components/GitHubScopingSearchFilterMenu.tsx
+++ b/packages/client/components/GitHubScopingSearchFilterMenu.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {commitLocalUpdate, PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {GitHubScopingSearchFilterMenuQuery} from '../__generated__/GitHubScopingSearchFilterMenuQuery.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/GitHubScopingSearchFilterMenuRoot.tsx b/packages/client/components/GitHubScopingSearchFilterMenuRoot.tsx
index c2fbf9b72eb..2509f7dd8a9 100644
--- a/packages/client/components/GitHubScopingSearchFilterMenuRoot.tsx
+++ b/packages/client/components/GitHubScopingSearchFilterMenuRoot.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import githubScopingSearchFilterMenuQuery, {
   GitHubScopingSearchFilterMenuQuery
diff --git a/packages/client/components/GitHubScopingSearchFilterToggle.tsx b/packages/client/components/GitHubScopingSearchFilterToggle.tsx
index 628522a6882..ea0ae044975 100644
--- a/packages/client/components/GitHubScopingSearchFilterToggle.tsx
+++ b/packages/client/components/GitHubScopingSearchFilterToggle.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {GitHubScopingSearchFilterToggle_meeting$key} from '../__generated__/GitHubScopingSearchFilterToggle_meeting.graphql'
 import {MenuPosition} from '../hooks/useCoords'
diff --git a/packages/client/components/GitHubScopingSearchHistoryToggle.tsx b/packages/client/components/GitHubScopingSearchHistoryToggle.tsx
index a88e6f124cb..6ad476198f2 100644
--- a/packages/client/components/GitHubScopingSearchHistoryToggle.tsx
+++ b/packages/client/components/GitHubScopingSearchHistoryToggle.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {GitHubScopingSearchHistoryToggle_meeting$key} from '../__generated__/GitHubScopingSearchHistoryToggle_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/GitHubScopingSearchResults.tsx b/packages/client/components/GitHubScopingSearchResults.tsx
index fa1535989f3..c3e1bd07cb4 100644
--- a/packages/client/components/GitHubScopingSearchResults.tsx
+++ b/packages/client/components/GitHubScopingSearchResults.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {PreloadedQuery, useFragment, usePaginationFragment, usePreloadedQuery} from 'react-relay'
 import MockScopingList from '~/modules/meeting/components/MockScopingList'
 import {GitHubScopingSearchResultsPaginationQuery} from '../__generated__/GitHubScopingSearchResultsPaginationQuery.graphql'
diff --git a/packages/client/components/GitHubScopingSearchResultsRoot.tsx b/packages/client/components/GitHubScopingSearchResultsRoot.tsx
index 633cc125899..77f5f431aa4 100644
--- a/packages/client/components/GitHubScopingSearchResultsRoot.tsx
+++ b/packages/client/components/GitHubScopingSearchResultsRoot.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import MockScopingList from '~/modules/meeting/components/MockScopingList'
 import githubScopingSearchResultsQuery, {
diff --git a/packages/client/components/GitHubScopingSelectAllIssues.tsx b/packages/client/components/GitHubScopingSelectAllIssues.tsx
index a7dd4f84321..dd57a3bf6c7 100644
--- a/packages/client/components/GitHubScopingSelectAllIssues.tsx
+++ b/packages/client/components/GitHubScopingSelectAllIssues.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useUnusedRecords from '~/hooks/useUnusedRecords'
 import {GitHubScopingSelectAllIssues_issues$key} from '../__generated__/GitHubScopingSelectAllIssues_issues.graphql'
diff --git a/packages/client/components/GitLabFieldDimensionDropdown.tsx b/packages/client/components/GitLabFieldDimensionDropdown.tsx
index 23d874bfb39..c5551058f50 100644
--- a/packages/client/components/GitLabFieldDimensionDropdown.tsx
+++ b/packages/client/components/GitLabFieldDimensionDropdown.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {ExpandMore} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
 import {GitLabFieldDimensionDropdown_stage$key} from '../__generated__/GitLabFieldDimensionDropdown_stage.graphql'
diff --git a/packages/client/components/GitLabFieldMenu.tsx b/packages/client/components/GitLabFieldMenu.tsx
index 0fbdbc20a93..cb49cc329d0 100644
--- a/packages/client/components/GitLabFieldMenu.tsx
+++ b/packages/client/components/GitLabFieldMenu.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {GitLabFieldMenu_stage$key} from '../__generated__/GitLabFieldMenu_stage.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/GitLabSVG.tsx b/packages/client/components/GitLabSVG.tsx
index e73a2177bb2..8bdaa191ddc 100644
--- a/packages/client/components/GitLabSVG.tsx
+++ b/packages/client/components/GitLabSVG.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
+import {memo} from 'react'
 
-const GitLabSVG = React.memo(() => {
+const GitLabSVG = memo(() => {
   return (
     <svg
       version='1.1'
diff --git a/packages/client/components/GitLabScopingSearchBar.tsx b/packages/client/components/GitLabScopingSearchBar.tsx
index a0028150162..159c2299c0d 100644
--- a/packages/client/components/GitLabScopingSearchBar.tsx
+++ b/packages/client/components/GitLabScopingSearchBar.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {GitLabScopingSearchBar_meeting$key} from '../__generated__/GitLabScopingSearchBar_meeting.graphql'
 import GitLabScopingSearchFilterToggle from './GitLabScopingSearchFilterToggle'
diff --git a/packages/client/components/GitLabScopingSearchFilterMenu.tsx b/packages/client/components/GitLabScopingSearchFilterMenu.tsx
index ce418c7370d..e112d7738a2 100644
--- a/packages/client/components/GitLabScopingSearchFilterMenu.tsx
+++ b/packages/client/components/GitLabScopingSearchFilterMenu.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {commitLocalUpdate, PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import useSearchFilter from '~/hooks/useSearchFilter'
 import getNonNullEdges from '~/utils/getNonNullEdges'
diff --git a/packages/client/components/GitLabScopingSearchFilterMenuRoot.tsx b/packages/client/components/GitLabScopingSearchFilterMenuRoot.tsx
index 3206a7635fe..fc860e55f9e 100644
--- a/packages/client/components/GitLabScopingSearchFilterMenuRoot.tsx
+++ b/packages/client/components/GitLabScopingSearchFilterMenuRoot.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import gitlabScopingSearchFilterMenuQuery, {
   GitLabScopingSearchFilterMenuQuery
diff --git a/packages/client/components/GitLabScopingSearchFilterToggle.tsx b/packages/client/components/GitLabScopingSearchFilterToggle.tsx
index edc62152e21..a82ce12fd7b 100644
--- a/packages/client/components/GitLabScopingSearchFilterToggle.tsx
+++ b/packages/client/components/GitLabScopingSearchFilterToggle.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {GitLabScopingSearchFilterToggle_meeting$key} from '../__generated__/GitLabScopingSearchFilterToggle_meeting.graphql'
 import {MenuPosition} from '../hooks/useCoords'
diff --git a/packages/client/components/GitLabScopingSearchResults.tsx b/packages/client/components/GitLabScopingSearchResults.tsx
index 814509d5ce5..dd0f1af372d 100644
--- a/packages/client/components/GitLabScopingSearchResults.tsx
+++ b/packages/client/components/GitLabScopingSearchResults.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {PreloadedQuery, useFragment, usePaginationFragment, usePreloadedQuery} from 'react-relay'
 import useGetUsedServiceTaskIds from '~/hooks/useGetUsedServiceTaskIds'
 import useLoadNextOnScrollBottom from '~/hooks/useLoadNextOnScrollBottom'
diff --git a/packages/client/components/GitLabScopingSearchResultsRoot.tsx b/packages/client/components/GitLabScopingSearchResultsRoot.tsx
index b7fbf59efed..5b29cd26ab1 100644
--- a/packages/client/components/GitLabScopingSearchResultsRoot.tsx
+++ b/packages/client/components/GitLabScopingSearchResultsRoot.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import MockScopingList from '~/modules/meeting/components/MockScopingList'
 import gitlabScopingSearchResultsQuery, {
diff --git a/packages/client/components/GitLabScopingSelectAllIssues.tsx b/packages/client/components/GitLabScopingSelectAllIssues.tsx
index adb175f28a1..93da86c3b97 100644
--- a/packages/client/components/GitLabScopingSelectAllIssues.tsx
+++ b/packages/client/components/GitLabScopingSelectAllIssues.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useUnusedRecords from '~/hooks/useUnusedRecords'
 import {GitLabScopingSelectAllIssues_issues$key} from '../__generated__/GitLabScopingSelectAllIssues_issues.graphql'
diff --git a/packages/client/components/GlobalBanner.tsx b/packages/client/components/GlobalBanner.tsx
index 2821a48413a..5916756b639 100644
--- a/packages/client/components/GlobalBanner.tsx
+++ b/packages/client/components/GlobalBanner.tsx
@@ -1,5 +1,4 @@
 import clsx from 'clsx'
-import React from 'react'
 
 interface Props {
   bgColor: string
diff --git a/packages/client/components/GoogleMeetProviderLogo.tsx b/packages/client/components/GoogleMeetProviderLogo.tsx
index f2bd53e8516..5ed0df3d7b9 100644
--- a/packages/client/components/GoogleMeetProviderLogo.tsx
+++ b/packages/client/components/GoogleMeetProviderLogo.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import logo from '../styles/theme/images/graphics/google-meet-icon.svg'
 
 const GoogleMeetProviderLogo = () => {
diff --git a/packages/client/components/GoogleOAuthButtonBlock.tsx b/packages/client/components/GoogleOAuthButtonBlock.tsx
index bf10cfc7eea..596191c0a08 100644
--- a/packages/client/components/GoogleOAuthButtonBlock.tsx
+++ b/packages/client/components/GoogleOAuthButtonBlock.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import clsx from 'clsx'
-import React from 'react'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import useRouter from '../hooks/useRouter'
diff --git a/packages/client/components/GroupingKanban.tsx b/packages/client/components/GroupingKanban.tsx
index e827bfe45b0..f8cc657b4dd 100644
--- a/packages/client/components/GroupingKanban.tsx
+++ b/packages/client/components/GroupingKanban.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {captureException} from '@sentry/minimal'
 import graphql from 'babel-plugin-relay/macro'
-import React, {RefObject, useEffect, useMemo, useRef, useState} from 'react'
+import {RefObject, useEffect, useMemo, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {GroupingKanban_meeting$key} from '~/__generated__/GroupingKanban_meeting.graphql'
 import useCallbackRef from '~/hooks/useCallbackRef'
diff --git a/packages/client/components/GroupingKanbanColumn.tsx b/packages/client/components/GroupingKanbanColumn.tsx
index cc44b48af09..9b9d7dd7247 100644
--- a/packages/client/components/GroupingKanbanColumn.tsx
+++ b/packages/client/components/GroupingKanbanColumn.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {RefObject, useMemo, useRef} from 'react'
+import {RefObject, useMemo, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {GroupingKanbanColumn_meeting$key} from '~/__generated__/GroupingKanbanColumn_meeting.graphql'
 import {GroupingKanbanColumn_prompt$key} from '~/__generated__/GroupingKanbanColumn_prompt.graphql'
diff --git a/packages/client/components/GroupingKanbanColumnHeader.tsx b/packages/client/components/GroupingKanbanColumnHeader.tsx
index 95083ec9cf2..d758b7f2afd 100644
--- a/packages/client/components/GroupingKanbanColumnHeader.tsx
+++ b/packages/client/components/GroupingKanbanColumnHeader.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {Add, UnfoldLess, UnfoldMore} from '@mui/icons-material'
-import React, {MouseEvent} from 'react'
+import {MouseEvent} from 'react'
 import useBreakpoint from '~/hooks/useBreakpoint'
 import {MenuPosition} from '~/hooks/useCoords'
 import useTooltip from '~/hooks/useTooltip'
diff --git a/packages/client/components/HorizontalSeparator/HorizontalSeparator.tsx b/packages/client/components/HorizontalSeparator/HorizontalSeparator.tsx
index d7b8fde4a6f..a41131a742c 100644
--- a/packages/client/components/HorizontalSeparator/HorizontalSeparator.tsx
+++ b/packages/client/components/HorizontalSeparator/HorizontalSeparator.tsx
@@ -5,7 +5,7 @@
  */
 
 import styled from '@emotion/styled'
-import React, {Fragment} from 'react'
+import {Fragment} from 'react'
 import {PALETTE} from '../../styles/paletteV3'
 import LabelHeading from '../LabelHeading/LabelHeading'
 
diff --git a/packages/client/components/HowToStepItem.tsx b/packages/client/components/HowToStepItem.tsx
index 5ed30e1e3e5..200866e0762 100644
--- a/packages/client/components/HowToStepItem.tsx
+++ b/packages/client/components/HowToStepItem.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {PALETTE} from '../styles/paletteV3'
 
 interface Props {
diff --git a/packages/client/components/IconButton.tsx b/packages/client/components/IconButton.tsx
index da31c6e8699..37869ff0c64 100644
--- a/packages/client/components/IconButton.tsx
+++ b/packages/client/components/IconButton.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {CancelOutlined, Close, Menu} from '@mui/icons-material'
-import React from 'react'
 import LinkButton, {LinkButtonProps} from './LinkButton'
 
 const StyledButton = styled(LinkButton)({outline: 0})
diff --git a/packages/client/components/IconLabel.tsx b/packages/client/components/IconLabel.tsx
index 86025cb37c5..b241a6507c3 100644
--- a/packages/client/components/IconLabel.tsx
+++ b/packages/client/components/IconLabel.tsx
@@ -27,7 +27,7 @@ import {
   WebAsset,
   Widgets
 } from '@mui/icons-material'
-import React, {ReactNode, forwardRef} from 'react'
+import {ReactNode, forwardRef} from 'react'
 
 const LabelBlock = styled('div')({
   alignItems: 'center',
diff --git a/packages/client/components/InputField/BasicInput.tsx b/packages/client/components/InputField/BasicInput.tsx
index c3b189a3dee..ee6e5320fef 100644
--- a/packages/client/components/InputField/BasicInput.tsx
+++ b/packages/client/components/InputField/BasicInput.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
-import React, {forwardRef, Ref} from 'react'
+import * as React from 'react'
+import {forwardRef, Ref} from 'react'
 import makeFieldColorPalette from '../../styles/helpers/makeFieldColorPalette'
 import ui from '../../styles/ui'
 import StyledError from '../StyledError'
diff --git a/packages/client/components/InputField/BasicTextArea.tsx b/packages/client/components/InputField/BasicTextArea.tsx
index fed98a5bfa3..b2cff6bfe78 100644
--- a/packages/client/components/InputField/BasicTextArea.tsx
+++ b/packages/client/components/InputField/BasicTextArea.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React from 'react'
+import * as React from 'react'
 import makeFieldColorPalette from '../../styles/helpers/makeFieldColorPalette'
 import ui from '../../styles/ui'
 import StyledError from '../StyledError'
diff --git a/packages/client/components/InputField/UnderlineInput.tsx b/packages/client/components/InputField/UnderlineInput.tsx
index a9ded2d7d7e..585df50f9ff 100644
--- a/packages/client/components/InputField/UnderlineInput.tsx
+++ b/packages/client/components/InputField/UnderlineInput.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
-import React, {forwardRef, Ref} from 'react'
+import * as React from 'react'
+import {forwardRef, Ref} from 'react'
 import {PALETTE} from '../../styles/paletteV3'
 import {FONT_FAMILY} from '../../styles/typographyV2'
 import StyledError from '../StyledError'
diff --git a/packages/client/components/IntegratedTaskContent.tsx b/packages/client/components/IntegratedTaskContent.tsx
index 31c2fdea8a5..b433128c1a6 100644
--- a/packages/client/components/IntegratedTaskContent.tsx
+++ b/packages/client/components/IntegratedTaskContent.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {IntegratedTaskContent_task$key} from '../__generated__/IntegratedTaskContent_task.graphql'
 
diff --git a/packages/client/components/IntegrationScopingNoResults.tsx b/packages/client/components/IntegrationScopingNoResults.tsx
index e571ccbe7e9..72001bb4d04 100644
--- a/packages/client/components/IntegrationScopingNoResults.tsx
+++ b/packages/client/components/IntegrationScopingNoResults.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {Info as InfoIcon, Warning} from '@mui/icons-material'
-import React from 'react'
 import {PALETTE} from '../styles/paletteV3'
 
 const Message = styled('div')({
diff --git a/packages/client/components/InvitationLink.tsx b/packages/client/components/InvitationLink.tsx
index 159357ac5c9..a79ff3d8c39 100644
--- a/packages/client/components/InvitationLink.tsx
+++ b/packages/client/components/InvitationLink.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {InvitationLinkQuery} from '../__generated__/InvitationLinkQuery.graphql'
 import InvitationLinkDialog from './InvitationLinkDialog'
diff --git a/packages/client/components/InvitationLinkAuthentication.tsx b/packages/client/components/InvitationLinkAuthentication.tsx
index 15aeb275203..8c1d5a4997f 100644
--- a/packages/client/components/InvitationLinkAuthentication.tsx
+++ b/packages/client/components/InvitationLinkAuthentication.tsx
@@ -1,4 +1,4 @@
-import React, {useState} from 'react'
+import {useState} from 'react'
 import GenericAuthentication, {AuthPageSlug, GotoAuthPage} from './GenericAuthentication'
 
 interface Props {
diff --git a/packages/client/components/InvitationLinkDialog.tsx b/packages/client/components/InvitationLinkDialog.tsx
index 55755069b6d..49034f4da95 100644
--- a/packages/client/components/InvitationLinkDialog.tsx
+++ b/packages/client/components/InvitationLinkDialog.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {RouteComponentProps, withRouter} from 'react-router'
 import {InvitationLinkDialog_massInvitation$key} from '../__generated__/InvitationLinkDialog_massInvitation.graphql'
diff --git a/packages/client/components/InvitationLinkErrorExpired.tsx b/packages/client/components/InvitationLinkErrorExpired.tsx
index b0dc095cc1e..81ee780c718 100644
--- a/packages/client/components/InvitationLinkErrorExpired.tsx
+++ b/packages/client/components/InvitationLinkErrorExpired.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {InvitationLinkErrorExpired_massInvitation$key} from '../__generated__/InvitationLinkErrorExpired_massInvitation.graphql'
 import useDocumentTitle from '../hooks/useDocumentTitle'
diff --git a/packages/client/components/InvitationLinkRoot.tsx b/packages/client/components/InvitationLinkRoot.tsx
index 82116dde604..231de629bd4 100644
--- a/packages/client/components/InvitationLinkRoot.tsx
+++ b/packages/client/components/InvitationLinkRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {RouteComponentProps} from 'react-router'
 import invitationLinkQuery, {InvitationLinkQuery} from '~/__generated__/InvitationLinkQuery.graphql'
 import useNoIndex from '../hooks/useNoIndex'
diff --git a/packages/client/components/InviteTeamMemberAvatar.tsx b/packages/client/components/InviteTeamMemberAvatar.tsx
index 028f6303716..7b8634f397e 100644
--- a/packages/client/components/InviteTeamMemberAvatar.tsx
+++ b/packages/client/components/InviteTeamMemberAvatar.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {PersonAdd} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
 import {InviteTeamMemberAvatar_teamMembers$key} from '../__generated__/InviteTeamMemberAvatar_teamMembers.graphql'
diff --git a/packages/client/components/JiraFieldDimensionDropdown.tsx b/packages/client/components/JiraFieldDimensionDropdown.tsx
index d1e464823ad..505ca4e3787 100644
--- a/packages/client/components/JiraFieldDimensionDropdown.tsx
+++ b/packages/client/components/JiraFieldDimensionDropdown.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {ExpandMore} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
 import {JiraFieldDimensionDropdown_stage$key} from '../__generated__/JiraFieldDimensionDropdown_stage.graphql'
diff --git a/packages/client/components/JiraFieldMenu.tsx b/packages/client/components/JiraFieldMenu.tsx
index b2b6c3fef32..7c1b099535d 100644
--- a/packages/client/components/JiraFieldMenu.tsx
+++ b/packages/client/components/JiraFieldMenu.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {OpenInNew} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {JiraFieldMenu_stage$key} from '../__generated__/JiraFieldMenu_stage.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/JiraIssueLink.tsx b/packages/client/components/JiraIssueLink.tsx
index f539158aeed..91d7701dc2c 100644
--- a/packages/client/components/JiraIssueLink.tsx
+++ b/packages/client/components/JiraIssueLink.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {PALETTE} from '../styles/paletteV3'
 import {Card} from '../types/constEnums'
 
diff --git a/packages/client/components/JiraSVG.tsx b/packages/client/components/JiraSVG.tsx
index 504f068e4dd..6b3804d800d 100644
--- a/packages/client/components/JiraSVG.tsx
+++ b/packages/client/components/JiraSVG.tsx
@@ -1,8 +1,8 @@
-import React from 'react'
+import {memo} from 'react'
 
 // Can multiply 24(n) for standard MD sizes eg. 24(2) = 48
 
-const JiraSVG = React.memo(() => {
+const JiraSVG = memo(() => {
   return (
     <svg width='24' height='24' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg'>
       <path
diff --git a/packages/client/components/JiraScopingSearchBar.tsx b/packages/client/components/JiraScopingSearchBar.tsx
index 36ae11847bb..2ab6cee829e 100644
--- a/packages/client/components/JiraScopingSearchBar.tsx
+++ b/packages/client/components/JiraScopingSearchBar.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {JiraScopingSearchBar_meeting$key} from '../__generated__/JiraScopingSearchBar_meeting.graphql'
 import JiraScopingSearchFilterToggle from './JiraScopingSearchFilterToggle'
diff --git a/packages/client/components/JiraScopingSearchCurrentFilters.tsx b/packages/client/components/JiraScopingSearchCurrentFilters.tsx
index d04ecfe050b..65f1c8e2bd5 100644
--- a/packages/client/components/JiraScopingSearchCurrentFilters.tsx
+++ b/packages/client/components/JiraScopingSearchCurrentFilters.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {JiraScopingSearchCurrentFilters_meeting$key} from '../__generated__/JiraScopingSearchCurrentFilters_meeting.graphql'
 import {PALETTE} from '../styles/paletteV3'
diff --git a/packages/client/components/JiraScopingSearchFilterMenu.tsx b/packages/client/components/JiraScopingSearchFilterMenu.tsx
index 4b91d879fbc..53c6a0eda1c 100644
--- a/packages/client/components/JiraScopingSearchFilterMenu.tsx
+++ b/packages/client/components/JiraScopingSearchFilterMenu.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {commitLocalUpdate} from 'react-relay'
 import useSearchFilter from '~/hooks/useSearchFilter'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/JiraScopingSearchFilterMenuRoot.tsx b/packages/client/components/JiraScopingSearchFilterMenuRoot.tsx
index f6a5bceb690..79d7adc9937 100644
--- a/packages/client/components/JiraScopingSearchFilterMenuRoot.tsx
+++ b/packages/client/components/JiraScopingSearchFilterMenuRoot.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useLazyLoadQuery} from 'react-relay'
 import {JiraScopingSearchFilterMenuRootQuery} from '../__generated__/JiraScopingSearchFilterMenuRootQuery.graphql'
 import {MenuProps} from '../hooks/useMenu'
diff --git a/packages/client/components/JiraScopingSearchFilterToggle.tsx b/packages/client/components/JiraScopingSearchFilterToggle.tsx
index 35c2ee567db..a13081a629a 100644
--- a/packages/client/components/JiraScopingSearchFilterToggle.tsx
+++ b/packages/client/components/JiraScopingSearchFilterToggle.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {JiraScopingSearchFilterToggle_meeting$key} from '../__generated__/JiraScopingSearchFilterToggle_meeting.graphql'
 import {MenuPosition} from '../hooks/useCoords'
diff --git a/packages/client/components/JiraScopingSearchHistoryToggle.tsx b/packages/client/components/JiraScopingSearchHistoryToggle.tsx
index 9c1f4f3da68..a5c8cf6f642 100644
--- a/packages/client/components/JiraScopingSearchHistoryToggle.tsx
+++ b/packages/client/components/JiraScopingSearchHistoryToggle.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {JiraScopingSearchHistoryToggle_meeting$key} from '../__generated__/JiraScopingSearchHistoryToggle_meeting.graphql'
 import JiraUniversalScopingSearchHistoryToggle from './JiraUniversalScopingSearchHistoryToggle'
diff --git a/packages/client/components/JiraScopingSearchInput.tsx b/packages/client/components/JiraScopingSearchInput.tsx
index 9fdde5ed431..75f4f428757 100644
--- a/packages/client/components/JiraScopingSearchInput.tsx
+++ b/packages/client/components/JiraScopingSearchInput.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {JiraScopingSearchInput_meeting$key} from '../__generated__/JiraScopingSearchInput_meeting.graphql'
 import ScopingSearchInput from './ScopingSearchInput'
diff --git a/packages/client/components/JiraScopingSearchResults.tsx b/packages/client/components/JiraScopingSearchResults.tsx
index 23aa7e914d9..664c1ebc5bb 100644
--- a/packages/client/components/JiraScopingSearchResults.tsx
+++ b/packages/client/components/JiraScopingSearchResults.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay'
 import useGetUsedServiceTaskIds from '~/hooks/useGetUsedServiceTaskIds'
 import {JiraScopingSearchResultsQuery} from '../__generated__/JiraScopingSearchResultsQuery.graphql'
diff --git a/packages/client/components/JiraScopingSearchResultsRoot.tsx b/packages/client/components/JiraScopingSearchResultsRoot.tsx
index 640d792ed18..f34e282fc12 100644
--- a/packages/client/components/JiraScopingSearchResultsRoot.tsx
+++ b/packages/client/components/JiraScopingSearchResultsRoot.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import MockScopingList from '~/modules/meeting/components/MockScopingList'
 import jiraScopingSearchResultsQuery, {
diff --git a/packages/client/components/JiraScopingSelectAllIssues.tsx b/packages/client/components/JiraScopingSelectAllIssues.tsx
index ade3b46aa16..e49bc382424 100644
--- a/packages/client/components/JiraScopingSelectAllIssues.tsx
+++ b/packages/client/components/JiraScopingSelectAllIssues.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useUnusedRecords from '~/hooks/useUnusedRecords'
 import {JiraScopingSelectAllIssues_issues$key} from '../__generated__/JiraScopingSelectAllIssues_issues.graphql'
diff --git a/packages/client/components/JiraServerConfigMenu.tsx b/packages/client/components/JiraServerConfigMenu.tsx
index 58b4d4fe305..1273dfe621f 100644
--- a/packages/client/components/JiraServerConfigMenu.tsx
+++ b/packages/client/components/JiraServerConfigMenu.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuProps} from '../hooks/useMenu'
 import {MenuMutationProps} from '../hooks/useMutationProps'
diff --git a/packages/client/components/JiraServerFieldDimensionDropdown.tsx b/packages/client/components/JiraServerFieldDimensionDropdown.tsx
index 1c2315517d1..731ef625027 100644
--- a/packages/client/components/JiraServerFieldDimensionDropdown.tsx
+++ b/packages/client/components/JiraServerFieldDimensionDropdown.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {ExpandMore} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {JiraServerFieldDimensionDropdown_stage$key} from '../__generated__/JiraServerFieldDimensionDropdown_stage.graphql'
 import {MenuPosition} from '../hooks/useCoords'
diff --git a/packages/client/components/JiraServerFieldMenu.tsx b/packages/client/components/JiraServerFieldMenu.tsx
index ec14af8f755..ba82a8191de 100644
--- a/packages/client/components/JiraServerFieldMenu.tsx
+++ b/packages/client/components/JiraServerFieldMenu.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
 import {JiraServerFieldMenu_stage$key} from '../__generated__/JiraServerFieldMenu_stage.graphql'
diff --git a/packages/client/components/JiraServerSVG.tsx b/packages/client/components/JiraServerSVG.tsx
index 99c90cddc24..c0f3feefb31 100644
--- a/packages/client/components/JiraServerSVG.tsx
+++ b/packages/client/components/JiraServerSVG.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
+import {memo} from 'react'
 
-const JiraServerSVG = React.memo(() => {
+const JiraServerSVG = memo(() => {
   return (
     <svg width='32' height='32' viewBox='0 0 32 32' fill='none' xmlns='http://www.w3.org/2000/svg'>
       <path
diff --git a/packages/client/components/JiraServerScopingSearchBar.tsx b/packages/client/components/JiraServerScopingSearchBar.tsx
index 2f7d237b05d..8de2379157d 100644
--- a/packages/client/components/JiraServerScopingSearchBar.tsx
+++ b/packages/client/components/JiraServerScopingSearchBar.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {JiraServerScopingSearchBar_meeting$key} from '../__generated__/JiraServerScopingSearchBar_meeting.graphql'
 import JiraServerScopingSearchFilterToggle from './JiraServerScopingSearchFilterToggle'
diff --git a/packages/client/components/JiraServerScopingSearchFilterMenuRoot.tsx b/packages/client/components/JiraServerScopingSearchFilterMenuRoot.tsx
index 05937171331..0cf3c0daa2f 100644
--- a/packages/client/components/JiraServerScopingSearchFilterMenuRoot.tsx
+++ b/packages/client/components/JiraServerScopingSearchFilterMenuRoot.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useLazyLoadQuery} from 'react-relay'
 import {JiraServerScopingSearchFilterMenuRootQuery} from '../__generated__/JiraServerScopingSearchFilterMenuRootQuery.graphql'
 import {MenuProps} from '../hooks/useMenu'
diff --git a/packages/client/components/JiraServerScopingSearchFilterToggle.tsx b/packages/client/components/JiraServerScopingSearchFilterToggle.tsx
index 35f85ef0944..0a40a38fa06 100644
--- a/packages/client/components/JiraServerScopingSearchFilterToggle.tsx
+++ b/packages/client/components/JiraServerScopingSearchFilterToggle.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {JiraServerScopingSearchFilterToggle_meeting$key} from '../__generated__/JiraServerScopingSearchFilterToggle_meeting.graphql'
 import {MenuPosition} from '../hooks/useCoords'
diff --git a/packages/client/components/JiraServerScopingSearchHistoryToggle.tsx b/packages/client/components/JiraServerScopingSearchHistoryToggle.tsx
index 0e161139d8c..d7eeb613ed1 100644
--- a/packages/client/components/JiraServerScopingSearchHistoryToggle.tsx
+++ b/packages/client/components/JiraServerScopingSearchHistoryToggle.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {JiraServerScopingSearchHistoryToggle_meeting$key} from '../__generated__/JiraServerScopingSearchHistoryToggle_meeting.graphql'
 import JiraUniversalScopingSearchHistoryToggle from './JiraUniversalScopingSearchHistoryToggle'
diff --git a/packages/client/components/JiraServerScopingSearchResults.tsx b/packages/client/components/JiraServerScopingSearchResults.tsx
index cbb680f5ca3..712275c477c 100644
--- a/packages/client/components/JiraServerScopingSearchResults.tsx
+++ b/packages/client/components/JiraServerScopingSearchResults.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {PreloadedQuery, useFragment, usePaginationFragment, usePreloadedQuery} from 'react-relay'
 import useGetUsedServiceTaskIds from '~/hooks/useGetUsedServiceTaskIds'
 import MockScopingList from '~/modules/meeting/components/MockScopingList'
diff --git a/packages/client/components/JiraServerScopingSearchResultsRoot.tsx b/packages/client/components/JiraServerScopingSearchResultsRoot.tsx
index 5c0bfe0cc8d..78c45e769fb 100644
--- a/packages/client/components/JiraServerScopingSearchResultsRoot.tsx
+++ b/packages/client/components/JiraServerScopingSearchResultsRoot.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import MockScopingList from '~/modules/meeting/components/MockScopingList'
 import jiraServerScopingSearchResultsQuery, {
diff --git a/packages/client/components/JiraUniversalScopingSearchHistoryToggle.tsx b/packages/client/components/JiraUniversalScopingSearchHistoryToggle.tsx
index a5b8aa3b2e1..615cdb70833 100644
--- a/packages/client/components/JiraUniversalScopingSearchHistoryToggle.tsx
+++ b/packages/client/components/JiraUniversalScopingSearchHistoryToggle.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import {commitLocalUpdate} from 'react-relay'
 import useAtmosphere from '../hooks/useAtmosphere'
 import PersistJiraSearchQueryMutation from '../mutations/PersistJiraSearchQueryMutation'
diff --git a/packages/client/components/KickedOut.tsx b/packages/client/components/KickedOut.tsx
index 922a4d11948..0127c1d82af 100644
--- a/packages/client/components/KickedOut.tsx
+++ b/packages/client/components/KickedOut.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {KickedOut_notification$key} from '~/__generated__/KickedOut_notification.graphql'
 import NotificationTemplate from './NotificationTemplate'
diff --git a/packages/client/components/LimitExceededWarning.tsx b/packages/client/components/LimitExceededWarning.tsx
index e52bc3b6d8a..1c67233e01f 100644
--- a/packages/client/components/LimitExceededWarning.tsx
+++ b/packages/client/components/LimitExceededWarning.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {LimitExceededWarning_organization$key} from '../__generated__/LimitExceededWarning_organization.graphql'
 import {PALETTE} from '../styles/paletteV3'
diff --git a/packages/client/components/LoadingComponent/LoadingComponent.tsx b/packages/client/components/LoadingComponent/LoadingComponent.tsx
index de7b5cd1ff2..c6fc5ceb2fa 100644
--- a/packages/client/components/LoadingComponent/LoadingComponent.tsx
+++ b/packages/client/components/LoadingComponent/LoadingComponent.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {forwardRef, useEffect} from 'react'
+import {forwardRef, useEffect} from 'react'
 import {LoadingDelayRef} from '../../hooks/useLoadingDelay'
 import useTimeout from '../../hooks/useTimeout'
 import Spinner from '../../modules/spinner/components/Spinner/Spinner'
diff --git a/packages/client/components/LogoBlock/LogoBlock.tsx b/packages/client/components/LogoBlock/LogoBlock.tsx
index 03375b43b96..922ded655f6 100644
--- a/packages/client/components/LogoBlock/LogoBlock.tsx
+++ b/packages/client/components/LogoBlock/LogoBlock.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {Link} from 'react-router-dom'
 import {PALETTE} from '../../styles/paletteV3'
 import logoMarkPurple from '../../styles/theme/images/brand/mark-color.svg'
diff --git a/packages/client/components/MSTeamsSVG.tsx b/packages/client/components/MSTeamsSVG.tsx
index 4afaec66bc4..afce3f2179c 100644
--- a/packages/client/components/MSTeamsSVG.tsx
+++ b/packages/client/components/MSTeamsSVG.tsx
@@ -1,8 +1,8 @@
-import React from 'react'
+import {memo} from 'react'
 
 // Can multiply 24(n) for standard MD sizes eg. 24(2) = 48
 
-const MSTeamsSVG = React.memo(() => {
+const MSTeamsSVG = memo(() => {
   return (
     <svg width='48' height='45' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 2228.833 2073.333'>
       <path
diff --git a/packages/client/components/MasonryCSSGrid.tsx b/packages/client/components/MasonryCSSGrid.tsx
index 62c316a55c3..29d7b8e9c90 100644
--- a/packages/client/components/MasonryCSSGrid.tsx
+++ b/packages/client/components/MasonryCSSGrid.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {Component, ReactNode} from 'react'
+import {Component, createRef, ReactNode} from 'react'
 import ResizeObserverPolyfill from 'resize-observer-polyfill'
 
 interface GridProps {
@@ -30,7 +30,7 @@ interface ItemRefs {
 const ResizeObserver = window.ResizeObserver || ResizeObserverPolyfill
 class MasonryCSSGrid extends Component<Props> {
   itemRefs: ItemRefs = {}
-  gridRef = React.createRef<HTMLDivElement>()
+  gridRef = createRef<HTMLDivElement>()
   resizeObserver = new ResizeObserver(() => {
     this.setSpans()
   })
diff --git a/packages/client/components/MassInvitationTokenLink.tsx b/packages/client/components/MassInvitationTokenLink.tsx
index 235f8aca58a..5834127a73f 100644
--- a/packages/client/components/MassInvitationTokenLink.tsx
+++ b/packages/client/components/MassInvitationTokenLink.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import ms from 'ms'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import useMutationProps from '~/hooks/useMutationProps'
 import CreateMassInvitationMutation from '~/mutations/CreateMassInvitationMutation'
diff --git a/packages/client/components/MassInvitationTokenLinkRoot.tsx b/packages/client/components/MassInvitationTokenLinkRoot.tsx
index 9d82a7160f3..1716ec26aaa 100644
--- a/packages/client/components/MassInvitationTokenLinkRoot.tsx
+++ b/packages/client/components/MassInvitationTokenLinkRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import massInvitationTokenLinkQuery, {
   MassInvitationTokenLinkQuery
 } from '../__generated__/MassInvitationTokenLinkQuery.graphql'
diff --git a/packages/client/components/MattermostSVG.tsx b/packages/client/components/MattermostSVG.tsx
index 6120ee31358..12da6cec388 100644
--- a/packages/client/components/MattermostSVG.tsx
+++ b/packages/client/components/MattermostSVG.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
+import {memo} from 'react'
 
-const MattermostSVG = React.memo(() => {
+const MattermostSVG = memo(() => {
   return (
     <svg
       width='24'
diff --git a/packages/client/components/MeetingCard.tsx b/packages/client/components/MeetingCard.tsx
index edde8152188..a21ae611127 100644
--- a/packages/client/components/MeetingCard.tsx
+++ b/packages/client/components/MeetingCard.tsx
@@ -2,7 +2,6 @@ import styled from '@emotion/styled'
 import * as Sentry from '@sentry/browser'
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {Link} from 'react-router-dom'
 import action from '../../../static/images/illustrations/action.png'
diff --git a/packages/client/components/MeetingCardOptionsMenu.tsx b/packages/client/components/MeetingCardOptionsMenu.tsx
index 1937602413f..4c81b0a2871 100644
--- a/packages/client/components/MeetingCardOptionsMenu.tsx
+++ b/packages/client/components/MeetingCardOptionsMenu.tsx
@@ -6,7 +6,6 @@ import {
   Replay as ReplayIcon
 } from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useMutationProps from '~/hooks/useMutationProps'
diff --git a/packages/client/components/MeetingCardOptionsMenuRoot.tsx b/packages/client/components/MeetingCardOptionsMenuRoot.tsx
index 379734f6603..a2ab86aa7bd 100644
--- a/packages/client/components/MeetingCardOptionsMenuRoot.tsx
+++ b/packages/client/components/MeetingCardOptionsMenuRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import meetingCardOptionsMenuQuery, {
   MeetingCardOptionsMenuQuery
 } from '../__generated__/MeetingCardOptionsMenuQuery.graphql'
diff --git a/packages/client/components/MeetingControlBar.tsx b/packages/client/components/MeetingControlBar.tsx
index 55eeda0c009..30e0ad6fc2f 100644
--- a/packages/client/components/MeetingControlBar.tsx
+++ b/packages/client/components/MeetingControlBar.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useRef} from 'react'
+import {useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {MeetingControlBar_meeting$key} from '~/__generated__/MeetingControlBar_meeting.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
diff --git a/packages/client/components/MeetingHelp/ActionMeetingAgendaItemsHelpMenu.tsx b/packages/client/components/MeetingHelp/ActionMeetingAgendaItemsHelpMenu.tsx
index 19a4fda6321..b78f19210d7 100644
--- a/packages/client/components/MeetingHelp/ActionMeetingAgendaItemsHelpMenu.tsx
+++ b/packages/client/components/MeetingHelp/ActionMeetingAgendaItemsHelpMenu.tsx
@@ -1,4 +1,4 @@
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import useClientSideTrack from '../../hooks/useClientSideTrack'
 import {ExternalLinks} from '../../types/constEnums'
 import HelpMenuContent from './HelpMenuContent'
diff --git a/packages/client/components/MeetingHelp/ActionMeetingFirstCallHelpMenu.tsx b/packages/client/components/MeetingHelp/ActionMeetingFirstCallHelpMenu.tsx
index f50d1fd63a0..86dc2d15d64 100644
--- a/packages/client/components/MeetingHelp/ActionMeetingFirstCallHelpMenu.tsx
+++ b/packages/client/components/MeetingHelp/ActionMeetingFirstCallHelpMenu.tsx
@@ -1,4 +1,4 @@
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import useClientSideTrack from '../../hooks/useClientSideTrack'
 import {ExternalLinks} from '../../types/constEnums'
 import HelpMenuContent from './HelpMenuContent'
diff --git a/packages/client/components/MeetingHelp/ActionMeetingLastCallHelpMenu.tsx b/packages/client/components/MeetingHelp/ActionMeetingLastCallHelpMenu.tsx
index a9f952809a5..ca0235b4935 100644
--- a/packages/client/components/MeetingHelp/ActionMeetingLastCallHelpMenu.tsx
+++ b/packages/client/components/MeetingHelp/ActionMeetingLastCallHelpMenu.tsx
@@ -1,4 +1,4 @@
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import useClientSideTrack from '../../hooks/useClientSideTrack'
 import {ExternalLinks} from '../../types/constEnums'
 import HelpMenuContent from './HelpMenuContent'
diff --git a/packages/client/components/MeetingHelp/CheckInHelpMenu.tsx b/packages/client/components/MeetingHelp/CheckInHelpMenu.tsx
index 2a14d40c109..ed98622d794 100644
--- a/packages/client/components/MeetingHelp/CheckInHelpMenu.tsx
+++ b/packages/client/components/MeetingHelp/CheckInHelpMenu.tsx
@@ -1,4 +1,4 @@
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import {MeetingTypeEnum} from '~/__generated__/MeetingSelectorQuery.graphql'
 import useClientSideTrack from '../../hooks/useClientSideTrack'
 import {ExternalLinks} from '../../types/constEnums'
diff --git a/packages/client/components/MeetingHelp/DelayedCopy.tsx b/packages/client/components/MeetingHelp/DelayedCopy.tsx
index bcdb2dad177..d5aba9957a5 100644
--- a/packages/client/components/MeetingHelp/DelayedCopy.tsx
+++ b/packages/client/components/MeetingHelp/DelayedCopy.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import Ellipsis from '../Ellipsis/Ellipsis'
 import HelpMenuCopy from './HelpMenuCopy'
 
diff --git a/packages/client/components/MeetingHelp/DemoDiscussHelpMenu.tsx b/packages/client/components/MeetingHelp/DemoDiscussHelpMenu.tsx
index 952389b2dfc..c98d12b9fb2 100644
--- a/packages/client/components/MeetingHelp/DemoDiscussHelpMenu.tsx
+++ b/packages/client/components/MeetingHelp/DemoDiscussHelpMenu.tsx
@@ -1,4 +1,4 @@
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import useInterval from '../../hooks/useInterval'
 import DelayedCopy from './DelayedCopy'
 import HelpMenuContent from './HelpMenuContent'
diff --git a/packages/client/components/MeetingHelp/DemoGroupHelpMenu.tsx b/packages/client/components/MeetingHelp/DemoGroupHelpMenu.tsx
index cb9ff52cce5..e1b65212012 100644
--- a/packages/client/components/MeetingHelp/DemoGroupHelpMenu.tsx
+++ b/packages/client/components/MeetingHelp/DemoGroupHelpMenu.tsx
@@ -1,4 +1,4 @@
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import useInterval from '../../hooks/useInterval'
 import DelayedCopy from './DelayedCopy'
 import HelpMenuContent from './HelpMenuContent'
diff --git a/packages/client/components/MeetingHelp/DemoReflectHelpMenu.tsx b/packages/client/components/MeetingHelp/DemoReflectHelpMenu.tsx
index 223d7c8ce8e..f449bb29966 100644
--- a/packages/client/components/MeetingHelp/DemoReflectHelpMenu.tsx
+++ b/packages/client/components/MeetingHelp/DemoReflectHelpMenu.tsx
@@ -1,4 +1,4 @@
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import useInterval from '../../hooks/useInterval'
 import DelayedCopy from './DelayedCopy'
 import HelpMenuContent from './HelpMenuContent'
diff --git a/packages/client/components/MeetingHelp/DemoVoteHelpMenu.tsx b/packages/client/components/MeetingHelp/DemoVoteHelpMenu.tsx
index 5eaf556965b..35480d588bb 100644
--- a/packages/client/components/MeetingHelp/DemoVoteHelpMenu.tsx
+++ b/packages/client/components/MeetingHelp/DemoVoteHelpMenu.tsx
@@ -1,4 +1,4 @@
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import useInterval from '../../hooks/useInterval'
 import DelayedCopy from './DelayedCopy'
 import HelpMenuContent from './HelpMenuContent'
diff --git a/packages/client/components/MeetingHelp/DiscussHelpMenu.tsx b/packages/client/components/MeetingHelp/DiscussHelpMenu.tsx
index f06df45bd1b..a0f2ca8f96c 100644
--- a/packages/client/components/MeetingHelp/DiscussHelpMenu.tsx
+++ b/packages/client/components/MeetingHelp/DiscussHelpMenu.tsx
@@ -1,4 +1,4 @@
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import useClientSideTrack from '../../hooks/useClientSideTrack'
 import {ExternalLinks} from '../../types/constEnums'
 import {phaseLabelLookup} from '../../utils/meetings/lookups'
diff --git a/packages/client/components/MeetingHelp/EstimateHelpMenu.tsx b/packages/client/components/MeetingHelp/EstimateHelpMenu.tsx
index 30252f80fbe..b1c8f145226 100644
--- a/packages/client/components/MeetingHelp/EstimateHelpMenu.tsx
+++ b/packages/client/components/MeetingHelp/EstimateHelpMenu.tsx
@@ -1,4 +1,4 @@
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import useClientSideTrack from '../../hooks/useClientSideTrack'
 import {ExternalLinks} from '../../types/constEnums'
 import {phaseLabelLookup} from '../../utils/meetings/lookups'
diff --git a/packages/client/components/MeetingHelp/GroupHelpMenu.tsx b/packages/client/components/MeetingHelp/GroupHelpMenu.tsx
index eb8fc1f7d39..2e27008662f 100644
--- a/packages/client/components/MeetingHelp/GroupHelpMenu.tsx
+++ b/packages/client/components/MeetingHelp/GroupHelpMenu.tsx
@@ -1,4 +1,4 @@
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import useClientSideTrack from '../../hooks/useClientSideTrack'
 import {ExternalLinks} from '../../types/constEnums'
 import {GROUP} from '../../utils/constants'
diff --git a/packages/client/components/MeetingHelp/HelpMenuContent.tsx b/packages/client/components/MeetingHelp/HelpMenuContent.tsx
index 3d2bd85fa64..f939d953dd3 100644
--- a/packages/client/components/MeetingHelp/HelpMenuContent.tsx
+++ b/packages/client/components/MeetingHelp/HelpMenuContent.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {Close} from '@mui/icons-material'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {PALETTE} from '../../styles/paletteV3'
 
 const Content = styled('div')({
diff --git a/packages/client/components/MeetingHelp/ReflectHelpMenu.tsx b/packages/client/components/MeetingHelp/ReflectHelpMenu.tsx
index ef26b23e7a5..58e05d9dd3a 100644
--- a/packages/client/components/MeetingHelp/ReflectHelpMenu.tsx
+++ b/packages/client/components/MeetingHelp/ReflectHelpMenu.tsx
@@ -1,4 +1,4 @@
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import useClientSideTrack from '../../hooks/useClientSideTrack'
 import {ExternalLinks} from '../../types/constEnums'
 import {phaseLabelLookup} from '../../utils/meetings/lookups'
diff --git a/packages/client/components/MeetingHelp/ScopeHelpMenu.tsx b/packages/client/components/MeetingHelp/ScopeHelpMenu.tsx
index 9d052cca2aa..bb6372b9979 100644
--- a/packages/client/components/MeetingHelp/ScopeHelpMenu.tsx
+++ b/packages/client/components/MeetingHelp/ScopeHelpMenu.tsx
@@ -1,4 +1,4 @@
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import useClientSideTrack from '../../hooks/useClientSideTrack'
 import {ExternalLinks} from '../../types/constEnums'
 import {phaseLabelLookup} from '../../utils/meetings/lookups'
diff --git a/packages/client/components/MeetingHelp/TeamHealthHelpMenu.tsx b/packages/client/components/MeetingHelp/TeamHealthHelpMenu.tsx
index 09127c5d22d..441d459bce2 100644
--- a/packages/client/components/MeetingHelp/TeamHealthHelpMenu.tsx
+++ b/packages/client/components/MeetingHelp/TeamHealthHelpMenu.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import {useFragment} from 'react-relay'
 import {TeamHealthHelpMenu_stage$key} from '~/__generated__/TeamHealthHelpMenu_stage.graphql'
 import useClientSideTrack from '../../hooks/useClientSideTrack'
diff --git a/packages/client/components/MeetingHelp/UpdatesHelpMenu.tsx b/packages/client/components/MeetingHelp/UpdatesHelpMenu.tsx
index e0dcd5b29c1..cf6959a8dab 100644
--- a/packages/client/components/MeetingHelp/UpdatesHelpMenu.tsx
+++ b/packages/client/components/MeetingHelp/UpdatesHelpMenu.tsx
@@ -1,4 +1,4 @@
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import useClientSideTrack from '../../hooks/useClientSideTrack'
 import {ExternalLinks} from '../../types/constEnums'
 import {phaseLabelLookup} from '../../utils/meetings/lookups'
diff --git a/packages/client/components/MeetingHelp/VoteHelpMenu.tsx b/packages/client/components/MeetingHelp/VoteHelpMenu.tsx
index e02c4c2b21e..37ada21cf58 100644
--- a/packages/client/components/MeetingHelp/VoteHelpMenu.tsx
+++ b/packages/client/components/MeetingHelp/VoteHelpMenu.tsx
@@ -1,4 +1,4 @@
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import useClientSideTrack from '../../hooks/useClientSideTrack'
 import {ExternalLinks} from '../../types/constEnums'
 import {VOTE} from '../../utils/constants'
diff --git a/packages/client/components/MeetingLockedOverlay.tsx b/packages/client/components/MeetingLockedOverlay.tsx
index cf35d279cea..5767082a166 100644
--- a/packages/client/components/MeetingLockedOverlay.tsx
+++ b/packages/client/components/MeetingLockedOverlay.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {Lock} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {MeetingLockedOverlay_meeting$key} from '~/__generated__/MeetingLockedOverlay_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/MeetingOptions.tsx b/packages/client/components/MeetingOptions.tsx
index 2d9a65c750a..775325bd122 100644
--- a/packages/client/components/MeetingOptions.tsx
+++ b/packages/client/components/MeetingOptions.tsx
@@ -1,6 +1,6 @@
 import SwapHorizIcon from '@mui/icons-material/SwapHoriz'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useState} from 'react'
+import {useEffect, useState} from 'react'
 import {useLazyLoadQuery} from 'react-relay'
 import {MeetingOptionsQuery} from '../__generated__/MeetingOptionsQuery.graphql'
 import {Menu} from '../ui/Menu/Menu'
diff --git a/packages/client/components/MeetingRoot.tsx b/packages/client/components/MeetingRoot.tsx
index a545a877fff..6af876f8d6c 100644
--- a/packages/client/components/MeetingRoot.tsx
+++ b/packages/client/components/MeetingRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense, useEffect} from 'react'
+import {Suspense, useEffect} from 'react'
 import meetingSelectorQuery, {
   MeetingSelectorQuery
 } from '../__generated__/MeetingSelectorQuery.graphql'
diff --git a/packages/client/components/MeetingSelector.tsx b/packages/client/components/MeetingSelector.tsx
index f7913daba10..fe929083bee 100644
--- a/packages/client/components/MeetingSelector.tsx
+++ b/packages/client/components/MeetingSelector.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {Redirect} from 'react-router'
 import useAtmosphere from '~/hooks/useAtmosphere'
diff --git a/packages/client/components/MeetingSeriesRedirector.tsx b/packages/client/components/MeetingSeriesRedirector.tsx
index 33d7009ace2..cdb844869f3 100644
--- a/packages/client/components/MeetingSeriesRedirector.tsx
+++ b/packages/client/components/MeetingSeriesRedirector.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {Redirect} from 'react-router'
 import {MeetingSeriesRedirectorQuery} from '../__generated__/MeetingSeriesRedirectorQuery.graphql'
diff --git a/packages/client/components/MeetingSeriesRoot.tsx b/packages/client/components/MeetingSeriesRoot.tsx
index 00a8c5b3fce..a5d59910fdd 100644
--- a/packages/client/components/MeetingSeriesRoot.tsx
+++ b/packages/client/components/MeetingSeriesRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {Redirect} from 'react-router'
 import meetingSeriesRedirectorQuery, {
   MeetingSeriesRedirectorQuery
diff --git a/packages/client/components/MeetingSidebarTeamMemberStageItems.tsx b/packages/client/components/MeetingSidebarTeamMemberStageItems.tsx
index 651e3739281..a0cd52f1196 100644
--- a/packages/client/components/MeetingSidebarTeamMemberStageItems.tsx
+++ b/packages/client/components/MeetingSidebarTeamMemberStageItems.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {MeetingSidebarTeamMemberStageItems_meeting$key} from '~/__generated__/MeetingSidebarTeamMemberStageItems_meeting.graphql'
 import {NewMeetingPhaseTypeEnum} from '../__generated__/ActionMeeting_meeting.graphql'
diff --git a/packages/client/components/MeetingStageTimeLimitEnd.tsx b/packages/client/components/MeetingStageTimeLimitEnd.tsx
index e4a431fcab9..4b08ead752d 100644
--- a/packages/client/components/MeetingStageTimeLimitEnd.tsx
+++ b/packages/client/components/MeetingStageTimeLimitEnd.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import NotificationAction from '~/components/NotificationAction'
 import {MeetingStageTimeLimitEnd_notification$key} from '../__generated__/MeetingStageTimeLimitEnd_notification.graphql'
diff --git a/packages/client/components/MeetingSubnavItem.tsx b/packages/client/components/MeetingSubnavItem.tsx
index fdacf66b198..e75c48258e0 100644
--- a/packages/client/components/MeetingSubnavItem.tsx
+++ b/packages/client/components/MeetingSubnavItem.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
-import React, {ReactNode, useRef} from 'react'
+import * as React from 'react'
+import {ReactNode, useRef} from 'react'
 import useScrollIntoView from '../hooks/useScrollIntoVIew'
 import {PALETTE} from '../styles/paletteV3'
 import {NavSidebar} from '../types/constEnums'
diff --git a/packages/client/components/MeetingTopBar.tsx b/packages/client/components/MeetingTopBar.tsx
index 22f8420a66a..082744657cb 100644
--- a/packages/client/components/MeetingTopBar.tsx
+++ b/packages/client/components/MeetingTopBar.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {Comment} from '@mui/icons-material'
-import React, {ReactElement, ReactNode} from 'react'
+import {ReactElement, ReactNode} from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import {meetingAvatarMediaQueries} from '../styles/meeting'
 import hasToken from '../utils/hasToken'
diff --git a/packages/client/components/MeetingsDash.tsx b/packages/client/components/MeetingsDash.tsx
index bffee6c9a76..1277a6b3de3 100644
--- a/packages/client/components/MeetingsDash.tsx
+++ b/packages/client/components/MeetingsDash.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {RefObject, useMemo} from 'react'
+import {RefObject, useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {MeetingsDash_viewer$key} from '~/__generated__/MeetingsDash_viewer.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/MeetingsDashEmpty.tsx b/packages/client/components/MeetingsDashEmpty.tsx
index 617e9588b3b..538f7173a1d 100644
--- a/packages/client/components/MeetingsDashEmpty.tsx
+++ b/packages/client/components/MeetingsDashEmpty.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {Link} from 'react-router-dom'
 import {commitLocalUpdate} from 'relay-runtime'
 import {Breakpoint} from '~/types/constEnums'
diff --git a/packages/client/components/MeetingsDashHeader.tsx b/packages/client/components/MeetingsDashHeader.tsx
index dc905c437a4..0734fd0b260 100644
--- a/packages/client/components/MeetingsDashHeader.tsx
+++ b/packages/client/components/MeetingsDashHeader.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {MeetingsDashHeader_viewer$key} from '../__generated__/MeetingsDashHeader_viewer.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/MeetingsDashTutorialModal.tsx b/packages/client/components/MeetingsDashTutorialModal.tsx
index 6be348e9f61..05c41faad69 100644
--- a/packages/client/components/MeetingsDashTutorialModal.tsx
+++ b/packages/client/components/MeetingsDashTutorialModal.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import DialogContainer from './DialogContainer'
 import DialogContent from './DialogContent'
 import DialogTitle from './DialogTitle'
diff --git a/packages/client/components/MentionTag/MentionTag.tsx b/packages/client/components/MentionTag/MentionTag.tsx
index c70508a9ac1..af70466eeee 100644
--- a/packages/client/components/MentionTag/MentionTag.tsx
+++ b/packages/client/components/MentionTag/MentionTag.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import DraftionMentionDescription from './DraftMentionDescription'
 import DraftMentionRow from './DraftMentionRow'
 
diff --git a/packages/client/components/MentionUser/MentionUser.tsx b/packages/client/components/MentionUser/MentionUser.tsx
index 4f2429855ab..370831ad96c 100644
--- a/packages/client/components/MentionUser/MentionUser.tsx
+++ b/packages/client/components/MentionUser/MentionUser.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import Avatar from '../Avatar/Avatar'
 import DraftMentionDescription from '../MentionTag/DraftMentionDescription'
 import DraftMentionRow from '../MentionTag/DraftMentionRow'
diff --git a/packages/client/components/Mentioned.tsx b/packages/client/components/Mentioned.tsx
index 82d98ff7655..0b5618a59ab 100644
--- a/packages/client/components/Mentioned.tsx
+++ b/packages/client/components/Mentioned.tsx
@@ -1,6 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
 import {Editor} from 'draft-js'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import NotificationAction from '~/components/NotificationAction'
 import useAtmosphere from '~/hooks/useAtmosphere'
diff --git a/packages/client/components/Menu.tsx b/packages/client/components/Menu.tsx
index d2512bacf7b..cb6b14bd38a 100644
--- a/packages/client/components/Menu.tsx
+++ b/packages/client/components/Menu.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
-import React, {
+
+import {
   Children,
   cloneElement,
   forwardRef,
@@ -11,6 +12,8 @@ import React, {
   useRef,
   useState
 } from 'react'
+
+import * as React from 'react'
 import {PortalStatus} from '../hooks/usePortal'
 import MenuItemAnimation from './MenuItemAnimation'
 
diff --git a/packages/client/components/MenuItem.tsx b/packages/client/components/MenuItem.tsx
index 0324538ddf3..d45112b7bfb 100644
--- a/packages/client/components/MenuItem.tsx
+++ b/packages/client/components/MenuItem.tsx
@@ -1,12 +1,6 @@
 import styled from '@emotion/styled'
-import React, {
-  forwardRef,
-  ReactNode,
-  RefObject,
-  useEffect,
-  useImperativeHandle,
-  useRef
-} from 'react'
+import * as React from 'react'
+import {forwardRef, ReactNode, RefObject, useEffect, useImperativeHandle, useRef} from 'react'
 import {PALETTE} from '../styles/paletteV3'
 import MenuItemLabel from './MenuItemLabel'
 
diff --git a/packages/client/components/MenuItemAnimation.tsx b/packages/client/components/MenuItemAnimation.tsx
index 989ae07af52..6c68336b252 100644
--- a/packages/client/components/MenuItemAnimation.tsx
+++ b/packages/client/components/MenuItemAnimation.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {PortalStatus} from '../hooks/usePortal'
 import {DECELERATE, fadeUp} from '../styles/animation'
 import {Duration} from '../types/constEnums'
diff --git a/packages/client/components/MenuItemWithIcon.tsx b/packages/client/components/MenuItemWithIcon.tsx
index 60cfd562fe8..c05241044b9 100644
--- a/packages/client/components/MenuItemWithIcon.tsx
+++ b/packages/client/components/MenuItemWithIcon.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {Bookmark, Comment, Delete, Edit, Keyboard} from '@mui/icons-material'
-import React from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 
 const Wrapper = styled('div')({
diff --git a/packages/client/components/MenuSearch.tsx b/packages/client/components/MenuSearch.tsx
index c7a55456a75..98d0263a1b9 100644
--- a/packages/client/components/MenuSearch.tsx
+++ b/packages/client/components/MenuSearch.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
-import React, {useCallback, useRef} from 'react'
+import * as React from 'react'
+import {useCallback, useRef} from 'react'
 import {PALETTE} from '../styles/paletteV3'
 
 interface Props {
diff --git a/packages/client/components/MicrosoftOAuthButtonBlock.tsx b/packages/client/components/MicrosoftOAuthButtonBlock.tsx
index ec75bfb7532..1c2ee20fe1c 100644
--- a/packages/client/components/MicrosoftOAuthButtonBlock.tsx
+++ b/packages/client/components/MicrosoftOAuthButtonBlock.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import clsx from 'clsx'
-import React from 'react'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import useRouter from '../hooks/useRouter'
diff --git a/packages/client/components/MiniPokerCard.tsx b/packages/client/components/MiniPokerCard.tsx
index cb85637e81d..ed7c94bb88c 100644
--- a/packages/client/components/MiniPokerCard.tsx
+++ b/packages/client/components/MiniPokerCard.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import PassSVG from '../../../static/images/icons/no_entry.svg'
 import {Elevation} from '../styles/elevation'
diff --git a/packages/client/components/MobileDashTopBar.tsx b/packages/client/components/MobileDashTopBar.tsx
index 5b61903e663..56742308a21 100644
--- a/packages/client/components/MobileDashTopBar.tsx
+++ b/packages/client/components/MobileDashTopBar.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {Menu} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
 import {ICON_SIZE} from '~/styles/typographyV2'
diff --git a/packages/client/components/MockFieldList.tsx b/packages/client/components/MockFieldList.tsx
index 26544433940..c0b4dd91934 100644
--- a/packages/client/components/MockFieldList.tsx
+++ b/packages/client/components/MockFieldList.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import MockFieldLine from '../modules/meeting/components/MockFieldLine'
 
 const Container = styled('div')({
diff --git a/packages/client/components/ModalError.tsx b/packages/client/components/ModalError.tsx
index 5bdd5e07619..0dcacce41d4 100644
--- a/packages/client/components/ModalError.tsx
+++ b/packages/client/components/ModalError.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {forwardRef, Ref} from 'react'
+import {forwardRef, Ref} from 'react'
 import useModal from '~/hooks/useModal'
 import DialogContent from './DialogContent'
 import DialogTitle from './DialogTitle'
diff --git a/packages/client/components/MyDashboardTasksAndHeader.tsx b/packages/client/components/MyDashboardTasksAndHeader.tsx
index 8ea14d366bd..bff6f909105 100644
--- a/packages/client/components/MyDashboardTasksAndHeader.tsx
+++ b/packages/client/components/MyDashboardTasksAndHeader.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {MyDashboardTasksAndHeaderQuery} from '../__generated__/MyDashboardTasksAndHeaderQuery.graphql'
 import UserTasksHeader from '../modules/userDashboard/components/UserTasksHeader/UserTasksHeader'
diff --git a/packages/client/components/MyDashboardTasksRoot.tsx b/packages/client/components/MyDashboardTasksRoot.tsx
index 2477a161c90..ad36e0dc0ed 100644
--- a/packages/client/components/MyDashboardTasksRoot.tsx
+++ b/packages/client/components/MyDashboardTasksRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {useQueryParameterParser} from '~/utils/useQueryParameterParser'
 import myDashboardTasksAndHeaderQuery, {
   MyDashboardTasksAndHeaderQuery
diff --git a/packages/client/components/MyDashboardTimeline.tsx b/packages/client/components/MyDashboardTimeline.tsx
index 5f44e842a1a..c67a01cba29 100644
--- a/packages/client/components/MyDashboardTimeline.tsx
+++ b/packages/client/components/MyDashboardTimeline.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import useDocumentTitle from '~/hooks/useDocumentTitle'
 import {MyDashboardTimelineQuery} from '../__generated__/MyDashboardTimelineQuery.graphql'
diff --git a/packages/client/components/MyDashboardTimelineRoot.tsx b/packages/client/components/MyDashboardTimelineRoot.tsx
index 0bfa541da40..c66ca0d7035 100644
--- a/packages/client/components/MyDashboardTimelineRoot.tsx
+++ b/packages/client/components/MyDashboardTimelineRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import myDashboardTimelineQuery, {
   MyDashboardTimelineQuery
 } from '../__generated__/MyDashboardTimelineQuery.graphql'
diff --git a/packages/client/components/NewAzureIssueInput.tsx b/packages/client/components/NewAzureIssueInput.tsx
index 323f93e026a..624dfdfbda8 100644
--- a/packages/client/components/NewAzureIssueInput.tsx
+++ b/packages/client/components/NewAzureIssueInput.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {ExpandMore} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {FormEvent, useEffect, useRef, useState} from 'react'
+import {FormEvent, useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {NewAzureIssueInput_viewer$key} from '~/__generated__/NewAzureIssueInput_viewer.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
diff --git a/packages/client/components/NewAzureIssueMenu.tsx b/packages/client/components/NewAzureIssueMenu.tsx
index 876cea0701d..56bbe750fdb 100644
--- a/packages/client/components/NewAzureIssueMenu.tsx
+++ b/packages/client/components/NewAzureIssueMenu.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {MenuProps} from '~/hooks/useMenu'
 import useSearchFilter from '~/hooks/useSearchFilter'
diff --git a/packages/client/components/NewGitHubIssueInput.tsx b/packages/client/components/NewGitHubIssueInput.tsx
index a9be74bcf2f..0e760e58075 100644
--- a/packages/client/components/NewGitHubIssueInput.tsx
+++ b/packages/client/components/NewGitHubIssueInput.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {ExpandMore} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {FormEvent, useEffect, useRef, useState} from 'react'
+import {FormEvent, useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {NewGitHubIssueInput_meeting$key} from '~/__generated__/NewGitHubIssueInput_meeting.graphql'
 import {NewGitHubIssueInput_viewer$key} from '~/__generated__/NewGitHubIssueInput_viewer.graphql'
diff --git a/packages/client/components/NewGitHubIssueMenu.tsx b/packages/client/components/NewGitHubIssueMenu.tsx
index 17a44d9dbe2..d6b540472d2 100644
--- a/packages/client/components/NewGitHubIssueMenu.tsx
+++ b/packages/client/components/NewGitHubIssueMenu.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import {Repo} from '~/hooks/useGetRepoContributions'
 import {MenuProps} from '~/hooks/useMenu'
 import useSearchFilter from '~/hooks/useSearchFilter'
diff --git a/packages/client/components/NewGitLabIssueInput.tsx b/packages/client/components/NewGitLabIssueInput.tsx
index 140c5f314dc..34ad73f9243 100644
--- a/packages/client/components/NewGitLabIssueInput.tsx
+++ b/packages/client/components/NewGitLabIssueInput.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {ExpandMore} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {FormEvent, useEffect, useRef, useState} from 'react'
+import {FormEvent, useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {NewGitLabIssueInput_viewer$key} from '~/__generated__/NewGitLabIssueInput_viewer.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
diff --git a/packages/client/components/NewGitLabIssueMenu.tsx b/packages/client/components/NewGitLabIssueMenu.tsx
index 56de23348e2..f43f5cdd898 100644
--- a/packages/client/components/NewGitLabIssueMenu.tsx
+++ b/packages/client/components/NewGitLabIssueMenu.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import {MenuProps} from '~/hooks/useMenu'
 import useSearchFilter from '~/hooks/useSearchFilter'
 import {EmptyDropdownMenuItemLabel} from './EmptyDropdownMenuItemLabel'
diff --git a/packages/client/components/NewIntegrationRecordButton.tsx b/packages/client/components/NewIntegrationRecordButton.tsx
index 5e57b9f5892..ed6b9b9c1b6 100644
--- a/packages/client/components/NewIntegrationRecordButton.tsx
+++ b/packages/client/components/NewIntegrationRecordButton.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {Add} from '@mui/icons-material'
-import React from 'react'
+import * as React from 'react'
 import {ZIndex} from '~/types/constEnums'
 import FloatingActionButton from './FloatingActionButton'
 
diff --git a/packages/client/components/NewJiraIssueInput.tsx b/packages/client/components/NewJiraIssueInput.tsx
index d904a5cc2d9..f3c0de103ba 100644
--- a/packages/client/components/NewJiraIssueInput.tsx
+++ b/packages/client/components/NewJiraIssueInput.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {ExpandMore} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {FormEvent, useEffect, useRef, useState} from 'react'
+import {FormEvent, useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {MenuPosition} from '~/hooks/useCoords'
diff --git a/packages/client/components/NewJiraIssueMenu.tsx b/packages/client/components/NewJiraIssueMenu.tsx
index b20c582cb1d..96e04d04dc0 100644
--- a/packages/client/components/NewJiraIssueMenu.tsx
+++ b/packages/client/components/NewJiraIssueMenu.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {MenuProps} from '~/hooks/useMenu'
 import useSearchFilter from '~/hooks/useSearchFilter'
diff --git a/packages/client/components/NewMeetingActions.tsx b/packages/client/components/NewMeetingActions.tsx
index 9ee965291a5..948e4fce2c5 100644
--- a/packages/client/components/NewMeetingActions.tsx
+++ b/packages/client/components/NewMeetingActions.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {NewMeetingActions_team$key} from '~/__generated__/NewMeetingActions_team.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/NewMeetingActionsCurrentMeetings.tsx b/packages/client/components/NewMeetingActionsCurrentMeetings.tsx
index 4c75e29d853..bc4b038b965 100644
--- a/packages/client/components/NewMeetingActionsCurrentMeetings.tsx
+++ b/packages/client/components/NewMeetingActionsCurrentMeetings.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {Forum} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {NewMeetingActionsCurrentMeetings_team$key} from '~/__generated__/NewMeetingActionsCurrentMeetings_team.graphql'
 import useSnacksForNewMeetings from '~/hooks/useSnacksForNewMeetings'
diff --git a/packages/client/components/NewMeetingCheckIn.tsx b/packages/client/components/NewMeetingCheckIn.tsx
index 9ca9869724a..bd36ccc0c63 100644
--- a/packages/client/components/NewMeetingCheckIn.tsx
+++ b/packages/client/components/NewMeetingCheckIn.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {RecordVoiceOver} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {ReactElement} from 'react'
+import {ReactElement} from 'react'
 import {useFragment} from 'react-relay'
 import {NewMeetingCheckIn_meeting$key} from '~/__generated__/NewMeetingCheckIn_meeting.graphql'
 import useGotoStageId from '~/hooks/useGotoStageId'
diff --git a/packages/client/components/NewMeetingSettingsToggleAnonymity.tsx b/packages/client/components/NewMeetingSettingsToggleAnonymity.tsx
index 26dfea3f66d..3128ef0ff0a 100644
--- a/packages/client/components/NewMeetingSettingsToggleAnonymity.tsx
+++ b/packages/client/components/NewMeetingSettingsToggleAnonymity.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {NewMeetingSettingsToggleAnonymity_settings$key} from '~/__generated__/NewMeetingSettingsToggleAnonymity_settings.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/NewMeetingSettingsToggleCheckIn.tsx b/packages/client/components/NewMeetingSettingsToggleCheckIn.tsx
index fad4442cf45..72085c3f0c6 100644
--- a/packages/client/components/NewMeetingSettingsToggleCheckIn.tsx
+++ b/packages/client/components/NewMeetingSettingsToggleCheckIn.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {NewMeetingSettingsToggleCheckIn_settings$key} from '~/__generated__/NewMeetingSettingsToggleCheckIn_settings.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/NewMeetingSettingsToggleTeamHealth.tsx b/packages/client/components/NewMeetingSettingsToggleTeamHealth.tsx
index 542938fd461..9072e995afd 100644
--- a/packages/client/components/NewMeetingSettingsToggleTeamHealth.tsx
+++ b/packages/client/components/NewMeetingSettingsToggleTeamHealth.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {NewMeetingSettingsToggleTeamHealth_settings$key} from '~/__generated__/NewMeetingSettingsToggleTeamHealth_settings.graphql'
 import {NewMeetingSettingsToggleTeamHealth_team$key} from '~/__generated__/NewMeetingSettingsToggleTeamHealth_team.graphql'
diff --git a/packages/client/components/NewMeetingSettingsToggleTranscription.tsx b/packages/client/components/NewMeetingSettingsToggleTranscription.tsx
index 92ed4edba81..9209997d488 100644
--- a/packages/client/components/NewMeetingSettingsToggleTranscription.tsx
+++ b/packages/client/components/NewMeetingSettingsToggleTranscription.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import DeleteIcon from '@mui/icons-material/Delete'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {NewMeetingSettingsToggleTranscription_settings$key} from '~/__generated__/NewMeetingSettingsToggleTranscription_settings.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/NewMeetingSettingsUpgradeForTeamHealth.tsx b/packages/client/components/NewMeetingSettingsUpgradeForTeamHealth.tsx
index 2149ebf098e..8fd0470ffba 100644
--- a/packages/client/components/NewMeetingSettingsUpgradeForTeamHealth.tsx
+++ b/packages/client/components/NewMeetingSettingsUpgradeForTeamHealth.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {Lock} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
+import {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {NewMeetingSettingsUpgradeForTeamHealth_team$key} from '~/__generated__/NewMeetingSettingsUpgradeForTeamHealth_team.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
@@ -45,7 +45,7 @@ const NewMeetingSettingsToggleTeamHealth = (props: Props) => {
   const {orgId} = team
   const atmosphere = useAtmosphere()
 
-  React.useEffect(() => {
+  useEffect(() => {
     SendClientSideEvent(atmosphere, 'Upgrade CTA Viewed', {
       upgradeCTALocation: 'meetingSettingsTeamHealth',
       meetingType: 'retrospective',
diff --git a/packages/client/components/NewMeetingSidebar.tsx b/packages/client/components/NewMeetingSidebar.tsx
index 0591e5461a6..b763bbe59cd 100644
--- a/packages/client/components/NewMeetingSidebar.tsx
+++ b/packages/client/components/NewMeetingSidebar.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {useFragment} from 'react-relay'
 import {Link} from 'react-router-dom'
 import {NewMeetingSidebar_meeting$key} from '~/__generated__/NewMeetingSidebar_meeting.graphql'
diff --git a/packages/client/components/NewMeetingSidebarPhaseListItem.tsx b/packages/client/components/NewMeetingSidebarPhaseListItem.tsx
index 31b929e1cf3..8000bafb6df 100644
--- a/packages/client/components/NewMeetingSidebarPhaseListItem.tsx
+++ b/packages/client/components/NewMeetingSidebarPhaseListItem.tsx
@@ -10,7 +10,7 @@ import {
   ThumbsUpDown,
   Update
 } from '@mui/icons-material'
-import React from 'react'
+import {useEffect} from 'react'
 import {NewMeetingPhaseTypeEnum} from '~/__generated__/NewMeetingSettingsToggleCheckIn_settings.graphql'
 import {MenuPosition} from '../hooks/useCoords'
 import useTooltip from '../hooks/useTooltip'
@@ -167,7 +167,7 @@ const NewMeetingSidebarPhaseListItem = (props: Props) => {
     }
   )
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (isConfirming) {
       openTooltip()
     }
diff --git a/packages/client/components/NewMeetingSidebarUpgradeBlock.tsx b/packages/client/components/NewMeetingSidebarUpgradeBlock.tsx
index a87cad5ac2d..da73ee6ba84 100644
--- a/packages/client/components/NewMeetingSidebarUpgradeBlock.tsx
+++ b/packages/client/components/NewMeetingSidebarUpgradeBlock.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {useEffect} from 'react'
+import {useEffect, useState} from 'react'
 import {useHistory} from 'react-router'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {PALETTE} from '../styles/paletteV3'
@@ -67,7 +67,7 @@ interface Props {
 const NewMeetingSidebarUpgradeBlock = (props: Props) => {
   const {onClick, orgId, meetingId} = props
   const history = useHistory()
-  const [closed, setClosed] = React.useState(false)
+  const [closed, setClosed] = useState(false)
   const atmosphere = useAtmosphere()
 
   const handleUpgradeClick = () => {
diff --git a/packages/client/components/NewMeetingTeamPicker.tsx b/packages/client/components/NewMeetingTeamPicker.tsx
index 24250081504..259b1c0253d 100644
--- a/packages/client/components/NewMeetingTeamPicker.tsx
+++ b/packages/client/components/NewMeetingTeamPicker.tsx
@@ -1,7 +1,6 @@
 import {ExpandMore, LockOpen} from '@mui/icons-material'
 import * as DropdownMenu from '@radix-ui/react-dropdown-menu'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {NewMeetingTeamPicker_selectedTeam$key} from '~/__generated__/NewMeetingTeamPicker_selectedTeam.graphql'
 import {NewMeetingTeamPicker_teams$key} from '~/__generated__/NewMeetingTeamPicker_teams.graphql'
diff --git a/packages/client/components/NewMeetingTeamPickerAvatars.tsx b/packages/client/components/NewMeetingTeamPickerAvatars.tsx
index 73a4ee1c187..2f2281d2605 100644
--- a/packages/client/components/NewMeetingTeamPickerAvatars.tsx
+++ b/packages/client/components/NewMeetingTeamPickerAvatars.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {NewMeetingTeamPickerAvatars_team$key} from '../__generated__/NewMeetingTeamPickerAvatars_team.graphql'
 import getShuffledArr from '../utils/getShuffledArr'
diff --git a/packages/client/components/NewTeamOrgDropdown.tsx b/packages/client/components/NewTeamOrgDropdown.tsx
index 3778804e48a..fd9fd64ba20 100644
--- a/packages/client/components/NewTeamOrgDropdown.tsx
+++ b/packages/client/components/NewTeamOrgDropdown.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {NewTeamOrgDropdown_organizations$key} from '../__generated__/NewTeamOrgDropdown_organizations.graphql'
 import {MenuProps} from '../hooks/useMenu'
diff --git a/packages/client/components/NotFound/NotFound.tsx b/packages/client/components/NotFound/NotFound.tsx
index 1474bf8f4bc..3e929c471f8 100644
--- a/packages/client/components/NotFound/NotFound.tsx
+++ b/packages/client/components/NotFound/NotFound.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {useEffect, useRef, useState} from 'react'
+import {useEffect, useRef, useState} from 'react'
 import {PALETTE} from '../../styles/paletteV3'
 import Confetti from '../Confetti'
 
diff --git a/packages/client/components/NotificationAction.tsx b/packages/client/components/NotificationAction.tsx
index 6eac14ae9d4..d99579ca5e0 100644
--- a/packages/client/components/NotificationAction.tsx
+++ b/packages/client/components/NotificationAction.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React from 'react'
+import * as React from 'react'
 import {PALETTE} from '../styles/paletteV3'
 import PlainButton from './PlainButton/PlainButton'
 
diff --git a/packages/client/components/NotificationDropdown.tsx b/packages/client/components/NotificationDropdown.tsx
index 3afb59a34a1..f6330642d83 100644
--- a/packages/client/components/NotificationDropdown.tsx
+++ b/packages/client/components/NotificationDropdown.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {RefObject} from 'react'
+import {RefObject} from 'react'
 import {usePaginationFragment} from 'react-relay'
 import {
   NotificationDropdown_query$data,
diff --git a/packages/client/components/NotificationPicker.tsx b/packages/client/components/NotificationPicker.tsx
index 6df1f86dd52..c079c5fe41f 100644
--- a/packages/client/components/NotificationPicker.tsx
+++ b/packages/client/components/NotificationPicker.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import {
   NotificationEnum,
diff --git a/packages/client/components/NotificationRow.tsx b/packages/client/components/NotificationRow.tsx
index eda7ebea52f..6e4b71b823f 100644
--- a/packages/client/components/NotificationRow.tsx
+++ b/packages/client/components/NotificationRow.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {ReactNode, useState} from 'react'
+import {ReactNode, useState} from 'react'
 import {NotificationStatusEnum} from '../__generated__/NotificationDropdown_query.graphql'
 import {PALETTE} from '../styles/paletteV3'
 
diff --git a/packages/client/components/NotificationSubtitle.tsx b/packages/client/components/NotificationSubtitle.tsx
index d1d0fc80663..8538f21f763 100644
--- a/packages/client/components/NotificationSubtitle.tsx
+++ b/packages/client/components/NotificationSubtitle.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {PALETTE} from '../styles/paletteV3'
 import relativeDate from '../utils/date/relativeDate'
 
diff --git a/packages/client/components/NotificationTemplate.tsx b/packages/client/components/NotificationTemplate.tsx
index 279ac41f640..a18842a6938 100644
--- a/packages/client/components/NotificationTemplate.tsx
+++ b/packages/client/components/NotificationTemplate.tsx
@@ -1,6 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
 import ms from 'ms'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {useFragment} from 'react-relay'
 import parabolLogo from 'static/images/brand/mark-color.svg'
 import {NotificationTemplate_notification$key} from '~/__generated__/NotificationTemplate_notification.graphql'
diff --git a/packages/client/components/NullCard/NullCard.tsx b/packages/client/components/NullCard/NullCard.tsx
index 00865769c95..bce36c81090 100644
--- a/packages/client/components/NullCard/NullCard.tsx
+++ b/packages/client/components/NullCard/NullCard.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {PALETTE} from '../../styles/paletteV3'
 import {Card} from '../../types/constEnums'
 import CreateCardRootStyles from '../CreateCard/CreateCardRootStyles'
diff --git a/packages/client/components/NullableTask/NullableTask.tsx b/packages/client/components/NullableTask/NullableTask.tsx
index bcca9e0e861..6ef2353f43a 100644
--- a/packages/client/components/NullableTask/NullableTask.tsx
+++ b/packages/client/components/NullableTask/NullableTask.tsx
@@ -1,6 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
 import {convertFromRaw} from 'draft-js'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql'
 import {NullableTask_task$key} from '../../__generated__/NullableTask_task.graphql'
diff --git a/packages/client/components/OrgAdminActionMenu.tsx b/packages/client/components/OrgAdminActionMenu.tsx
index 9a3dcab406b..d9c557d5e44 100644
--- a/packages/client/components/OrgAdminActionMenu.tsx
+++ b/packages/client/components/OrgAdminActionMenu.tsx
@@ -1,6 +1,5 @@
 import {MoreVert} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {OrgAdminActionMenu_organization$key} from '../__generated__/OrgAdminActionMenu_organization.graphql'
diff --git a/packages/client/components/OrgAvatarInput.tsx b/packages/client/components/OrgAvatarInput.tsx
index 56abd163dea..21221bf12ae 100644
--- a/packages/client/components/OrgAvatarInput.tsx
+++ b/packages/client/components/OrgAvatarInput.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import sanitizeSVG from '@mattkrick/sanitize-svg'
-import React from 'react'
 import UploadOrgImageMutation from '~/mutations/UploadOrgImageMutation'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
diff --git a/packages/client/components/OverflowAvatar.tsx b/packages/client/components/OverflowAvatar.tsx
index 3d404c16d4d..42f7b3eed8b 100644
--- a/packages/client/components/OverflowAvatar.tsx
+++ b/packages/client/components/OverflowAvatar.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {useRef} from 'react'
+import {useRef} from 'react'
 import {TransitionStatus} from '~/hooks/useTransition'
 import useResizeFontForElement from '../hooks/useResizeFontForElement'
 import {PALETTE} from '../styles/paletteV3'
diff --git a/packages/client/components/PaletteColor/PaletteColor.tsx b/packages/client/components/PaletteColor/PaletteColor.tsx
index ea835de80c9..da83c799503 100644
--- a/packages/client/components/PaletteColor/PaletteColor.tsx
+++ b/packages/client/components/PaletteColor/PaletteColor.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {Check} from '@mui/icons-material'
-import React from 'react'
 import {MenuPosition} from '~/hooks/useCoords'
 import useTooltip from '~/hooks/useTooltip'
 import {PALETTE} from '~/styles/paletteV3'
diff --git a/packages/client/components/PalettePicker/PalettePicker.tsx b/packages/client/components/PalettePicker/PalettePicker.tsx
index 41cefa48c8d..dc988ac4548 100644
--- a/packages/client/components/PalettePicker/PalettePicker.tsx
+++ b/packages/client/components/PalettePicker/PalettePicker.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {PalettePicker_prompt$key} from '~/__generated__/PalettePicker_prompt.graphql'
 import {PalettePicker_prompts$key} from '~/__generated__/PalettePicker_prompts.graphql'
diff --git a/packages/client/components/Panel/Panel.tsx b/packages/client/components/Panel/Panel.tsx
index 4e521f67daf..01e87deafe0 100644
--- a/packages/client/components/Panel/Panel.tsx
+++ b/packages/client/components/Panel/Panel.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {CSSProperties, ReactNode} from 'react'
+import {CSSProperties, ReactNode} from 'react'
 import {panelShadow} from '../../styles/elevation'
 import {Layout} from '../../types/constEnums'
 import LabelHeading from '../LabelHeading/LabelHeading'
diff --git a/packages/client/components/ParabolLogoSVG.tsx b/packages/client/components/ParabolLogoSVG.tsx
index df091696749..13c341503da 100644
--- a/packages/client/components/ParabolLogoSVG.tsx
+++ b/packages/client/components/ParabolLogoSVG.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
+import {memo} from 'react'
 
-const ParabolLogoSVG = React.memo(() => {
+const ParabolLogoSVG = memo(() => {
   return (
     <svg
       xmlns='http://www.w3.org/2000/svg'
diff --git a/packages/client/components/ParabolScopingSearchBar.tsx b/packages/client/components/ParabolScopingSearchBar.tsx
index 5f43d56faa4..30b2ebaf504 100644
--- a/packages/client/components/ParabolScopingSearchBar.tsx
+++ b/packages/client/components/ParabolScopingSearchBar.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ParabolScopingSearchBar_meeting$key} from '../__generated__/ParabolScopingSearchBar_meeting.graphql'
 import ParabolScopingSearchFilterToggle from './ParabolScopingSearchFilterToggle'
diff --git a/packages/client/components/ParabolScopingSearchFilterMenu.tsx b/packages/client/components/ParabolScopingSearchFilterMenu.tsx
index 1a69f762037..4c5d22882da 100644
--- a/packages/client/components/ParabolScopingSearchFilterMenu.tsx
+++ b/packages/client/components/ParabolScopingSearchFilterMenu.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {ParabolSearchQuery} from '~/types/clientSchema'
diff --git a/packages/client/components/ParabolScopingSearchFilterToggle.tsx b/packages/client/components/ParabolScopingSearchFilterToggle.tsx
index 018cb6c4ad9..b35da6973ba 100644
--- a/packages/client/components/ParabolScopingSearchFilterToggle.tsx
+++ b/packages/client/components/ParabolScopingSearchFilterToggle.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {MenuPosition} from '~/hooks/useCoords'
 import useMenu from '~/hooks/useMenu'
diff --git a/packages/client/components/ParabolScopingSearchResultItem.tsx b/packages/client/components/ParabolScopingSearchResultItem.tsx
index c5e2f5b6858..6942bd1a490 100644
--- a/packages/client/components/ParabolScopingSearchResultItem.tsx
+++ b/packages/client/components/ParabolScopingSearchResultItem.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import {convertToRaw} from 'draft-js'
-import React, {useRef} from 'react'
+import {useRef} from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useEditorState from '~/hooks/useEditorState'
diff --git a/packages/client/components/ParabolScopingSearchResults.tsx b/packages/client/components/ParabolScopingSearchResults.tsx
index 5726c7fa882..6817e51e344 100644
--- a/packages/client/components/ParabolScopingSearchResults.tsx
+++ b/packages/client/components/ParabolScopingSearchResults.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useState} from 'react'
+import {useEffect, useState} from 'react'
 import {PreloadedQuery, useFragment, usePaginationFragment, usePreloadedQuery} from 'react-relay'
 import useGetUsedServiceTaskIds from '~/hooks/useGetUsedServiceTaskIds'
 import useMutationProps from '~/hooks/useMutationProps'
diff --git a/packages/client/components/ParabolScopingSearchResultsRoot.tsx b/packages/client/components/ParabolScopingSearchResultsRoot.tsx
index 9f69f579116..8b83a047200 100644
--- a/packages/client/components/ParabolScopingSearchResultsRoot.tsx
+++ b/packages/client/components/ParabolScopingSearchResultsRoot.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import {ParabolSearchQuery} from '~/types/clientSchema'
 import {taskScopingStatusFilters} from '~/utils/constants'
diff --git a/packages/client/components/ParabolScopingSelectAllTasks.tsx b/packages/client/components/ParabolScopingSelectAllTasks.tsx
index e0b019610af..ee0f9863d80 100644
--- a/packages/client/components/ParabolScopingSelectAllTasks.tsx
+++ b/packages/client/components/ParabolScopingSelectAllTasks.tsx
@@ -1,7 +1,6 @@
 /* Copy and pasted from `./JiraScopingSelectAllIssues.tsx` */
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useMutationProps from '~/hooks/useMutationProps'
 import useUnusedRecords from '~/hooks/useUnusedRecords'
diff --git a/packages/client/components/PasswordInputField.tsx b/packages/client/components/PasswordInputField.tsx
index ce812f4cfe9..2bf0f38ff0e 100644
--- a/packages/client/components/PasswordInputField.tsx
+++ b/packages/client/components/PasswordInputField.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React from 'react'
+import * as React from 'react'
 import UnderlineInput from './InputField/UnderlineInput'
 import TinyLabel from './TinyLabel'
 
diff --git a/packages/client/components/PasswordResetLink.tsx b/packages/client/components/PasswordResetLink.tsx
index 59a59eb6f9b..db814997d93 100644
--- a/packages/client/components/PasswordResetLink.tsx
+++ b/packages/client/components/PasswordResetLink.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import passwordIcon from '../../../static/images/icons/password_black_24dp.svg'
 import {PasswordResetLink_viewer$key} from '../__generated__/PasswordResetLink_viewer.graphql'
diff --git a/packages/client/components/PaymentRejected.tsx b/packages/client/components/PaymentRejected.tsx
index f4fc172a364..1e4276fde43 100644
--- a/packages/client/components/PaymentRejected.tsx
+++ b/packages/client/components/PaymentRejected.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import NotificationAction from '~/components/NotificationAction'
 import {PaymentRejected_notification$key} from '../__generated__/PaymentRejected_notification.graphql'
diff --git a/packages/client/components/PhaseWrapper.tsx b/packages/client/components/PhaseWrapper.tsx
index 1d4f80429a9..033d86be5c3 100644
--- a/packages/client/components/PhaseWrapper.tsx
+++ b/packages/client/components/PhaseWrapper.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {forwardRef, ReactNode} from 'react'
+import {forwardRef, ReactNode} from 'react'
 import ErrorBoundary from './ErrorBoundary'
 
 const PhaseWrapperStyles = styled('div')({
diff --git a/packages/client/components/PinnedSnackbarNotifications.tsx b/packages/client/components/PinnedSnackbarNotifications.tsx
index f1922402631..a240eb8b61b 100644
--- a/packages/client/components/PinnedSnackbarNotifications.tsx
+++ b/packages/client/components/PinnedSnackbarNotifications.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
+import {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {PinnedSnackbarNotifications_query$key} from '~/__generated__/PinnedSnackbarNotifications_query.graphql'
 import {NotificationEnum} from '../__generated__/popNotificationToast_notification.graphql'
@@ -58,7 +58,7 @@ const PinnedSnackbarNotifications = ({queryRef}: Props) => {
     ({node}) => node.status === 'UNREAD' && Object.keys(typePicker).includes(node.type)
   )
 
-  React.useEffect(() => {
+  useEffect(() => {
     snackbarNotifications.forEach(({node}) => {
       const specificNotificationToastMapper = typePicker[node.type]
       if (!specificNotificationToastMapper) {
diff --git a/packages/client/components/PokerActiveVoting.tsx b/packages/client/components/PokerActiveVoting.tsx
index f1c2fc64840..4e7d31be4aa 100644
--- a/packages/client/components/PokerActiveVoting.tsx
+++ b/packages/client/components/PokerActiveVoting.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {Check as CheckIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import useMutationProps from '~/hooks/useMutationProps'
 import {PALETTE} from '~/styles/paletteV3'
diff --git a/packages/client/components/PokerCard.tsx b/packages/client/components/PokerCard.tsx
index 10d1be85bb5..427e4f31d64 100644
--- a/packages/client/components/PokerCard.tsx
+++ b/packages/client/components/PokerCard.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {RefObject, useEffect, useRef} from 'react'
+import {RefObject, useEffect, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import useBreakpoint from '~/hooks/useBreakpoint'
 import PassSVG from '../../../static/images/icons/no_entry.svg'
diff --git a/packages/client/components/PokerCardDeck.tsx b/packages/client/components/PokerCardDeck.tsx
index 41932cae97e..5e0a5235a4c 100644
--- a/packages/client/components/PokerCardDeck.tsx
+++ b/packages/client/components/PokerCardDeck.tsx
@@ -1,6 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {KeyboardEvent, RefObject, useEffect, useMemo, useRef, useState} from 'react'
+import * as React from 'react'
+import {KeyboardEvent, RefObject, useEffect, useMemo, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import useMutationProps from '~/hooks/useMutationProps'
 import usePokerDeckLeftEdge from '~/hooks/usePokerDeckLeftEdge'
diff --git a/packages/client/components/PokerDimensionFinalScorePicker.tsx b/packages/client/components/PokerDimensionFinalScorePicker.tsx
index ad6e992b948..8e1576febfe 100644
--- a/packages/client/components/PokerDimensionFinalScorePicker.tsx
+++ b/packages/client/components/PokerDimensionFinalScorePicker.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {RefObject} from 'react'
+import {RefObject} from 'react'
 import {useFragment} from 'react-relay'
 import useBreakpoint from '~/hooks/useBreakpoint'
 import {Breakpoint} from '~/types/constEnums'
diff --git a/packages/client/components/PokerDimensionValueControl.tsx b/packages/client/components/PokerDimensionValueControl.tsx
index 1f62fe52492..639059471fc 100644
--- a/packages/client/components/PokerDimensionValueControl.tsx
+++ b/packages/client/components/PokerDimensionValueControl.tsx
@@ -1,6 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {Dispatch, MutableRefObject, SetStateAction, useRef} from 'react'
+import * as React from 'react'
+import {Dispatch, MutableRefObject, SetStateAction, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import useBreakpoint from '~/hooks/useBreakpoint'
 import {PALETTE} from '~/styles/paletteV3'
diff --git a/packages/client/components/PokerDiscussVoting.tsx b/packages/client/components/PokerDiscussVoting.tsx
index 148189efbcb..444d416c807 100644
--- a/packages/client/components/PokerDiscussVoting.tsx
+++ b/packages/client/components/PokerDiscussVoting.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useMemo, useRef, useState} from 'react'
+import {Fragment, useEffect, useMemo, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {PokerDiscussVoting_meeting$key} from '../__generated__/PokerDiscussVoting_meeting.graphql'
@@ -177,14 +177,14 @@ const PokerDiscussVoting = (props: Props) => {
           }
 
           return (
-            <React.Fragment key={key}>
+            <Fragment key={key}>
               <PokerVotingRow
                 scaleValue={scaleValue}
                 scores={scores}
                 setFinalScore={canClick ? setFinalScore : undefined}
                 isInitialStageRender={isInitialStageRender}
               />
-            </React.Fragment>
+            </Fragment>
           )
         })}
       </GroupedVotes>
diff --git a/packages/client/components/PokerEstimateHeaderCard.tsx b/packages/client/components/PokerEstimateHeaderCard.tsx
index 5c67174f6d0..717477d73d2 100644
--- a/packages/client/components/PokerEstimateHeaderCard.tsx
+++ b/packages/client/components/PokerEstimateHeaderCard.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {
   PokerEstimateHeaderCard_stage$data,
diff --git a/packages/client/components/PokerEstimateHeaderCardContent.tsx b/packages/client/components/PokerEstimateHeaderCardContent.tsx
index b5b68beb700..586e0493e52 100644
--- a/packages/client/components/PokerEstimateHeaderCardContent.tsx
+++ b/packages/client/components/PokerEstimateHeaderCardContent.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {Launch} from '@mui/icons-material'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import useBreakpoint from '~/hooks/useBreakpoint'
 import {Elevation} from '~/styles/elevation'
 import {PALETTE} from '~/styles/paletteV3'
diff --git a/packages/client/components/PokerEstimateHeaderCardError.tsx b/packages/client/components/PokerEstimateHeaderCardError.tsx
index c7e5b35da4b..3797e052f16 100644
--- a/packages/client/components/PokerEstimateHeaderCardError.tsx
+++ b/packages/client/components/PokerEstimateHeaderCardError.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import useBreakpoint from '../hooks/useBreakpoint'
 import {Elevation} from '../styles/elevation'
 import {PALETTE} from '../styles/paletteV3'
diff --git a/packages/client/components/PokerEstimateHeaderCardParabol.tsx b/packages/client/components/PokerEstimateHeaderCardParabol.tsx
index e0b54b7d65d..2d7de26b41d 100644
--- a/packages/client/components/PokerEstimateHeaderCardParabol.tsx
+++ b/packages/client/components/PokerEstimateHeaderCardParabol.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import {convertToRaw} from 'draft-js'
-import React, {useRef, useState} from 'react'
+import {useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import useBreakpoint from '~/hooks/useBreakpoint'
 import useEditorState from '~/hooks/useEditorState'
diff --git a/packages/client/components/PokerEstimatePhase.tsx b/packages/client/components/PokerEstimatePhase.tsx
index 4c4e6036f6d..fafb852d7a5 100644
--- a/packages/client/components/PokerEstimatePhase.tsx
+++ b/packages/client/components/PokerEstimatePhase.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useBreakpoint from '~/hooks/useBreakpoint'
 import useGotoStageId from '~/hooks/useGotoStageId'
diff --git a/packages/client/components/PokerMeeting.tsx b/packages/client/components/PokerMeeting.tsx
index a13b3669f3b..cf49f29f1b7 100644
--- a/packages/client/components/PokerMeeting.tsx
+++ b/packages/client/components/PokerMeeting.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {ReactElement, Suspense} from 'react'
+import {ReactElement, Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import {
   NewMeetingPhaseTypeEnum,
diff --git a/packages/client/components/PokerMeetingSidebar.tsx b/packages/client/components/PokerMeetingSidebar.tsx
index 53e9cb6cfd7..1356400253e 100644
--- a/packages/client/components/PokerMeetingSidebar.tsx
+++ b/packages/client/components/PokerMeetingSidebar.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {Fragment} from 'react'
+import {Fragment} from 'react'
 import {useFragment} from 'react-relay'
 import {
   NewMeetingPhaseTypeEnum,
diff --git a/packages/client/components/PokerSidebarEstimateMeta.tsx b/packages/client/components/PokerSidebarEstimateMeta.tsx
index 6f114869d4b..75b072f63a0 100644
--- a/packages/client/components/PokerSidebarEstimateMeta.tsx
+++ b/packages/client/components/PokerSidebarEstimateMeta.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {MenuPosition} from '../hooks/useCoords'
 import useTooltip from '../hooks/useTooltip'
 import {PALETTE} from '../styles/paletteV3'
diff --git a/packages/client/components/PokerSidebarEstimateSection.tsx b/packages/client/components/PokerSidebarEstimateSection.tsx
index 235267fa14c..34454fc20d4 100644
--- a/packages/client/components/PokerSidebarEstimateSection.tsx
+++ b/packages/client/components/PokerSidebarEstimateSection.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {DragDropContext, Draggable, Droppable, DropResult} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
 import {PokerSidebarEstimateSection_meeting$key} from '~/__generated__/PokerSidebarEstimateSection_meeting.graphql'
diff --git a/packages/client/components/PokerSidebarPhaseListItemChildren.tsx b/packages/client/components/PokerSidebarPhaseListItemChildren.tsx
index d40750e3f5e..235291d9fd6 100644
--- a/packages/client/components/PokerSidebarPhaseListItemChildren.tsx
+++ b/packages/client/components/PokerSidebarPhaseListItemChildren.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {
   NewMeetingPhaseTypeEnum,
diff --git a/packages/client/components/PokerVotingNoVotes.tsx b/packages/client/components/PokerVotingNoVotes.tsx
index a93d89df566..9920ea6d2a2 100644
--- a/packages/client/components/PokerVotingNoVotes.tsx
+++ b/packages/client/components/PokerVotingNoVotes.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {PALETTE} from '../styles/paletteV3'
 import {PokerCards} from '../types/constEnums'
 
diff --git a/packages/client/components/PokerVotingRow.tsx b/packages/client/components/PokerVotingRow.tsx
index 0256935ca6e..718b77f0005 100644
--- a/packages/client/components/PokerVotingRow.tsx
+++ b/packages/client/components/PokerVotingRow.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {PokerVotingRow_scaleValue$key} from '../__generated__/PokerVotingRow_scaleValue.graphql'
 import {PokerVotingRow_scores$key} from '../__generated__/PokerVotingRow_scores.graphql'
diff --git a/packages/client/components/Poll/AddPollOptionButton.tsx b/packages/client/components/Poll/AddPollOptionButton.tsx
index 6f8d5e54cc7..f1ea4dfdd27 100644
--- a/packages/client/components/Poll/AddPollOptionButton.tsx
+++ b/packages/client/components/Poll/AddPollOptionButton.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {AddOutlined} from '@mui/icons-material'
-import React from 'react'
 import {PollsAriaLabels} from '~/types/constEnums'
 import {PALETTE} from '../../styles/paletteV3'
 import PlainButton from '../PlainButton/PlainButton'
diff --git a/packages/client/components/Poll/EditablePollOption.tsx b/packages/client/components/Poll/EditablePollOption.tsx
index d5cbb5df84e..b33ecfe7b2c 100644
--- a/packages/client/components/Poll/EditablePollOption.tsx
+++ b/packages/client/components/Poll/EditablePollOption.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
+import * as React from 'react'
 import {useFragment} from 'react-relay'
 import {EditablePollOption_option$key} from '../../__generated__/EditablePollOption_option.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
diff --git a/packages/client/components/Poll/EditablePollTitle.tsx b/packages/client/components/Poll/EditablePollTitle.tsx
index 9516e4c3256..9e55d848c4f 100644
--- a/packages/client/components/Poll/EditablePollTitle.tsx
+++ b/packages/client/components/Poll/EditablePollTitle.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
+import * as React from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
 import {Polls, PollsAriaLabels} from '~/types/constEnums'
diff --git a/packages/client/components/Poll/Poll.tsx b/packages/client/components/Poll/Poll.tsx
index a012fc0f765..269aa0df73f 100644
--- a/packages/client/components/Poll/Poll.tsx
+++ b/packages/client/components/Poll/Poll.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
+import * as React from 'react'
 import {useFragment} from 'react-relay'
 import {Poll_poll$key} from '~/__generated__/Poll_poll.graphql'
 import {cardShadow, Elevation} from '~/styles/elevation'
diff --git a/packages/client/components/Poll/PollOption.tsx b/packages/client/components/Poll/PollOption.tsx
index 085cd9c53c3..ac727738557 100644
--- a/packages/client/components/Poll/PollOption.tsx
+++ b/packages/client/components/Poll/PollOption.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
 import {PollOption_option$key} from '../../__generated__/PollOption_option.graphql'
diff --git a/packages/client/components/Poll/PollTitle.tsx b/packages/client/components/Poll/PollTitle.tsx
index fe41b732ebb..fa6f4645456 100644
--- a/packages/client/components/Poll/PollTitle.tsx
+++ b/packages/client/components/Poll/PollTitle.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {PollTitle_poll$key} from '../../__generated__/PollTitle_poll.graphql'
 
diff --git a/packages/client/components/PrimaryButton.tsx b/packages/client/components/PrimaryButton.tsx
index fd5aece1634..83cf81f8edc 100644
--- a/packages/client/components/PrimaryButton.tsx
+++ b/packages/client/components/PrimaryButton.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import {Elevation} from '~/styles/elevation'
 import {PALETTE} from '~/styles/paletteV3'
 import {Radius} from '~/types/constEnums'
diff --git a/packages/client/components/PrivateRoutes.tsx b/packages/client/components/PrivateRoutes.tsx
index 6509d72a7ba..b4417b9a69f 100644
--- a/packages/client/components/PrivateRoutes.tsx
+++ b/packages/client/components/PrivateRoutes.tsx
@@ -1,5 +1,5 @@
 import {Location} from 'history'
-import React, {lazy} from 'react'
+import {lazy} from 'react'
 import {Redirect, Route, Switch, useLocation} from 'react-router'
 import useAuthRoute from '../hooks/useAuthRoute'
 import useNoIndex from '../hooks/useNoIndex'
diff --git a/packages/client/components/PromoteToBillingLeader.tsx b/packages/client/components/PromoteToBillingLeader.tsx
index 76844479944..0fbeb111684 100644
--- a/packages/client/components/PromoteToBillingLeader.tsx
+++ b/packages/client/components/PromoteToBillingLeader.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {PromoteToBillingLeader_notification$key} from '~/__generated__/PromoteToBillingLeader_notification.graphql'
 import useRouter from '~/hooks/useRouter'
diff --git a/packages/client/components/PromptToJoinOrgNotification.tsx b/packages/client/components/PromptToJoinOrgNotification.tsx
index 71e989f0980..49eed5eca96 100644
--- a/packages/client/components/PromptToJoinOrgNotification.tsx
+++ b/packages/client/components/PromptToJoinOrgNotification.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {PromptToJoinOrgNotification_notification$key} from '~/__generated__/PromptToJoinOrgNotification_notification.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/Radio/Radio.tsx b/packages/client/components/Radio/Radio.tsx
index 7cf5f47713b..81c84e13ba0 100644
--- a/packages/client/components/Radio/Radio.tsx
+++ b/packages/client/components/Radio/Radio.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
-import React, {Component} from 'react'
+import * as React from 'react'
+import {Component} from 'react'
 import {PALETTE} from '../../styles/paletteV3'
 import ui from '../../styles/ui'
 
diff --git a/packages/client/components/RaisedButton.tsx b/packages/client/components/RaisedButton.tsx
index bf9a9cd36c8..ae05d9fcf18 100644
--- a/packages/client/components/RaisedButton.tsx
+++ b/packages/client/components/RaisedButton.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {forwardRef, Ref} from 'react'
+import {forwardRef, Ref} from 'react'
 import {Elevation} from '../styles/elevation'
 import {PALETTE} from '../styles/paletteV3'
 import {Radius} from '../types/constEnums'
diff --git a/packages/client/components/ReactjiPicker.tsx b/packages/client/components/ReactjiPicker.tsx
index 065363fce04..e2cbf993036 100644
--- a/packages/client/components/ReactjiPicker.tsx
+++ b/packages/client/components/ReactjiPicker.tsx
@@ -2,7 +2,6 @@ import styled from '@emotion/styled'
 import 'emoji-mart/css/emoji-mart.css'
 import appleEmojis from 'emoji-mart/data/apple.json'
 import NimblePicker from 'emoji-mart/dist-modern/components/picker/nimble-picker'
-import React from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import {MenuProps} from '../hooks/useMenu'
 import Menu from './Menu'
diff --git a/packages/client/components/Recurrence/EndRecurringMeetingModal.tsx b/packages/client/components/Recurrence/EndRecurringMeetingModal.tsx
index 2165e45b31f..458686065d7 100644
--- a/packages/client/components/Recurrence/EndRecurringMeetingModal.tsx
+++ b/packages/client/components/Recurrence/EndRecurringMeetingModal.tsx
@@ -1,6 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import React, {useMemo, useState} from 'react'
+import {useMemo, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {RRule} from 'rrule'
 import {EndRecurringMeetingModal_meeting$key} from '../../__generated__/EndRecurringMeetingModal_meeting.graphql'
diff --git a/packages/client/components/Recurrence/HumanReadableRecurrenceRule.tsx b/packages/client/components/Recurrence/HumanReadableRecurrenceRule.tsx
index e06df9f9b06..f3e6452d113 100644
--- a/packages/client/components/Recurrence/HumanReadableRecurrenceRule.tsx
+++ b/packages/client/components/Recurrence/HumanReadableRecurrenceRule.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {Frequency, RRule} from 'rrule'
 import {PALETTE} from '../../styles/paletteV3'
 import plural from '../../utils/plural'
diff --git a/packages/client/components/Recurrence/RecurrenceDayCheckbox.tsx b/packages/client/components/Recurrence/RecurrenceDayCheckbox.tsx
index a262a5287d2..0940a993596 100644
--- a/packages/client/components/Recurrence/RecurrenceDayCheckbox.tsx
+++ b/packages/client/components/Recurrence/RecurrenceDayCheckbox.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {Weekday} from 'rrule'
 import {PALETTE} from '../../styles/paletteV3'
 
diff --git a/packages/client/components/Recurrence/RecurrenceSettings.tsx b/packages/client/components/Recurrence/RecurrenceSettings.tsx
index d47254ab708..38c94e9f85a 100644
--- a/packages/client/components/Recurrence/RecurrenceSettings.tsx
+++ b/packages/client/components/Recurrence/RecurrenceSettings.tsx
@@ -2,7 +2,8 @@ import clsx from 'clsx'
 import dayjs, {Dayjs} from 'dayjs'
 import timezonePlugin from 'dayjs/plugin/timezone'
 import utcPlugin from 'dayjs/plugin/utc'
-import React, {PropsWithChildren, useEffect} from 'react'
+import * as React from 'react'
+import {PropsWithChildren, useEffect} from 'react'
 import {Frequency, RRule} from 'rrule'
 import {MenuPosition} from '../../hooks/useCoords'
 import useMenu from '../../hooks/useMenu'
diff --git a/packages/client/components/Recurrence/RecurrenceTimePicker.tsx b/packages/client/components/Recurrence/RecurrenceTimePicker.tsx
index 7ab9957ad02..e53724788a8 100644
--- a/packages/client/components/Recurrence/RecurrenceTimePicker.tsx
+++ b/packages/client/components/Recurrence/RecurrenceTimePicker.tsx
@@ -1,6 +1,5 @@
 import dayjs, {Dayjs} from 'dayjs'
 import ms from 'ms'
-import React from 'react'
 import {MenuProps} from '../../hooks/useMenu'
 import Menu from '../Menu'
 import MenuItem from '../MenuItem'
diff --git a/packages/client/components/Recurrence/TimeLeftBadge.tsx b/packages/client/components/Recurrence/TimeLeftBadge.tsx
index 375f0ec4a43..7e613e09d42 100644
--- a/packages/client/components/Recurrence/TimeLeftBadge.tsx
+++ b/packages/client/components/Recurrence/TimeLeftBadge.tsx
@@ -1,5 +1,4 @@
 import dayjs from 'dayjs'
-import React from 'react'
 import {MenuPosition} from '../../hooks/useCoords'
 import useRefreshInterval from '../../hooks/useRefreshInterval'
 import useTooltip from '../../hooks/useTooltip'
diff --git a/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx b/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx
index 0453caafc43..c47eaf39c37 100644
--- a/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx
+++ b/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {Close} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {ChangeEvent, useMemo, useState} from 'react'
+import {ChangeEvent, useMemo, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {RRule} from 'rrule'
 import {UpdateRecurrenceSettingsModal_meeting$key} from '~/__generated__/UpdateRecurrenceSettingsModal_meeting.graphql'
diff --git a/packages/client/components/ReflectionCard/AddReactjiButton.tsx b/packages/client/components/ReflectionCard/AddReactjiButton.tsx
index 93d21e46c55..768a7468b8d 100644
--- a/packages/client/components/ReflectionCard/AddReactjiButton.tsx
+++ b/packages/client/components/ReflectionCard/AddReactjiButton.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import PlainButton from '~/components/PlainButton/PlainButton'
 import {MenuPosition} from '~/hooks/useCoords'
 import useMenu from '~/hooks/useMenu'
diff --git a/packages/client/components/ReflectionCard/ColorBadge.tsx b/packages/client/components/ReflectionCard/ColorBadge.tsx
index b759a3430b8..d199b6b6d33 100644
--- a/packages/client/components/ReflectionCard/ColorBadge.tsx
+++ b/packages/client/components/ReflectionCard/ColorBadge.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {NewMeetingPhaseTypeEnum} from '~/__generated__/ActionMeeting_meeting.graphql'
 import {ColorBadge_reflection$key} from '~/__generated__/ColorBadge_reflection.graphql'
diff --git a/packages/client/components/ReflectionCard/EmojiUsersReaction.tsx b/packages/client/components/ReflectionCard/EmojiUsersReaction.tsx
index dc4c7ff0ba0..a024ed4c6ce 100644
--- a/packages/client/components/ReflectionCard/EmojiUsersReaction.tsx
+++ b/packages/client/components/ReflectionCard/EmojiUsersReaction.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
+import {memo} from 'react'
 import {useFragment} from 'react-relay'
 import {EmojiUsersReaction_reactji$key} from '~/__generated__/EmojiUsersReaction_reactji.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
@@ -61,4 +61,4 @@ const EmojiUsersReaction = ({reactjiRef, reactjiShortName}: Props) => {
   )
 }
 
-export default React.memo(EmojiUsersReaction)
+export default memo(EmojiUsersReaction)
diff --git a/packages/client/components/ReflectionCard/ReactjiCount.tsx b/packages/client/components/ReflectionCard/ReactjiCount.tsx
index 65f5c7f30de..e1ee36b0256 100644
--- a/packages/client/components/ReflectionCard/ReactjiCount.tsx
+++ b/packages/client/components/ReflectionCard/ReactjiCount.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ReactjiCount_reactji$key} from '~/__generated__/ReactjiCount_reactji.graphql'
 import PlainButton from '~/components/PlainButton/PlainButton'
diff --git a/packages/client/components/ReflectionCard/ReactjiSection.tsx b/packages/client/components/ReflectionCard/ReactjiSection.tsx
index c3fee9144ed..25494e9f59c 100644
--- a/packages/client/components/ReflectionCard/ReactjiSection.tsx
+++ b/packages/client/components/ReflectionCard/ReactjiSection.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ReactjiSection_reactjis$key} from '~/__generated__/ReactjiSection_reactjis.graphql'
 import useInitialRender from '~/hooks/useInitialRender'
diff --git a/packages/client/components/ReflectionCard/ReflectionCard.tsx b/packages/client/components/ReflectionCard/ReflectionCard.tsx
index 1e606a2fdbd..4ebad1d8f95 100644
--- a/packages/client/components/ReflectionCard/ReflectionCard.tsx
+++ b/packages/client/components/ReflectionCard/ReflectionCard.tsx
@@ -1,7 +1,8 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import {convertToRaw, EditorProps} from 'draft-js'
-import React, {MouseEvent, useEffect, useRef, useState} from 'react'
+import * as React from 'react'
+import {MouseEvent, useEffect, useRef, useState} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {
   NewMeetingPhaseTypeEnum,
diff --git a/packages/client/components/ReflectionCard/ReflectionCardDeleteButton.tsx b/packages/client/components/ReflectionCard/ReflectionCardDeleteButton.tsx
index af5177e9aa0..a0efe71030a 100644
--- a/packages/client/components/ReflectionCard/ReflectionCardDeleteButton.tsx
+++ b/packages/client/components/ReflectionCard/ReflectionCardDeleteButton.tsx
@@ -4,7 +4,6 @@
  */
 import styled from '@emotion/styled'
 import {Cancel} from '@mui/icons-material'
-import React from 'react'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import RemoveReflectionMutation from '../../mutations/RemoveReflectionMutation'
 import {PALETTE} from '../../styles/paletteV3'
diff --git a/packages/client/components/ReflectionEditorWrapper.tsx b/packages/client/components/ReflectionEditorWrapper.tsx
index 73436c33cd1..ccf6dea288c 100644
--- a/packages/client/components/ReflectionEditorWrapper.tsx
+++ b/packages/client/components/ReflectionEditorWrapper.tsx
@@ -8,7 +8,7 @@ import {
   EditorState,
   getDefaultKeyBinding
 } from 'draft-js'
-import React, {RefObject, Suspense, useEffect, useRef} from 'react'
+import {RefObject, Suspense, useEffect, useRef} from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import {Card, ElementHeight, Gutters} from '../types/constEnums'
 import {textTags} from '../utils/constants'
diff --git a/packages/client/components/ReflectionGroup/DraggableReflectionCard.tsx b/packages/client/components/ReflectionGroup/DraggableReflectionCard.tsx
index 22b51205077..ed343c29d06 100644
--- a/packages/client/components/ReflectionGroup/DraggableReflectionCard.tsx
+++ b/packages/client/components/ReflectionGroup/DraggableReflectionCard.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo, useState} from 'react'
+import {useMemo, useState} from 'react'
 import {useFragment} from 'react-relay'
 import useSpotlightResults from '~/hooks/useSpotlightResults'
 import {DraggableReflectionCard_meeting$key} from '../../__generated__/DraggableReflectionCard_meeting.graphql'
diff --git a/packages/client/components/ReflectionGroup/ReflectionGroup.tsx b/packages/client/components/ReflectionGroup/ReflectionGroup.tsx
index f213a284f39..5481f321472 100644
--- a/packages/client/components/ReflectionGroup/ReflectionGroup.tsx
+++ b/packages/client/components/ReflectionGroup/ReflectionGroup.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {RefObject, useEffect, useMemo, useRef, useState} from 'react'
+import {RefObject, useEffect, useMemo, useRef, useState} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {ReflectionGroup_meeting$key} from '../../__generated__/ReflectionGroup_meeting.graphql'
 import {ReflectionGroup_reflectionGroup$key} from '../../__generated__/ReflectionGroup_reflectionGroup.graphql'
diff --git a/packages/client/components/ReflectionGroup/ReflectionGroupTitleEditor.tsx b/packages/client/components/ReflectionGroup/ReflectionGroupTitleEditor.tsx
index e5c6aeb8353..fc351007483 100644
--- a/packages/client/components/ReflectionGroup/ReflectionGroupTitleEditor.tsx
+++ b/packages/client/components/ReflectionGroup/ReflectionGroupTitleEditor.tsx
@@ -1,6 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {RefObject, useRef} from 'react'
+import * as React from 'react'
+import {RefObject, useRef} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {ReflectionGroupTitleEditor_meeting$key} from '../../__generated__/ReflectionGroupTitleEditor_meeting.graphql'
 import {ReflectionGroupTitleEditor_reflectionGroup$key} from '../../__generated__/ReflectionGroupTitleEditor_reflectionGroup.graphql'
diff --git a/packages/client/components/ReflectionGroup/RemoteReflection.tsx b/packages/client/components/ReflectionGroup/RemoteReflection.tsx
index 7275d86114f..30a2ae63333 100644
--- a/packages/client/components/ReflectionGroup/RemoteReflection.tsx
+++ b/packages/client/components/ReflectionGroup/RemoteReflection.tsx
@@ -1,7 +1,8 @@
 import {keyframes} from '@emotion/core'
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {RefObject, useEffect, useMemo, useRef} from 'react'
+import * as React from 'react'
+import {RefObject, useEffect, useMemo, useRef} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import useSpotlightResults from '~/hooks/useSpotlightResults'
 import {RemoteReflection_meeting$key} from '../../__generated__/RemoteReflection_meeting.graphql'
diff --git a/packages/client/components/ReflectionGroupHeader.tsx b/packages/client/components/ReflectionGroupHeader.tsx
index 9e79985b3e2..414eef74e22 100644
--- a/packages/client/components/ReflectionGroupHeader.tsx
+++ b/packages/client/components/ReflectionGroupHeader.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {Edit} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {forwardRef, Ref, RefObject} from 'react'
+import {forwardRef, Ref, RefObject} from 'react'
 import {useFragment} from 'react-relay'
 import {ReflectionGroupHeader_meeting$key} from '../__generated__/ReflectionGroupHeader_meeting.graphql'
 import {ReflectionGroupHeader_reflectionGroup$key} from '../__generated__/ReflectionGroupHeader_reflectionGroup.graphql'
diff --git a/packages/client/components/ReflectionGroupVoting.tsx b/packages/client/components/ReflectionGroupVoting.tsx
index 78b4c0b9cad..31503e0aeb2 100644
--- a/packages/client/components/ReflectionGroupVoting.tsx
+++ b/packages/client/components/ReflectionGroupVoting.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {Add as AddIcon, Remove as RemoveIcon, ThumbUp} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useMutationProps from '~/hooks/useMutationProps'
diff --git a/packages/client/components/ReportErrorFeedback.tsx b/packages/client/components/ReportErrorFeedback.tsx
index 02c814604f8..b1edbd89064 100644
--- a/packages/client/components/ReportErrorFeedback.tsx
+++ b/packages/client/components/ReportErrorFeedback.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
-import React, {useState} from 'react'
+import * as React from 'react'
+import {useState} from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import DialogContainer from './DialogContainer'
 import DialogContent from './DialogContent'
diff --git a/packages/client/components/RequestToJoin.tsx b/packages/client/components/RequestToJoin.tsx
index d08b61f543f..99ca06fa6c4 100644
--- a/packages/client/components/RequestToJoin.tsx
+++ b/packages/client/components/RequestToJoin.tsx
@@ -1,5 +1,5 @@
 import {Lock, MailOutline} from '@mui/icons-material'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useRouteMatch} from 'react-router'
 import {PushInvitationMutation$data} from '../__generated__/PushInvitationMutation.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/RequestToJoinOrgNotification.tsx b/packages/client/components/RequestToJoinOrgNotification.tsx
index f48163a99ff..3095fbb980b 100644
--- a/packages/client/components/RequestToJoinOrgNotification.tsx
+++ b/packages/client/components/RequestToJoinOrgNotification.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {useLocation} from 'react-router'
 import {RequestToJoinOrgNotification_notification$key} from '~/__generated__/RequestToJoinOrgNotification_notification.graphql'
diff --git a/packages/client/components/ResetPasswordPage/SetNewPassword.tsx b/packages/client/components/ResetPasswordPage/SetNewPassword.tsx
index 413abc7bdec..1ede421fe61 100644
--- a/packages/client/components/ResetPasswordPage/SetNewPassword.tsx
+++ b/packages/client/components/ResetPasswordPage/SetNewPassword.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React from 'react'
+import * as React from 'react'
 import {RouteComponentProps} from 'react-router'
 import useCanonical from '~/hooks/useCanonical'
 import useAtmosphere from '../../hooks/useAtmosphere'
diff --git a/packages/client/components/ResponseMentioned.tsx b/packages/client/components/ResponseMentioned.tsx
index 616c474c278..98a4ddcd6da 100644
--- a/packages/client/components/ResponseMentioned.tsx
+++ b/packages/client/components/ResponseMentioned.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import NotificationAction from '~/components/NotificationAction'
 import useAtmosphere from '~/hooks/useAtmosphere'
diff --git a/packages/client/components/ResponseReplied.tsx b/packages/client/components/ResponseReplied.tsx
index 3f84dbfa717..0eb41ed7f97 100644
--- a/packages/client/components/ResponseReplied.tsx
+++ b/packages/client/components/ResponseReplied.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import {Editor} from 'draft-js'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import NotificationAction from '~/components/NotificationAction'
 import {ResponseReplied_notification$key} from '../__generated__/ResponseReplied_notification.graphql'
diff --git a/packages/client/components/ResponsiveDashSidebar.tsx b/packages/client/components/ResponsiveDashSidebar.tsx
index 1b6bbff81dc..7867b1585a2 100644
--- a/packages/client/components/ResponsiveDashSidebar.tsx
+++ b/packages/client/components/ResponsiveDashSidebar.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import useBreakpoint from '../hooks/useBreakpoint'
 import {DECELERATE} from '../styles/animation'
 import {desktopSidebarShadow, Elevation} from '../styles/elevation'
diff --git a/packages/client/components/RetroDiscussPhase.tsx b/packages/client/components/RetroDiscussPhase.tsx
index a6e90191f69..8eb76e4ba30 100644
--- a/packages/client/components/RetroDiscussPhase.tsx
+++ b/packages/client/components/RetroDiscussPhase.tsx
@@ -2,7 +2,6 @@ import styled from '@emotion/styled'
 import {ThumbUp} from '@mui/icons-material'
 import * as Sentry from '@sentry/browser'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {RetroDiscussPhase_meeting$key} from '~/__generated__/RetroDiscussPhase_meeting.graphql'
 import useBreakpoint from '~/hooks/useBreakpoint'
diff --git a/packages/client/components/RetroDiscussionThreadHeader.tsx b/packages/client/components/RetroDiscussionThreadHeader.tsx
index 41cd525dfaa..5e37771b48c 100644
--- a/packages/client/components/RetroDiscussionThreadHeader.tsx
+++ b/packages/client/components/RetroDiscussionThreadHeader.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {commitLocalUpdate} from 'relay-runtime'
 import {RetroDiscussionThreadHeader_organization$key} from '~/__generated__/RetroDiscussionThreadHeader_organization.graphql'
diff --git a/packages/client/components/RetroDrawer.tsx b/packages/client/components/RetroDrawer.tsx
index 19cba982af2..4ba0314cd97 100644
--- a/packages/client/components/RetroDrawer.tsx
+++ b/packages/client/components/RetroDrawer.tsx
@@ -1,6 +1,5 @@
 import {Close} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {RetroDrawerQuery} from '../__generated__/RetroDrawerQuery.graphql'
 import useBreakpoint from '../hooks/useBreakpoint'
diff --git a/packages/client/components/RetroDrawerRoot.tsx b/packages/client/components/RetroDrawerRoot.tsx
index 28ce86ccbd0..0e1702d3d75 100644
--- a/packages/client/components/RetroDrawerRoot.tsx
+++ b/packages/client/components/RetroDrawerRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense, useState} from 'react'
+import {Suspense, useState} from 'react'
 import retroDrawerQuery, {RetroDrawerQuery} from '../__generated__/RetroDrawerQuery.graphql'
 import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import MeetingOptions from './MeetingOptions'
diff --git a/packages/client/components/RetroDrawerTemplateCard.tsx b/packages/client/components/RetroDrawerTemplateCard.tsx
index b40d25637d0..f468316dddd 100644
--- a/packages/client/components/RetroDrawerTemplateCard.tsx
+++ b/packages/client/components/RetroDrawerTemplateCard.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {RetroDrawerTemplateCard_template$key} from '~/__generated__/RetroDrawerTemplateCard_template.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/RetroGroupPhase.tsx b/packages/client/components/RetroGroupPhase.tsx
index 1451abcd966..41dc731367f 100644
--- a/packages/client/components/RetroGroupPhase.tsx
+++ b/packages/client/components/RetroGroupPhase.tsx
@@ -5,7 +5,6 @@ import graphql from 'babel-plugin-relay/macro'
  */
 import styled from '@emotion/styled'
 import {Info as InfoIcon} from '@mui/icons-material'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {RetroGroupPhase_meeting$key} from '~/__generated__/RetroGroupPhase_meeting.graphql'
 import useCallbackRef from '~/hooks/useCallbackRef'
diff --git a/packages/client/components/RetroMeeting.tsx b/packages/client/components/RetroMeeting.tsx
index bbe5f14906e..8bff0d8d776 100644
--- a/packages/client/components/RetroMeeting.tsx
+++ b/packages/client/components/RetroMeeting.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {ReactElement, Suspense} from 'react'
+import {ReactElement, Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import {
   NewMeetingPhaseTypeEnum,
diff --git a/packages/client/components/RetroMeetingSidebar.tsx b/packages/client/components/RetroMeetingSidebar.tsx
index a77fbd832ee..40a32dbab38 100644
--- a/packages/client/components/RetroMeetingSidebar.tsx
+++ b/packages/client/components/RetroMeetingSidebar.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {Fragment, useState} from 'react'
+import {Fragment, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {
   NewMeetingPhaseTypeEnum,
diff --git a/packages/client/components/RetroReflectPhase/ExpandedReflection.tsx b/packages/client/components/RetroReflectPhase/ExpandedReflection.tsx
index 14e8fb83698..8f2f26c053f 100644
--- a/packages/client/components/RetroReflectPhase/ExpandedReflection.tsx
+++ b/packages/client/components/RetroReflectPhase/ExpandedReflection.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {useEffect, useRef} from 'react'
+import {useEffect, useRef} from 'react'
 import {commitLocalUpdate} from 'relay-runtime'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import {ElementWidth} from '../../types/constEnums'
diff --git a/packages/client/components/RetroReflectPhase/ExpandedReflectionStack.tsx b/packages/client/components/RetroReflectPhase/ExpandedReflectionStack.tsx
index 1271e8ff7bc..2eb63223d55 100644
--- a/packages/client/components/RetroReflectPhase/ExpandedReflectionStack.tsx
+++ b/packages/client/components/RetroReflectPhase/ExpandedReflectionStack.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
-import React, {ReactNode, Ref, RefObject, useEffect, useMemo} from 'react'
+import * as React from 'react'
+import {ReactNode, Ref, RefObject, useEffect, useMemo} from 'react'
 import {PALETTE} from '../../styles/paletteV3'
 import {BBox} from '../../types/animations'
 import {DragAttribute, ElementWidth, ZIndex} from '../../types/constEnums'
diff --git a/packages/client/components/RetroReflectPhase/PhaseItemChits.tsx b/packages/client/components/RetroReflectPhase/PhaseItemChits.tsx
index ef574aa8ff0..58ec1cefc81 100644
--- a/packages/client/components/RetroReflectPhase/PhaseItemChits.tsx
+++ b/packages/client/components/RetroReflectPhase/PhaseItemChits.tsx
@@ -1,6 +1,6 @@
 import {keyframes} from '@emotion/core'
 import styled from '@emotion/styled'
-import React, {Component} from 'react'
+import {Component} from 'react'
 import {DECELERATE, fadeIn} from '../../styles/animation'
 import {Elevation} from '../../styles/elevation'
 import {PALETTE} from '../../styles/paletteV3'
diff --git a/packages/client/components/RetroReflectPhase/PhaseItemColumn.tsx b/packages/client/components/RetroReflectPhase/PhaseItemColumn.tsx
index d5ce339b896..7584f378666 100644
--- a/packages/client/components/RetroReflectPhase/PhaseItemColumn.tsx
+++ b/packages/client/components/RetroReflectPhase/PhaseItemColumn.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import {EditorState} from 'draft-js'
-import React, {RefObject, useEffect, useMemo, useRef} from 'react'
+import {RefObject, useEffect, useMemo, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {PhaseItemColumn_prompt$key} from '~/__generated__/PhaseItemColumn_prompt.graphql'
 import {PhaseItemColumn_meeting$key} from '../../__generated__/PhaseItemColumn_meeting.graphql'
diff --git a/packages/client/components/RetroReflectPhase/PhaseItemEditor.tsx b/packages/client/components/RetroReflectPhase/PhaseItemEditor.tsx
index 51dfc541425..5ae526bc493 100644
--- a/packages/client/components/RetroReflectPhase/PhaseItemEditor.tsx
+++ b/packages/client/components/RetroReflectPhase/PhaseItemEditor.tsx
@@ -2,7 +2,8 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import {ContentState, EditorState, convertFromRaw, convertToRaw} from 'draft-js'
 import {Stack} from 'immutable'
-import React, {MutableRefObject, RefObject, useEffect, useRef, useState} from 'react'
+import * as React from 'react'
+import {MutableRefObject, RefObject, useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {PhaseItemEditor_meeting$key} from '../../__generated__/PhaseItemEditor_meeting.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
diff --git a/packages/client/components/RetroReflectPhase/ReflectWrapperDesktop.tsx b/packages/client/components/RetroReflectPhase/ReflectWrapperDesktop.tsx
index 3ca5f84ebad..05e4d821d06 100644
--- a/packages/client/components/RetroReflectPhase/ReflectWrapperDesktop.tsx
+++ b/packages/client/components/RetroReflectPhase/ReflectWrapperDesktop.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {forwardRef, ReactNode, Ref} from 'react'
+import {forwardRef, ReactNode, Ref} from 'react'
 
 const DesktopWrapper = styled('div')({
   display: 'flex',
diff --git a/packages/client/components/RetroReflectPhase/ReflectionStack.tsx b/packages/client/components/RetroReflectPhase/ReflectionStack.tsx
index 7a64cad67f4..b631f68fcb1 100644
--- a/packages/client/components/RetroReflectPhase/ReflectionStack.tsx
+++ b/packages/client/components/RetroReflectPhase/ReflectionStack.tsx
@@ -1,6 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {RefObject, useRef} from 'react'
+import * as React from 'react'
+import {RefObject, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {ReflectionStack_meeting$key} from '~/__generated__/ReflectionStack_meeting.graphql'
 import {PhaseItemColumn_meeting$data} from '../../__generated__/PhaseItemColumn_meeting.graphql'
diff --git a/packages/client/components/RetroReflectPhase/ReflectionStackPlaceholder.tsx b/packages/client/components/RetroReflectPhase/ReflectionStackPlaceholder.tsx
index c7b8b972ad8..db870e1903f 100644
--- a/packages/client/components/RetroReflectPhase/ReflectionStackPlaceholder.tsx
+++ b/packages/client/components/RetroReflectPhase/ReflectionStackPlaceholder.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {forwardRef, Ref} from 'react'
+import {forwardRef, Ref} from 'react'
 import {PALETTE} from '../../styles/paletteV3'
 import {Breakpoint, Card, ElementHeight, ElementWidth, Gutters} from '../../types/constEnums'
 
diff --git a/packages/client/components/RetroReflectPhase/ReflectionWrapperMobile.tsx b/packages/client/components/RetroReflectPhase/ReflectionWrapperMobile.tsx
index bb07eb1c31f..f2f021c31b3 100644
--- a/packages/client/components/RetroReflectPhase/ReflectionWrapperMobile.tsx
+++ b/packages/client/components/RetroReflectPhase/ReflectionWrapperMobile.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {Children, ReactNode} from 'react'
+import {Children, ReactNode} from 'react'
 import SwipeableViews from 'react-swipeable-views'
 import {PALETTE} from '../../styles/paletteV3'
 
diff --git a/packages/client/components/RetroReflectPhase/RetroReflectPhase.tsx b/packages/client/components/RetroReflectPhase/RetroReflectPhase.tsx
index 9fa7a86cfab..466215052e7 100644
--- a/packages/client/components/RetroReflectPhase/RetroReflectPhase.tsx
+++ b/packages/client/components/RetroReflectPhase/RetroReflectPhase.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {RetroReflectPhase_meeting$key} from '~/__generated__/RetroReflectPhase_meeting.graphql'
 import useCallbackRef from '~/hooks/useCallbackRef'
diff --git a/packages/client/components/RetroSidebarDiscussSection.tsx b/packages/client/components/RetroSidebarDiscussSection.tsx
index d83e63fb5f6..c56b74d4ee6 100644
--- a/packages/client/components/RetroSidebarDiscussSection.tsx
+++ b/packages/client/components/RetroSidebarDiscussSection.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {ThumbUp} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {DragDropContext, Draggable, Droppable, DropResult} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
 import {
diff --git a/packages/client/components/RetroSidebarPhaseListItemChildren.tsx b/packages/client/components/RetroSidebarPhaseListItemChildren.tsx
index 83428fdb9e5..144d6df92d1 100644
--- a/packages/client/components/RetroSidebarPhaseListItemChildren.tsx
+++ b/packages/client/components/RetroSidebarPhaseListItemChildren.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {
   NewMeetingPhaseTypeEnum,
diff --git a/packages/client/components/RetroVoteMetaHeader.tsx b/packages/client/components/RetroVoteMetaHeader.tsx
index 38148c32f0d..b39b73bdc83 100644
--- a/packages/client/components/RetroVoteMetaHeader.tsx
+++ b/packages/client/components/RetroVoteMetaHeader.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {ExpandMore} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {RetroVoteMetaHeader_meeting$key} from '~/__generated__/RetroVoteMetaHeader_meeting.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
diff --git a/packages/client/components/RetroVotePhase.tsx b/packages/client/components/RetroVotePhase.tsx
index a9adca8a62a..6c15cad3fa8 100644
--- a/packages/client/components/RetroVotePhase.tsx
+++ b/packages/client/components/RetroVotePhase.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {RetroVotePhase_meeting$key} from '~/__generated__/RetroVotePhase_meeting.graphql'
 import useCallbackRef from '../hooks/useCallbackRef'
diff --git a/packages/client/components/ReviewRequestToJoinOrgModal.tsx b/packages/client/components/ReviewRequestToJoinOrgModal.tsx
index dcdd9844a2f..f0ed4e2b0c2 100644
--- a/packages/client/components/ReviewRequestToJoinOrgModal.tsx
+++ b/packages/client/components/ReviewRequestToJoinOrgModal.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo, useState} from 'react'
+import {useMemo, useState} from 'react'
 import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay'
 import {ReviewRequestToJoinOrgModalQuery} from '../__generated__/ReviewRequestToJoinOrgModalQuery.graphql'
 import {ReviewRequestToJoinOrgModal_viewer$key} from '../__generated__/ReviewRequestToJoinOrgModal_viewer.graphql'
diff --git a/packages/client/components/ReviewRequestToJoinOrgRoot.tsx b/packages/client/components/ReviewRequestToJoinOrgRoot.tsx
index d4a4d018008..86eefc16eb2 100644
--- a/packages/client/components/ReviewRequestToJoinOrgRoot.tsx
+++ b/packages/client/components/ReviewRequestToJoinOrgRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense, useCallback, useEffect} from 'react'
+import {Suspense, useCallback, useEffect} from 'react'
 import {useHistory, useLocation} from 'react-router'
 import ReviewRequestToJoinOrgModal from '~/components/ReviewRequestToJoinOrgModal'
 import reviewRequestToJoinOrgModalQuery, {
diff --git a/packages/client/components/SAMLRedirect.tsx b/packages/client/components/SAMLRedirect.tsx
index a096351559e..ad3f0159325 100644
--- a/packages/client/components/SAMLRedirect.tsx
+++ b/packages/client/components/SAMLRedirect.tsx
@@ -1,4 +1,4 @@
-import React, {useEffect, useState} from 'react'
+import {useEffect, useState} from 'react'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useRouter from '../hooks/useRouter'
 import DialogContent from './DialogContent'
diff --git a/packages/client/components/ScheduleDialog.tsx b/packages/client/components/ScheduleDialog.tsx
index 351f242064f..022acaba3ef 100644
--- a/packages/client/components/ScheduleDialog.tsx
+++ b/packages/client/components/ScheduleDialog.tsx
@@ -3,7 +3,8 @@ import * as Collapsible from '@radix-ui/react-collapsible'
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
 import dayjs from 'dayjs'
-import React, {ChangeEvent, useState} from 'react'
+import * as React from 'react'
+import {ChangeEvent, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {RRule} from 'rrule'
 import {ScheduleDialog_team$key} from '~/__generated__/ScheduleDialog_team.graphql'
diff --git a/packages/client/components/ScopePhase.tsx b/packages/client/components/ScopePhase.tsx
index 978338259c7..e27ab80e9a8 100644
--- a/packages/client/components/ScopePhase.tsx
+++ b/packages/client/components/ScopePhase.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ScopePhase_meeting$key} from '~/__generated__/ScopePhase_meeting.graphql'
 import useGotoStageId from '~/hooks/useGotoStageId'
diff --git a/packages/client/components/ScopePhaseArea.tsx b/packages/client/components/ScopePhaseArea.tsx
index 78576239ccd..4db13b3f433 100644
--- a/packages/client/components/ScopePhaseArea.tsx
+++ b/packages/client/components/ScopePhaseArea.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import SwipeableViews from 'react-swipeable-views'
 import {ScopePhaseArea_meeting$key} from '~/__generated__/ScopePhaseArea_meeting.graphql'
diff --git a/packages/client/components/ScopePhaseAreaAddAzureDevOps.tsx b/packages/client/components/ScopePhaseAreaAddAzureDevOps.tsx
index 02a3ed859bb..bcff035827c 100644
--- a/packages/client/components/ScopePhaseAreaAddAzureDevOps.tsx
+++ b/packages/client/components/ScopePhaseAreaAddAzureDevOps.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import AzureDevOpsClientManager from '~/utils/AzureDevOpsClientManager'
 import {ScopePhaseAreaAddAzureDevOps_meeting$key} from '../__generated__/ScopePhaseAreaAddAzureDevOps_meeting.graphql'
diff --git a/packages/client/components/ScopePhaseAreaAddGitHub.tsx b/packages/client/components/ScopePhaseAreaAddGitHub.tsx
index d761088d452..c8b1e2a7c48 100644
--- a/packages/client/components/ScopePhaseAreaAddGitHub.tsx
+++ b/packages/client/components/ScopePhaseAreaAddGitHub.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ScopePhaseAreaAddGitHub_meeting$key} from '../__generated__/ScopePhaseAreaAddGitHub_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/ScopePhaseAreaAddGitLab.tsx b/packages/client/components/ScopePhaseAreaAddGitLab.tsx
index e589573c47d..9a91ab8f84e 100644
--- a/packages/client/components/ScopePhaseAreaAddGitLab.tsx
+++ b/packages/client/components/ScopePhaseAreaAddGitLab.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import GitLabClientManager from '~/utils/GitLabClientManager'
 import {ScopePhaseAreaAddGitLab_meeting$key} from '../__generated__/ScopePhaseAreaAddGitLab_meeting.graphql'
diff --git a/packages/client/components/ScopePhaseAreaAddJira.tsx b/packages/client/components/ScopePhaseAreaAddJira.tsx
index 2d48d5e7da7..1ab98c7290f 100644
--- a/packages/client/components/ScopePhaseAreaAddJira.tsx
+++ b/packages/client/components/ScopePhaseAreaAddJira.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {ScopePhaseAreaAddJira_meeting$key} from '../__generated__/ScopePhaseAreaAddJira_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/ScopePhaseAreaAddJiraServer.tsx b/packages/client/components/ScopePhaseAreaAddJiraServer.tsx
index 4eec0b82e43..9cbb5b3d646 100644
--- a/packages/client/components/ScopePhaseAreaAddJiraServer.tsx
+++ b/packages/client/components/ScopePhaseAreaAddJiraServer.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ScopePhaseAreaAddJiraServer_meeting$key} from '../__generated__/ScopePhaseAreaAddJiraServer_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/ScopePhaseAreaAzureDevOps.tsx b/packages/client/components/ScopePhaseAreaAzureDevOps.tsx
index 1fa720999ab..a32e3df1bb5 100644
--- a/packages/client/components/ScopePhaseAreaAzureDevOps.tsx
+++ b/packages/client/components/ScopePhaseAreaAzureDevOps.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ScopePhaseAreaAzureDevOps_meeting$key} from '../__generated__/ScopePhaseAreaAzureDevOps_meeting.graphql'
 import ScopePhaseAreaAddAzureDevOps from './ScopePhaseAreaAddAzureDevOps'
diff --git a/packages/client/components/ScopePhaseAreaAzureDevOpsScoping.tsx b/packages/client/components/ScopePhaseAreaAzureDevOpsScoping.tsx
index 1ca577d4ae8..d5f604cbcc4 100644
--- a/packages/client/components/ScopePhaseAreaAzureDevOpsScoping.tsx
+++ b/packages/client/components/ScopePhaseAreaAzureDevOpsScoping.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ScopePhaseAreaAzureDevOpsScoping_meeting$key} from '../__generated__/ScopePhaseAreaAzureDevOpsScoping_meeting.graphql'
 import AzureDevOpsScopingSearchBar from './AzureDevOpsScopingSearchBar'
diff --git a/packages/client/components/ScopePhaseAreaGitHub.tsx b/packages/client/components/ScopePhaseAreaGitHub.tsx
index 7b6e5b10f09..d4417f14681 100644
--- a/packages/client/components/ScopePhaseAreaGitHub.tsx
+++ b/packages/client/components/ScopePhaseAreaGitHub.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ScopePhaseAreaGitHub_meeting$key} from '../__generated__/ScopePhaseAreaGitHub_meeting.graphql'
 import {Providers} from '../types/constEnums'
diff --git a/packages/client/components/ScopePhaseAreaGitHubScoping.tsx b/packages/client/components/ScopePhaseAreaGitHubScoping.tsx
index fafe8a4a58c..01de8d5d849 100644
--- a/packages/client/components/ScopePhaseAreaGitHubScoping.tsx
+++ b/packages/client/components/ScopePhaseAreaGitHubScoping.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ScopePhaseAreaGitHubScoping_meeting$key} from '../__generated__/ScopePhaseAreaGitHubScoping_meeting.graphql'
 import GitHubScopingSearchBar from './GitHubScopingSearchBar'
diff --git a/packages/client/components/ScopePhaseAreaGitLab.tsx b/packages/client/components/ScopePhaseAreaGitLab.tsx
index 115879e8d8d..dbe4553c5c3 100644
--- a/packages/client/components/ScopePhaseAreaGitLab.tsx
+++ b/packages/client/components/ScopePhaseAreaGitLab.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ScopePhaseAreaGitLab_meeting$key} from '../__generated__/ScopePhaseAreaGitLab_meeting.graphql'
 import ScopePhaseAreaAddGitLab from './ScopePhaseAreaAddGitLab'
diff --git a/packages/client/components/ScopePhaseAreaGitLabScoping.tsx b/packages/client/components/ScopePhaseAreaGitLabScoping.tsx
index 3becd402b11..1dcd193beaf 100644
--- a/packages/client/components/ScopePhaseAreaGitLabScoping.tsx
+++ b/packages/client/components/ScopePhaseAreaGitLabScoping.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ScopePhaseAreaGitLabScoping_meeting$key} from '../__generated__/ScopePhaseAreaGitLabScoping_meeting.graphql'
 import GitLabScopingSearchBar from './GitLabScopingSearchBar'
diff --git a/packages/client/components/ScopePhaseAreaJira.tsx b/packages/client/components/ScopePhaseAreaJira.tsx
index 19e480a8b60..d08bad36e6a 100644
--- a/packages/client/components/ScopePhaseAreaJira.tsx
+++ b/packages/client/components/ScopePhaseAreaJira.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ScopePhaseAreaJira_meeting$key} from '../__generated__/ScopePhaseAreaJira_meeting.graphql'
 import ScopePhaseAreaAddJira from './ScopePhaseAreaAddJira'
diff --git a/packages/client/components/ScopePhaseAreaJiraScoping.tsx b/packages/client/components/ScopePhaseAreaJiraScoping.tsx
index 6f9c48d695b..8eb739cb5a6 100644
--- a/packages/client/components/ScopePhaseAreaJiraScoping.tsx
+++ b/packages/client/components/ScopePhaseAreaJiraScoping.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ScopePhaseAreaJiraScoping_meeting$key} from '../__generated__/ScopePhaseAreaJiraScoping_meeting.graphql'
 import JiraScopingSearchBar from './JiraScopingSearchBar'
diff --git a/packages/client/components/ScopePhaseAreaJiraServer.tsx b/packages/client/components/ScopePhaseAreaJiraServer.tsx
index bcb59593a0f..b1c3e8d86e0 100644
--- a/packages/client/components/ScopePhaseAreaJiraServer.tsx
+++ b/packages/client/components/ScopePhaseAreaJiraServer.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ScopePhaseAreaJiraServer_meeting$key} from '../__generated__/ScopePhaseAreaJiraServer_meeting.graphql'
 import JiraServerScopingSearchBar from './JiraServerScopingSearchBar'
diff --git a/packages/client/components/ScopePhaseAreaParabolScoping.tsx b/packages/client/components/ScopePhaseAreaParabolScoping.tsx
index a0e210fc791..f6c7825e6e0 100644
--- a/packages/client/components/ScopePhaseAreaParabolScoping.tsx
+++ b/packages/client/components/ScopePhaseAreaParabolScoping.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ScopePhaseAreaParabolScoping_meeting$key} from '../__generated__/ScopePhaseAreaParabolScoping_meeting.graphql'
 import ParabolScopingSearchBar from './ParabolScopingSearchBar'
diff --git a/packages/client/components/ScopingSearchBar.tsx b/packages/client/components/ScopingSearchBar.tsx
index d20bbe7f476..913253cdb0f 100644
--- a/packages/client/components/ScopingSearchBar.tsx
+++ b/packages/client/components/ScopingSearchBar.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {PALETTE} from '../styles/paletteV3'
 
 const SearchBar = styled('div')({
diff --git a/packages/client/components/ScopingSearchHistoryMenu.tsx b/packages/client/components/ScopingSearchHistoryMenu.tsx
index cd36086cece..6ff46dfe00d 100644
--- a/packages/client/components/ScopingSearchHistoryMenu.tsx
+++ b/packages/client/components/ScopingSearchHistoryMenu.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {MouseEvent} from 'react'
+import {MouseEvent} from 'react'
 import {MenuProps} from '../hooks/useMenu'
 import {PALETTE} from '../styles/paletteV3'
 import {ICON_SIZE} from '../styles/typographyV2'
diff --git a/packages/client/components/ScopingSearchHistoryToggle.tsx b/packages/client/components/ScopingSearchHistoryToggle.tsx
index 4c5724dc769..cf40b7a78f7 100644
--- a/packages/client/components/ScopingSearchHistoryToggle.tsx
+++ b/packages/client/components/ScopingSearchHistoryToggle.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {ExpandMore, Search} from '@mui/icons-material'
-import React from 'react'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
 import {PALETTE} from '../styles/paletteV3'
diff --git a/packages/client/components/ScopingSearchInput.tsx b/packages/client/components/ScopingSearchInput.tsx
index 8cb849e6fcb..0d7688b7841 100644
--- a/packages/client/components/ScopingSearchInput.tsx
+++ b/packages/client/components/ScopingSearchInput.tsx
@@ -1,6 +1,7 @@
 import styled from '@emotion/styled'
 import {Close} from '@mui/icons-material'
-import React, {useEffect, useRef} from 'react'
+import * as React from 'react'
+import {useEffect, useRef} from 'react'
 import {commitLocalUpdate} from 'react-relay'
 import {TaskServiceEnum} from '../__generated__/CreateTaskMutation.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/ScopingSearchResultItem.tsx b/packages/client/components/ScopingSearchResultItem.tsx
index d619ae8a7a3..36715d54af6 100644
--- a/packages/client/components/ScopingSearchResultItem.tsx
+++ b/packages/client/components/ScopingSearchResultItem.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React from 'react'
+import * as React from 'react'
 import {UpdatePokerScopeMutation as TUpdatePokerScopeMutation} from '../__generated__/UpdatePokerScopeMutation.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
diff --git a/packages/client/components/SearchMenuItem.tsx b/packages/client/components/SearchMenuItem.tsx
index d1c1c34e1f3..cde851cadbf 100644
--- a/packages/client/components/SearchMenuItem.tsx
+++ b/packages/client/components/SearchMenuItem.tsx
@@ -1,6 +1,7 @@
 import styled from '@emotion/styled'
 import {Search} from '@mui/icons-material'
-import React, {forwardRef} from 'react'
+import * as React from 'react'
+import {forwardRef} from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import MenuItemComponentAvatar from './MenuItemComponentAvatar'
 import MenuItemLabel from './MenuItemLabel'
diff --git a/packages/client/components/SelectMeetingDropdown.tsx b/packages/client/components/SelectMeetingDropdown.tsx
index c7c23b172f2..6b8ab582549 100644
--- a/packages/client/components/SelectMeetingDropdown.tsx
+++ b/packages/client/components/SelectMeetingDropdown.tsx
@@ -1,6 +1,5 @@
 import * as DropdownMenu from '@radix-ui/react-dropdown-menu'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {SelectMeetingDropdown_meetings$key} from '~/__generated__/SelectMeetingDropdown_meetings.graphql'
 import plural from '~/utils/plural'
diff --git a/packages/client/components/SelectMeetingDropdownItem.tsx b/packages/client/components/SelectMeetingDropdownItem.tsx
index 63e8ad36acf..ab2a0bb5eae 100644
--- a/packages/client/components/SelectMeetingDropdownItem.tsx
+++ b/packages/client/components/SelectMeetingDropdownItem.tsx
@@ -6,7 +6,6 @@ import {
 } from '@mui/icons-material'
 import * as Sentry from '@sentry/browser'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {SelectMeetingDropdownItem_meeting$key} from '~/__generated__/SelectMeetingDropdownItem_meeting.graphql'
 import useRouter from '~/hooks/useRouter'
diff --git a/packages/client/components/SelectSharingScopeDropdown.tsx b/packages/client/components/SelectSharingScopeDropdown.tsx
index 57d2af47173..5e7d3d1db16 100644
--- a/packages/client/components/SelectSharingScopeDropdown.tsx
+++ b/packages/client/components/SelectSharingScopeDropdown.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {SelectSharingScopeDropdown_template$key} from '../__generated__/SelectSharingScopeDropdown_template.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/SelectTeamDropdown.tsx b/packages/client/components/SelectTeamDropdown.tsx
index a345304a9f7..985d3fdd040 100644
--- a/packages/client/components/SelectTeamDropdown.tsx
+++ b/packages/client/components/SelectTeamDropdown.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
+import * as React from 'react'
 import {useFragment} from 'react-relay'
 import {SelectTeamDropdown_teams$key} from '~/__generated__/SelectTeamDropdown_teams.graphql'
 import {MenuProps} from '../hooks/useMenu'
diff --git a/packages/client/components/SendCommentButton.tsx b/packages/client/components/SendCommentButton.tsx
index 1e1541ecfda..6371ecec9b1 100644
--- a/packages/client/components/SendCommentButton.tsx
+++ b/packages/client/components/SendCommentButton.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {ArrowUpward} from '@mui/icons-material'
-import React from 'react'
+import * as React from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import isAndroid from '~/utils/draftjs/isAndroid'
 import {MenuPosition} from '../hooks/useCoords'
diff --git a/packages/client/components/ShareTopicModal.tsx b/packages/client/components/ShareTopicModal.tsx
index 98fe17407de..2b247d5c4a8 100644
--- a/packages/client/components/ShareTopicModal.tsx
+++ b/packages/client/components/ShareTopicModal.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
+import {useState} from 'react'
 import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay'
 import {ShareTopicModalQuery} from '../__generated__/ShareTopicModalQuery.graphql'
 import {ShareTopicModal_viewer$key} from '../__generated__/ShareTopicModal_viewer.graphql'
@@ -98,12 +98,10 @@ const ShareTopicModal = (props: Props) => {
   const isLoading = slackOAuthSubmitting || shareTopicSubmitting
 
   const defaultSelectedIntegration = isSlackConnected ? 'slack' : ''
-  const [selectedIntegration, setSelectedIntegration] = React.useState<Integration | ''>(
+  const [selectedIntegration, setSelectedIntegration] = useState<Integration | ''>(
     defaultSelectedIntegration
   )
-  const [selectedChannel, setSelectedChannel] = React.useState<string>(
-    slackDefaultTeamChannelId ?? ''
-  )
+  const [selectedChannel, setSelectedChannel] = useState<string>(slackDefaultTeamChannelId ?? '')
 
   if (!meeting) {
     return null
diff --git a/packages/client/components/ShareTopicRoot.tsx b/packages/client/components/ShareTopicRoot.tsx
index 04f248254c2..88082b65bdd 100644
--- a/packages/client/components/ShareTopicRoot.tsx
+++ b/packages/client/components/ShareTopicRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import ShareTopicModal from '~/components/ShareTopicModal'
 import shareTopicModalQuery, {
   ShareTopicModalQuery
diff --git a/packages/client/components/ShareTopicRouterRoot.tsx b/packages/client/components/ShareTopicRouterRoot.tsx
index de90986081c..9b510a4043d 100644
--- a/packages/client/components/ShareTopicRouterRoot.tsx
+++ b/packages/client/components/ShareTopicRouterRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense, useCallback} from 'react'
+import {Suspense, useCallback} from 'react'
 import {useHistory, useLocation} from 'react-router'
 import ShareTopicModal from '~/components/ShareTopicModal'
 import shareTopicModalQuery, {
diff --git a/packages/client/components/SideBarStartMeetingButton.tsx b/packages/client/components/SideBarStartMeetingButton.tsx
index ce2a3d9830a..c7fec022cdf 100644
--- a/packages/client/components/SideBarStartMeetingButton.tsx
+++ b/packages/client/components/SideBarStartMeetingButton.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {Add} from '@mui/icons-material'
-import React from 'react'
 import useRouter from '~/hooks/useRouter'
 import {BezierCurve} from '../types/constEnums'
 import FlatPrimaryButton from './FlatPrimaryButton'
diff --git a/packages/client/components/SidebarToggle.tsx b/packages/client/components/SidebarToggle.tsx
index 792bdac0fea..7cac4715ba1 100644
--- a/packages/client/components/SidebarToggle.tsx
+++ b/packages/client/components/SidebarToggle.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {PALETTE} from '../styles/paletteV3'
 import {BaseButtonProps} from './BaseButton'
 import IconButton from './IconButton'
diff --git a/packages/client/components/SimpleTooltip.tsx b/packages/client/components/SimpleTooltip.tsx
index a38ebd8bacb..e74e1e5ffa5 100644
--- a/packages/client/components/SimpleTooltip.tsx
+++ b/packages/client/components/SimpleTooltip.tsx
@@ -1,5 +1,5 @@
 import clsx from 'clsx'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {MenuPosition} from '../hooks/useCoords'
 import useTooltip from '../hooks/useTooltip'
 
diff --git a/packages/client/components/SlackChannelDropdown.tsx b/packages/client/components/SlackChannelDropdown.tsx
index 9b3afd82a5d..18e54165b52 100644
--- a/packages/client/components/SlackChannelDropdown.tsx
+++ b/packages/client/components/SlackChannelDropdown.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 import {MenuProps} from '../hooks/useMenu'
 import Menu from './Menu'
 import MenuItem from './MenuItem'
diff --git a/packages/client/components/SlackConfigMenu.tsx b/packages/client/components/SlackConfigMenu.tsx
index 8a54e724c5a..2fc7983cd9d 100644
--- a/packages/client/components/SlackConfigMenu.tsx
+++ b/packages/client/components/SlackConfigMenu.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuProps} from '../hooks/useMenu'
 import {MenuMutationProps} from '../hooks/useMutationProps'
diff --git a/packages/client/components/SlackSVG.tsx b/packages/client/components/SlackSVG.tsx
index 0fca31fb0a3..cab3f9a901b 100644
--- a/packages/client/components/SlackSVG.tsx
+++ b/packages/client/components/SlackSVG.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
+import {memo} from 'react'
 
-const SlackSVG = React.memo(() => {
+const SlackSVG = memo(() => {
   return (
     <svg width='24' height='24' viewBox='0 0 48 48' fill='none' xmlns='http://www.w3.org/2000/svg'>
       <path
diff --git a/packages/client/components/Snackbar.tsx b/packages/client/components/Snackbar.tsx
index 19c321f7749..517b9d2ad62 100644
--- a/packages/client/components/Snackbar.tsx
+++ b/packages/client/components/Snackbar.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {useEffect, useLayoutEffect, useRef} from 'react'
+import {memo, useEffect, useLayoutEffect, useRef} from 'react'
 import useForceUpdate from '~/hooks/useForceUpdate'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useBreakpoint from '../hooks/useBreakpoint'
@@ -51,7 +51,7 @@ export interface Snack {
   showDismissButton?: boolean
 }
 
-const Snackbar = React.memo(() => {
+const Snackbar = memo(() => {
   const snackQueueRef = useRef<Snack[]>([])
   const activeSnacksRef = useRef<Snack[]>([])
   const forceUpdate = useForceUpdate()
diff --git a/packages/client/components/SnackbarMessage.tsx b/packages/client/components/SnackbarMessage.tsx
index d6cd730ff96..467becbd565 100644
--- a/packages/client/components/SnackbarMessage.tsx
+++ b/packages/client/components/SnackbarMessage.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {Close} from '@mui/icons-material'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {TransitionStatus} from '../hooks/useTransition'
 import {DECELERATE} from '../styles/animation'
 import {snackbarShadow} from '../styles/elevation'
diff --git a/packages/client/components/SnackbarMessageAction.tsx b/packages/client/components/SnackbarMessageAction.tsx
index 9792f4525d7..2baedd60e4d 100644
--- a/packages/client/components/SnackbarMessageAction.tsx
+++ b/packages/client/components/SnackbarMessageAction.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {DECELERATE} from '../styles/animation'
 import {PALETTE} from '../styles/paletteV3'
 import {Radius} from '../types/constEnums'
diff --git a/packages/client/components/SpotlightModal.tsx b/packages/client/components/SpotlightModal.tsx
index e885b01250a..d42ceeaaa4f 100644
--- a/packages/client/components/SpotlightModal.tsx
+++ b/packages/client/components/SpotlightModal.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {RefObject, useEffect, useRef, useState} from 'react'
+import {RefObject, useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {PortalStatus} from '~/hooks/usePortal'
 import {MAX_SPOTLIGHT_COLUMNS, SPOTLIGHT_TOP_SECTION_HEIGHT} from '~/utils/constants'
diff --git a/packages/client/components/SpotlightResults.tsx b/packages/client/components/SpotlightResults.tsx
index cd2b0c88f9b..e5ccff438db 100644
--- a/packages/client/components/SpotlightResults.tsx
+++ b/packages/client/components/SpotlightResults.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {RefObject, useRef} from 'react'
+import {RefObject, useRef} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {SpotlightResultsQuery} from '~/__generated__/SpotlightResultsQuery.graphql'
 import useResultsHeight from '~/hooks/useResultsHeight'
diff --git a/packages/client/components/SpotlightResultsEmptyState.tsx b/packages/client/components/SpotlightResultsEmptyState.tsx
index 739a039b8a9..67ab95067ea 100644
--- a/packages/client/components/SpotlightResultsEmptyState.tsx
+++ b/packages/client/components/SpotlightResultsEmptyState.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {PALETTE} from '../styles/paletteV3'
 import purpleLines from '../styles/theme/images/purpleLines.svg'
 
diff --git a/packages/client/components/SpotlightResultsRoot.tsx b/packages/client/components/SpotlightResultsRoot.tsx
index 714dff4370a..0ff790d1ce7 100644
--- a/packages/client/components/SpotlightResultsRoot.tsx
+++ b/packages/client/components/SpotlightResultsRoot.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {RefObject, Suspense, useRef} from 'react'
+import {RefObject, Suspense, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import useQueryLoaderNow from '~/hooks/useQueryLoaderNow'
 import spotlightResultsQuery, {
diff --git a/packages/client/components/SpotlightSearchBar.tsx b/packages/client/components/SpotlightSearchBar.tsx
index a85b2e21b30..0ff7a6bdc18 100644
--- a/packages/client/components/SpotlightSearchBar.tsx
+++ b/packages/client/components/SpotlightSearchBar.tsx
@@ -1,7 +1,8 @@
 import styled from '@emotion/styled'
 import {Search as SearchIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useRef} from 'react'
+import * as React from 'react'
+import {useRef} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import SendClientSideEvent from '~/utils/SendClientSideEvent'
 import Atmosphere from '../Atmosphere'
diff --git a/packages/client/components/SpotlightSourceGroup.tsx b/packages/client/components/SpotlightSourceGroup.tsx
index 5d23a6a38a7..fa6f440aed4 100644
--- a/packages/client/components/SpotlightSourceGroup.tsx
+++ b/packages/client/components/SpotlightSourceGroup.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {RefObject} from 'react'
+import {RefObject} from 'react'
 import {useFragment} from 'react-relay'
 import {SpotlightSourceGroup_meeting$key} from '../__generated__/SpotlightSourceGroup_meeting.graphql'
 import {ElementHeight} from '../types/constEnums'
diff --git a/packages/client/components/SpotlightTopBar.tsx b/packages/client/components/SpotlightTopBar.tsx
index 30e373a8110..a01606f9d58 100644
--- a/packages/client/components/SpotlightTopBar.tsx
+++ b/packages/client/components/SpotlightTopBar.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {Close} from '@mui/icons-material'
-import React from 'react'
 import {PALETTE} from '../styles/paletteV3'
 import PlainButton from './PlainButton/PlainButton'
 
diff --git a/packages/client/components/StageTimerControl.tsx b/packages/client/components/StageTimerControl.tsx
index 9ac8d00ec9d..607f6eca45f 100644
--- a/packages/client/components/StageTimerControl.tsx
+++ b/packages/client/components/StageTimerControl.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {StageTimerControl_meeting$key} from '~/__generated__/StageTimerControl_meeting.graphql'
 import {TransitionStatus} from '~/hooks/useTransition'
diff --git a/packages/client/components/StageTimerDisplay.tsx b/packages/client/components/StageTimerDisplay.tsx
index 5edba7dd6c5..ead3db08fda 100644
--- a/packages/client/components/StageTimerDisplay.tsx
+++ b/packages/client/components/StageTimerDisplay.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {StageTimerDisplay_meeting$key} from '~/__generated__/StageTimerDisplay_meeting.graphql'
 import PhaseCompleteTag from '~/components/Tag/PhaseCompleteTag'
diff --git a/packages/client/components/StageTimerDisplayGauge.tsx b/packages/client/components/StageTimerDisplayGauge.tsx
index fb36ec13791..b3764528144 100644
--- a/packages/client/components/StageTimerDisplayGauge.tsx
+++ b/packages/client/components/StageTimerDisplayGauge.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import endTimerSound from '../../../static/sounds/tic-tac.mp3'
 import useBreakpoint from '../hooks/useBreakpoint'
 import useRefreshInterval from '../hooks/useRefreshInterval'
diff --git a/packages/client/components/StageTimerHourPicker.tsx b/packages/client/components/StageTimerHourPicker.tsx
index efa1956b863..9342a84a3f5 100644
--- a/packages/client/components/StageTimerHourPicker.tsx
+++ b/packages/client/components/StageTimerHourPicker.tsx
@@ -1,5 +1,4 @@
 import ms from 'ms'
-import React from 'react'
 import {MenuProps} from '../hooks/useMenu'
 import formatTime from '../utils/date/formatTime'
 import Menu from './Menu'
diff --git a/packages/client/components/StageTimerMinutePicker.tsx b/packages/client/components/StageTimerMinutePicker.tsx
index 883ac1852ee..038412be8ff 100644
--- a/packages/client/components/StageTimerMinutePicker.tsx
+++ b/packages/client/components/StageTimerMinutePicker.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import {MenuProps} from '../hooks/useMenu'
 import plural from '../utils/plural'
 import Menu from './Menu'
diff --git a/packages/client/components/StageTimerModal.tsx b/packages/client/components/StageTimerModal.tsx
index e9f30b379fb..ebdd7f2788d 100644
--- a/packages/client/components/StageTimerModal.tsx
+++ b/packages/client/components/StageTimerModal.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {Event as EventIcon, Timer as TimerIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import SwipeableViews from 'react-swipeable-views'
 import {StageTimerModal_facilitator$key} from '../__generated__/StageTimerModal_facilitator.graphql'
diff --git a/packages/client/components/StageTimerModalEditTimeEnd.tsx b/packages/client/components/StageTimerModalEditTimeEnd.tsx
index d1857b20ed9..fdfb3ebcdde 100644
--- a/packages/client/components/StageTimerModalEditTimeEnd.tsx
+++ b/packages/client/components/StageTimerModalEditTimeEnd.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {Stop} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {StageTimerModalEditTimeEnd_facilitator$key} from '../__generated__/StageTimerModalEditTimeEnd_facilitator.graphql'
 import {StageTimerModalEditTimeEnd_stage$key} from '../__generated__/StageTimerModalEditTimeEnd_stage.graphql'
diff --git a/packages/client/components/StageTimerModalEditTimeLimit.tsx b/packages/client/components/StageTimerModalEditTimeLimit.tsx
index 827e3f56b7a..d27fd618a0e 100644
--- a/packages/client/components/StageTimerModalEditTimeLimit.tsx
+++ b/packages/client/components/StageTimerModalEditTimeLimit.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {TimerOff} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {StageTimerModalEditTimeLimit_stage$key} from '../__generated__/StageTimerModalEditTimeLimit_stage.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/StageTimerModalEndTime.tsx b/packages/client/components/StageTimerModalEndTime.tsx
index c6c3e10fbd9..eb9ffba19f5 100644
--- a/packages/client/components/StageTimerModalEndTime.tsx
+++ b/packages/client/components/StageTimerModalEndTime.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import ms from 'ms'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {StageTimerModalEndTime_facilitator$key} from '../__generated__/StageTimerModalEndTime_facilitator.graphql'
 import {StageTimerModalEndTime_stage$key} from '../__generated__/StageTimerModalEndTime_stage.graphql'
diff --git a/packages/client/components/StageTimerModalEndTimeDate.tsx b/packages/client/components/StageTimerModalEndTimeDate.tsx
index 6b01b537901..1874e40dba6 100644
--- a/packages/client/components/StageTimerModalEndTimeDate.tsx
+++ b/packages/client/components/StageTimerModalEndTimeDate.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {Event} from '@mui/icons-material'
 import ms from 'ms'
-import React from 'react'
 import {DayModifiers, DayPicker} from 'react-day-picker'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
diff --git a/packages/client/components/StageTimerModalEndTimeHour.tsx b/packages/client/components/StageTimerModalEndTimeHour.tsx
index 5f7088ee702..ba5dda3cdf6 100644
--- a/packages/client/components/StageTimerModalEndTimeHour.tsx
+++ b/packages/client/components/StageTimerModalEndTimeHour.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
 import formatTime from '../utils/date/formatTime'
diff --git a/packages/client/components/StageTimerModalEndTimeSlackToggle.tsx b/packages/client/components/StageTimerModalEndTimeSlackToggle.tsx
index fc3cc490e30..dfd9d4e7f4f 100644
--- a/packages/client/components/StageTimerModalEndTimeSlackToggle.tsx
+++ b/packages/client/components/StageTimerModalEndTimeSlackToggle.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {SetSlackNotificationMutation as TSetSlackNotificationMutation} from '../__generated__/SetSlackNotificationMutation.graphql'
 import {StageTimerModalEndTimeSlackToggle_facilitator$key} from '../__generated__/StageTimerModalEndTimeSlackToggle_facilitator.graphql'
diff --git a/packages/client/components/StageTimerModalTimeLimit.tsx b/packages/client/components/StageTimerModalTimeLimit.tsx
index 8e2f52f78ca..a490e718757 100644
--- a/packages/client/components/StageTimerModalTimeLimit.tsx
+++ b/packages/client/components/StageTimerModalTimeLimit.tsx
@@ -2,7 +2,7 @@ import styled from '@emotion/styled'
 import {Timer} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import ms from 'ms'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {StageTimerModalTimeLimit_stage$key} from '../__generated__/StageTimerModalTimeLimit_stage.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/StandardHub/StandardHub.tsx b/packages/client/components/StandardHub/StandardHub.tsx
index 3bb47e353ec..303ec9a2678 100644
--- a/packages/client/components/StandardHub/StandardHub.tsx
+++ b/packages/client/components/StandardHub/StandardHub.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useRouter from '~/hooks/useRouter'
 import {StandardHub_viewer$key} from '../../__generated__/StandardHub_viewer.graphql'
diff --git a/packages/client/components/StandardHubUserMenu.tsx b/packages/client/components/StandardHubUserMenu.tsx
index ff19261ae81..f3f015fca1b 100644
--- a/packages/client/components/StandardHubUserMenu.tsx
+++ b/packages/client/components/StandardHubUserMenu.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {AccountBalance, AccountBox, ExitToApp, Star} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {Link} from 'react-router-dom'
 import {StandardHubUserMenu_viewer$key} from '../__generated__/StandardHubUserMenu_viewer.graphql'
diff --git a/packages/client/components/StartMeetingFAB.tsx b/packages/client/components/StartMeetingFAB.tsx
index ebc0a3c1208..c1c764f1dc3 100644
--- a/packages/client/components/StartMeetingFAB.tsx
+++ b/packages/client/components/StartMeetingFAB.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {Add as AddIcon} from '@mui/icons-material'
-import React, {useEffect, useRef, useState} from 'react'
+import {useEffect, useRef, useState} from 'react'
 import useRouter from '~/hooks/useRouter'
 import {PALETTE} from '~/styles/paletteV3'
 import useBreakpoint from '../hooks/useBreakpoint'
diff --git a/packages/client/components/StaticSidebar.tsx b/packages/client/components/StaticSidebar.tsx
index 5a6441c9a5c..e3489d4dbc3 100644
--- a/packages/client/components/StaticSidebar.tsx
+++ b/packages/client/components/StaticSidebar.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {DECELERATE} from '../styles/animation'
 import {NavSidebar, ZIndex} from '../types/constEnums'
 
diff --git a/packages/client/components/SubmittedForgotPasswordPage.tsx b/packages/client/components/SubmittedForgotPasswordPage.tsx
index 9a6fd89394d..81b39639cd0 100644
--- a/packages/client/components/SubmittedForgotPasswordPage.tsx
+++ b/packages/client/components/SubmittedForgotPasswordPage.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import useRouter from '../hooks/useRouter'
 import {emailLinkStyle} from '../modules/email/styles'
 import {ForgotPasswordResType} from '../mutations/EmailPasswordResetMutation'
diff --git a/packages/client/components/SuggestMentionableUsers.tsx b/packages/client/components/SuggestMentionableUsers.tsx
index 8a1fad5aac1..86b418ccb02 100644
--- a/packages/client/components/SuggestMentionableUsers.tsx
+++ b/packages/client/components/SuggestMentionableUsers.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import stringScore from 'string-score'
 import {SuggestMentionableUsersQuery} from '../__generated__/SuggestMentionableUsersQuery.graphql'
diff --git a/packages/client/components/SuggestMentionableUsersRoot.tsx b/packages/client/components/SuggestMentionableUsersRoot.tsx
index 9f7d4207a4f..9b2a3d2854c 100644
--- a/packages/client/components/SuggestMentionableUsersRoot.tsx
+++ b/packages/client/components/SuggestMentionableUsersRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import suggestMentionableUsersQuery, {
   SuggestMentionableUsersQuery
 } from '../__generated__/SuggestMentionableUsersQuery.graphql'
diff --git a/packages/client/components/SuggestedActionBackground.tsx b/packages/client/components/SuggestedActionBackground.tsx
index 13c8781f5a2..55bb643c1aa 100644
--- a/packages/client/components/SuggestedActionBackground.tsx
+++ b/packages/client/components/SuggestedActionBackground.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import patternTile from '../styles/theme/images/icon-pattern-tile.svg'
 import {DashTimeline} from '../types/constEnums'
 import getRotatedBBox from '../utils/getRotatedBBox'
diff --git a/packages/client/components/SuggestedActionButton.tsx b/packages/client/components/SuggestedActionButton.tsx
index 40c5b73e25c..cd9c04b1400 100644
--- a/packages/client/components/SuggestedActionButton.tsx
+++ b/packages/client/components/SuggestedActionButton.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {forwardRef, Ref} from 'react'
+import {forwardRef, Ref} from 'react'
 import PrimaryButton from './PrimaryButton'
 
 const ActionButton = styled(PrimaryButton)({
diff --git a/packages/client/components/SuggestedActionCard.tsx b/packages/client/components/SuggestedActionCard.tsx
index 16fb3b73ce7..991cb388e0b 100644
--- a/packages/client/components/SuggestedActionCard.tsx
+++ b/packages/client/components/SuggestedActionCard.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {Cancel, ChangeHistory, GroupAdd, GroupWork, History, PersonAdd} from '@mui/icons-material'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import DismissSuggestedActionMutation from '../mutations/DismissSuggestedActionMutation'
 import {DECELERATE, fadeIn} from '../styles/animation'
diff --git a/packages/client/components/SuggestedActionCreateNewTeam.tsx b/packages/client/components/SuggestedActionCreateNewTeam.tsx
index b7f9eb440ed..781181cd251 100644
--- a/packages/client/components/SuggestedActionCreateNewTeam.tsx
+++ b/packages/client/components/SuggestedActionCreateNewTeam.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {RouteComponentProps, withRouter} from 'react-router'
 import {SuggestedActionCreateNewTeam_suggestedAction$key} from '../__generated__/SuggestedActionCreateNewTeam_suggestedAction.graphql'
diff --git a/packages/client/components/SuggestedActionInviteYourTeam.tsx b/packages/client/components/SuggestedActionInviteYourTeam.tsx
index 3ba3bc1d9a3..13ab8033942 100644
--- a/packages/client/components/SuggestedActionInviteYourTeam.tsx
+++ b/packages/client/components/SuggestedActionInviteYourTeam.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {lazy} from 'react'
+import {lazy} from 'react'
 import {useFragment} from 'react-relay'
 import {SuggestedActionInviteYourTeam_suggestedAction$key} from '../__generated__/SuggestedActionInviteYourTeam_suggestedAction.graphql'
 import useModal from '../hooks/useModal'
diff --git a/packages/client/components/SuggestedActionTryActionMeeting.tsx b/packages/client/components/SuggestedActionTryActionMeeting.tsx
index 2f2264d2e78..574397e2512 100644
--- a/packages/client/components/SuggestedActionTryActionMeeting.tsx
+++ b/packages/client/components/SuggestedActionTryActionMeeting.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {RouteComponentProps, withRouter} from 'react-router'
 import {SuggestedActionTryActionMeeting_suggestedAction$key} from '../__generated__/SuggestedActionTryActionMeeting_suggestedAction.graphql'
diff --git a/packages/client/components/SuggestedActionTryRetroMeeting.tsx b/packages/client/components/SuggestedActionTryRetroMeeting.tsx
index 8290a1f9078..29b68387bce 100644
--- a/packages/client/components/SuggestedActionTryRetroMeeting.tsx
+++ b/packages/client/components/SuggestedActionTryRetroMeeting.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {RouteComponentProps, withRouter} from 'react-router'
 import {SuggestedActionTryRetroMeeting_suggestedAction$key} from '../__generated__/SuggestedActionTryRetroMeeting_suggestedAction.graphql'
diff --git a/packages/client/components/SuggestedActionTryTheDemo.tsx b/packages/client/components/SuggestedActionTryTheDemo.tsx
index a6e1ef8bc43..c720e05aa96 100644
--- a/packages/client/components/SuggestedActionTryTheDemo.tsx
+++ b/packages/client/components/SuggestedActionTryTheDemo.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {RouteComponentProps, withRouter} from 'react-router'
 import useAtmosphere from '~/hooks/useAtmosphere'
diff --git a/packages/client/components/SwipeableDashSidebar.tsx b/packages/client/components/SwipeableDashSidebar.tsx
index ef6dc960759..ee17b9e23f4 100644
--- a/packages/client/components/SwipeableDashSidebar.tsx
+++ b/packages/client/components/SwipeableDashSidebar.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
-import React, {ReactNode, useCallback, useEffect, useState} from 'react'
+import * as React from 'react'
+import {ReactNode, useCallback, useEffect, useState} from 'react'
 import useEventCallback from '~/hooks/useEventCallback'
 import usePortal from '../hooks/usePortal'
 import {DECELERATE} from '../styles/animation'
diff --git a/packages/client/components/Tab/Tab.tsx b/packages/client/components/Tab/Tab.tsx
index de471723c0c..91682ea0105 100644
--- a/packages/client/components/Tab/Tab.tsx
+++ b/packages/client/components/Tab/Tab.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {forwardRef, ReactNode, Ref} from 'react'
+import {forwardRef, ReactNode, Ref} from 'react'
 import {PALETTE} from '../../styles/paletteV3'
 import PlainButton from '../PlainButton/PlainButton'
 
diff --git a/packages/client/components/Tabs/Tabs.tsx b/packages/client/components/Tabs/Tabs.tsx
index 3686184a14a..9e574d5a13e 100644
--- a/packages/client/components/Tabs/Tabs.tsx
+++ b/packages/client/components/Tabs/Tabs.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {Children, cloneElement, Component, ReactElement, ReactNode} from 'react'
+import {Children, cloneElement, Component, ReactElement, ReactNode} from 'react'
 import {PALETTE} from '../../styles/paletteV3'
 import getBBox from '../RetroReflectPhase/getBBox'
 
diff --git a/packages/client/components/Tag/PhaseCompleteTag.tsx b/packages/client/components/Tag/PhaseCompleteTag.tsx
index 5cc87bd6efe..fd038d0ffeb 100644
--- a/packages/client/components/Tag/PhaseCompleteTag.tsx
+++ b/packages/client/components/Tag/PhaseCompleteTag.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 
 const Wrapper = styled('div')({
diff --git a/packages/client/components/Tag/TierTag.tsx b/packages/client/components/Tag/TierTag.tsx
index 221c526972b..ef39a09e247 100644
--- a/packages/client/components/Tag/TierTag.tsx
+++ b/packages/client/components/Tag/TierTag.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {TierEnum} from '../../__generated__/OrganizationSubscription.graphql'
 import {PALETTE} from '../../styles/paletteV3'
 import {TierLabel} from '../../types/constEnums'
diff --git a/packages/client/components/TaskColumns/TaskColumns.tsx b/packages/client/components/TaskColumns/TaskColumns.tsx
index bd42a583e8f..b7bb6da4281 100644
--- a/packages/client/components/TaskColumns/TaskColumns.tsx
+++ b/packages/client/components/TaskColumns/TaskColumns.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {DragDropContext, DropResult} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
 import {TaskColumns_teams$key} from '~/__generated__/TaskColumns_teams.graphql'
diff --git a/packages/client/components/TaskEditor/CommentEditor.tsx b/packages/client/components/TaskEditor/CommentEditor.tsx
index cb7378613bb..f882cb23c0d 100644
--- a/packages/client/components/TaskEditor/CommentEditor.tsx
+++ b/packages/client/components/TaskEditor/CommentEditor.tsx
@@ -7,7 +7,8 @@ import {
   EditorState,
   getDefaultKeyBinding
 } from 'draft-js'
-import React, {RefObject, Suspense, useEffect, useRef} from 'react'
+import * as React from 'react'
+import {RefObject, Suspense, useEffect, useRef} from 'react'
 import {AriaLabels, Card} from '../../types/constEnums'
 import {textTags} from '../../utils/constants'
 import completeEntity from '../../utils/draftjs/completeEntity'
diff --git a/packages/client/components/TaskEditor/EditorLink.tsx b/packages/client/components/TaskEditor/EditorLink.tsx
index b76a2626a59..b56f9897c5d 100644
--- a/packages/client/components/TaskEditor/EditorLink.tsx
+++ b/packages/client/components/TaskEditor/EditorLink.tsx
@@ -1,5 +1,5 @@
 import {ContentState, EditorState} from 'draft-js'
-import React, {Component, MouseEvent, ReactNode} from 'react'
+import {Component, MouseEvent, ReactNode} from 'react'
 import {PALETTE} from '../../styles/paletteV3'
 
 const baseStyle = {
diff --git a/packages/client/components/TaskEditor/EmojiMenuContainer.tsx b/packages/client/components/TaskEditor/EmojiMenuContainer.tsx
index 242659330a9..842f8c2ff6a 100644
--- a/packages/client/components/TaskEditor/EmojiMenuContainer.tsx
+++ b/packages/client/components/TaskEditor/EmojiMenuContainer.tsx
@@ -1,4 +1,4 @@
-import React, {Ref, useEffect} from 'react'
+import {Ref, useEffect} from 'react'
 import {MenuPosition} from '../../hooks/useCoords'
 import useMenu from '../../hooks/useMenu'
 import lazyPreload from '../../utils/lazyPreload'
diff --git a/packages/client/components/TaskEditor/Hashtag.tsx b/packages/client/components/TaskEditor/Hashtag.tsx
index 901fe509af1..00a7ac65b18 100644
--- a/packages/client/components/TaskEditor/Hashtag.tsx
+++ b/packages/client/components/TaskEditor/Hashtag.tsx
@@ -1,4 +1,4 @@
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {PALETTE} from '../../styles/paletteV3'
 
 // inline styles so oy-vey doesn't barf when making emails using draft-js cards
diff --git a/packages/client/components/TaskEditor/Mention.tsx b/packages/client/components/TaskEditor/Mention.tsx
index 264d644fa1a..d8f9f7a82d0 100644
--- a/packages/client/components/TaskEditor/Mention.tsx
+++ b/packages/client/components/TaskEditor/Mention.tsx
@@ -1,4 +1,4 @@
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {PALETTE} from '../../styles/paletteV3'
 
 const style = {
diff --git a/packages/client/components/TaskEditor/SearchHighlight.tsx b/packages/client/components/TaskEditor/SearchHighlight.tsx
index bc23c5e2030..dc07d8647a9 100644
--- a/packages/client/components/TaskEditor/SearchHighlight.tsx
+++ b/packages/client/components/TaskEditor/SearchHighlight.tsx
@@ -1,4 +1,4 @@
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {PALETTE} from '../../styles/paletteV3'
 
 const style = {
diff --git a/packages/client/components/TaskEditor/TaskEditor.tsx b/packages/client/components/TaskEditor/TaskEditor.tsx
index 3e85bb6fec8..1626bc98a17 100644
--- a/packages/client/components/TaskEditor/TaskEditor.tsx
+++ b/packages/client/components/TaskEditor/TaskEditor.tsx
@@ -7,7 +7,8 @@ import {
   EditorState,
   getDefaultKeyBinding
 } from 'draft-js'
-import React, {RefObject, Suspense, useEffect, useRef} from 'react'
+import * as React from 'react'
+import {RefObject, Suspense, useEffect, useRef} from 'react'
 import completeEntity from '~/utils/draftjs/completeEntity'
 import linkify from '~/utils/linkify'
 import {UseTaskChild} from '../../hooks/useTaskChildFocus'
diff --git a/packages/client/components/TaskEditor/TruncatedEllipsis.tsx b/packages/client/components/TaskEditor/TruncatedEllipsis.tsx
index 6a412ae2a95..6c8fb015dd9 100644
--- a/packages/client/components/TaskEditor/TruncatedEllipsis.tsx
+++ b/packages/client/components/TaskEditor/TruncatedEllipsis.tsx
@@ -1,5 +1,5 @@
 import {ContentState, EditorState} from 'draft-js'
-import React, {Component, ReactNode} from 'react'
+import {Component, ReactNode} from 'react'
 
 interface Props {
   contentState: ContentState
diff --git a/packages/client/components/TaskEditor/useEmojis.tsx b/packages/client/components/TaskEditor/useEmojis.tsx
index 343f2087357..270a5f28fc2 100644
--- a/packages/client/components/TaskEditor/useEmojis.tsx
+++ b/packages/client/components/TaskEditor/useEmojis.tsx
@@ -1,5 +1,6 @@
 import {EditorProps, EditorState} from 'draft-js'
-import React, {ReactNode, useRef, useState} from 'react'
+import * as React from 'react'
+import {ReactNode, useRef, useState} from 'react'
 import {SetEditorState} from '../../types/draft'
 import {autoCompleteEmoji} from '../../utils/draftjs/completeEntity'
 import getDraftCoords from '../../utils/getDraftCoords'
diff --git a/packages/client/components/TaskEditor/useLinks.tsx b/packages/client/components/TaskEditor/useLinks.tsx
index 70cab4436e1..962a4cd2b52 100644
--- a/packages/client/components/TaskEditor/useLinks.tsx
+++ b/packages/client/components/TaskEditor/useLinks.tsx
@@ -5,7 +5,7 @@ import {
   KeyBindingUtil,
   SelectionState
 } from 'draft-js'
-import React, {ReactNode, RefObject, Suspense, useRef, useState} from 'react'
+import {ReactNode, RefObject, Suspense, useRef, useState} from 'react'
 import useForceUpdate from '../../hooks/useForceUpdate'
 import {UseTaskChild} from '../../hooks/useTaskChildFocus'
 import {SetEditorState} from '../../types/draft'
diff --git a/packages/client/components/TaskEditor/useSuggestions.tsx b/packages/client/components/TaskEditor/useSuggestions.tsx
index ca381e7c5c9..9db13e2199e 100644
--- a/packages/client/components/TaskEditor/useSuggestions.tsx
+++ b/packages/client/components/TaskEditor/useSuggestions.tsx
@@ -1,5 +1,5 @@
 import {EditorProps, EditorState} from 'draft-js'
-import React, {Suspense, lazy, useState} from 'react'
+import {Suspense, lazy, useState} from 'react'
 import useForceUpdate from '../../hooks/useForceUpdate'
 import {SetEditorState} from '../../types/draft'
 import completeEntity from '../../utils/draftjs/completeEntity'
diff --git a/packages/client/components/TaskFooterIntegrateMenu.tsx b/packages/client/components/TaskFooterIntegrateMenu.tsx
index 06e19980674..08bbad0d414 100644
--- a/packages/client/components/TaskFooterIntegrateMenu.tsx
+++ b/packages/client/components/TaskFooterIntegrateMenu.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay'
 import {IntegrationProviderServiceEnum} from '../__generated__/CreateTaskIntegrationMutation.graphql'
 import {TaskFooterIntegrateMenuQuery} from '../__generated__/TaskFooterIntegrateMenuQuery.graphql'
diff --git a/packages/client/components/TaskFooterIntegrateMenuList.tsx b/packages/client/components/TaskFooterIntegrateMenuList.tsx
index 0ac264f345a..6d832ab873e 100644
--- a/packages/client/components/TaskFooterIntegrateMenuList.tsx
+++ b/packages/client/components/TaskFooterIntegrateMenuList.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useState} from 'react'
+import {useEffect, useState} from 'react'
 import {useLazyLoadQuery} from 'react-relay'
 import useSearchFilter from '~/hooks/useSearchFilter'
 import IntegrationRepoId from '~/shared/gqlIds/IntegrationRepoId'
diff --git a/packages/client/components/TaskFooterIntegrateMenuRoot.tsx b/packages/client/components/TaskFooterIntegrateMenuRoot.tsx
index d9dd8740cc7..e3beff511b5 100644
--- a/packages/client/components/TaskFooterIntegrateMenuRoot.tsx
+++ b/packages/client/components/TaskFooterIntegrateMenuRoot.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import taskFooterIntegrateMenuQuery, {
   TaskFooterIntegrateMenuQuery
diff --git a/packages/client/components/TaskFooterIntegrateMenuSignup.tsx b/packages/client/components/TaskFooterIntegrateMenuSignup.tsx
index 4455346f7a4..d46bb71dccd 100644
--- a/packages/client/components/TaskFooterIntegrateMenuSignup.tsx
+++ b/packages/client/components/TaskFooterIntegrateMenuSignup.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TaskFooterIntegrateMenuSignup_TeamMemberIntegrations$key} from '~/__generated__/TaskFooterIntegrateMenuSignup_TeamMemberIntegrations.graphql'
 import {PALETTE} from '~/styles/paletteV3'
diff --git a/packages/client/components/TaskIntegrationLink.tsx b/packages/client/components/TaskIntegrationLink.tsx
index 050af864ad3..e999a38b700 100644
--- a/packages/client/components/TaskIntegrationLink.tsx
+++ b/packages/client/components/TaskIntegrationLink.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {useFragment} from 'react-relay'
 import {parseWebPath} from '~/utils/parseWebPath'
 import {TaskIntegrationLink_integration$key} from '../__generated__/TaskIntegrationLink_integration.graphql'
diff --git a/packages/client/components/TaskIntegrationMenuItem.tsx b/packages/client/components/TaskIntegrationMenuItem.tsx
index 8e4b47c9ec8..5d1dec74e2a 100644
--- a/packages/client/components/TaskIntegrationMenuItem.tsx
+++ b/packages/client/components/TaskIntegrationMenuItem.tsx
@@ -1,4 +1,4 @@
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import {TaskServiceEnum} from '../__generated__/CreateTaskMutation.graphql'
 import AzureDevOpsSVG from './AzureDevOpsSVG'
 import GitHubSVG from './GitHubSVG'
diff --git a/packages/client/components/TaskInvolves.tsx b/packages/client/components/TaskInvolves.tsx
index 0fae1dbfdd9..9fa622a1459 100644
--- a/packages/client/components/TaskInvolves.tsx
+++ b/packages/client/components/TaskInvolves.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import {Editor} from 'draft-js'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import NotificationAction from '~/components/NotificationAction'
 import OutcomeCardStatusIndicator from '~/modules/outcomeCard/components/OutcomeCardStatusIndicator/OutcomeCardStatusIndicator'
diff --git a/packages/client/components/TaskWatermark.tsx b/packages/client/components/TaskWatermark.tsx
index f98f8177ac4..66c342e87a6 100644
--- a/packages/client/components/TaskWatermark.tsx
+++ b/packages/client/components/TaskWatermark.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import AzureDevOpsSVG from './AzureDevOpsSVG'
 import GitHubSVG from './GitHubSVG'
 import GitLabSVG from './GitLabSVG'
diff --git a/packages/client/components/TeamArchived.tsx b/packages/client/components/TeamArchived.tsx
index 74bc493a82e..12308c05af9 100644
--- a/packages/client/components/TeamArchived.tsx
+++ b/packages/client/components/TeamArchived.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TeamArchived_notification$key} from '../__generated__/TeamArchived_notification.graphql'
 import NotificationTemplate from './NotificationTemplate'
diff --git a/packages/client/components/TeamDashTeamMemberMenu.tsx b/packages/client/components/TeamDashTeamMemberMenu.tsx
index d4897ffd634..89225e3929b 100644
--- a/packages/client/components/TeamDashTeamMemberMenu.tsx
+++ b/packages/client/components/TeamDashTeamMemberMenu.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useSearchFilter from '~/hooks/useSearchFilter'
 import {TeamDashTeamMemberMenu_team$key} from '../__generated__/TeamDashTeamMemberMenu_team.graphql'
diff --git a/packages/client/components/TeamFilterMenu.tsx b/packages/client/components/TeamFilterMenu.tsx
index bf7dc7ac07d..ca41e6b317e 100644
--- a/packages/client/components/TeamFilterMenu.tsx
+++ b/packages/client/components/TeamFilterMenu.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo, useRef} from 'react'
+import {useMemo, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {
   TeamFilterMenu_viewer$data,
diff --git a/packages/client/components/TeamHealth.tsx b/packages/client/components/TeamHealth.tsx
index 2f746c182cf..98880e00148 100644
--- a/packages/client/components/TeamHealth.tsx
+++ b/packages/client/components/TeamHealth.tsx
@@ -1,7 +1,7 @@
 import * as RadioGroup from '@radix-ui/react-radio-group'
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import React, {ReactElement} from 'react'
+import {ReactElement} from 'react'
 import {useFragment} from 'react-relay'
 import {TeamHealth_meeting$key} from '~/__generated__/TeamHealth_meeting.graphql'
 import useGotoStageId from '~/hooks/useGotoStageId'
diff --git a/packages/client/components/TeamHealthVotingRow.tsx b/packages/client/components/TeamHealthVotingRow.tsx
index c5c98030620..94e47adaaa6 100644
--- a/packages/client/components/TeamHealthVotingRow.tsx
+++ b/packages/client/components/TeamHealthVotingRow.tsx
@@ -1,6 +1,5 @@
 import {Check as CheckIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TeamHealthVotingRow_stage$key} from '../__generated__/TeamHealthVotingRow_stage.graphql'
 import {PALETTE} from '../styles/paletteV3'
diff --git a/packages/client/components/TeamInvitation.tsx b/packages/client/components/TeamInvitation.tsx
index 001932c4456..5cde27a3a3b 100644
--- a/packages/client/components/TeamInvitation.tsx
+++ b/packages/client/components/TeamInvitation.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {TeamInvitationQuery} from '../__generated__/TeamInvitationQuery.graphql'
 import TeamInvitationDialog from './TeamInvitationDialog'
diff --git a/packages/client/components/TeamInvitationDialog.tsx b/packages/client/components/TeamInvitationDialog.tsx
index 2b14e65c979..67e40d8a259 100644
--- a/packages/client/components/TeamInvitationDialog.tsx
+++ b/packages/client/components/TeamInvitationDialog.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {RouteComponentProps, withRouter} from 'react-router'
 import useAtmosphere from '~/hooks/useAtmosphere'
diff --git a/packages/client/components/TeamInvitationEmailCreateAccount.tsx b/packages/client/components/TeamInvitationEmailCreateAccount.tsx
index b5920cf318f..f888140f01d 100644
--- a/packages/client/components/TeamInvitationEmailCreateAccount.tsx
+++ b/packages/client/components/TeamInvitationEmailCreateAccount.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TeamInvitationEmailCreateAccount_verifiedInvitation$key} from '../__generated__/TeamInvitationEmailCreateAccount_verifiedInvitation.graphql'
 import useDocumentTitle from '../hooks/useDocumentTitle'
diff --git a/packages/client/components/TeamInvitationEmailSignin.tsx b/packages/client/components/TeamInvitationEmailSignin.tsx
index fabd428ed54..8e0ac903889 100644
--- a/packages/client/components/TeamInvitationEmailSignin.tsx
+++ b/packages/client/components/TeamInvitationEmailSignin.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TeamInvitationEmailSignin_verifiedInvitation$key} from '../__generated__/TeamInvitationEmailSignin_verifiedInvitation.graphql'
 import useDocumentTitle from '../hooks/useDocumentTitle'
diff --git a/packages/client/components/TeamInvitationErrorAccepted.tsx b/packages/client/components/TeamInvitationErrorAccepted.tsx
index 03788963fca..21c140fe210 100644
--- a/packages/client/components/TeamInvitationErrorAccepted.tsx
+++ b/packages/client/components/TeamInvitationErrorAccepted.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TeamInvitationErrorAccepted_verifiedInvitation$key} from '../__generated__/TeamInvitationErrorAccepted_verifiedInvitation.graphql'
 import useDocumentTitle from '../hooks/useDocumentTitle'
diff --git a/packages/client/components/TeamInvitationErrorExpired.tsx b/packages/client/components/TeamInvitationErrorExpired.tsx
index 119e96987a2..b50e92bbdc6 100644
--- a/packages/client/components/TeamInvitationErrorExpired.tsx
+++ b/packages/client/components/TeamInvitationErrorExpired.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TeamInvitationErrorExpired_verifiedInvitation$key} from '../__generated__/TeamInvitationErrorExpired_verifiedInvitation.graphql'
 import useDocumentTitle from '../hooks/useDocumentTitle'
diff --git a/packages/client/components/TeamInvitationErrorNotFound.tsx b/packages/client/components/TeamInvitationErrorNotFound.tsx
index d1d345f2e1e..490f5b5937f 100644
--- a/packages/client/components/TeamInvitationErrorNotFound.tsx
+++ b/packages/client/components/TeamInvitationErrorNotFound.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import useDocumentTitle from '../hooks/useDocumentTitle'
 import DialogContent from './DialogContent'
 import DialogTitle from './DialogTitle'
diff --git a/packages/client/components/TeamInvitationGoogleCreateAccount.tsx b/packages/client/components/TeamInvitationGoogleCreateAccount.tsx
index f55d4d11a9a..216c14bdc39 100644
--- a/packages/client/components/TeamInvitationGoogleCreateAccount.tsx
+++ b/packages/client/components/TeamInvitationGoogleCreateAccount.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {TeamInvitationGoogleCreateAccount_verifiedInvitation$key} from '../__generated__/TeamInvitationGoogleCreateAccount_verifiedInvitation.graphql'
 import useDocumentTitle from '../hooks/useDocumentTitle'
diff --git a/packages/client/components/TeamInvitationGoogleSignin.tsx b/packages/client/components/TeamInvitationGoogleSignin.tsx
index d7695aa5c49..65e4c132be9 100644
--- a/packages/client/components/TeamInvitationGoogleSignin.tsx
+++ b/packages/client/components/TeamInvitationGoogleSignin.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TeamInvitationGoogleSignin_verifiedInvitation$key} from '../__generated__/TeamInvitationGoogleSignin_verifiedInvitation.graphql'
 import useDocumentTitle from '../hooks/useDocumentTitle'
diff --git a/packages/client/components/TeamInvitationMeetingAbstract.tsx b/packages/client/components/TeamInvitationMeetingAbstract.tsx
index 2c9ba6c37fe..9aacb8f7e4d 100644
--- a/packages/client/components/TeamInvitationMeetingAbstract.tsx
+++ b/packages/client/components/TeamInvitationMeetingAbstract.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {PALETTE} from '../styles/paletteV3'
 import makeMinWidthMediaQuery from '../utils/makeMinWidthMediaQuery'
 
diff --git a/packages/client/components/TeamInvitationNotification.tsx b/packages/client/components/TeamInvitationNotification.tsx
index cd51db6de15..9b8ee2bbf5e 100644
--- a/packages/client/components/TeamInvitationNotification.tsx
+++ b/packages/client/components/TeamInvitationNotification.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TeamInvitationNotification_notification$key} from '~/__generated__/TeamInvitationNotification_notification.graphql'
 import NotificationAction from '~/components/NotificationAction'
diff --git a/packages/client/components/TeamInvitationRoot.tsx b/packages/client/components/TeamInvitationRoot.tsx
index f64b07f2923..eb7a4fd2529 100644
--- a/packages/client/components/TeamInvitationRoot.tsx
+++ b/packages/client/components/TeamInvitationRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {RouteComponentProps} from 'react-router'
 import teamInvitationQuery, {TeamInvitationQuery} from '~/__generated__/TeamInvitationQuery.graphql'
 import useNoIndex from '~/hooks/useNoIndex'
diff --git a/packages/client/components/TeamInvitationSSO.tsx b/packages/client/components/TeamInvitationSSO.tsx
index a181d0c1169..8f9e4c20535 100644
--- a/packages/client/components/TeamInvitationSSO.tsx
+++ b/packages/client/components/TeamInvitationSSO.tsx
@@ -1,4 +1,4 @@
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useDocumentTitle from '../hooks/useDocumentTitle'
 import useMutationProps from '../hooks/useMutationProps'
diff --git a/packages/client/components/TeamInvitationWrapper.tsx b/packages/client/components/TeamInvitationWrapper.tsx
index ea47b9ea344..9c264170752 100644
--- a/packages/client/components/TeamInvitationWrapper.tsx
+++ b/packages/client/components/TeamInvitationWrapper.tsx
@@ -1,4 +1,4 @@
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import Header from './AuthPage/Header'
 
 interface Props {
diff --git a/packages/client/components/TeamPrompt/TeamPromptDiscussionDrawer.tsx b/packages/client/components/TeamPrompt/TeamPromptDiscussionDrawer.tsx
index 71186f123b8..22a82e13173 100644
--- a/packages/client/components/TeamPrompt/TeamPromptDiscussionDrawer.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptDiscussionDrawer.tsx
@@ -2,7 +2,6 @@ import styled from '@emotion/styled'
 import {Close} from '@mui/icons-material'
 import {JSONContent} from '@tiptap/react'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TeamPromptDiscussionDrawer_meeting$key} from '~/__generated__/TeamPromptDiscussionDrawer_meeting.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
diff --git a/packages/client/components/TeamPrompt/TeamPromptDrawer.tsx b/packages/client/components/TeamPrompt/TeamPromptDrawer.tsx
index a52bf4888f5..ac82248aa41 100644
--- a/packages/client/components/TeamPrompt/TeamPromptDrawer.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptDrawer.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {TeamPromptDrawer_meeting$key} from '~/__generated__/TeamPromptDrawer_meeting.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
diff --git a/packages/client/components/TeamPrompt/TeamPromptEditablePrompt.tsx b/packages/client/components/TeamPrompt/TeamPromptEditablePrompt.tsx
index c31f0c79eaa..8f2afbb10da 100644
--- a/packages/client/components/TeamPrompt/TeamPromptEditablePrompt.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptEditablePrompt.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {Edit} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TeamPromptEditablePrompt_meeting$key} from '~/__generated__/TeamPromptEditablePrompt_meeting.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
diff --git a/packages/client/components/TeamPrompt/TeamPromptEditablePromptModal.tsx b/packages/client/components/TeamPrompt/TeamPromptEditablePromptModal.tsx
index 86cdb7a1a40..a12ce9116cc 100644
--- a/packages/client/components/TeamPrompt/TeamPromptEditablePromptModal.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptEditablePromptModal.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {Close, Info} from '@mui/icons-material'
-import React from 'react'
+import * as React from 'react'
 import TextAreaAutoSize from 'react-textarea-autosize'
 import useBreakpoint from '~/hooks/useBreakpoint'
 import useForm from '~/hooks/useForm'
diff --git a/packages/client/components/TeamPrompt/TeamPromptEndedBadge.tsx b/packages/client/components/TeamPrompt/TeamPromptEndedBadge.tsx
index 142d6a693de..5627777cfd6 100644
--- a/packages/client/components/TeamPrompt/TeamPromptEndedBadge.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptEndedBadge.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {Link} from 'react-router-dom'
 import useBreakpoint from '../../hooks/useBreakpoint'
 import useRefreshInterval from '../../hooks/useRefreshInterval'
diff --git a/packages/client/components/TeamPrompt/TeamPromptLastUpdatedTime.tsx b/packages/client/components/TeamPrompt/TeamPromptLastUpdatedTime.tsx
index 48e449576b2..a3a301d339b 100644
--- a/packages/client/components/TeamPrompt/TeamPromptLastUpdatedTime.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptLastUpdatedTime.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import useRefreshInterval from '~/hooks/useRefreshInterval'
 import {MenuPosition} from '../../hooks/useCoords'
 import useTooltip from '../../hooks/useTooltip'
diff --git a/packages/client/components/TeamPrompt/TeamPromptMeetingStatus.tsx b/packages/client/components/TeamPrompt/TeamPromptMeetingStatus.tsx
index c35e71ab76b..995f77ba1da 100644
--- a/packages/client/components/TeamPrompt/TeamPromptMeetingStatus.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptMeetingStatus.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {RRule} from 'rrule'
 import {TeamPromptMeetingStatus_meeting$key} from '~/__generated__/TeamPromptMeetingStatus_meeting.graphql'
diff --git a/packages/client/components/TeamPrompt/TeamPromptOptions.tsx b/packages/client/components/TeamPrompt/TeamPromptOptions.tsx
index cf307d37157..c408918204c 100644
--- a/packages/client/components/TeamPrompt/TeamPromptOptions.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptOptions.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TeamPromptOptions_meeting$key} from '~/__generated__/TeamPromptOptions_meeting.graphql'
 import {MenuPosition} from '~/hooks/useCoords'
diff --git a/packages/client/components/TeamPrompt/TeamPromptOptionsMenu.tsx b/packages/client/components/TeamPrompt/TeamPromptOptionsMenu.tsx
index ce8ed1e29df..b4e305f17aa 100644
--- a/packages/client/components/TeamPrompt/TeamPromptOptionsMenu.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptOptionsMenu.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {Flag, Link as MuiLink, OpenInNew, Replay} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {Link} from 'react-router-dom'
 import {TeamPromptOptionsMenu_meeting$key} from '~/__generated__/TeamPromptOptionsMenu_meeting.graphql'
diff --git a/packages/client/components/TeamPrompt/TeamPromptOverflowAvatar.tsx b/packages/client/components/TeamPrompt/TeamPromptOverflowAvatar.tsx
index b970988fdf5..3ed1824acb6 100644
--- a/packages/client/components/TeamPrompt/TeamPromptOverflowAvatar.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptOverflowAvatar.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {useRef} from 'react'
+import {useRef} from 'react'
 import {TransitionStatus} from '~/hooks/useTransition'
 import useResizeFontForElement from '../../hooks/useResizeFontForElement'
 import {BezierCurve} from '../../types/constEnums'
diff --git a/packages/client/components/TeamPrompt/TeamPromptRepliesAvatarList.tsx b/packages/client/components/TeamPrompt/TeamPromptRepliesAvatarList.tsx
index 41d794ee484..63062f928a4 100644
--- a/packages/client/components/TeamPrompt/TeamPromptRepliesAvatarList.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptRepliesAvatarList.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TeamPromptRepliesAvatarList_edges$key} from '~/__generated__/TeamPromptRepliesAvatarList_edges.graphql'
 import useOverflowAvatars from '~/hooks/useOverflowAvatars'
diff --git a/packages/client/components/TeamPrompt/TeamPromptResponseCard.tsx b/packages/client/components/TeamPrompt/TeamPromptResponseCard.tsx
index 7c3107b977e..9d278f7870b 100644
--- a/packages/client/components/TeamPrompt/TeamPromptResponseCard.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptResponseCard.tsx
@@ -3,7 +3,7 @@ import {Link} from '@mui/icons-material'
 import {Editor as EditorState} from '@tiptap/core'
 import {JSONContent} from '@tiptap/react'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import CopyToClipboard from 'react-copy-to-clipboard'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {TeamPromptResponseCard_stage$key} from '~/__generated__/TeamPromptResponseCard_stage.graphql'
diff --git a/packages/client/components/TeamPrompt/TeamPromptResponseEmojis.tsx b/packages/client/components/TeamPrompt/TeamPromptResponseEmojis.tsx
index 4b3715dfaf6..a325b4de380 100644
--- a/packages/client/components/TeamPrompt/TeamPromptResponseEmojis.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptResponseEmojis.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TeamPromptResponseEmojis_response$key} from '~/__generated__/TeamPromptResponseEmojis_response.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
diff --git a/packages/client/components/TeamPrompt/TeamPromptTopBar.tsx b/packages/client/components/TeamPrompt/TeamPromptTopBar.tsx
index bcf1ff3477f..6f8871cf66f 100644
--- a/packages/client/components/TeamPrompt/TeamPromptTopBar.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptTopBar.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {KeyboardArrowLeft, KeyboardArrowRight} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {Link} from 'react-router-dom'
 import {TeamPromptTopBar_meeting$key} from '~/__generated__/TeamPromptTopBar_meeting.graphql'
diff --git a/packages/client/components/TeamPrompt/TeamPromptWorkDrawer.tsx b/packages/client/components/TeamPrompt/TeamPromptWorkDrawer.tsx
index bdf7baf6d3a..6088a556e5b 100644
--- a/packages/client/components/TeamPrompt/TeamPromptWorkDrawer.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptWorkDrawer.tsx
@@ -1,6 +1,6 @@
 import {Close} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useState} from 'react'
+import {useEffect, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {TeamPromptWorkDrawer_meeting$key} from '../../__generated__/TeamPromptWorkDrawer_meeting.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GCalEventCard.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GCalEventCard.tsx
index 0c975f1f8a9..c28629a840b 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/GCalEventCard.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/GCalEventCard.tsx
@@ -2,7 +2,6 @@ import {ContentCopy} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
 import ms from 'ms'
-import React from 'react'
 import CopyToClipboard from 'react-copy-to-clipboard'
 import {useFragment} from 'react-relay'
 import {GCalEventCard_event$key} from '../../../__generated__/GCalEventCard_event.graphql'
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationPanel.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationPanel.tsx
index ac6f51d7fb9..6082c967a93 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationPanel.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationPanel.tsx
@@ -1,6 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {GCalIntegrationPanel_meeting$key} from '../../../__generated__/GCalIntegrationPanel_meeting.graphql'
 import useAtmosphere from '../../../hooks/useAtmosphere'
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResults.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResults.tsx
index 5cde5356f6b..c21781f6303 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResults.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResults.tsx
@@ -1,6 +1,5 @@
 import {OpenInNew} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {Link} from 'react-router-dom'
 import halloweenRetrospectiveTemplate from '../../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png'
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResultsRoot.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResultsRoot.tsx
index b9f6a2f7362..c9a43b51748 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResultsRoot.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResultsRoot.tsx
@@ -1,5 +1,5 @@
 import ms from 'ms'
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {Loader} from '~/utils/relay/renderLoader'
 import gcalIntegrationResultsQuery, {
   GCalIntegrationResultsQuery
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationPanel.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationPanel.tsx
index 30e08ce4159..f4503695d32 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationPanel.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationPanel.tsx
@@ -1,6 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {GitHubIntegrationPanel_meeting$key} from '../../../__generated__/GitHubIntegrationPanel_meeting.graphql'
 import useAtmosphere from '../../../hooks/useAtmosphere'
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResults.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResults.tsx
index 5749f8e3f7f..50ae521f9af 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResults.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResults.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePaginationFragment, usePreloadedQuery} from 'react-relay'
 import {Link} from 'react-router-dom'
 import halloweenRetrospectiveTemplate from '../../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png'
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResultsRoot.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResultsRoot.tsx
index 394487eb5ed..b943b9445ec 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResultsRoot.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResultsRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {Loader} from '~/utils/relay/renderLoader'
 import gitHubIntegrationResultsQuery, {
   GitHubIntegrationResultsQuery
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GitHubObjectCard.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GitHubObjectCard.tsx
index 678ab58dffb..caaa3dff0df 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/GitHubObjectCard.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/GitHubObjectCard.tsx
@@ -1,6 +1,5 @@
 import {Link} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import CopyToClipboard from 'react-copy-to-clipboard'
 import {useFragment} from 'react-relay'
 import {GitHubObjectCard_result$key} from '../../../__generated__/GitHubObjectCard_result.graphql'
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GitHubRepoFilterBar.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GitHubRepoFilterBar.tsx
index 6da092962fa..8a3ad39f5b6 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/GitHubRepoFilterBar.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/GitHubRepoFilterBar.tsx
@@ -1,7 +1,6 @@
 import {ExpandMore, FilterList} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {GitHubRepoFilterBar_teamMember$key} from '../../../__generated__/GitHubRepoFilterBar_teamMember.graphql'
 import {MenuPosition} from '../../../hooks/useCoords'
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationPanel.tsx b/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationPanel.tsx
index 6430d4724b0..08faaa649b3 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationPanel.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationPanel.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {JiraIntegrationPanel_meeting$key} from '../../../__generated__/JiraIntegrationPanel_meeting.graphql'
 import useAtmosphere from '../../../hooks/useAtmosphere'
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResults.tsx b/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResults.tsx
index f46a2c142c7..ba09bff3576 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResults.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResults.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePaginationFragment, usePreloadedQuery} from 'react-relay'
 import {Link} from 'react-router-dom'
 import halloweenRetrospectiveTemplate from '../../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png'
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResultsRoot.tsx b/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResultsRoot.tsx
index dac120c9396..db175f1d891 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResultsRoot.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResultsRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {Loader} from '~/utils/relay/renderLoader'
 import jiraIntegrationResultsQuery, {
   JiraIntegrationResultsQuery
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/JiraObjectCard.tsx b/packages/client/components/TeamPrompt/WorkDrawer/JiraObjectCard.tsx
index 76e35dbb96f..15948f587af 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/JiraObjectCard.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/JiraObjectCard.tsx
@@ -1,6 +1,5 @@
 import {Link} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import CopyToClipboard from 'react-copy-to-clipboard'
 import {useFragment} from 'react-relay'
 import {JiraObjectCard_result$key} from '../../../__generated__/JiraObjectCard_result.graphql'
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/JiraServerIntegrationPanel.tsx b/packages/client/components/TeamPrompt/WorkDrawer/JiraServerIntegrationPanel.tsx
index da6eedf1a05..6acc11293ce 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/JiraServerIntegrationPanel.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/JiraServerIntegrationPanel.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {JiraServerIntegrationPanel_meeting$key} from '../../../__generated__/JiraServerIntegrationPanel_meeting.graphql'
 import useAtmosphere from '../../../hooks/useAtmosphere'
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/JiraServerIntegrationResults.tsx b/packages/client/components/TeamPrompt/WorkDrawer/JiraServerIntegrationResults.tsx
index a2b1be1fdf5..58a3549ce6b 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/JiraServerIntegrationResults.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/JiraServerIntegrationResults.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePaginationFragment, usePreloadedQuery} from 'react-relay'
 import {Link} from 'react-router-dom'
 import halloweenRetrospectiveTemplate from '../../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png'
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/JiraServerIntegrationResultsRoot.tsx b/packages/client/components/TeamPrompt/WorkDrawer/JiraServerIntegrationResultsRoot.tsx
index c58e4170e3d..3529d980041 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/JiraServerIntegrationResultsRoot.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/JiraServerIntegrationResultsRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {Loader} from '~/utils/relay/renderLoader'
 import jiraIntegrationResultsQuery, {
   JiraServerIntegrationResultsQuery
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/JiraServerObjectCard.tsx b/packages/client/components/TeamPrompt/WorkDrawer/JiraServerObjectCard.tsx
index dd6da759a71..9820ff3456d 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/JiraServerObjectCard.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/JiraServerObjectCard.tsx
@@ -1,6 +1,5 @@
 import {Link} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import CopyToClipboard from 'react-copy-to-clipboard'
 import {useFragment} from 'react-relay'
 import {JiraServerObjectCard_result$key} from '../../../__generated__/JiraServerObjectCard_result.graphql'
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksPanel.tsx b/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksPanel.tsx
index e3a5cc1e809..224b14ee4ab 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksPanel.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksPanel.tsx
@@ -1,6 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {ParabolTasksPanel_meeting$key} from '../../../__generated__/ParabolTasksPanel_meeting.graphql'
 import {TaskStatusEnum} from '../../../__generated__/ParabolTasksResultsQuery.graphql'
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResults.tsx b/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResults.tsx
index dd895bd1955..b767290faf9 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResults.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResults.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import halloweenRetrospectiveTemplate from '../../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png'
 import {
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResultsRoot.tsx b/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResultsRoot.tsx
index 3fa964fba44..6c5fbd384aa 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResultsRoot.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResultsRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {Loader} from '~/utils/relay/renderLoader'
 import parabolTasksResultsQuery, {
   ParabolTasksResultsQuery,
diff --git a/packages/client/components/TeamPromptMeeting.tsx b/packages/client/components/TeamPromptMeeting.tsx
index 9875249e078..f163c121270 100644
--- a/packages/client/components/TeamPromptMeeting.tsx
+++ b/packages/client/components/TeamPromptMeeting.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {Suspense, useEffect, useMemo} from 'react'
+import {Suspense, useEffect, useMemo} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {useHistory} from 'react-router'
 import {TeamPromptMeeting_meeting$key} from '~/__generated__/TeamPromptMeeting_meeting.graphql'
diff --git a/packages/client/components/TeamsLimitExceededNotification.tsx b/packages/client/components/TeamsLimitExceededNotification.tsx
index 3ee4aa6f7fa..dfc2e666dc7 100644
--- a/packages/client/components/TeamsLimitExceededNotification.tsx
+++ b/packages/client/components/TeamsLimitExceededNotification.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {TeamsLimitExceededNotification_notification$key} from '~/__generated__/TeamsLimitExceededNotification_notification.graphql'
 import useRouter from '~/hooks/useRouter'
diff --git a/packages/client/components/TeamsLimitReminderNotification.tsx b/packages/client/components/TeamsLimitReminderNotification.tsx
index b432f4c812a..3df9679c9c0 100644
--- a/packages/client/components/TeamsLimitReminderNotification.tsx
+++ b/packages/client/components/TeamsLimitReminderNotification.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {TeamsLimitReminderNotification_notification$key} from '~/__generated__/TeamsLimitReminderNotification_notification.graphql'
 import useRouter from '~/hooks/useRouter'
diff --git a/packages/client/components/ThreadedAvatarColumn.tsx b/packages/client/components/ThreadedAvatarColumn.tsx
index b81bcaac427..53473dc7d6d 100644
--- a/packages/client/components/ThreadedAvatarColumn.tsx
+++ b/packages/client/components/ThreadedAvatarColumn.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import Avatar from './Avatar/Avatar'
 
 const AvatarCol = styled('div')<{isReply: boolean | undefined}>(({isReply}) => ({
diff --git a/packages/client/components/ThreadedCommentBase.tsx b/packages/client/components/ThreadedCommentBase.tsx
index 52572afb0d6..6858560a03b 100644
--- a/packages/client/components/ThreadedCommentBase.tsx
+++ b/packages/client/components/ThreadedCommentBase.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import {convertToRaw, EditorState} from 'draft-js'
-import React, {ReactNode, useEffect, useRef, useState} from 'react'
+import {ReactNode, useEffect, useRef, useState} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {ThreadedCommentBase_comment$key} from '~/__generated__/ThreadedCommentBase_comment.graphql'
 import {ThreadedCommentBase_discussion$key} from '~/__generated__/ThreadedCommentBase_discussion.graphql'
diff --git a/packages/client/components/ThreadedCommentFooter.tsx b/packages/client/components/ThreadedCommentFooter.tsx
index 9178c2cb77e..390759bdd1e 100644
--- a/packages/client/components/ThreadedCommentFooter.tsx
+++ b/packages/client/components/ThreadedCommentFooter.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ThreadedCommentFooter_reactjis$key} from '~/__generated__/ThreadedCommentFooter_reactjis.graphql'
 import {PALETTE} from '~/styles/paletteV3'
diff --git a/packages/client/components/ThreadedCommentHeader.tsx b/packages/client/components/ThreadedCommentHeader.tsx
index 5a902055eaa..1de83cc71d7 100644
--- a/packages/client/components/ThreadedCommentHeader.tsx
+++ b/packages/client/components/ThreadedCommentHeader.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {
   ThreadedCommentHeader_comment$data,
diff --git a/packages/client/components/ThreadedItem.tsx b/packages/client/components/ThreadedItem.tsx
index bba643681eb..d4d2553d48d 100644
--- a/packages/client/components/ThreadedItem.tsx
+++ b/packages/client/components/ThreadedItem.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {ThreadedItem_discussion$key} from '~/__generated__/ThreadedItem_discussion.graphql'
 import {ThreadedItem_threadable$key} from '~/__generated__/ThreadedItem_threadable.graphql'
diff --git a/packages/client/components/ThreadedItemHeaderDescription.tsx b/packages/client/components/ThreadedItemHeaderDescription.tsx
index 9d7a3b4adf4..e48bdf5271e 100644
--- a/packages/client/components/ThreadedItemHeaderDescription.tsx
+++ b/packages/client/components/ThreadedItemHeaderDescription.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 
 const Header = styled('div')({
diff --git a/packages/client/components/ThreadedItemReply.tsx b/packages/client/components/ThreadedItemReply.tsx
index 590d02e8f19..b7572c92c6f 100644
--- a/packages/client/components/ThreadedItemReply.tsx
+++ b/packages/client/components/ThreadedItemReply.tsx
@@ -1,6 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
 import {Editor} from 'draft-js'
-import React, {RefObject, useRef} from 'react'
+import {RefObject, useRef} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {ThreadedItemReply_discussion$key} from '~/__generated__/ThreadedItemReply_discussion.graphql'
 import {ThreadedItemReply_threadable$key} from '~/__generated__/ThreadedItemReply_threadable.graphql'
diff --git a/packages/client/components/ThreadedPollBase.tsx b/packages/client/components/ThreadedPollBase.tsx
index 7e19e8b3958..ea8a94acee9 100644
--- a/packages/client/components/ThreadedPollBase.tsx
+++ b/packages/client/components/ThreadedPollBase.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {ThreadedPollBase_discussion$key} from '~/__generated__/ThreadedPollBase_discussion.graphql'
 import {ThreadedPollBase_poll$key} from '~/__generated__/ThreadedPollBase_poll.graphql'
diff --git a/packages/client/components/ThreadedRepliesList.tsx b/packages/client/components/ThreadedRepliesList.tsx
index 73520112815..13978e840b7 100644
--- a/packages/client/components/ThreadedRepliesList.tsx
+++ b/packages/client/components/ThreadedRepliesList.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ThreadedRepliesList_discussion$key} from '~/__generated__/ThreadedRepliesList_discussion.graphql'
 import {ThreadedRepliesList_replies$key} from '~/__generated__/ThreadedRepliesList_replies.graphql'
diff --git a/packages/client/components/ThreadedReplyButton.tsx b/packages/client/components/ThreadedReplyButton.tsx
index dda689cd45f..c1ae0b38b9a 100644
--- a/packages/client/components/ThreadedReplyButton.tsx
+++ b/packages/client/components/ThreadedReplyButton.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React from 'react'
+import * as React from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import PlainButton from './PlainButton/PlainButton'
 
diff --git a/packages/client/components/ThreadedTaskBase.tsx b/packages/client/components/ThreadedTaskBase.tsx
index eb05e3a2f99..62c48deea4f 100644
--- a/packages/client/components/ThreadedTaskBase.tsx
+++ b/packages/client/components/ThreadedTaskBase.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {ReactNode, useRef} from 'react'
+import {ReactNode, useRef} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {ThreadedTaskBase_discussion$key} from '~/__generated__/ThreadedTaskBase_discussion.graphql'
 import {ThreadedTaskBase_task$key} from '~/__generated__/ThreadedTaskBase_task.graphql'
diff --git a/packages/client/components/TimelineEvent.tsx b/packages/client/components/TimelineEvent.tsx
index 05c9e906aea..f482de60031 100644
--- a/packages/client/components/TimelineEvent.tsx
+++ b/packages/client/components/TimelineEvent.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {lazy, Suspense} from 'react'
+import {lazy, Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import {TimelineEvent_timelineEvent$key} from '../__generated__/TimelineEvent_timelineEvent.graphql'
 import {ValueOf} from '../types/generics'
diff --git a/packages/client/components/TimelineEventCard.tsx b/packages/client/components/TimelineEventCard.tsx
index 798fb5fce4d..c0e0a6187aa 100644
--- a/packages/client/components/TimelineEventCard.tsx
+++ b/packages/client/components/TimelineEventCard.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {useFragment} from 'react-relay'
 import {TimelineEventCard_timelineEvent$key} from '../__generated__/TimelineEventCard_timelineEvent.graphql'
 import {cardShadow} from '../styles/elevation'
diff --git a/packages/client/components/TimelineEventCompletedActionMeeting.tsx b/packages/client/components/TimelineEventCompletedActionMeeting.tsx
index d9d0b1ca00f..2df58b3e57d 100644
--- a/packages/client/components/TimelineEventCompletedActionMeeting.tsx
+++ b/packages/client/components/TimelineEventCompletedActionMeeting.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TimelineEventCompletedActionMeeting_timelineEvent$key} from '../__generated__/TimelineEventCompletedActionMeeting_timelineEvent.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/TimelineEventCompletedRetroMeeting.tsx b/packages/client/components/TimelineEventCompletedRetroMeeting.tsx
index e555203ee63..a852f85542b 100644
--- a/packages/client/components/TimelineEventCompletedRetroMeeting.tsx
+++ b/packages/client/components/TimelineEventCompletedRetroMeeting.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TimelineEventCompletedRetroMeeting_timelineEvent$key} from '../__generated__/TimelineEventCompletedRetroMeeting_timelineEvent.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/TimelineEventDate.tsx b/packages/client/components/TimelineEventDate.tsx
index fa309d87165..a11c6e3dda1 100644
--- a/packages/client/components/TimelineEventDate.tsx
+++ b/packages/client/components/TimelineEventDate.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import ms from 'ms'
-import React, {Component} from 'react'
+import {Component} from 'react'
 import {PALETTE} from '../styles/paletteV3'
 import absoluteDate from '../utils/date/absoluteDate'
 import relativeDate from '../utils/date/relativeDate'
diff --git a/packages/client/components/TimelineEventHeaderMenu.tsx b/packages/client/components/TimelineEventHeaderMenu.tsx
index dda8e265111..a6678f13db2 100644
--- a/packages/client/components/TimelineEventHeaderMenu.tsx
+++ b/packages/client/components/TimelineEventHeaderMenu.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {Archive} from '@mui/icons-material'
-import React from 'react'
 import Menu from '~/components/Menu'
 import MenuItem from '~/components/MenuItem'
 import useAtmosphere from '~/hooks/useAtmosphere'
diff --git a/packages/client/components/TimelineEventHeaderMenuToggle.tsx b/packages/client/components/TimelineEventHeaderMenuToggle.tsx
index 36de82de560..2cd8773461d 100644
--- a/packages/client/components/TimelineEventHeaderMenuToggle.tsx
+++ b/packages/client/components/TimelineEventHeaderMenuToggle.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import CardButton from '~/components/CardButton'
 import IconLabel from '~/components/IconLabel'
 import {MenuPosition} from '~/hooks/useCoords'
diff --git a/packages/client/components/TimelineEventJoinedParabol.tsx b/packages/client/components/TimelineEventJoinedParabol.tsx
index 9da3265431e..7a277696cad 100644
--- a/packages/client/components/TimelineEventJoinedParabol.tsx
+++ b/packages/client/components/TimelineEventJoinedParabol.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TimelineEventJoinedParabol_timelineEvent$key} from '../__generated__/TimelineEventJoinedParabol_timelineEvent.graphql'
 import StyledLink from './StyledLink'
diff --git a/packages/client/components/TimelineEventMock.tsx b/packages/client/components/TimelineEventMock.tsx
index 0c54dc76126..1aa0460347f 100644
--- a/packages/client/components/TimelineEventMock.tsx
+++ b/packages/client/components/TimelineEventMock.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import LoadingComponent from './LoadingComponent/LoadingComponent'
 
 // TODO needs design to show what a mock of an event looks like (probably just gray blurbs & junk)
diff --git a/packages/client/components/TimelineEventPokerComplete.tsx b/packages/client/components/TimelineEventPokerComplete.tsx
index 02c8935011e..d8a5b1a3e9a 100644
--- a/packages/client/components/TimelineEventPokerComplete.tsx
+++ b/packages/client/components/TimelineEventPokerComplete.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TimelineEventPokerComplete_timelineEvent$key} from '../__generated__/TimelineEventPokerComplete_timelineEvent.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/TimelineEventTeamCreated.tsx b/packages/client/components/TimelineEventTeamCreated.tsx
index 2a922fd9c40..a53811ae319 100644
--- a/packages/client/components/TimelineEventTeamCreated.tsx
+++ b/packages/client/components/TimelineEventTeamCreated.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TimelineEventTeamCreated_timelineEvent$key} from '../__generated__/TimelineEventTeamCreated_timelineEvent.graphql'
 import StyledLink from './StyledLink'
diff --git a/packages/client/components/TimelineEventTeamPromptComplete.tsx b/packages/client/components/TimelineEventTeamPromptComplete.tsx
index d74a9671494..4b33743b1d2 100644
--- a/packages/client/components/TimelineEventTeamPromptComplete.tsx
+++ b/packages/client/components/TimelineEventTeamPromptComplete.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TimelineEventTeamPromptComplete_timelineEvent$key} from '../__generated__/TimelineEventTeamPromptComplete_timelineEvent.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/TimelineEventTypeIcon.tsx b/packages/client/components/TimelineEventTypeIcon.tsx
index a957f1b8eaf..dae45e13d5b 100644
--- a/packages/client/components/TimelineEventTypeIcon.tsx
+++ b/packages/client/components/TimelineEventTypeIcon.tsx
@@ -9,7 +9,6 @@ import {
   Style,
   Timeline
 } from '@mui/icons-material'
-import React from 'react'
 import {PALETTE} from '../styles/paletteV3'
 
 interface Props {
diff --git a/packages/client/components/TimelineEventTypeMenu.tsx b/packages/client/components/TimelineEventTypeMenu.tsx
index 2194f374570..d643c1a5baa 100644
--- a/packages/client/components/TimelineEventTypeMenu.tsx
+++ b/packages/client/components/TimelineEventTypeMenu.tsx
@@ -1,4 +1,4 @@
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useRouter from '~/hooks/useRouter'
 import constructFilterQueryParamURL from '~/utils/constructFilterQueryParamURL'
diff --git a/packages/client/components/TimelineFeedList.tsx b/packages/client/components/TimelineFeedList.tsx
index 6e23fbd6dba..6b1d2585dc0 100644
--- a/packages/client/components/TimelineFeedList.tsx
+++ b/packages/client/components/TimelineFeedList.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {usePaginationFragment} from 'react-relay'
 import {Link} from 'react-router-dom'
 import useLoadNextOnScrollBottom from '~/hooks/useLoadNextOnScrollBottom'
diff --git a/packages/client/components/TimelineHeader.tsx b/packages/client/components/TimelineHeader.tsx
index e7e0ea2f215..3fac8eb8a27 100644
--- a/packages/client/components/TimelineHeader.tsx
+++ b/packages/client/components/TimelineHeader.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {TimelineHeader_viewer$key} from '../__generated__/TimelineHeader_viewer.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/TimelineHistoryLockedCard.tsx b/packages/client/components/TimelineHistoryLockedCard.tsx
index 020ae2730ce..3e1fc1eb621 100644
--- a/packages/client/components/TimelineHistoryLockedCard.tsx
+++ b/packages/client/components/TimelineHistoryLockedCard.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {Lock} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useRef} from 'react'
+import {useEffect, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {TimelineHistoryLockedCard_organization$key} from '../__generated__/TimelineHistoryLockedCard_organization.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/TimelineLoadingEvents.tsx b/packages/client/components/TimelineLoadingEvents.tsx
index 6d2ae30eef9..607d9d9397b 100644
--- a/packages/client/components/TimelineLoadingEvents.tsx
+++ b/packages/client/components/TimelineLoadingEvents.tsx
@@ -1,13 +1,13 @@
-import React from 'react'
+import {Fragment} from 'react'
 import TimelineEventMock from './TimelineEventMock'
 
 const TimelineLoadingEvents = () => {
   return (
-    <React.Fragment>
+    <Fragment>
       <TimelineEventMock />
       <TimelineEventMock />
       <TimelineEventMock />
-    </React.Fragment>
+    </Fragment>
   )
 }
 
diff --git a/packages/client/components/TimelineNoTasks.tsx b/packages/client/components/TimelineNoTasks.tsx
index a448072efbf..273aeb1de95 100644
--- a/packages/client/components/TimelineNoTasks.tsx
+++ b/packages/client/components/TimelineNoTasks.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {ThumbUp} from '@mui/icons-material'
-import React from 'react'
 import getRallyLink from '../modules/userDashboard/helpers/getRallyLink'
 import {PALETTE} from '../styles/paletteV3'
 
diff --git a/packages/client/components/TimelinePriorityTasks.tsx b/packages/client/components/TimelinePriorityTasks.tsx
index 554ba4ba218..a1eb51543fe 100644
--- a/packages/client/components/TimelinePriorityTasks.tsx
+++ b/packages/client/components/TimelinePriorityTasks.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {Whatshot} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {DragDropContext, Droppable, DroppableProvided, DropResult} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
 import {TimelinePriorityTasks_viewer$key} from '../__generated__/TimelinePriorityTasks_viewer.graphql'
diff --git a/packages/client/components/TimelineRightDrawer.tsx b/packages/client/components/TimelineRightDrawer.tsx
index ba23d3479d6..4699698a857 100644
--- a/packages/client/components/TimelineRightDrawer.tsx
+++ b/packages/client/components/TimelineRightDrawer.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery'
 import {TimelineRightDrawer_viewer$key} from '../__generated__/TimelineRightDrawer_viewer.graphql'
diff --git a/packages/client/components/TimelineSuggestedAction.tsx b/packages/client/components/TimelineSuggestedAction.tsx
index 3d6b8d16f3d..ff69364bd1c 100644
--- a/packages/client/components/TimelineSuggestedAction.tsx
+++ b/packages/client/components/TimelineSuggestedAction.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {lazy} from 'react'
+import {lazy} from 'react'
 import {useFragment} from 'react-relay'
 import {TimelineSuggestedAction_viewer$key} from '../__generated__/TimelineSuggestedAction_viewer.graphql'
 import {ValueOf} from '../types/generics'
diff --git a/packages/client/components/TipBanner.tsx b/packages/client/components/TipBanner.tsx
index 661c3a46915..b0b0dc09b8c 100644
--- a/packages/client/components/TipBanner.tsx
+++ b/packages/client/components/TipBanner.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {Info as InfoIcon} from '@mui/icons-material'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 
 const Banner = styled('div')({
diff --git a/packages/client/components/Toggle/Toggle.tsx b/packages/client/components/Toggle/Toggle.tsx
index d2e2ff0fbb5..cb96921dd37 100644
--- a/packages/client/components/Toggle/Toggle.tsx
+++ b/packages/client/components/Toggle/Toggle.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React from 'react'
+import * as React from 'react'
 import {DECELERATE} from '../../styles/animation'
 import {switchShadow} from '../../styles/elevation'
 import {PALETTE} from '../../styles/paletteV3'
diff --git a/packages/client/components/ToggleNav/ToggleNav.tsx b/packages/client/components/ToggleNav/ToggleNav.tsx
index 76b9c097ff1..b95d5654e14 100644
--- a/packages/client/components/ToggleNav/ToggleNav.tsx
+++ b/packages/client/components/ToggleNav/ToggleNav.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {CreditCard, Extension, Group, Key} from '@mui/icons-material'
-import React from 'react'
 import {PALETTE} from '../../styles/paletteV3'
 
 //    TODO:
diff --git a/packages/client/components/Tooltip.tsx b/packages/client/components/Tooltip.tsx
index 2eb570b03f6..4c43b0e2da8 100644
--- a/packages/client/components/Tooltip.tsx
+++ b/packages/client/components/Tooltip.tsx
@@ -1,5 +1,5 @@
 import clsx from 'clsx'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {MenuPosition} from '../hooks/useCoords'
 import useTooltip from '../hooks/useTooltip'
 
diff --git a/packages/client/components/TopBarAvatar.tsx b/packages/client/components/TopBarAvatar.tsx
index 247e9d757a8..4901b6510fa 100644
--- a/packages/client/components/TopBarAvatar.tsx
+++ b/packages/client/components/TopBarAvatar.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TopBarAvatar_viewer$key} from '~/__generated__/TopBarAvatar_viewer.graphql'
 import {MenuPosition} from '~/hooks/useCoords'
diff --git a/packages/client/components/TopBarHelp.tsx b/packages/client/components/TopBarHelp.tsx
index 4ff7fd8b153..ffea0a17cd1 100644
--- a/packages/client/components/TopBarHelp.tsx
+++ b/packages/client/components/TopBarHelp.tsx
@@ -1,4 +1,4 @@
-import React, {lazy} from 'react'
+import {lazy} from 'react'
 import {MenuPosition} from '~/hooks/useCoords'
 import useMenu from '~/hooks/useMenu'
 import useModal from '~/hooks/useModal'
diff --git a/packages/client/components/TopBarHelpMenu.tsx b/packages/client/components/TopBarHelpMenu.tsx
index 579c758f9f3..def2ffd27bf 100644
--- a/packages/client/components/TopBarHelpMenu.tsx
+++ b/packages/client/components/TopBarHelpMenu.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import useBreakpoint from '~/hooks/useBreakpoint'
 import {Breakpoint, ExternalLinks} from '~/types/constEnums'
 import {MenuProps} from '../hooks/useMenu'
diff --git a/packages/client/components/TopBarIcon.tsx b/packages/client/components/TopBarIcon.tsx
index 4a3f89c8112..cd4faddf2fd 100644
--- a/packages/client/components/TopBarIcon.tsx
+++ b/packages/client/components/TopBarIcon.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {HelpOutline, Notifications, Search} from '@mui/icons-material'
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import {PALETTE} from '../styles/paletteV3'
 import PlainButton from './PlainButton/PlainButton'
 
diff --git a/packages/client/components/TopBarNotifications.tsx b/packages/client/components/TopBarNotifications.tsx
index d4f3322fa36..644cc5b274c 100644
--- a/packages/client/components/TopBarNotifications.tsx
+++ b/packages/client/components/TopBarNotifications.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useRef} from 'react'
+import {useEffect, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {TopBarNotifications_query$key} from '~/__generated__/TopBarNotifications_query.graphql'
 import {MenuPosition} from '~/hooks/useCoords'
diff --git a/packages/client/components/TopBarSearch.tsx b/packages/client/components/TopBarSearch.tsx
index db7b7045f3f..6a74cdadb28 100644
--- a/packages/client/components/TopBarSearch.tsx
+++ b/packages/client/components/TopBarSearch.tsx
@@ -1,7 +1,8 @@
 import styled from '@emotion/styled'
 import {Close, Search} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useRef} from 'react'
+import * as React from 'react'
+import {useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {RouteProps, matchPath} from 'react-router'
 import {commitLocalUpdate} from 'relay-runtime'
diff --git a/packages/client/components/Transcription.tsx b/packages/client/components/Transcription.tsx
index 4f330b53e6a..237a2ca4169 100644
--- a/packages/client/components/Transcription.tsx
+++ b/packages/client/components/Transcription.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import {RetroDiscussPhase_meeting$data} from '../__generated__/RetroDiscussPhase_meeting.graphql'
 
 export type TranscriptBlock = {
diff --git a/packages/client/components/TutorialMeetingCard.tsx b/packages/client/components/TutorialMeetingCard.tsx
index da38f967417..6c8fe2d6079 100644
--- a/packages/client/components/TutorialMeetingCard.tsx
+++ b/packages/client/components/TutorialMeetingCard.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {useCallback} from 'react'
+import {useCallback} from 'react'
 import SendClientSideEvent from '~/utils/SendClientSideEvent'
 import pokerTutorialThumb from '../../../static/images/illustrations/pokerTutorialThumb.jpg'
 import retroTutorialThumb from '../../../static/images/illustrations/retroTutorialThumb.png'
diff --git a/packages/client/components/TypeAheadLabel.tsx b/packages/client/components/TypeAheadLabel.tsx
index a78b8406324..3f98dd91162 100644
--- a/packages/client/components/TypeAheadLabel.tsx
+++ b/packages/client/components/TypeAheadLabel.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import * as DOMPurify from 'dompurify'
-import React from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import getSafeRegex from '~/utils/getSafeRegex'
 
diff --git a/packages/client/components/UndoableGroupPhaseControl.tsx b/packages/client/components/UndoableGroupPhaseControl.tsx
index 30c4898f51b..482265a0d84 100644
--- a/packages/client/components/UndoableGroupPhaseControl.tsx
+++ b/packages/client/components/UndoableGroupPhaseControl.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {Edit} from '@mui/icons-material'
-import React from 'react'
 import FlatButton from '~/components/FlatButton'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useHotkey from '~/hooks/useHotkey'
diff --git a/packages/client/components/UndoableGroupPhaseDialog.tsx b/packages/client/components/UndoableGroupPhaseDialog.tsx
index 5eb3ac812c3..84e14262e9b 100644
--- a/packages/client/components/UndoableGroupPhaseDialog.tsx
+++ b/packages/client/components/UndoableGroupPhaseDialog.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import DialogContainer from '~/components/DialogContainer'
 import DialogContent from '~/components/DialogContent'
 import DialogTitle from '~/components/DialogTitle'
diff --git a/packages/client/components/UpgradeBenefits.tsx b/packages/client/components/UpgradeBenefits.tsx
index 3d057a47604..9e602d1ecd6 100644
--- a/packages/client/components/UpgradeBenefits.tsx
+++ b/packages/client/components/UpgradeBenefits.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {CheckCircle} from '@mui/icons-material'
-import React from 'react'
 import {PALETTE} from '../styles/paletteV3'
 
 const StyledIcon = styled(CheckCircle)({
diff --git a/packages/client/components/UpgradeCreditCardFormField.tsx b/packages/client/components/UpgradeCreditCardFormField.tsx
index 31c914e297d..fe9ca00527f 100644
--- a/packages/client/components/UpgradeCreditCardFormField.tsx
+++ b/packages/client/components/UpgradeCreditCardFormField.tsx
@@ -1,5 +1,5 @@
 import {CreditCard, DateRange, Lock} from '@mui/icons-material'
-import React from 'react'
+import * as React from 'react'
 import UpgradeCreditCardFormFieldBlock from './UpgradeCreditCardFormFieldBlock'
 import UpgradeCreditCardFormFieldIcon from './UpgradeCreditCardFormFieldIcon'
 
diff --git a/packages/client/components/UpgradeCreditCardNumberFormField.tsx b/packages/client/components/UpgradeCreditCardNumberFormField.tsx
index a72cfaa3180..6a50d3394bc 100644
--- a/packages/client/components/UpgradeCreditCardNumberFormField.tsx
+++ b/packages/client/components/UpgradeCreditCardNumberFormField.tsx
@@ -1,6 +1,6 @@
 import {CreditCard} from '@mui/icons-material'
 import Cleave from 'cleave.js/react'
-import React from 'react'
+import * as React from 'react'
 import UpgradeCreditCardFormFieldBlock from './UpgradeCreditCardFormFieldBlock'
 import UpgradeCreditCardFormFieldIcon from './UpgradeCreditCardFormFieldIcon'
 
diff --git a/packages/client/components/UpgradeLater.tsx b/packages/client/components/UpgradeLater.tsx
index 04cc593f19b..839af593d1a 100644
--- a/packages/client/components/UpgradeLater.tsx
+++ b/packages/client/components/UpgradeLater.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import upgradeLaterSvg from '../../../static/images/illustrations/conversion_prompt-upgrade_later.svg'
 import DialogContainer from './DialogContainer'
 import InvitationDialogCopy from './InvitationDialogCopy'
diff --git a/packages/client/components/UpgradeSuccess.tsx b/packages/client/components/UpgradeSuccess.tsx
index 8a1c3bcbf9e..b464eb76d14 100644
--- a/packages/client/components/UpgradeSuccess.tsx
+++ b/packages/client/components/UpgradeSuccess.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {useEffect, useState} from 'react'
+import {useEffect, useState} from 'react'
 import paymentSuccessSvg from '../../../static/images/illustrations/conversion_prompt-payment_success.svg'
 import {TEAM_LABEL} from '../utils/constants'
 import Confetti from './Confetti'
diff --git a/packages/client/components/UserAvatarInput.tsx b/packages/client/components/UserAvatarInput.tsx
index e68966d9547..e9ba2d9a923 100644
--- a/packages/client/components/UserAvatarInput.tsx
+++ b/packages/client/components/UserAvatarInput.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import sanitizeSVG from '@mattkrick/sanitize-svg'
 import {Close} from '@mui/icons-material'
-import React from 'react'
 import jpgWithoutEXIF from '~/utils/jpgWithoutEXIF'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
diff --git a/packages/client/components/UserDashTeamMemberMenu.tsx b/packages/client/components/UserDashTeamMemberMenu.tsx
index fb3a73d6ebd..60e4d40e3a6 100644
--- a/packages/client/components/UserDashTeamMemberMenu.tsx
+++ b/packages/client/components/UserDashTeamMemberMenu.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo, useRef} from 'react'
+import {useMemo, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useRouter from '~/hooks/useRouter'
diff --git a/packages/client/components/UserDraggingHeader.tsx b/packages/client/components/UserDraggingHeader.tsx
index 820b4ce6268..192e652efc1 100644
--- a/packages/client/components/UserDraggingHeader.tsx
+++ b/packages/client/components/UserDraggingHeader.tsx
@@ -1,7 +1,7 @@
 import {keyframes} from '@emotion/core'
 import styled from '@emotion/styled'
 import {ArrowBack, ArrowDownward, ArrowForward, ArrowUpward} from '@mui/icons-material'
-import React from 'react'
+import * as React from 'react'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {PALETTE} from '../styles/paletteV3'
 import BaseTag from './Tag/BaseTag'
diff --git a/packages/client/components/UserTaskViewRoot.tsx b/packages/client/components/UserTaskViewRoot.tsx
index 0795a5b5857..a1613d7c099 100644
--- a/packages/client/components/UserTaskViewRoot.tsx
+++ b/packages/client/components/UserTaskViewRoot.tsx
@@ -1,4 +1,4 @@
-import React, {lazy} from 'react'
+import {lazy} from 'react'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useDocumentTitle from '~/hooks/useDocumentTitle'
 import {useQueryParameterParser} from '~/utils/useQueryParameterParser'
diff --git a/packages/client/components/VerifyEmail.tsx b/packages/client/components/VerifyEmail.tsx
index e607e2fe5f3..cebb47072a5 100644
--- a/packages/client/components/VerifyEmail.tsx
+++ b/packages/client/components/VerifyEmail.tsx
@@ -1,4 +1,4 @@
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {RouteComponentProps} from 'react-router'
 import useCanonical from '~/hooks/useCanonical'
 import VerifyEmailMutation from '~/mutations/VerifyEmailMutation'
diff --git a/packages/client/components/ViewerNotOnTeam.tsx b/packages/client/components/ViewerNotOnTeam.tsx
index 50fdefeed89..1375616b77d 100644
--- a/packages/client/components/ViewerNotOnTeam.tsx
+++ b/packages/client/components/ViewerNotOnTeam.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {ViewerNotOnTeamQuery} from '../__generated__/ViewerNotOnTeamQuery.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
diff --git a/packages/client/components/ViewerNotOnTeamRoot.tsx b/packages/client/components/ViewerNotOnTeamRoot.tsx
index 174650f60c0..b630b298df8 100644
--- a/packages/client/components/ViewerNotOnTeamRoot.tsx
+++ b/packages/client/components/ViewerNotOnTeamRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import viewerNotOnTeamQuery, {
   ViewerNotOnTeamQuery
 } from '../__generated__/ViewerNotOnTeamQuery.graphql'
diff --git a/packages/client/components/VoteSettingsMenu.tsx b/packages/client/components/VoteSettingsMenu.tsx
index cfc99fffb85..8f63be03bf8 100644
--- a/packages/client/components/VoteSettingsMenu.tsx
+++ b/packages/client/components/VoteSettingsMenu.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {VoteSettingsMenu_meeting$key} from '~/__generated__/VoteSettingsMenu_meeting.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
diff --git a/packages/client/components/VoteSettingsStepper.tsx b/packages/client/components/VoteSettingsStepper.tsx
index 91ee4bf2a24..43e6cce8f7a 100644
--- a/packages/client/components/VoteSettingsStepper.tsx
+++ b/packages/client/components/VoteSettingsStepper.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {Add, Remove} from '@mui/icons-material'
-import React from 'react'
 import {MeetingSettingsThreshold} from '~/types/constEnums'
 import {PALETTE} from '../styles/paletteV3'
 import PlainButton from './PlainButton/PlainButton'
diff --git a/packages/client/components/WaitingForFacilitatorToPay.tsx b/packages/client/components/WaitingForFacilitatorToPay.tsx
index 44627f1fcb5..2b937fd7131 100644
--- a/packages/client/components/WaitingForFacilitatorToPay.tsx
+++ b/packages/client/components/WaitingForFacilitatorToPay.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {LiveHelp} from '@mui/icons-material'
-import React from 'react'
 import DialogContainer from './DialogContainer'
 import Ellipsis from './Ellipsis/Ellipsis'
 import InvitationDialogCopy from './InvitationDialogCopy'
diff --git a/packages/client/components/ZoomProviderLogo.tsx b/packages/client/components/ZoomProviderLogo.tsx
index 9d2fd193e56..08801b30b2a 100644
--- a/packages/client/components/ZoomProviderLogo.tsx
+++ b/packages/client/components/ZoomProviderLogo.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import {twMerge} from 'tailwind-merge'
 import logo from '../styles/theme/images/graphics/zoom-logo.svg'
 
diff --git a/packages/client/components/ZoomSVG.tsx b/packages/client/components/ZoomSVG.tsx
index dccfe175c71..bcde7889b01 100644
--- a/packages/client/components/ZoomSVG.tsx
+++ b/packages/client/components/ZoomSVG.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 export const ZoomSVG = () => (
   <svg width='100%' height='100%' viewBox='0 0 472.4 472.4' xmlns='http://www.w3.org/2000/svg'>
     <circle cx='236.2' cy='236.2' fill='#4a8cff' r='236.2' />
diff --git a/packages/client/components/promptResponse/EmojiMenuTipTap.tsx b/packages/client/components/promptResponse/EmojiMenuTipTap.tsx
index 498f8f43a28..0ba531dd8eb 100644
--- a/packages/client/components/promptResponse/EmojiMenuTipTap.tsx
+++ b/packages/client/components/promptResponse/EmojiMenuTipTap.tsx
@@ -1,7 +1,7 @@
 import {Editor, Range} from '@tiptap/core'
 import Suggestion from '@tiptap/suggestion'
 import {PluginKey} from 'prosemirror-state'
-import React, {useEffect, useState} from 'react'
+import {useEffect, useState} from 'react'
 import EmojiMenuContainer from '../TaskEditor/EmojiMenuContainer'
 import {getSelectionBoundingBox} from './tiptapConfig'
 
diff --git a/packages/client/components/promptResponse/MentionsTipTap.tsx b/packages/client/components/promptResponse/MentionsTipTap.tsx
index b9b2b61dd1f..6ff69235a0d 100644
--- a/packages/client/components/promptResponse/MentionsTipTap.tsx
+++ b/packages/client/components/promptResponse/MentionsTipTap.tsx
@@ -1,7 +1,7 @@
 import {Editor, Range} from '@tiptap/core'
 import Suggestion from '@tiptap/suggestion'
 import {PluginKey} from 'prosemirror-state'
-import React, {Suspense, useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react'
+import {Suspense, useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react'
 import TeamMemberId from '../../shared/gqlIds/TeamMemberId'
 import SuggestMentionableUsersRoot from '../SuggestMentionableUsersRoot'
 import {MentionSuggestion} from '../TaskEditor/useSuggestions'
diff --git a/packages/client/components/promptResponse/PromptResponseEditor.tsx b/packages/client/components/promptResponse/PromptResponseEditor.tsx
index f0647ad8aa6..323713cc9f6 100644
--- a/packages/client/components/promptResponse/PromptResponseEditor.tsx
+++ b/packages/client/components/promptResponse/PromptResponseEditor.tsx
@@ -3,7 +3,7 @@ import {Link} from '@mui/icons-material'
 import {Editor as EditorState} from '@tiptap/core'
 import {BubbleMenu, EditorContent, JSONContent, useEditor} from '@tiptap/react'
 import areEqual from 'fbjs/lib/areEqual'
-import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'
+import {useCallback, useEffect, useMemo, useRef, useState} from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import {Radius} from '~/types/constEnums'
 import BaseButton from '../BaseButton'
diff --git a/packages/client/containers/EditorHelpModalContainer/EditorHelpModalContainer.tsx b/packages/client/containers/EditorHelpModalContainer/EditorHelpModalContainer.tsx
index 4e1baadfda2..d18188575f2 100644
--- a/packages/client/containers/EditorHelpModalContainer/EditorHelpModalContainer.tsx
+++ b/packages/client/containers/EditorHelpModalContainer/EditorHelpModalContainer.tsx
@@ -1,4 +1,4 @@
-import React, {lazy, Suspense} from 'react'
+import {lazy, Suspense} from 'react'
 import useHotkey from '../../hooks/useHotkey'
 import useModal from '../../hooks/useModal'
 
diff --git a/packages/client/containers/TaskCard/DraggableTask.tsx b/packages/client/containers/TaskCard/DraggableTask.tsx
index a0a0183b746..3b1322084d8 100644
--- a/packages/client/containers/TaskCard/DraggableTask.tsx
+++ b/packages/client/containers/TaskCard/DraggableTask.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {Draggable, DraggableProvided, DraggableStateSnapshot} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
 import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql'
diff --git a/packages/client/hooks/useDemoMeeting.tsx b/packages/client/hooks/useDemoMeeting.tsx
index 5653b1e779a..3ca17c713b0 100644
--- a/packages/client/hooks/useDemoMeeting.tsx
+++ b/packages/client/hooks/useDemoMeeting.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback, useEffect} from 'react'
+import {useCallback, useEffect} from 'react'
 import LocalAtmosphere from '../modules/demo/LocalAtmosphere'
 import lazyPreload from '../utils/lazyPreload'
 import useAtmosphere from './useAtmosphere'
diff --git a/packages/client/hooks/useDraggableReflectionCard.tsx b/packages/client/hooks/useDraggableReflectionCard.tsx
index 6e6e82e83c5..35fb59d29c7 100644
--- a/packages/client/hooks/useDraggableReflectionCard.tsx
+++ b/packages/client/hooks/useDraggableReflectionCard.tsx
@@ -1,4 +1,5 @@
-import React, {useContext, useEffect, useRef, useState} from 'react'
+import * as React from 'react'
+import {useContext, useEffect, useRef, useState} from 'react'
 import {commitLocalUpdate} from 'relay-runtime'
 import {DraggableReflectionCard_meeting$data} from '~/__generated__/DraggableReflectionCard_meeting.graphql'
 import {DragReflectionDropTargetTypeEnum} from '~/__generated__/EndDraggingReflectionMutation_meeting.graphql'
diff --git a/packages/client/hooks/useEmailItemGrid.tsx b/packages/client/hooks/useEmailItemGrid.tsx
index 2bd3c8d9e49..8776a588918 100644
--- a/packages/client/hooks/useEmailItemGrid.tsx
+++ b/packages/client/hooks/useEmailItemGrid.tsx
@@ -1,4 +1,4 @@
-import React, {ReactElement} from 'react'
+import {ReactElement} from 'react'
 import getMinColumns from '../utils/getMinColumns'
 import unflattenIntoRows from '../utils/unflattenIntoRows'
 
diff --git a/packages/client/hooks/useForm.tsx b/packages/client/hooks/useForm.tsx
index f356bc0257f..f311cfe8003 100644
--- a/packages/client/hooks/useForm.tsx
+++ b/packages/client/hooks/useForm.tsx
@@ -1,4 +1,5 @@
-import React, {Reducer, useCallback, useMemo, useReducer} from 'react'
+import * as React from 'react'
+import {Reducer, useCallback, useMemo, useReducer} from 'react'
 import Legitity from '../validation/Legitity'
 import useEventCallback from './useEventCallback'
 
diff --git a/packages/client/hooks/useLoadNextOnScrollBottom.tsx b/packages/client/hooks/useLoadNextOnScrollBottom.tsx
index 0b0eb163189..e895f13d52b 100644
--- a/packages/client/hooks/useLoadNextOnScrollBottom.tsx
+++ b/packages/client/hooks/useLoadNextOnScrollBottom.tsx
@@ -1,4 +1,4 @@
-import React, {useEffect, useRef, useState} from 'react'
+import {useEffect, useRef, useState} from 'react'
 import {usePaginationFragmentHookType} from 'react-relay/relay-hooks/usePaginationFragment'
 
 const useLoadNextOnScrollBottom = (
diff --git a/packages/client/hooks/useMenuPortal.tsx b/packages/client/hooks/useMenuPortal.tsx
index 1b2d70aead3..28a209d798a 100644
--- a/packages/client/hooks/useMenuPortal.tsx
+++ b/packages/client/hooks/useMenuPortal.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {ReactElement, ReactNode, ReactPortal, RefObject, Suspense, useEffect} from 'react'
+import {ReactElement, ReactNode, ReactPortal, RefObject, Suspense, useEffect} from 'react'
 import ErrorBoundary from '../components/ErrorBoundary'
 import LoadingComponent from '../components/LoadingComponent/LoadingComponent'
 import Menu from '../components/Menu'
diff --git a/packages/client/hooks/useModalPortal.tsx b/packages/client/hooks/useModalPortal.tsx
index 38e12a8de8f..7e882085cfd 100644
--- a/packages/client/hooks/useModalPortal.tsx
+++ b/packages/client/hooks/useModalPortal.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {ReactElement, ReactNode, ReactPortal, Ref, Suspense, useEffect} from 'react'
+import {ReactElement, ReactNode, ReactPortal, Ref, Suspense, useEffect} from 'react'
 import ErrorBoundary from '../components/ErrorBoundary'
 import LoadingComponent from '../components/LoadingComponent/LoadingComponent'
 import ModalError from '../components/ModalError'
diff --git a/packages/client/hooks/usePortal.tsx b/packages/client/hooks/usePortal.tsx
index f7956369df4..0c5ae71a03e 100644
--- a/packages/client/hooks/usePortal.tsx
+++ b/packages/client/hooks/usePortal.tsx
@@ -1,4 +1,5 @@
-import React, {ReactNode, createContext, useCallback, useContext, useEffect, useRef} from 'react'
+import * as React from 'react'
+import {ReactNode, createContext, useCallback, useContext, useEffect, useRef} from 'react'
 import {createPortal} from 'react-dom'
 import requestDoubleAnimationFrame from '../components/RetroReflectPhase/requestDoubleAnimationFrame'
 import hideBodyScroll from '../utils/hideBodyScroll'
diff --git a/packages/client/hooks/useTooltipPortal.tsx b/packages/client/hooks/useTooltipPortal.tsx
index 4cf65f6aa7b..e22a891304a 100644
--- a/packages/client/hooks/useTooltipPortal.tsx
+++ b/packages/client/hooks/useTooltipPortal.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {ReactElement, ReactNode, ReactPortal, RefObject, useEffect} from 'react'
+import {ReactElement, ReactNode, ReactPortal, RefObject, useEffect} from 'react'
 import {ZIndex} from '../types/constEnums'
 import TooltipBackground from './TooltipBackground'
 import {UseCoordsValue} from './useCoords'
diff --git a/packages/client/modules/admin/containers/Graphql/GraphqlContainer.tsx b/packages/client/modules/admin/containers/Graphql/GraphqlContainer.tsx
index 69217cf5b4c..1ef64d1579e 100644
--- a/packages/client/modules/admin/containers/Graphql/GraphqlContainer.tsx
+++ b/packages/client/modules/admin/containers/Graphql/GraphqlContainer.tsx
@@ -1,7 +1,7 @@
 import {Fetcher} from '@graphiql/toolkit'
 import GraphiQL from 'graphiql/dist'
 import 'graphiql/graphiql.css'
-import React, {useEffect, useState} from 'react'
+import {useEffect, useState} from 'react'
 import {Link} from 'react-router-dom'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import useAuthRoute from '../../../../hooks/useAuthRoute'
diff --git a/packages/client/modules/admin/containers/Impersonate/ImpersonateContainer.tsx b/packages/client/modules/admin/containers/Impersonate/ImpersonateContainer.tsx
index ce3f7e6d002..70eb4ce3095 100644
--- a/packages/client/modules/admin/containers/Impersonate/ImpersonateContainer.tsx
+++ b/packages/client/modules/admin/containers/Impersonate/ImpersonateContainer.tsx
@@ -1,4 +1,4 @@
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import useAuthRoute from '../../../../hooks/useAuthRoute'
 import CreateImposterTokenMutation from '../../../../mutations/CreateImposterTokenMutation'
diff --git a/packages/client/modules/demo/components/CreateAccountSection.tsx b/packages/client/modules/demo/components/CreateAccountSection.tsx
index f565063d3b3..4d89f7f663d 100644
--- a/packages/client/modules/demo/components/CreateAccountSection.tsx
+++ b/packages/client/modules/demo/components/CreateAccountSection.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import {ExternalLinks, LocalStorageKey} from '~/types/constEnums'
 import EmailBorderBottom from '../../email/components/SummaryEmail/MeetingSummaryEmail/EmailBorderBottom'
diff --git a/packages/client/modules/email/components/Button.tsx b/packages/client/modules/email/components/Button.tsx
index 64e923c0c35..32522ce161e 100644
--- a/packages/client/modules/email/components/Button.tsx
+++ b/packages/client/modules/email/components/Button.tsx
@@ -1,4 +1,5 @@
-import React, {ReactNode} from 'react'
+import * as React from 'react'
+import {ReactNode} from 'react'
 import {emailPrimaryButtonStyle, emailTableBase} from '../styles'
 
 const cellStyle = {
diff --git a/packages/client/modules/email/components/EmailBlock/EmailBlock.tsx b/packages/client/modules/email/components/EmailBlock/EmailBlock.tsx
index 0909c735436..6b41045d3af 100644
--- a/packages/client/modules/email/components/EmailBlock/EmailBlock.tsx
+++ b/packages/client/modules/email/components/EmailBlock/EmailBlock.tsx
@@ -1,4 +1,4 @@
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {
   emailBackgroundColor,
   emailBodyColor,
diff --git a/packages/client/modules/email/components/EmailFooter/EmailFooter.tsx b/packages/client/modules/email/components/EmailFooter/EmailFooter.tsx
index 2d8b0263590..ea0f6ed1ae7 100644
--- a/packages/client/modules/email/components/EmailFooter/EmailFooter.tsx
+++ b/packages/client/modules/email/components/EmailFooter/EmailFooter.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import {ContactInfo} from '../../../../types/constEnums'
 import {emailCopyStyle, emailTableBase, emailTextColor} from '../../styles'
 import EmptySpace from '../EmptySpace/EmptySpace'
diff --git a/packages/client/modules/email/components/EmailNotifications/EmailDiscussionMentioned.tsx b/packages/client/modules/email/components/EmailNotifications/EmailDiscussionMentioned.tsx
index 87e69cfd1dc..3e5ac111192 100644
--- a/packages/client/modules/email/components/EmailNotifications/EmailDiscussionMentioned.tsx
+++ b/packages/client/modules/email/components/EmailNotifications/EmailDiscussionMentioned.tsx
@@ -2,7 +2,8 @@ import graphql from 'babel-plugin-relay/macro'
 import {convertFromRaw, Editor, EditorState} from 'draft-js'
 import {EmailDiscussionMentioned_notification$key} from 'parabol-client/__generated__/EmailDiscussionMentioned_notification.graphql'
 import editorDecorators from 'parabol-client/components/TaskEditor/decorators'
-import React, {useMemo, useRef} from 'react'
+import * as React from 'react'
+import {useMemo, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {cardShadow} from '../../../../styles/elevation'
 import {PALETTE} from '../../../../styles/paletteV3'
diff --git a/packages/client/modules/email/components/EmailNotifications/EmailKickedOut.tsx b/packages/client/modules/email/components/EmailNotifications/EmailKickedOut.tsx
index 4a08f084e0a..74a255a6b34 100644
--- a/packages/client/modules/email/components/EmailNotifications/EmailKickedOut.tsx
+++ b/packages/client/modules/email/components/EmailNotifications/EmailKickedOut.tsx
@@ -1,6 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
 import {EmailKickedOut_notification$key} from 'parabol-client/__generated__/EmailKickedOut_notification.graphql'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import EmailNotificationTemplate from './EmailNotificationTemplate'
 
diff --git a/packages/client/modules/email/components/EmailNotifications/EmailMeetingStageTimeLimitEnd.tsx b/packages/client/modules/email/components/EmailNotifications/EmailMeetingStageTimeLimitEnd.tsx
index 69dd1996139..d66b7e2d58e 100644
--- a/packages/client/modules/email/components/EmailNotifications/EmailMeetingStageTimeLimitEnd.tsx
+++ b/packages/client/modules/email/components/EmailNotifications/EmailMeetingStageTimeLimitEnd.tsx
@@ -1,6 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
 import {EmailMeetingStageTimeLimitEnd_notification$key} from 'parabol-client/__generated__/EmailMeetingStageTimeLimitEnd_notification.graphql'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import makeAppURL from '../../../../utils/makeAppURL'
 import {notificationSummaryUrlParams} from '../NotificationSummaryEmail'
diff --git a/packages/client/modules/email/components/EmailNotifications/EmailNotificationPicker.tsx b/packages/client/modules/email/components/EmailNotifications/EmailNotificationPicker.tsx
index 2a842df7432..e7a5b72fdc8 100644
--- a/packages/client/modules/email/components/EmailNotifications/EmailNotificationPicker.tsx
+++ b/packages/client/modules/email/components/EmailNotifications/EmailNotificationPicker.tsx
@@ -1,7 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
 import {EmailNotificationPicker_notification$key} from 'parabol-client/__generated__/EmailNotificationPicker_notification.graphql'
 import typedLookup from 'parabol-client/types/typedLookup'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import EmailDiscussionMentioned from './EmailDiscussionMentioned'
 import EmailKickedOut from './EmailKickedOut'
diff --git a/packages/client/modules/email/components/EmailNotifications/EmailNotificationTemplate.tsx b/packages/client/modules/email/components/EmailNotifications/EmailNotificationTemplate.tsx
index dbecb4a5456..64378787f04 100644
--- a/packages/client/modules/email/components/EmailNotifications/EmailNotificationTemplate.tsx
+++ b/packages/client/modules/email/components/EmailNotifications/EmailNotificationTemplate.tsx
@@ -1,6 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {EmailNotificationTemplate_notification$key} from 'parabol-client/__generated__/EmailNotificationTemplate_notification.graphql'
-import React, {ReactNode} from 'react'
+import * as React from 'react'
+import {ReactNode} from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '../../../../styles/paletteV3'
 import relativeDate from '../../../../utils/date/relativeDate'
diff --git a/packages/client/modules/email/components/EmailNotifications/EmailPaymentRejected.tsx b/packages/client/modules/email/components/EmailNotifications/EmailPaymentRejected.tsx
index 5ebc8f6cd7f..dbb680c0db8 100644
--- a/packages/client/modules/email/components/EmailNotifications/EmailPaymentRejected.tsx
+++ b/packages/client/modules/email/components/EmailNotifications/EmailPaymentRejected.tsx
@@ -1,6 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
 import {EmailPaymentRejected_notification$key} from 'parabol-client/__generated__/EmailPaymentRejected_notification.graphql'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import makeAppURL from '../../../../utils/makeAppURL'
 import {notificationSummaryUrlParams} from '../NotificationSummaryEmail'
diff --git a/packages/client/modules/email/components/EmailNotifications/EmailPromoteToBillingLeader.tsx b/packages/client/modules/email/components/EmailNotifications/EmailPromoteToBillingLeader.tsx
index a4b924d20bb..744d8f02f49 100644
--- a/packages/client/modules/email/components/EmailNotifications/EmailPromoteToBillingLeader.tsx
+++ b/packages/client/modules/email/components/EmailNotifications/EmailPromoteToBillingLeader.tsx
@@ -1,6 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
 import {EmailPromoteToBillingLeader_notification$key} from 'parabol-client/__generated__/EmailPromoteToBillingLeader_notification.graphql'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import makeAppURL from '../../../../utils/makeAppURL'
 import {notificationSummaryUrlParams} from '../NotificationSummaryEmail'
diff --git a/packages/client/modules/email/components/EmailNotifications/EmailResponseMentioned.tsx b/packages/client/modules/email/components/EmailNotifications/EmailResponseMentioned.tsx
index 7d42fb562f7..402fc7b150f 100644
--- a/packages/client/modules/email/components/EmailNotifications/EmailResponseMentioned.tsx
+++ b/packages/client/modules/email/components/EmailNotifications/EmailResponseMentioned.tsx
@@ -1,6 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
 import {EmailResponseMentioned_notification$key} from 'parabol-client/__generated__/EmailResponseMentioned_notification.graphql'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import makeAppURL from '../../../../utils/makeAppURL'
 import {notificationSummaryUrlParams} from '../NotificationSummaryEmail'
diff --git a/packages/client/modules/email/components/EmailNotifications/EmailResponseReplied.tsx b/packages/client/modules/email/components/EmailNotifications/EmailResponseReplied.tsx
index d18009f4d02..d016c31d4e3 100644
--- a/packages/client/modules/email/components/EmailNotifications/EmailResponseReplied.tsx
+++ b/packages/client/modules/email/components/EmailNotifications/EmailResponseReplied.tsx
@@ -2,7 +2,7 @@ import graphql from 'babel-plugin-relay/macro'
 import {convertFromRaw, Editor, EditorState} from 'draft-js'
 import {EmailResponseReplied_notification$key} from 'parabol-client/__generated__/EmailResponseReplied_notification.graphql'
 import editorDecorators from 'parabol-client/components/TaskEditor/decorators'
-import React, {useMemo, useRef} from 'react'
+import {useMemo, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {cardShadow} from '../../../../styles/elevation'
 import {PALETTE} from '../../../../styles/paletteV3'
diff --git a/packages/client/modules/email/components/EmailNotifications/EmailTaskInvolves.tsx b/packages/client/modules/email/components/EmailNotifications/EmailTaskInvolves.tsx
index 69659c3fb31..5f3dad741a0 100644
--- a/packages/client/modules/email/components/EmailNotifications/EmailTaskInvolves.tsx
+++ b/packages/client/modules/email/components/EmailNotifications/EmailTaskInvolves.tsx
@@ -1,7 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
 import {EmailTaskInvolves_notification$key} from 'parabol-client/__generated__/EmailTaskInvolves_notification.graphql'
 import {ASSIGNEE, MENTIONEE} from 'parabol-client/utils/constants'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import makeAppURL from '../../../../utils/makeAppURL'
 import {notificationSummaryUrlParams} from '../NotificationSummaryEmail'
diff --git a/packages/client/modules/email/components/EmailNotifications/EmailTeamArchived.tsx b/packages/client/modules/email/components/EmailNotifications/EmailTeamArchived.tsx
index 90c6aebb662..a61c4d53963 100644
--- a/packages/client/modules/email/components/EmailNotifications/EmailTeamArchived.tsx
+++ b/packages/client/modules/email/components/EmailNotifications/EmailTeamArchived.tsx
@@ -1,6 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
 import {EmailTeamArchived_notification$key} from 'parabol-client/__generated__/EmailTeamArchived_notification.graphql'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import EmailNotificationTemplate from './EmailNotificationTemplate'
 
diff --git a/packages/client/modules/email/components/EmailNotifications/EmailTeamInvitation.tsx b/packages/client/modules/email/components/EmailNotifications/EmailTeamInvitation.tsx
index 5b1479b7012..a5000ee54b8 100644
--- a/packages/client/modules/email/components/EmailNotifications/EmailTeamInvitation.tsx
+++ b/packages/client/modules/email/components/EmailNotifications/EmailTeamInvitation.tsx
@@ -1,6 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
 import {EmailTeamInvitation_notification$key} from 'parabol-client/__generated__/EmailTeamInvitation_notification.graphql'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import makeAppURL from '../../../../utils/makeAppURL'
 import {notificationSummaryUrlParams} from '../NotificationSummaryEmail'
diff --git a/packages/client/modules/email/components/EmailVerificationEmail.tsx b/packages/client/modules/email/components/EmailVerificationEmail.tsx
index acb2149b447..2d0ed1999c3 100644
--- a/packages/client/modules/email/components/EmailVerificationEmail.tsx
+++ b/packages/client/modules/email/components/EmailVerificationEmail.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import {EMAIL_CORS_OPTIONS} from '../../../types/cors'
 import {emailCopyStyle, emailLinkStyle, emailProductTeamSignature} from '../styles'
 import EmailBlock from './EmailBlock/EmailBlock'
diff --git a/packages/client/modules/email/components/EmptySpace/EmptySpace.tsx b/packages/client/modules/email/components/EmptySpace/EmptySpace.tsx
index b79c80fec1f..4f1d044d3fa 100644
--- a/packages/client/modules/email/components/EmptySpace/EmptySpace.tsx
+++ b/packages/client/modules/email/components/EmptySpace/EmptySpace.tsx
@@ -1,7 +1,6 @@
 // EmptySpace:
 // Table-based way to add vertical space. Uses line-height.
 
-import React from 'react'
 import {emailTableBase} from '../../styles'
 
 const EmptySpace = (props: {height: number}) => {
diff --git a/packages/client/modules/email/components/Header/Header.tsx b/packages/client/modules/email/components/Header/Header.tsx
index ba587263a5f..99987163d5e 100644
--- a/packages/client/modules/email/components/Header/Header.tsx
+++ b/packages/client/modules/email/components/Header/Header.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import {ExternalLinks} from '../../../../types/constEnums'
 import {CorsOptions} from '../../../../types/cors'
 import makeAppURL from '../../../../utils/makeAppURL'
diff --git a/packages/client/modules/email/components/Layout/Layout.tsx b/packages/client/modules/email/components/Layout/Layout.tsx
index f14b53f7fc5..0c6fb787705 100644
--- a/packages/client/modules/email/components/Layout/Layout.tsx
+++ b/packages/client/modules/email/components/Layout/Layout.tsx
@@ -1,4 +1,4 @@
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {emailBackgroundColor, emailMaxWidth, emailTableBase} from '../../styles'
 
 const containerStyle = {
diff --git a/packages/client/modules/email/components/LimitsEmails/LockedEmail.tsx b/packages/client/modules/email/components/LimitsEmails/LockedEmail.tsx
index 0372e40f13e..7fea1313bb8 100644
--- a/packages/client/modules/email/components/LimitsEmails/LockedEmail.tsx
+++ b/packages/client/modules/email/components/LimitsEmails/LockedEmail.tsx
@@ -1,5 +1,4 @@
 import {ContactInfo, Threshold} from 'parabol-client/types/constEnums'
-import React from 'react'
 import {EMAIL_CORS_OPTIONS} from '../../../../types/cors'
 import makeAppURL from '../../../../utils/makeAppURL'
 import {emailCopyStyle, emailLinkStyle} from '../../styles'
diff --git a/packages/client/modules/email/components/LimitsEmails/SevenDayWarningEmail.tsx b/packages/client/modules/email/components/LimitsEmails/SevenDayWarningEmail.tsx
index 3beb7786e34..bde65c8b8eb 100644
--- a/packages/client/modules/email/components/LimitsEmails/SevenDayWarningEmail.tsx
+++ b/packages/client/modules/email/components/LimitsEmails/SevenDayWarningEmail.tsx
@@ -1,5 +1,4 @@
 import {ContactInfo, ExternalLinks, Threshold} from 'parabol-client/types/constEnums'
-import React from 'react'
 import {EMAIL_CORS_OPTIONS} from '../../../../types/cors'
 import makeAppURL from '../../../../utils/makeAppURL'
 import {emailCopyStyle, emailLinkStyle} from '../../styles'
diff --git a/packages/client/modules/email/components/LimitsEmails/ThirtyDayWarningEmail.tsx b/packages/client/modules/email/components/LimitsEmails/ThirtyDayWarningEmail.tsx
index 4c0b1ac98b9..004d6241b8d 100644
--- a/packages/client/modules/email/components/LimitsEmails/ThirtyDayWarningEmail.tsx
+++ b/packages/client/modules/email/components/LimitsEmails/ThirtyDayWarningEmail.tsx
@@ -1,5 +1,4 @@
 import {ContactInfo, ExternalLinks, Threshold} from 'parabol-client/types/constEnums'
-import React from 'react'
 import {EMAIL_CORS_OPTIONS} from '../../../../types/cors'
 import makeAppURL from '../../../../utils/makeAppURL'
 import {emailCopyStyle, emailLinkStyle} from '../../styles'
diff --git a/packages/client/modules/email/components/MeetingSummaryEmailRootSSR.tsx b/packages/client/modules/email/components/MeetingSummaryEmailRootSSR.tsx
index 2a26eb65bc0..cb059cb7b83 100644
--- a/packages/client/modules/email/components/MeetingSummaryEmailRootSSR.tsx
+++ b/packages/client/modules/email/components/MeetingSummaryEmailRootSSR.tsx
@@ -1,6 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
 import {MeetingSummaryEmailRootSSRQuery} from 'parabol-client/__generated__/MeetingSummaryEmailRootSSRQuery.graphql'
-import React from 'react'
 import {useLazyLoadQuery} from 'react-relay'
 import {EMAIL_CORS_OPTIONS} from '../../../types/cors'
 import makeAppURL from '../../../utils/makeAppURL'
diff --git a/packages/client/modules/email/components/NotificationSummaryEmail.tsx b/packages/client/modules/email/components/NotificationSummaryEmail.tsx
index 09584b916a3..e3376c82501 100644
--- a/packages/client/modules/email/components/NotificationSummaryEmail.tsx
+++ b/packages/client/modules/email/components/NotificationSummaryEmail.tsx
@@ -1,7 +1,6 @@
 import {EmailNotificationPicker_notification$key} from 'parabol-client/__generated__/EmailNotificationPicker_notification.graphql'
 import {ContactInfo, ExternalLinks} from 'parabol-client/types/constEnums'
 import plural from 'parabol-client/utils/plural'
-import React from 'react'
 import {EMAIL_CORS_OPTIONS} from '../../../types/cors'
 import makeAppURL from '../../../utils/makeAppURL'
 import {emailCopyStyle, emailLinkStyle} from '../styles'
diff --git a/packages/client/modules/email/components/NotificationSummaryEmailRoot.tsx b/packages/client/modules/email/components/NotificationSummaryEmailRoot.tsx
index cd610f6758d..10ff5a93096 100644
--- a/packages/client/modules/email/components/NotificationSummaryEmailRoot.tsx
+++ b/packages/client/modules/email/components/NotificationSummaryEmailRoot.tsx
@@ -1,7 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
 import ms from 'ms'
 import {NotificationSummaryEmailRootQuery} from 'parabol-client/__generated__/NotificationSummaryEmailRootQuery.graphql'
-import React from 'react'
 import {useLazyLoadQuery} from 'react-relay'
 import {NOTIFICATION_TEMPLATE_TYPE} from './EmailNotifications/EmailNotificationPicker'
 import NotificationSummaryEmail from './NotificationSummaryEmail'
diff --git a/packages/client/modules/email/components/ResetPasswordEmail.tsx b/packages/client/modules/email/components/ResetPasswordEmail.tsx
index 770fba0e88e..4ff894d727e 100644
--- a/packages/client/modules/email/components/ResetPasswordEmail.tsx
+++ b/packages/client/modules/email/components/ResetPasswordEmail.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import {EMAIL_CORS_OPTIONS} from '../../../types/cors'
 import {emailCopyStyle, emailLinkStyle, emailProductTeamSignature} from '../styles'
 import EmailBlock from './EmailBlock/EmailBlock'
diff --git a/packages/client/modules/email/components/SummaryEmail/ExportToCSV.tsx b/packages/client/modules/email/components/SummaryEmail/ExportToCSV.tsx
index d68afb2e6e8..dfe953aa5ed 100644
--- a/packages/client/modules/email/components/SummaryEmail/ExportToCSV.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/ExportToCSV.tsx
@@ -5,7 +5,7 @@ import {ExportToCSVQuery} from 'parabol-client/__generated__/ExportToCSVQuery.gr
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import extractTextFromDraftString from 'parabol-client/utils/draftjs/extractTextFromDraftString'
 import withMutationProps, {WithMutationProps} from 'parabol-client/utils/relay/withMutationProps'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {ExternalLinks, PokerCards} from '../../../../types/constEnums'
 import {CorsOptions} from '../../../../types/cors'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/AnchorIfEmail.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/AnchorIfEmail.tsx
index cb1b9dab7b2..0d89ca56979 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/AnchorIfEmail.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/AnchorIfEmail.tsx
@@ -1,4 +1,4 @@
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {Link} from 'react-router-dom'
 
 interface Props {
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ContactUsFooter.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ContactUsFooter.tsx
index 10bdefcf8e5..2f60de28360 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ContactUsFooter.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ContactUsFooter.tsx
@@ -1,7 +1,6 @@
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
 import {MEETING_NAME} from 'parabol-client/utils/constants'
-import React from 'react'
 
 const promptStyle = {
   color: PALETTE.SLATE_700,
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailBorderBottom.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailBorderBottom.tsx
index 25b7716b83c..ff6f30d189d 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailBorderBottom.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailBorderBottom.tsx
@@ -1,5 +1,5 @@
 import {PALETTE} from 'parabol-client/styles/paletteV3'
-import React from 'react'
+import * as React from 'react'
 
 const borderStyles = {
   borderBottom: `1px solid ${PALETTE.SLATE_400}`,
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailReflectionCard.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailReflectionCard.tsx
index 44fc7089dcb..ee5d99fa6f6 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailReflectionCard.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailReflectionCard.tsx
@@ -4,7 +4,8 @@ import {EmailReflectionCard_reflection$key} from 'parabol-client/__generated__/E
 import editorDecorators from 'parabol-client/components/TaskEditor/decorators'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
-import React, {useMemo, useRef} from 'react'
+import * as React from 'react'
+import {useMemo, useRef} from 'react'
 import {useFragment} from 'react-relay'
 
 interface Props {
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailTaskCard.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailTaskCard.tsx
index bb8ae51275f..9d54764f9c7 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailTaskCard.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailTaskCard.tsx
@@ -5,7 +5,8 @@ import editorDecorators from 'parabol-client/components/TaskEditor/decorators'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
 import {taskStatusColors} from 'parabol-client/utils/taskStatus'
-import React, {useMemo, useRef} from 'react'
+import * as React from 'react'
+import {useMemo, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {TaskStatusEnum} from '../../../../../__generated__/EmailTaskCard_task.graphql'
 import convertToTaskContent from '../../../../../utils/draftjs/convertToTaskContent'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasks.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasks.tsx
index 65ed83c6d83..133b36f58ab 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasks.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasks.tsx
@@ -1,7 +1,7 @@
 import {Loop} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {
   ExportAllTasks_meeting$key,
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenu.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenu.tsx
index d96f590c3cb..e401fc1f52d 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenu.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenu.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay'
 import {TaskServiceEnum} from '../../../../../__generated__/CreateTaskMutation.graphql'
 import {ExportAllTasksMenuQuery} from '../../../../../__generated__/ExportAllTasksMenuQuery.graphql'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenuRoot.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenuRoot.tsx
index df7a84f8220..0b7e71827de 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenuRoot.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenuRoot.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import {TaskServiceEnum} from '../../../../../__generated__/CreateTaskMutation.graphql'
 import exportAllTasksMenuQuery, {
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/LogoFooter.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/LogoFooter.tsx
index e10d6e23058..290bdb133da 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/LogoFooter.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/LogoFooter.tsx
@@ -1,6 +1,5 @@
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
-import React from 'react'
 import {ExternalLinks} from '../../../../../types/constEnums'
 import {CorsOptions} from '../../../../../types/cors'
 import makeAppURL from '../../../../../utils/makeAppURL'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMemberTaskSummaryList.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMemberTaskSummaryList.tsx
index aeca571181d..c065746de38 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMemberTaskSummaryList.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMemberTaskSummaryList.tsx
@@ -1,7 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
 import {MeetingMemberTaskSummaryList_meetingMember$key} from 'parabol-client/__generated__/MeetingMemberTaskSummaryList_meetingMember.graphql'
 import plural from 'parabol-client/utils/plural'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import SummaryAvatarHeader from './SummaryAvatarHeader'
 import TaskSummarySection from './TaskSummarySection'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMembersWithTasks.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMembersWithTasks.tsx
index 3a9e7e89dbb..10ec2db0cf1 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMembersWithTasks.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMembersWithTasks.tsx
@@ -1,6 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
 import {MeetingMembersWithTasks_meeting$key} from 'parabol-client/__generated__/MeetingMembersWithTasks_meeting.graphql'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import EmailBorderBottom from './EmailBorderBottom'
 import MeetingMemberTaskSummaryList from './MeetingMemberTaskSummaryList'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMembersWithoutTasks.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMembersWithoutTasks.tsx
index 5498b2565ab..66f718c2746 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMembersWithoutTasks.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMembersWithoutTasks.tsx
@@ -6,7 +6,6 @@ import {
 import useEmailItemGrid from 'parabol-client/hooks/useEmailItemGrid'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import EmailBorderBottom from './EmailBorderBottom'
 import SummaryAvatarHeader from './SummaryAvatarHeader'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingSummaryEmail.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingSummaryEmail.tsx
index b49644af0f5..a9d81623c5f 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingSummaryEmail.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingSummaryEmail.tsx
@@ -1,5 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect} from 'react'
+import * as React from 'react'
+import {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {CorsOptions} from '../../../../../types/cors'
 // import './reactEmailDeclarations'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/QuickStats.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/QuickStats.tsx
index e3fb8fafd21..a8a1adc426c 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/QuickStats.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/QuickStats.tsx
@@ -3,7 +3,7 @@ import {QuickStats_meeting$key} from 'parabol-client/__generated__/QuickStats_me
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
 import {ACTION, RETROSPECTIVE} from 'parabol-client/utils/constants'
-import React from 'react'
+import * as React from 'react'
 import {useFragment} from 'react-relay'
 import makeActionStats from './makeActionStats'
 import makePokerStats from './makePokerStats'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx
index ff6b1d204da..242f6dd60f2 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx
@@ -3,7 +3,6 @@ import useEmailItemGrid from 'parabol-client/hooks/useEmailItemGrid'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY, ICON_SIZE} from 'parabol-client/styles/typographyV2'
 import plural from 'parabol-client/utils/plural'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {RetroTopic_meeting$key} from '../../../../../__generated__/RetroTopic_meeting.graphql'
 import {RetroTopic_stage$key} from '../../../../../__generated__/RetroTopic_stage.graphql'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopics.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopics.tsx
index 123d02e2897..41af89a868b 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopics.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopics.tsx
@@ -4,7 +4,7 @@ import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
 import {RETRO_TOPIC_LABEL} from 'parabol-client/utils/constants'
 import plural from 'parabol-client/utils/plural'
-import React from 'react'
+import {Fragment} from 'react'
 import {useFragment} from 'react-relay'
 import useEmailItemGrid from '../../../../../hooks/useEmailItemGrid'
 import makeAppURL from '../../../../../utils/makeAppURL'
@@ -118,7 +118,7 @@ const RetroTopics = (props: Props) => {
             // eslint-disable-next-line react-hooks/rules-of-hooks
             const grid = useEmailItemGrid(reflections, 3)
             return (
-              <React.Fragment key={reflectionGroup.id}>
+              <Fragment key={reflectionGroup.id}>
                 <tr>
                   <td align='center' style={{paddingTop: 20}}>
                     <AnchorIfEmail
@@ -138,7 +138,7 @@ const RetroTopics = (props: Props) => {
                     ))}
                   </td>
                 </tr>
-              </React.Fragment>
+              </Fragment>
             )
           })}
       <EmailBorderBottom />
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ShareTopic.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ShareTopic.tsx
index 2f72c71d09c..a58411a7945 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ShareTopic.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ShareTopic.tsx
@@ -1,6 +1,5 @@
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
-import React from 'react'
 import ShareTopicRoot from '../../../../../components/ShareTopicRoot'
 import {useDialogState} from '../../../../../ui/Dialog/useDialogState'
 import makeAppURL from '../../../../../utils/makeAppURL'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryAvatarHeader.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryAvatarHeader.tsx
index 2dffc5f88de..22cf871ce72 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryAvatarHeader.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryAvatarHeader.tsx
@@ -2,7 +2,6 @@ import graphql from 'babel-plugin-relay/macro'
 import {SummaryAvatarHeader_meetingMember$key} from 'parabol-client/__generated__/SummaryAvatarHeader_meetingMember.graphql'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
-import React from 'react'
 import {useFragment} from 'react-relay'
 
 const avatarCell = {
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryHeader.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryHeader.tsx
index 3e5699f9460..23078f130d5 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryHeader.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryHeader.tsx
@@ -3,7 +3,7 @@ import {SummaryHeader_meeting$key} from 'parabol-client/__generated__/SummaryHea
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
 import makeDateString from 'parabol-client/utils/makeDateString'
-import React from 'react'
+import * as React from 'react'
 import {useFragment} from 'react-relay'
 import {ExternalLinks} from '../../../../../types/constEnums'
 import {CorsOptions} from '../../../../../types/cors'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryPokerStories.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryPokerStories.tsx
index 5df09279819..36d5e64b656 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryPokerStories.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryPokerStories.tsx
@@ -2,7 +2,6 @@ import graphql from 'babel-plugin-relay/macro'
 import {SummaryPokerStories_meeting$key} from 'parabol-client/__generated__/SummaryPokerStories_meeting.graphql'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import makeAppURL from '../../../../../utils/makeAppURL'
 import AnchorIfEmail from './AnchorIfEmail'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummarySheet.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummarySheet.tsx
index c42a46ed20b..3c341bfa8a9 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummarySheet.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummarySheet.tsx
@@ -5,7 +5,7 @@ import {SummarySheet_meeting$key} from 'parabol-client/__generated__/SummaryShee
 import CreateAccountSection from 'parabol-client/modules/demo/components/CreateAccountSection'
 import {sheetShadow} from 'parabol-client/styles/elevation'
 import {ACTION} from 'parabol-client/utils/constants'
-import React, {useRef} from 'react'
+import {useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {Link} from 'react-router-dom'
 import useAtmosphere from '../../../../../hooks/useAtmosphere'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummarySheetCTA.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummarySheetCTA.tsx
index ee25792c0d2..78375478ad1 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummarySheetCTA.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummarySheetCTA.tsx
@@ -1,7 +1,6 @@
 import {buttonShadow} from 'parabol-client/styles/elevation'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
-import React from 'react'
 import AnchorIfEmail from './AnchorIfEmail'
 import {MeetingSummaryReferrer} from './MeetingSummaryEmail'
 
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TaskSummarySection.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TaskSummarySection.tsx
index c2f51081cc7..c855142cfc4 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TaskSummarySection.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TaskSummarySection.tsx
@@ -3,7 +3,6 @@ import {TaskSummarySection_tasks$key} from 'parabol-client/__generated__/TaskSum
 import useEmailItemGrid from 'parabol-client/hooks/useEmailItemGrid'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import EmailTaskCard from './EmailTaskCard'
 
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamHealthSummary.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamHealthSummary.tsx
index ab8b8ae8e65..5ef42dff51f 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamHealthSummary.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamHealthSummary.tsx
@@ -3,7 +3,6 @@ import {TeamHealthSummary_meeting$key} from 'parabol-client/__generated__/TeamHe
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
 import getTeamHealthVoteColor from 'parabol-client/utils/getTeamHealthVoteColor'
-import React from 'react'
 import {useFragment} from 'react-relay'
 
 interface Props {
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamPromptResponseSummary.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamPromptResponseSummary.tsx
index f7983a6a2bf..1eda646199a 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamPromptResponseSummary.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamPromptResponseSummary.tsx
@@ -1,6 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
 import {TeamPromptResponseSummary_meeting$key} from 'parabol-client/__generated__/TeamPromptResponseSummary_meeting.graphql'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import getPhaseByTypename from '~/utils/getPhaseByTypename'
 import {isNotNull} from '~/utils/predicates'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamPromptResponseSummaryCard.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamPromptResponseSummaryCard.tsx
index b2c37627ea0..bd0439c0529 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamPromptResponseSummaryCard.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamPromptResponseSummaryCard.tsx
@@ -2,7 +2,7 @@ import styled from '@emotion/styled'
 import {generateHTML} from '@tiptap/html'
 import graphql from 'babel-plugin-relay/macro'
 import {TeamPromptResponseSummaryCard_stage$key} from 'parabol-client/__generated__/TeamPromptResponseSummaryCard_stage.graphql'
-import React from 'react'
+import * as React from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
 import {createEditorExtensions} from '../../../../../components/promptResponse/tiptapConfig'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ViewInBrowserHeader.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ViewInBrowserHeader.tsx
index 91a1009cb3b..62bcc785d53 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ViewInBrowserHeader.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ViewInBrowserHeader.tsx
@@ -1,6 +1,5 @@
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
-import React from 'react'
 import {MeetingSummaryReferrer} from './MeetingSummaryEmail'
 
 const bannerLink = {
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummary.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummary.tsx
index 4d98482b5f4..e8ac18e8ec7 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummary.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummary.tsx
@@ -1,6 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
 import {WholeMeetingSummary_meeting$key} from 'parabol-client/__generated__/WholeMeetingSummary_meeting.graphql'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import WholeMeetingSummaryLoading from './WholeMeetingSummaryLoading'
 import WholeMeetingSummaryResult from './WholeMeetingSummaryResult'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryLoading.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryLoading.tsx
index e34d17ed410..fa59d75c71a 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryLoading.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryLoading.tsx
@@ -1,6 +1,5 @@
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
-import React from 'react'
 import Ellipsis from '../../../../../components/Ellipsis/Ellipsis'
 
 const explainerStyle = {
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx
index ca4705f9733..57e46e57e4b 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx
@@ -1,6 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
 import {marked} from 'marked'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import sanitizeHtml from 'sanitize-html'
 import {WholeMeetingSummaryResult_meeting$key} from '../../../../../__generated__/WholeMeetingSummaryResult_meeting.graphql'
diff --git a/packages/client/modules/email/components/SummaryEmail/SummaryCTA.tsx b/packages/client/modules/email/components/SummaryEmail/SummaryCTA.tsx
index 06af4393c54..53c1a7a721a 100644
--- a/packages/client/modules/email/components/SummaryEmail/SummaryCTA.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/SummaryCTA.tsx
@@ -1,5 +1,5 @@
 import CreateAccountSection from 'parabol-client/modules/demo/components/CreateAccountSection'
-import React, {CSSProperties} from 'react'
+import {CSSProperties, Fragment} from 'react'
 import {Link} from 'react-router-dom'
 import {emailPrimaryButtonStyle, emailRuleStyle} from '../../styles'
 
@@ -29,10 +29,10 @@ const SummaryCTA = (props: Props) => {
   const {isDemo, referrer, teamDashUrl} = props
   if (isDemo) {
     return (
-      <React.Fragment>
+      <Fragment>
         <hr style={ruleStyle} />
         <CreateAccountSection />
-      </React.Fragment>
+      </Fragment>
     )
   }
   if (referrer === 'email') {
diff --git a/packages/client/modules/email/components/TeamInvite.tsx b/packages/client/modules/email/components/TeamInvite.tsx
index 1ae269e1242..3b6900756df 100644
--- a/packages/client/modules/email/components/TeamInvite.tsx
+++ b/packages/client/modules/email/components/TeamInvite.tsx
@@ -1,5 +1,4 @@
 import {ExternalLinks} from 'parabol-client/types/constEnums'
-import React from 'react'
 import {CorsOptions} from '../../../types/cors'
 import {emailCopyStyle, emailLinkStyle, emailProductTeamSignature} from '../styles'
 import Button from './Button'
diff --git a/packages/client/modules/meeting/components/ActionMeetingUpdatesPromptTeamHelpText.tsx b/packages/client/modules/meeting/components/ActionMeetingUpdatesPromptTeamHelpText.tsx
index efb77f608d4..1a1cda8bee3 100644
--- a/packages/client/modules/meeting/components/ActionMeetingUpdatesPromptTeamHelpText.tsx
+++ b/packages/client/modules/meeting/components/ActionMeetingUpdatesPromptTeamHelpText.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ActionMeetingUpdatesPromptTeamHelpText_currentMeetingMember$key} from '../../../__generated__/ActionMeetingUpdatesPromptTeamHelpText_currentMeetingMember.graphql'
 import useAtmosphere from '../../../hooks/useAtmosphere'
diff --git a/packages/client/modules/meeting/components/AddPokerTemplateDimension.tsx b/packages/client/modules/meeting/components/AddPokerTemplateDimension.tsx
index 97a13eb59dc..5f24b4582c6 100644
--- a/packages/client/modules/meeting/components/AddPokerTemplateDimension.tsx
+++ b/packages/client/modules/meeting/components/AddPokerTemplateDimension.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {Add} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {Threshold} from '~/types/constEnums'
 import {AddPokerTemplateDimension_dimensions$key} from '../../../__generated__/AddPokerTemplateDimension_dimensions.graphql'
diff --git a/packages/client/modules/meeting/components/AddPokerTemplateScaleValue.tsx b/packages/client/modules/meeting/components/AddPokerTemplateScaleValue.tsx
index 82e00dba863..61a382e0df8 100644
--- a/packages/client/modules/meeting/components/AddPokerTemplateScaleValue.tsx
+++ b/packages/client/modules/meeting/components/AddPokerTemplateScaleValue.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {Add} from '@mui/icons-material'
-import React from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import LinkButton from '../../../components/LinkButton'
 
diff --git a/packages/client/modules/meeting/components/AddScaleValueButtonInput.tsx b/packages/client/modules/meeting/components/AddScaleValueButtonInput.tsx
index 0a89b38300d..2ac29650174 100644
--- a/packages/client/modules/meeting/components/AddScaleValueButtonInput.tsx
+++ b/packages/client/modules/meeting/components/AddScaleValueButtonInput.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {AddScaleValueButtonInput_scale$key} from '~/__generated__/AddScaleValueButtonInput_scale.graphql'
 import {Threshold} from '../../../types/constEnums'
diff --git a/packages/client/modules/meeting/components/AddTemplatePrompt.tsx b/packages/client/modules/meeting/components/AddTemplatePrompt.tsx
index 886dae9fdd2..52acf0659c6 100644
--- a/packages/client/modules/meeting/components/AddTemplatePrompt.tsx
+++ b/packages/client/modules/meeting/components/AddTemplatePrompt.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {Add} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {Threshold} from '~/types/constEnums'
diff --git a/packages/client/modules/meeting/components/AgendaShortcutHint/AgendaShortcutHint.tsx b/packages/client/modules/meeting/components/AgendaShortcutHint/AgendaShortcutHint.tsx
index fd9d2f2ee25..f9565121f2c 100644
--- a/packages/client/modules/meeting/components/AgendaShortcutHint/AgendaShortcutHint.tsx
+++ b/packages/client/modules/meeting/components/AgendaShortcutHint/AgendaShortcutHint.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import {AGENDA_ITEM_LABEL} from '../../../../utils/constants'
 import MeetingCopy from '../MeetingCopy/MeetingCopy'
 
diff --git a/packages/client/modules/meeting/components/CloneTemplate.tsx b/packages/client/modules/meeting/components/CloneTemplate.tsx
index 6fbc5a1460a..a9bd8b42c70 100644
--- a/packages/client/modules/meeting/components/CloneTemplate.tsx
+++ b/packages/client/modules/meeting/components/CloneTemplate.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import DetailAction from '../../../components/DetailAction'
 
 interface Props {
diff --git a/packages/client/modules/meeting/components/CopyShortLink/CopyShortLink.tsx b/packages/client/modules/meeting/components/CopyShortLink/CopyShortLink.tsx
index a7605f975e2..a512fc51776 100644
--- a/packages/client/modules/meeting/components/CopyShortLink/CopyShortLink.tsx
+++ b/packages/client/modules/meeting/components/CopyShortLink/CopyShortLink.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {Link} from '@mui/icons-material'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import CopyLink from '../../../../components/CopyLink'
 import {PALETTE} from '../../../../styles/paletteV3'
 
diff --git a/packages/client/modules/meeting/components/CustomTemplateUpgradeMsg.tsx b/packages/client/modules/meeting/components/CustomTemplateUpgradeMsg.tsx
index 68a5ffb0073..dfbb8022321 100644
--- a/packages/client/modules/meeting/components/CustomTemplateUpgradeMsg.tsx
+++ b/packages/client/modules/meeting/components/CustomTemplateUpgradeMsg.tsx
@@ -1,6 +1,5 @@
 import {keyframes} from '@emotion/core'
 import styled from '@emotion/styled'
-import React from 'react'
 import {useHistory} from 'react-router'
 import customTemplate from '../../../../../static/images/illustrations/customTemplate.png'
 import {MeetingTypeEnum} from '../../../__generated__/TeamInvitationQuery.graphql'
diff --git a/packages/client/modules/meeting/components/EditableTemplateDescription.tsx b/packages/client/modules/meeting/components/EditableTemplateDescription.tsx
index 1ce1fafa553..6150ed066f1 100644
--- a/packages/client/modules/meeting/components/EditableTemplateDescription.tsx
+++ b/packages/client/modules/meeting/components/EditableTemplateDescription.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import EditableText from '../../../components/EditableText'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
diff --git a/packages/client/modules/meeting/components/EditableTemplateDimension.tsx b/packages/client/modules/meeting/components/EditableTemplateDimension.tsx
index 9eedc7f8ddf..573ce816546 100644
--- a/packages/client/modules/meeting/components/EditableTemplateDimension.tsx
+++ b/packages/client/modules/meeting/components/EditableTemplateDimension.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useRef} from 'react'
+import {useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
 import {EditableTemplateDimension_dimensions$key} from '../../../__generated__/EditableTemplateDimension_dimensions.graphql'
diff --git a/packages/client/modules/meeting/components/EditableTemplateName.tsx b/packages/client/modules/meeting/components/EditableTemplateName.tsx
index 7270d45a101..9223b97b6db 100644
--- a/packages/client/modules/meeting/components/EditableTemplateName.tsx
+++ b/packages/client/modules/meeting/components/EditableTemplateName.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import clsx from 'clsx'
-import React from 'react'
 import EditableText from '../../../components/EditableText'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
diff --git a/packages/client/modules/meeting/components/EditableTemplatePrompt.tsx b/packages/client/modules/meeting/components/EditableTemplatePrompt.tsx
index 54b9af04bcc..94d2834fcf0 100644
--- a/packages/client/modules/meeting/components/EditableTemplatePrompt.tsx
+++ b/packages/client/modules/meeting/components/EditableTemplatePrompt.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {EditableTemplatePrompt_prompts$key} from '../../../__generated__/EditableTemplatePrompt_prompts.graphql'
 import EditableText from '../../../components/EditableText'
diff --git a/packages/client/modules/meeting/components/EditableTemplatePromptColor.tsx b/packages/client/modules/meeting/components/EditableTemplatePromptColor.tsx
index 3220269c6f2..2bb2bb9ad6c 100644
--- a/packages/client/modules/meeting/components/EditableTemplatePromptColor.tsx
+++ b/packages/client/modules/meeting/components/EditableTemplatePromptColor.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {ArrowDropDown as ArrowDropDownIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {EditableTemplatePromptColor_prompt$key} from '~/__generated__/EditableTemplatePromptColor_prompt.graphql'
 import {EditableTemplatePromptColor_prompts$key} from '~/__generated__/EditableTemplatePromptColor_prompts.graphql'
diff --git a/packages/client/modules/meeting/components/EditableTemplateScaleName.tsx b/packages/client/modules/meeting/components/EditableTemplateScaleName.tsx
index a4bd3f7e4f2..b5aab411c6f 100644
--- a/packages/client/modules/meeting/components/EditableTemplateScaleName.tsx
+++ b/packages/client/modules/meeting/components/EditableTemplateScaleName.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {EditableTemplateScaleName_scales$key} from '../../../__generated__/EditableTemplateScaleName_scales.graphql'
 import EditableText from '../../../components/EditableText'
diff --git a/packages/client/modules/meeting/components/EditableTemplateScaleValueColor.tsx b/packages/client/modules/meeting/components/EditableTemplateScaleValueColor.tsx
index 18f7332b77a..9be97f5b444 100644
--- a/packages/client/modules/meeting/components/EditableTemplateScaleValueColor.tsx
+++ b/packages/client/modules/meeting/components/EditableTemplateScaleValueColor.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {ArrowDropDown as ArrowDropDownIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {EditableTemplateScaleValueColor_scale$key} from '~/__generated__/EditableTemplateScaleValueColor_scale.graphql'
 import PlainButton from '~/components/PlainButton/PlainButton'
diff --git a/packages/client/modules/meeting/components/EditableTemplateScaleValueLabel.tsx b/packages/client/modules/meeting/components/EditableTemplateScaleValueLabel.tsx
index dc8bec0242d..55fa166a0bf 100644
--- a/packages/client/modules/meeting/components/EditableTemplateScaleValueLabel.tsx
+++ b/packages/client/modules/meeting/components/EditableTemplateScaleValueLabel.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {EditableTemplateScaleValueLabel_scale$key} from '~/__generated__/EditableTemplateScaleValueLabel_scale.graphql'
 import {EditableTemplateScaleValueLabel_scaleValue$key} from '~/__generated__/EditableTemplateScaleValueLabel_scaleValue.graphql'
diff --git a/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatar.tsx b/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatar.tsx
index 97b8f3af468..107203a1a1c 100644
--- a/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatar.tsx
+++ b/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatar.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {NewMeetingAvatar_teamMember$key} from '../../../../__generated__/NewMeetingAvatar_teamMember.graphql'
 import ErrorBoundary from '../../../../components/ErrorBoundary'
diff --git a/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatarGroup.tsx b/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatarGroup.tsx
index 675a34dcd79..c8f77b86c8c 100644
--- a/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatarGroup.tsx
+++ b/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatarGroup.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {NewMeetingAvatarGroup_meeting$key} from '../../../../__generated__/NewMeetingAvatarGroup_meeting.graphql'
 import AddTeamMemberAvatarButton from '../../../../components/AddTeamMemberAvatarButton'
diff --git a/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewCheckInQuestion.tsx b/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewCheckInQuestion.tsx
index a7b1294e39c..81b3f1bd580 100644
--- a/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewCheckInQuestion.tsx
+++ b/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewCheckInQuestion.tsx
@@ -2,7 +2,7 @@ import styled from '@emotion/styled'
 import {Create as CreateIcon, Refresh as RefreshIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import {ContentState, EditorState, SelectionState, convertToRaw} from 'draft-js'
-import React, {useRef, useState} from 'react'
+import {useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {NewCheckInQuestion_meeting$key} from '~/__generated__/NewCheckInQuestion_meeting.graphql'
 import {
diff --git a/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewMeetingCheckInPrompt.tsx b/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewMeetingCheckInPrompt.tsx
index 5333987bfe5..c5c1298cbf8 100644
--- a/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewMeetingCheckInPrompt.tsx
+++ b/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewMeetingCheckInPrompt.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {NewMeetingCheckInPrompt_meeting$key} from '~/__generated__/NewMeetingCheckInPrompt_meeting.graphql'
 import {NewMeetingCheckInPrompt_teamMember$key} from '../../../../__generated__/NewMeetingCheckInPrompt_teamMember.graphql'
diff --git a/packages/client/modules/meeting/components/MeetingFacilitationHint/MeetingFacilitationHint.tsx b/packages/client/modules/meeting/components/MeetingFacilitationHint/MeetingFacilitationHint.tsx
index 095323a980e..c40b4fb3bf4 100644
--- a/packages/client/modules/meeting/components/MeetingFacilitationHint/MeetingFacilitationHint.tsx
+++ b/packages/client/modules/meeting/components/MeetingFacilitationHint/MeetingFacilitationHint.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import Ellipsis from '../../../../components/Ellipsis/Ellipsis'
 import {PALETTE} from '../../../../styles/paletteV3'
 
diff --git a/packages/client/modules/meeting/components/MockScopingList.tsx b/packages/client/modules/meeting/components/MockScopingList.tsx
index c97b067add9..bfe959c7080 100644
--- a/packages/client/modules/meeting/components/MockScopingList.tsx
+++ b/packages/client/modules/meeting/components/MockScopingList.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import MockScopingTask from './MockScopingTask'
 
 const MockScopingList = () => {
diff --git a/packages/client/modules/meeting/components/MockScopingTask.tsx b/packages/client/modules/meeting/components/MockScopingTask.tsx
index 3bfb4c48f8a..0c265337f23 100644
--- a/packages/client/modules/meeting/components/MockScopingTask.tsx
+++ b/packages/client/modules/meeting/components/MockScopingTask.tsx
@@ -1,6 +1,5 @@
 import {keyframes} from '@emotion/core'
 import styled from '@emotion/styled'
-import React from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import Checkbox from '../../../components/Checkbox'
 export const skeletonShine = keyframes`
diff --git a/packages/client/modules/meeting/components/MockTemplateItem.tsx b/packages/client/modules/meeting/components/MockTemplateItem.tsx
index 92a69e86404..c8e85b19eb1 100644
--- a/packages/client/modules/meeting/components/MockTemplateItem.tsx
+++ b/packages/client/modules/meeting/components/MockTemplateItem.tsx
@@ -1,6 +1,5 @@
 import {keyframes} from '@emotion/core'
 import styled from '@emotion/styled'
-import React from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 export const skeletonShine = keyframes`
   0% {
diff --git a/packages/client/modules/meeting/components/MockTemplateList.tsx b/packages/client/modules/meeting/components/MockTemplateList.tsx
index 99b428b67ba..0afe1cf8c7d 100644
--- a/packages/client/modules/meeting/components/MockTemplateList.tsx
+++ b/packages/client/modules/meeting/components/MockTemplateList.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import MockTemplateItem from './MockTemplateItem'
 
 const MockTemplateList = () => {
diff --git a/packages/client/modules/meeting/components/NewMeetingCheckInGreeting.tsx b/packages/client/modules/meeting/components/NewMeetingCheckInGreeting.tsx
index bf7d6eb5c92..74caa06cf8b 100644
--- a/packages/client/modules/meeting/components/NewMeetingCheckInGreeting.tsx
+++ b/packages/client/modules/meeting/components/NewMeetingCheckInGreeting.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {NewMeetingCheckInGreeting_checkInGreeting$key} from '../../../__generated__/NewMeetingCheckInGreeting_checkInGreeting.graphql'
 import {NewMeetingCheckInGreeting_teamMember$key} from '../../../__generated__/NewMeetingCheckInGreeting_teamMember.graphql'
diff --git a/packages/client/modules/meeting/components/NewTemplateScaleValueLabelInput.tsx b/packages/client/modules/meeting/components/NewTemplateScaleValueLabelInput.tsx
index 2f7fce4b9fd..b622deab560 100644
--- a/packages/client/modules/meeting/components/NewTemplateScaleValueLabelInput.tsx
+++ b/packages/client/modules/meeting/components/NewTemplateScaleValueLabelInput.tsx
@@ -1,7 +1,8 @@
 import styled from '@emotion/styled'
 import {Cancel as CancelIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {FormEvent, useEffect, useRef, useState} from 'react'
+import * as React from 'react'
+import {FormEvent, useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useMutationProps from '~/hooks/useMutationProps'
diff --git a/packages/client/modules/meeting/components/PokerTemplateScaleDetails.tsx b/packages/client/modules/meeting/components/PokerTemplateScaleDetails.tsx
index 014b693da05..36354c6b794 100644
--- a/packages/client/modules/meeting/components/PokerTemplateScaleDetails.tsx
+++ b/packages/client/modules/meeting/components/PokerTemplateScaleDetails.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {ArrowBack} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {PokerTemplateScaleDetails_team$key} from '../../../__generated__/PokerTemplateScaleDetails_team.graphql'
 import FlatButton from '../../../components/FlatButton'
diff --git a/packages/client/modules/meeting/components/PokerTemplateScalePicker.tsx b/packages/client/modules/meeting/components/PokerTemplateScalePicker.tsx
index 5b25e5f165e..de80555f9c2 100644
--- a/packages/client/modules/meeting/components/PokerTemplateScalePicker.tsx
+++ b/packages/client/modules/meeting/components/PokerTemplateScalePicker.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {ExpandMore} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {PokerTemplateScalePicker_dimension$key} from '../../../__generated__/PokerTemplateScalePicker_dimension.graphql'
 import {MenuPosition} from '../../../hooks/useCoords'
diff --git a/packages/client/modules/meeting/components/RemoveTemplate.tsx b/packages/client/modules/meeting/components/RemoveTemplate.tsx
index b9a594d8d57..b0ca7967654 100644
--- a/packages/client/modules/meeting/components/RemoveTemplate.tsx
+++ b/packages/client/modules/meeting/components/RemoveTemplate.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {MeetingTypeEnum} from '~/__generated__/MeetingSelectorQuery.graphql'
 import {RemoveTemplate_teamTemplates$key} from '../../../__generated__/RemoveTemplate_teamTemplates.graphql'
diff --git a/packages/client/modules/meeting/components/ScaleActions.tsx b/packages/client/modules/meeting/components/ScaleActions.tsx
index 301bf51b885..dd8445417a4 100644
--- a/packages/client/modules/meeting/components/ScaleActions.tsx
+++ b/packages/client/modules/meeting/components/ScaleActions.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
+import * as React from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {ScaleActions_scale$key} from '../../../__generated__/ScaleActions_scale.graphql'
 import DetailAction from '../../../components/DetailAction'
diff --git a/packages/client/modules/meeting/components/ScaleDropdownMenuItem.tsx b/packages/client/modules/meeting/components/ScaleDropdownMenuItem.tsx
index 6362418d51e..c34b674e4ff 100644
--- a/packages/client/modules/meeting/components/ScaleDropdownMenuItem.tsx
+++ b/packages/client/modules/meeting/components/ScaleDropdownMenuItem.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {Public} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import {useFragment} from 'react-relay'
 import textOverflow from '~/styles/helpers/textOverflow'
 import {PALETTE} from '~/styles/paletteV3'
diff --git a/packages/client/modules/meeting/components/ScaleValuePalettePicker.tsx b/packages/client/modules/meeting/components/ScaleValuePalettePicker.tsx
index 265485aee72..cc7ac3e753a 100644
--- a/packages/client/modules/meeting/components/ScaleValuePalettePicker.tsx
+++ b/packages/client/modules/meeting/components/ScaleValuePalettePicker.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import Menu from '~/components/Menu'
 import PaletteColor from '~/components/PaletteColor/PaletteColor'
diff --git a/packages/client/modules/meeting/components/SelectScaleDropdown.tsx b/packages/client/modules/meeting/components/SelectScaleDropdown.tsx
index b557015c6e2..8f06185b7cf 100644
--- a/packages/client/modules/meeting/components/SelectScaleDropdown.tsx
+++ b/packages/client/modules/meeting/components/SelectScaleDropdown.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {Add} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {SelectScaleDropdown_dimension$key} from '../../../__generated__/SelectScaleDropdown_dimension.graphql'
 import LinkButton from '../../../components/LinkButton'
diff --git a/packages/client/modules/meeting/components/TemplateDimensionItem.tsx b/packages/client/modules/meeting/components/TemplateDimensionItem.tsx
index 1e7e93c0c76..2c651f13728 100644
--- a/packages/client/modules/meeting/components/TemplateDimensionItem.tsx
+++ b/packages/client/modules/meeting/components/TemplateDimensionItem.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {Cancel as CancelIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {DraggableProvided} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
 import {TemplateDimensionItem_dimensions$key} from '~/__generated__/TemplateDimensionItem_dimensions.graphql'
diff --git a/packages/client/modules/meeting/components/TemplateDimensionList.tsx b/packages/client/modules/meeting/components/TemplateDimensionList.tsx
index cfef49ef476..85330073b6e 100644
--- a/packages/client/modules/meeting/components/TemplateDimensionList.tsx
+++ b/packages/client/modules/meeting/components/TemplateDimensionList.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {DragDropContext, Draggable, Droppable, DropResult} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
 import {TemplateDimensionList_dimensions$key} from '../../../__generated__/TemplateDimensionList_dimensions.graphql'
diff --git a/packages/client/modules/meeting/components/TemplatePromptItem.tsx b/packages/client/modules/meeting/components/TemplatePromptItem.tsx
index b893c5925dc..115b32a9800 100644
--- a/packages/client/modules/meeting/components/TemplatePromptItem.tsx
+++ b/packages/client/modules/meeting/components/TemplatePromptItem.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {Cancel as CancelIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {DraggableProvided} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
 import {TemplatePromptItem_prompts$key} from '~/__generated__/TemplatePromptItem_prompts.graphql'
diff --git a/packages/client/modules/meeting/components/TemplatePromptList.tsx b/packages/client/modules/meeting/components/TemplatePromptList.tsx
index dd9e9fa14e3..921f3701226 100644
--- a/packages/client/modules/meeting/components/TemplatePromptList.tsx
+++ b/packages/client/modules/meeting/components/TemplatePromptList.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {DragDropContext, Draggable, Droppable, DropResult} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
 import {TemplatePromptList_prompts$key} from '../../../__generated__/TemplatePromptList_prompts.graphql'
diff --git a/packages/client/modules/meeting/components/TemplateScaleValueItem.tsx b/packages/client/modules/meeting/components/TemplateScaleValueItem.tsx
index 739be82b776..87159cc994e 100644
--- a/packages/client/modules/meeting/components/TemplateScaleValueItem.tsx
+++ b/packages/client/modules/meeting/components/TemplateScaleValueItem.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {Cancel as CancelIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {DraggableProvided} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
 import {TemplateScaleValueItem_scale$key} from '~/__generated__/TemplateScaleValueItem_scale.graphql'
diff --git a/packages/client/modules/meeting/components/TemplateScaleValueList.tsx b/packages/client/modules/meeting/components/TemplateScaleValueList.tsx
index d6af03432ed..08bf5f5d8aa 100644
--- a/packages/client/modules/meeting/components/TemplateScaleValueList.tsx
+++ b/packages/client/modules/meeting/components/TemplateScaleValueList.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {DragDropContext, Draggable, Droppable, DropResult} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
 import {TemplateScaleValueList_scale$key} from '~/__generated__/TemplateScaleValueList_scale.graphql'
diff --git a/packages/client/modules/meeting/components/TemplateSharing.tsx b/packages/client/modules/meeting/components/TemplateSharing.tsx
index a64d315bfd6..e592ea293ac 100644
--- a/packages/client/modules/meeting/components/TemplateSharing.tsx
+++ b/packages/client/modules/meeting/components/TemplateSharing.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {ExpandMore as ExpandMoreIcon, Share as ShareIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TemplateSharing_template$key} from '../../../__generated__/TemplateSharing_template.graphql'
 import {MenuPosition} from '../../../hooks/useCoords'
diff --git a/packages/client/modules/newTeam/NewTeam.tsx b/packages/client/modules/newTeam/NewTeam.tsx
index 68a8346979f..51be508d436 100644
--- a/packages/client/modules/newTeam/NewTeam.tsx
+++ b/packages/client/modules/newTeam/NewTeam.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import useDocumentTitle from '~/hooks/useDocumentTitle'
 import {NewTeamQuery} from '../../__generated__/NewTeamQuery.graphql'
diff --git a/packages/client/modules/newTeam/components/NewTeamForm/NewTeamForm.tsx b/packages/client/modules/newTeam/components/NewTeamForm/NewTeamForm.tsx
index 1609a79e63e..5e5c81e1b20 100644
--- a/packages/client/modules/newTeam/components/NewTeamForm/NewTeamForm.tsx
+++ b/packages/client/modules/newTeam/components/NewTeamForm/NewTeamForm.tsx
@@ -1,6 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {ChangeEvent, FormEvent, useState} from 'react'
+import * as React from 'react'
+import {ChangeEvent, FormEvent, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {NewTeamForm_organizations$key} from '../../../../__generated__/NewTeamForm_organizations.graphql'
 import Checkbox from '../../../../components/Checkbox'
diff --git a/packages/client/modules/newTeam/components/NewTeamForm/NewTeamFormOrgName.tsx b/packages/client/modules/newTeam/components/NewTeamForm/NewTeamFormOrgName.tsx
index 46b57697790..bad34b8a9cf 100644
--- a/packages/client/modules/newTeam/components/NewTeamForm/NewTeamFormOrgName.tsx
+++ b/packages/client/modules/newTeam/components/NewTeamForm/NewTeamFormOrgName.tsx
@@ -1,4 +1,4 @@
-import React, {ChangeEvent} from 'react'
+import {ChangeEvent} from 'react'
 import BasicInput from '../../../../components/InputField/BasicInput'
 import Radio from '../../../../components/Radio/Radio'
 import {NewTeamFieldBlock} from './NewTeamForm'
diff --git a/packages/client/modules/newTeam/components/NewTeamForm/NewTeamFormTeamName.tsx b/packages/client/modules/newTeam/components/NewTeamForm/NewTeamFormTeamName.tsx
index 3f1446b772f..417e9e191b6 100644
--- a/packages/client/modules/newTeam/components/NewTeamForm/NewTeamFormTeamName.tsx
+++ b/packages/client/modules/newTeam/components/NewTeamForm/NewTeamFormTeamName.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {ChangeEvent} from 'react'
+import {ChangeEvent} from 'react'
 import FieldLabel from '../../../../components/FieldLabel/FieldLabel'
 import BasicInput from '../../../../components/InputField/BasicInput'
 import {Breakpoint} from '../../../../types/constEnums'
diff --git a/packages/client/modules/newTeam/containers/NewTeamForm/NewTeamRoot.tsx b/packages/client/modules/newTeam/containers/NewTeamForm/NewTeamRoot.tsx
index f699fdc8543..b7cf9c5a403 100644
--- a/packages/client/modules/newTeam/containers/NewTeamForm/NewTeamRoot.tsx
+++ b/packages/client/modules/newTeam/containers/NewTeamForm/NewTeamRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import newTeamQuery, {NewTeamQuery} from '../../../../__generated__/NewTeamQuery.graphql'
 import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow'
 import useRouter from '../../../../hooks/useRouter'
diff --git a/packages/client/modules/notifications/components/NotificationErrorMessage.tsx b/packages/client/modules/notifications/components/NotificationErrorMessage.tsx
index 2cc1f44f2ce..7254f6a5ddc 100644
--- a/packages/client/modules/notifications/components/NotificationErrorMessage.tsx
+++ b/packages/client/modules/notifications/components/NotificationErrorMessage.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {PALETTE} from '../../../styles/paletteV3'
 
 const StyledError = styled('div')({
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx b/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx
index 5f1ce1a37ba..f7d03e9f753 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import {EditorState} from 'draft-js'
-import React, {memo, RefObject} from 'react'
+import {memo, RefObject} from 'react'
 import {useFragment} from 'react-relay'
 import {OutcomeCard_task$key} from '~/__generated__/OutcomeCard_task.graphql'
 import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql'
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddIntegrationDialog.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddIntegrationDialog.tsx
index 37084b0757c..fa1fa73d9f4 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddIntegrationDialog.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeAddIntegrationDialog.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import DialogContainer from '~/components/DialogContainer'
 import DialogContent from '~/components/DialogContent'
 import DialogTitle from '~/components/DialogTitle'
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
index 52da89bd3e3..43f1247a493 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo, useState} from 'react'
+import {useMemo, useState} from 'react'
 import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay'
 import {TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery} from '~/__generated__/TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery.graphql'
 import {EmptyDropdownMenuItemLabel} from '~/components/EmptyDropdownMenuItemLabel'
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterUserAssigneeMenu.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterUserAssigneeMenu.tsx
index c985bf70f49..9d56ff50d88 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterUserAssigneeMenu.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterUserAssigneeMenu.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay'
 import {AreaEnum} from '~/__generated__/UpdateTaskMutation.graphql'
 import {EmptyDropdownMenuItemLabel} from '~/components/EmptyDropdownMenuItemLabel'
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooter.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooter.tsx
index 6853f991fd0..f9c1423555b 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooter.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooter.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import {EditorState} from 'draft-js'
-import React from 'react'
+import {Fragment} from 'react'
 import {useFragment} from 'react-relay'
 import {AreaEnum} from '~/__generated__/UpdateTaskMutation.graphql'
 import {TaskFooter_task$key} from '../../../../__generated__/TaskFooter_task.graphql'
@@ -110,7 +110,7 @@ const TaskFooter = (props: Props) => {
   const canAssignUser = !integration && !isArchived
   const canAssignTeam = !isArchived
   return (
-    <React.Fragment>
+    <Fragment>
       <Footer>
         <AvatarBlock>
           {showTeam ? (
@@ -160,7 +160,7 @@ const TaskFooter = (props: Props) => {
         </ButtonGroup>
       </Footer>
       {error && <OutcomeCardMessage onClose={handleCompleted} message={error} />}
-    </React.Fragment>
+    </Fragment>
   )
 }
 
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterIntegrateToggle.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterIntegrateToggle.tsx
index 08612053ddc..c9b5dbc49e3 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterIntegrateToggle.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterIntegrateToggle.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import useTooltip from '~/hooks/useTooltip'
 import CardButton from '../../../../components/CardButton'
 import IconLabel from '../../../../components/IconLabel'
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTagMenuToggle.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTagMenuToggle.tsx
index bcf5f8e1cd0..7aab2ae55bb 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTagMenuToggle.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTagMenuToggle.tsx
@@ -1,5 +1,4 @@
 import {EditorState} from 'draft-js'
-import React from 'react'
 import {AreaEnum} from '~/__generated__/UpdateTaskMutation.graphql'
 import useTooltip from '~/hooks/useTooltip'
 import CardButton from '../../../../components/CardButton'
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx
index 06478015f97..501517a874f 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useTooltip from '~/hooks/useTooltip'
 import {TaskFooterTeamAssignee_task$key} from '../../../../__generated__/TaskFooterTeamAssignee_task.graphql'
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterUserAssignee.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterUserAssignee.tsx
index c9d2744f814..43e766a8e17 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterUserAssignee.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterUserAssignee.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {AssignmentInd as AssignmentIndIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useTooltip from '~/hooks/useTooltip'
 import {TaskFooterUserAssignee_task$key} from '../../../../__generated__/TaskFooterUserAssignee_task.graphql'
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardMessage/OutcomeCardMessage.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardMessage/OutcomeCardMessage.tsx
index 9fe6722fa20..bcb9b25f2b4 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardMessage/OutcomeCardMessage.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardMessage/OutcomeCardMessage.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {Close as CloseIcon} from '@mui/icons-material'
-import React from 'react'
 import {PALETTE} from '../../../../styles/paletteV3'
 
 const Message = styled('div')({
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenu.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenu.tsx
index 820389e901e..f6e836786ba 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenu.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenu.tsx
@@ -1,6 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
 import {EditorState} from 'draft-js'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {AreaEnum} from '~/__generated__/UpdateTaskMutation.graphql'
 import {TaskFooterTagMenu_task$key} from '../../../../__generated__/TaskFooterTagMenu_task.graphql'
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenuStatusItem.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenuStatusItem.tsx
index 80b15babf37..54955b3a276 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenuStatusItem.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenuStatusItem.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 import {useFragment} from 'react-relay'
 import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql'
 import {TaskFooterTagMenuStatusItem_task$key} from '../../../../__generated__/TaskFooterTagMenuStatusItem_task.graphql'
diff --git a/packages/client/modules/outcomeCard/components/TaskFooterTeamAssigneeMenuRoot.tsx b/packages/client/modules/outcomeCard/components/TaskFooterTeamAssigneeMenuRoot.tsx
index aee750d4afc..54aaeb3a0fd 100644
--- a/packages/client/modules/outcomeCard/components/TaskFooterTeamAssigneeMenuRoot.tsx
+++ b/packages/client/modules/outcomeCard/components/TaskFooterTeamAssigneeMenuRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import taskFooterTeamAssigneeMenuQuery, {
   TaskFooterTeamAssigneeMenuQuery
 } from '~/__generated__/TaskFooterTeamAssigneeMenuQuery.graphql'
diff --git a/packages/client/modules/outcomeCard/components/TaskFooterUserAssigneeMenuRoot.tsx b/packages/client/modules/outcomeCard/components/TaskFooterUserAssigneeMenuRoot.tsx
index 1d9bb53ad24..1184a8ffeee 100644
--- a/packages/client/modules/outcomeCard/components/TaskFooterUserAssigneeMenuRoot.tsx
+++ b/packages/client/modules/outcomeCard/components/TaskFooterUserAssigneeMenuRoot.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import taskFooterUserAssigneeMenuQuery, {
   TaskFooterUserAssigneeMenuQuery
diff --git a/packages/client/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.tsx b/packages/client/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.tsx
index 41762fd484e..de54a30f7ab 100644
--- a/packages/client/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.tsx
+++ b/packages/client/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import {ContentState, convertToRaw} from 'draft-js'
-import React, {memo, useEffect, useRef, useState} from 'react'
+import {memo, useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {OutcomeCardContainer_task$key} from '~/__generated__/OutcomeCardContainer_task.graphql'
 import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql'
diff --git a/packages/client/modules/spinner/components/Spinner/Spinner.tsx b/packages/client/modules/spinner/components/Spinner/Spinner.tsx
index 2972c37b60e..6ade71f9d30 100644
--- a/packages/client/modules/spinner/components/Spinner/Spinner.tsx
+++ b/packages/client/modules/spinner/components/Spinner/Spinner.tsx
@@ -1,6 +1,5 @@
 import {keyframes} from '@emotion/core'
 import styled from '@emotion/styled'
-import React from 'react'
 
 // NOTE: Let’s set this up!
 //    1. PATHS    for leaves of the logo
diff --git a/packages/client/modules/summary/components/NewMeetingSummary.tsx b/packages/client/modules/summary/components/NewMeetingSummary.tsx
index aa4975e70ab..942e6745ec4 100644
--- a/packages/client/modules/summary/components/NewMeetingSummary.tsx
+++ b/packages/client/modules/summary/components/NewMeetingSummary.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {NewMeetingSummaryQuery} from '../../../__generated__/NewMeetingSummaryQuery.graphql'
 import DashTopBar from '../../../components/DashTopBar'
diff --git a/packages/client/modules/summary/components/NewMeetingSummaryRoot.tsx b/packages/client/modules/summary/components/NewMeetingSummaryRoot.tsx
index 9ba0a91c003..bb0734c4231 100644
--- a/packages/client/modules/summary/components/NewMeetingSummaryRoot.tsx
+++ b/packages/client/modules/summary/components/NewMeetingSummaryRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import newMeetingSummaryQuery, {
   NewMeetingSummaryQuery
 } from '../../../__generated__/NewMeetingSummaryQuery.graphql'
diff --git a/packages/client/modules/team/components/NewTeamOrgPicker.tsx b/packages/client/modules/team/components/NewTeamOrgPicker.tsx
index 1d7a94856fb..fac380b5c27 100644
--- a/packages/client/modules/team/components/NewTeamOrgPicker.tsx
+++ b/packages/client/modules/team/components/NewTeamOrgPicker.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useMemo} from 'react'
+import {useEffect, useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {NewTeamOrgPicker_organizations$key} from '../../../__generated__/NewTeamOrgPicker_organizations.graphql'
 import DropdownMenuToggle from '../../../components/DropdownMenuToggle'
diff --git a/packages/client/modules/teamDashboard/components/AgendaInput/AgendaInput.tsx b/packages/client/modules/teamDashboard/components/AgendaInput/AgendaInput.tsx
index 25f37cfee19..fc69433a563 100644
--- a/packages/client/modules/teamDashboard/components/AgendaInput/AgendaInput.tsx
+++ b/packages/client/modules/teamDashboard/components/AgendaInput/AgendaInput.tsx
@@ -1,7 +1,8 @@
 import styled from '@emotion/styled'
 import {Add} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useRef} from 'react'
+import * as React from 'react'
+import {useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {AgendaInput_team$key} from '../../../../__generated__/AgendaInput_team.graphql'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
diff --git a/packages/client/modules/teamDashboard/components/AgendaItem/AgendaItem.tsx b/packages/client/modules/teamDashboard/components/AgendaItem/AgendaItem.tsx
index d6d4609bf50..5cb9fe1202d 100644
--- a/packages/client/modules/teamDashboard/components/AgendaItem/AgendaItem.tsx
+++ b/packages/client/modules/teamDashboard/components/AgendaItem/AgendaItem.tsx
@@ -1,6 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useRef, useState} from 'react'
+import * as React from 'react'
+import {useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {
   AgendaItem_meeting$data,
diff --git a/packages/client/modules/teamDashboard/components/AgendaList/AgendaList.tsx b/packages/client/modules/teamDashboard/components/AgendaList/AgendaList.tsx
index eee3e55c318..10dcf4845d7 100644
--- a/packages/client/modules/teamDashboard/components/AgendaList/AgendaList.tsx
+++ b/packages/client/modules/teamDashboard/components/AgendaList/AgendaList.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {DragDropContext, Draggable, Droppable, DropResult} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
 import {AgendaList_agendaItems$key} from '~/__generated__/AgendaList_agendaItems.graphql'
diff --git a/packages/client/modules/teamDashboard/components/AgendaList/AgendaListEmptyState.tsx b/packages/client/modules/teamDashboard/components/AgendaList/AgendaListEmptyState.tsx
index 9dfe457e702..dd8af570593 100644
--- a/packages/client/modules/teamDashboard/components/AgendaList/AgendaListEmptyState.tsx
+++ b/packages/client/modules/teamDashboard/components/AgendaList/AgendaListEmptyState.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {PALETTE} from '../../../../styles/paletteV3'
 
 interface Props {
diff --git a/packages/client/modules/teamDashboard/components/AgendaListAndInput/AgendaListAndInput.tsx b/packages/client/modules/teamDashboard/components/AgendaListAndInput/AgendaListAndInput.tsx
index 9ca9f852e54..502464d64c5 100644
--- a/packages/client/modules/teamDashboard/components/AgendaListAndInput/AgendaListAndInput.tsx
+++ b/packages/client/modules/teamDashboard/components/AgendaListAndInput/AgendaListAndInput.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {
   AgendaListAndInput_meeting$data,
diff --git a/packages/client/modules/teamDashboard/components/AgendaToggle/AgendaToggle.tsx b/packages/client/modules/teamDashboard/components/AgendaToggle/AgendaToggle.tsx
index 9070034c4b0..4141e2c9237 100644
--- a/packages/client/modules/teamDashboard/components/AgendaToggle/AgendaToggle.tsx
+++ b/packages/client/modules/teamDashboard/components/AgendaToggle/AgendaToggle.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {Chat} from '@mui/icons-material'
-import React from 'react'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import ToggleTeamDrawerMutation from '~/mutations/ToggleTeamDrawerMutation'
 import {PALETTE} from '../../../../styles/paletteV3'
diff --git a/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganization.tsx b/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganization.tsx
index cad52bc66fd..ee1b8fb4d60 100644
--- a/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganization.tsx
+++ b/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganization.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {ArchiveOrganization_organization$key} from '~/__generated__/ArchiveOrganization_organization.graphql'
 import IconLabel from '../../../../components/IconLabel'
diff --git a/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganizationForm.tsx b/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganizationForm.tsx
index b72437a5de2..fc64e4a35f9 100644
--- a/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganizationForm.tsx
+++ b/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganizationForm.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
+import * as React from 'react'
 import {useFragment} from 'react-relay'
 import {ArchiveOrganizationForm_organization$key} from '~/__generated__/ArchiveOrganizationForm_organization.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
diff --git a/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveTeam.tsx b/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveTeam.tsx
index b759ed58ad3..5bebd9183cb 100644
--- a/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveTeam.tsx
+++ b/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveTeam.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {ArchiveTeam_team$key} from '~/__generated__/ArchiveTeam_team.graphql'
 import IconLabel from '../../../../components/IconLabel'
diff --git a/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveTeamForm.tsx b/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveTeamForm.tsx
index bc57a0a1419..a8d8bd2b768 100644
--- a/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveTeamForm.tsx
+++ b/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveTeamForm.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
+import * as React from 'react'
 import {useFragment} from 'react-relay'
 import {ArchiveTeamForm_team$key} from '~/__generated__/ArchiveTeamForm_team.graphql'
 import SecondaryButton from '~/components/SecondaryButton'
diff --git a/packages/client/modules/teamDashboard/components/CloseDrawer/CloseDrawer.tsx b/packages/client/modules/teamDashboard/components/CloseDrawer/CloseDrawer.tsx
index 61ccf13d826..2d95be6a36d 100644
--- a/packages/client/modules/teamDashboard/components/CloseDrawer/CloseDrawer.tsx
+++ b/packages/client/modules/teamDashboard/components/CloseDrawer/CloseDrawer.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import IconButton from '../../../../components/IconButton'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import useMutationProps from '../../../../hooks/useMutationProps'
diff --git a/packages/client/modules/teamDashboard/components/EditTeamName/EditableTeamName.tsx b/packages/client/modules/teamDashboard/components/EditTeamName/EditableTeamName.tsx
index 257f4525787..972bf339451 100644
--- a/packages/client/modules/teamDashboard/components/EditTeamName/EditableTeamName.tsx
+++ b/packages/client/modules/teamDashboard/components/EditTeamName/EditableTeamName.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {EditableTeamName_team$key} from '../../../../__generated__/EditableTeamName_team.graphql'
diff --git a/packages/client/modules/teamDashboard/components/LeaveTeamModal/LeaveTeamModal.tsx b/packages/client/modules/teamDashboard/components/LeaveTeamModal/LeaveTeamModal.tsx
index 6354a84f718..95be3ca4364 100644
--- a/packages/client/modules/teamDashboard/components/LeaveTeamModal/LeaveTeamModal.tsx
+++ b/packages/client/modules/teamDashboard/components/LeaveTeamModal/LeaveTeamModal.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {LeaveTeamModal_teamMember$key} from '../../../../__generated__/LeaveTeamModal_teamMember.graphql'
 import DialogContainer from '../../../../components/DialogContainer'
diff --git a/packages/client/modules/teamDashboard/components/ManageTeam/ManageTeamList.tsx b/packages/client/modules/teamDashboard/components/ManageTeam/ManageTeamList.tsx
index 7ed7de48036..76306c9a0fc 100644
--- a/packages/client/modules/teamDashboard/components/ManageTeam/ManageTeamList.tsx
+++ b/packages/client/modules/teamDashboard/components/ManageTeam/ManageTeamList.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {ManageTeamList_team$key} from '../../../../__generated__/ManageTeamList_team.graphql'
 import ManageTeamMember from './ManageTeamMember'
diff --git a/packages/client/modules/teamDashboard/components/ManageTeam/ManageTeamMember.tsx b/packages/client/modules/teamDashboard/components/ManageTeam/ManageTeamMember.tsx
index a3f48da65d6..1cfa6a864d7 100644
--- a/packages/client/modules/teamDashboard/components/ManageTeam/ManageTeamMember.tsx
+++ b/packages/client/modules/teamDashboard/components/ManageTeam/ManageTeamMember.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {MoreVert as MoreVertIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useRef} from 'react'
+import {useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {ManageTeamMember_teamMember$key} from '~/__generated__/ManageTeamMember_teamMember.graphql'
 import Avatar from '../../../../components/Avatar/Avatar'
diff --git a/packages/client/modules/teamDashboard/components/PromoteTeamMemberModal/PromoteTeamMemberModal.tsx b/packages/client/modules/teamDashboard/components/PromoteTeamMemberModal/PromoteTeamMemberModal.tsx
index 17c9946891a..a4d10b582b9 100644
--- a/packages/client/modules/teamDashboard/components/PromoteTeamMemberModal/PromoteTeamMemberModal.tsx
+++ b/packages/client/modules/teamDashboard/components/PromoteTeamMemberModal/PromoteTeamMemberModal.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {PromoteTeamMemberModal_teamMember$key} from '../../../../__generated__/PromoteTeamMemberModal_teamMember.graphql'
diff --git a/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx b/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx
index bdadb899580..dee2090c142 100644
--- a/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {ProviderListQuery} from '../../../../__generated__/ProviderListQuery.graphql'
 import SettingsWrapper from '../../../../components/Settings/SettingsWrapper'
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/AtlassianProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/AtlassianProviderRow.tsx
index 114a8293149..67b9d2e2fb7 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/AtlassianProviderRow.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/AtlassianProviderRow.tsx
@@ -1,6 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
 import jwtDecode from 'jwt-decode'
-import React, {useEffect, useMemo} from 'react'
+import {useEffect, useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import AtlassianProviderLogo from '../../../../AtlassianProviderLogo'
 import {AtlassianProviderRow_viewer$key} from '../../../../__generated__/AtlassianProviderRow_viewer.graphql'
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/AzureDevOpsProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/AzureDevOpsProviderRow.tsx
index c8675c83689..01a35ae2302 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/AzureDevOpsProviderRow.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/AzureDevOpsProviderRow.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {AzureDevOpsProviderRow_viewer$key} from '../../../../__generated__/AzureDevOpsProviderRow_viewer.graphql'
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/ConnectButton.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/ConnectButton.tsx
index b5679f4499a..8e92c164f9c 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/ConnectButton.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/ConnectButton.tsx
@@ -1,5 +1,5 @@
 import {Add as AddIcon} from '@mui/icons-material'
-import React from 'react'
+import * as React from 'react'
 import useBreakpoint from '../../../../hooks/useBreakpoint'
 import {Breakpoint} from '../../../../types/constEnums'
 import ProviderRowActionButton from './ProviderRowActionButton'
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/ContactUsButton.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/ContactUsButton.tsx
index 5eecdf6f4a1..dd98e8caf17 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/ContactUsButton.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/ContactUsButton.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {MailOutlined} from '@mui/icons-material'
-import React from 'react'
 import useBreakpoint from '../../../../hooks/useBreakpoint'
 import {Breakpoint} from '../../../../types/constEnums'
 import ProviderRowActionButton from './ProviderRowActionButton'
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/GcalProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/GcalProviderRow.tsx
index 208ede99d93..516b3dce758 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/GcalProviderRow.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/GcalProviderRow.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {GcalProviderRow_viewer$key} from '../../../../__generated__/GcalProviderRow_viewer.graphql'
 import GcalConfigMenu from '../../../../components/GcalConfigMenu'
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/GitHubProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/GitHubProviderRow.tsx
index cae02297c16..97879add893 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/GitHubProviderRow.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/GitHubProviderRow.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {GitHubProviderRow_viewer$key} from '../../../../__generated__/GitHubProviderRow_viewer.graphql'
 import GitHubConfigMenu from '../../../../components/GitHubConfigMenu'
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/GitLabConfigMenu.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/GitLabConfigMenu.tsx
index 3d360a76425..256bb331fd5 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/GitLabConfigMenu.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/GitLabConfigMenu.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import Menu from '../../../../components/Menu'
 import MenuItem from '../../../../components/MenuItem'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/GitLabProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/GitLabProviderRow.tsx
index 806c4fcf077..365e5e7ad3b 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/GitLabProviderRow.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/GitLabProviderRow.tsx
@@ -1,6 +1,5 @@
 import {Done as DoneIcon, MoreVert as MoreVertIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {GitLabProviderRow_viewer$key} from '../../../../__generated__/GitLabProviderRow_viewer.graphql'
 import FlatButton from '../../../../components/FlatButton'
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/JiraServerProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/JiraServerProviderRow.tsx
index c7ec67958d9..d50f775c5d6 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/JiraServerProviderRow.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/JiraServerProviderRow.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {JiraServerProviderRow_viewer$key} from '~/__generated__/JiraServerProviderRow_viewer.graphql'
 import JiraServerConfigMenu from '../../../../components/JiraServerConfigMenu'
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsConfigMenu.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsConfigMenu.tsx
index 4b3a5d00603..dfe774a4600 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsConfigMenu.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsConfigMenu.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import Menu from '../../../../components/Menu'
 import MenuItem from '../../../../components/MenuItem'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsPanel.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsPanel.tsx
index 61bae87c02b..af2d82d7b63 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsPanel.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsPanel.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {FormEvent, useEffect} from 'react'
+import {FormEvent, useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {MSTeamsPanel_viewer$key} from '~/__generated__/MSTeamsPanel_viewer.graphql'
 import {MenuPosition} from '~/hooks/useCoords'
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsProviderRow.tsx
index e22cdc5a9d3..2269eab3787 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsProviderRow.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsProviderRow.tsx
@@ -1,6 +1,6 @@
 import {Add as AddIcon, Close as CloseIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {MSTeamsProviderRow_viewer$key} from '~/__generated__/MSTeamsProviderRow_viewer.graphql'
 import MSTeamsProviderLogo from '../../../../components/MSTeamsProviderLogo'
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/MattermostConfigMenu.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/MattermostConfigMenu.tsx
index 478d0afbfe5..9a4dbc1d998 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/MattermostConfigMenu.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/MattermostConfigMenu.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import Menu from '../../../../components/Menu'
 import MenuItem from '../../../../components/MenuItem'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/MattermostPanel.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/MattermostPanel.tsx
index e2075426a5b..a17275081e2 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/MattermostPanel.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/MattermostPanel.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {Info as InfoIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {FormEvent, useEffect} from 'react'
+import {FormEvent, useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {MattermostPanel_viewer$key} from '~/__generated__/MattermostPanel_viewer.graphql'
 import {MenuPosition} from '~/hooks/useCoords'
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/MattermostProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/MattermostProviderRow.tsx
index baf902c80f0..45a66d6e195 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/MattermostProviderRow.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/MattermostProviderRow.tsx
@@ -1,6 +1,6 @@
 import {Add as AddIcon, Close as CloseIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {MattermostProviderRow_viewer$key} from '~/__generated__/MattermostProviderRow_viewer.graphql'
 import MattermostProviderLogo from '../../../../components/MattermostProviderLogo'
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/ProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/ProviderRow.tsx
index 2f075f9c9c0..bae1688a06f 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/ProviderRow.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/ProviderRow.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 import ConnectButton from './ConnectButton'
 import ProviderRowBase, {ProviderRowBaseProps} from './ProviderRowBase'
 
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/ProviderRowBase.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/ProviderRowBase.tsx
index 7309692cab6..a999cdf7b7a 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/ProviderRowBase.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/ProviderRowBase.tsx
@@ -1,5 +1,5 @@
 import {Done as DoneIcon, MoreVert as MoreVertIcon} from '@mui/icons-material'
-import React from 'react'
+import * as React from 'react'
 import FlatButton from '../../../../components/FlatButton'
 import ProviderActions from '../../../../components/ProviderActions'
 import RowInfo from '../../../../components/Row/RowInfo'
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/ProviderRowContactUs.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/ProviderRowContactUs.tsx
index 879f39c3d07..3402687ccc6 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/ProviderRowContactUs.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/ProviderRowContactUs.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 import ConnectButton from './ConnectButton'
 import ContactUsButton from './ContactUsButton'
 import ProviderRowBase, {ProviderRowBaseProps} from './ProviderRowBase'
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/SlackChannelPicker.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/SlackChannelPicker.tsx
index 9b25abbe96b..bf89ddb3ade 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/SlackChannelPicker.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/SlackChannelPicker.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import DropdownMenuToggle from '../../../../components/DropdownMenuToggle'
 import {
   SlackChannelDropdownChannels,
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationList.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationList.tsx
index f6029e9502b..ff6136394f0 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationList.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationList.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import SetDefaultSlackChannelMutation from '~/mutations/SetDefaultSlackChannelMutation'
 import {
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationRow.tsx
index 8c832e697bd..f8e79405951 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationRow.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationRow.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {
   SlackNotificationEventEnum,
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/SlackProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/SlackProviderRow.tsx
index b595759e732..be5d8621773 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/SlackProviderRow.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/SlackProviderRow.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {SlackProviderRow_viewer$key} from '../../../../__generated__/SlackProviderRow_viewer.graphql'
 import SlackConfigMenu from '../../../../components/SlackConfigMenu'
diff --git a/packages/client/modules/teamDashboard/components/RemoveTeamMemberModal/RemoveTeamMemberModal.tsx b/packages/client/modules/teamDashboard/components/RemoveTeamMemberModal/RemoveTeamMemberModal.tsx
index fb7a5c6a8bb..91a7cf14c75 100644
--- a/packages/client/modules/teamDashboard/components/RemoveTeamMemberModal/RemoveTeamMemberModal.tsx
+++ b/packages/client/modules/teamDashboard/components/RemoveTeamMemberModal/RemoveTeamMemberModal.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {RemoveTeamMemberModal_teamMember$key} from '../../../../__generated__/RemoveTeamMemberModal_teamMember.graphql'
diff --git a/packages/client/modules/teamDashboard/components/TaskColumn/ArchiveAllDoneTasksModal.tsx b/packages/client/modules/teamDashboard/components/TaskColumn/ArchiveAllDoneTasksModal.tsx
index 6b40112455f..8efb4487896 100644
--- a/packages/client/modules/teamDashboard/components/TaskColumn/ArchiveAllDoneTasksModal.tsx
+++ b/packages/client/modules/teamDashboard/components/TaskColumn/ArchiveAllDoneTasksModal.tsx
@@ -1,5 +1,4 @@
 import {Close} from '@mui/icons-material'
-import React from 'react'
 import DialogTitle from '../../../../components/DialogTitle'
 import FlatButton from '../../../../components/FlatButton'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
diff --git a/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumn.tsx b/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumn.tsx
index 0d9704ee221..d2cd34096b9 100644
--- a/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumn.tsx
+++ b/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumn.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {Droppable, DroppableProvided, DroppableStateSnapshot} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
 import {TaskColumn_teams$key} from '~/__generated__/TaskColumn_teams.graphql'
diff --git a/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnAddTask.tsx b/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnAddTask.tsx
index e69016284bb..5d0646274e3 100644
--- a/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnAddTask.tsx
+++ b/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnAddTask.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TaskColumnAddTask_teams$key} from '~/__generated__/TaskColumnAddTask_teams.graphql'
 import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql'
diff --git a/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnAddTaskSelectTeam.tsx b/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnAddTaskSelectTeam.tsx
index 66e76ce42d9..e4cfb5f2259 100644
--- a/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnAddTaskSelectTeam.tsx
+++ b/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnAddTaskSelectTeam.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TaskColumnAddTaskSelectTeam_teams$key} from '~/__generated__/TaskColumnAddTaskSelectTeam_teams.graphql'
 import {TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql'
diff --git a/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnInner.tsx b/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnInner.tsx
index 542f6a3506d..f20340cc181 100644
--- a/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnInner.tsx
+++ b/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnInner.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {memo} from 'react'
+import {memo} from 'react'
 import {useFragment} from 'react-relay'
 import {TaskColumnInner_tasks$key} from '~/__generated__/TaskColumnInner_tasks.graphql'
 import {AreaEnum} from '~/__generated__/UpdateTaskMutation.graphql'
diff --git a/packages/client/modules/teamDashboard/components/Team/Team.tsx b/packages/client/modules/teamDashboard/components/Team/Team.tsx
index 0051f53821a..3c57493b3ee 100644
--- a/packages/client/modules/teamDashboard/components/Team/Team.tsx
+++ b/packages/client/modules/teamDashboard/components/Team/Team.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {ArrowBack} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {lazy, ReactNode, Suspense} from 'react'
+import {lazy, ReactNode, Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import {Layout} from '~/types/constEnums'
 import {Team_team$key} from '../../../../__generated__/Team_team.graphql'
diff --git a/packages/client/modules/teamDashboard/components/TeamArchive/TeamArchive.tsx b/packages/client/modules/teamDashboard/components/TeamArchive/TeamArchive.tsx
index 3f3f190f8af..12719f7227e 100644
--- a/packages/client/modules/teamDashboard/components/TeamArchive/TeamArchive.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamArchive/TeamArchive.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useMemo, useRef, useState} from 'react'
+import {useEffect, useMemo, useRef, useState} from 'react'
 import {PreloadedQuery, useFragment, usePaginationFragment, usePreloadedQuery} from 'react-relay'
 import {
   AutoSizer,
diff --git a/packages/client/modules/teamDashboard/components/TeamArchiveHeader/TeamArchiveHeader.tsx b/packages/client/modules/teamDashboard/components/TeamArchiveHeader/TeamArchiveHeader.tsx
index 04108edf585..4a01ed4d4e7 100644
--- a/packages/client/modules/teamDashboard/components/TeamArchiveHeader/TeamArchiveHeader.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamArchiveHeader/TeamArchiveHeader.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import {Archive} from '@mui/icons-material'
-import React from 'react'
 import DashNavControl from '../../../../components/DashNavControl/DashNavControl'
 import useRouter from '../../../../hooks/useRouter'
 import {PALETTE} from '../../../../styles/paletteV3'
diff --git a/packages/client/modules/teamDashboard/components/TeamDashActivityTab/TeamDashActivityTab.tsx b/packages/client/modules/teamDashboard/components/TeamDashActivityTab/TeamDashActivityTab.tsx
index 5a413d2d1ae..ebb6d17aa55 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashActivityTab/TeamDashActivityTab.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashActivityTab/TeamDashActivityTab.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TeamDashActivityTab_team$key} from '~/__generated__/TeamDashActivityTab_team.graphql'
 import DemoMeetingCard from '../../../../components/DemoMeetingCard'
diff --git a/packages/client/modules/teamDashboard/components/TeamDashHeader/TeamDashHeader.tsx b/packages/client/modules/teamDashboard/components/TeamDashHeader/TeamDashHeader.tsx
index 51a1928546a..f2e0e3ffd75 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashHeader/TeamDashHeader.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashHeader/TeamDashHeader.tsx
@@ -1,7 +1,7 @@
 import {ClassNames} from '@emotion/core'
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {useLocation} from 'react-router'
 import {NavLink} from 'react-router-dom'
diff --git a/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/FeedbackModal.tsx b/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/FeedbackModal.tsx
index 634c24dce0c..de8a40d557c 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/FeedbackModal.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/FeedbackModal.tsx
@@ -1,5 +1,5 @@
 import {RadioButtonChecked, RadioButtonUnchecked, ThumbDown, ThumbUp} from '@mui/icons-material'
-import React, {useCallback, useState} from 'react'
+import {useCallback, useState} from 'react'
 import BasicTextArea from '../../../../components/InputField/BasicTextArea'
 import PrimaryButton from '../../../../components/PrimaryButton'
 import useManualClientSideTrack from '../../../../hooks/useManualClientSideTrack'
diff --git a/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamDashInsightsTab.tsx b/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamDashInsightsTab.tsx
index 3b1ae503875..5fa63b680f5 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamDashInsightsTab.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamDashInsightsTab.tsx
@@ -1,4 +1,4 @@
-import React, {lazy} from 'react'
+import {lazy} from 'react'
 
 interface Props {
   teamId: string
diff --git a/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamInsightContent.tsx b/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamInsightContent.tsx
index 849181d07e6..603e6bb6c43 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamInsightContent.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamInsightContent.tsx
@@ -2,7 +2,6 @@ import AutoAwesomeIcon from '@mui/icons-material/AutoAwesome'
 import graphql from 'babel-plugin-relay/macro'
 import dayjs from 'dayjs'
 import {marked} from 'marked'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import sanitizeHtml from 'sanitize-html'
 import {TeamInsightContent_team$key} from '../../../../__generated__/TeamInsightContent_team.graphql'
diff --git a/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamInsightEmptyState.tsx b/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamInsightEmptyState.tsx
index ca25b2337ab..0b9decef259 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamInsightEmptyState.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamInsightEmptyState.tsx
@@ -1,5 +1,4 @@
 import AddIcon from '@mui/icons-material/Add'
-import React from 'react'
 import insightsEmptyStateImg from '../../../../../../static/images/illustrations/insights-empty-state.png'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import useMutationProps from '../../../../hooks/useMutationProps'
diff --git a/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamInsights.tsx b/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamInsights.tsx
index 192e2a0e1e5..487ea977640 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamInsights.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamInsights.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {TeamInsightsQuery} from '../../../../__generated__/TeamInsightsQuery.graphql'
 import {useDialogState} from '../../../../ui/Dialog/useDialogState'
diff --git a/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamInsightsRoot.tsx b/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamInsightsRoot.tsx
index 0959339d857..d79d19caf69 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamInsightsRoot.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashInsightsTab/TeamInsightsRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import teamInsightsQuery, {
   TeamInsightsQuery
 } from '../../../../__generated__/TeamInsightsQuery.graphql'
diff --git a/packages/client/modules/teamDashboard/components/TeamDashIntegrationsTab/TeamDashIntegrationsTab.tsx b/packages/client/modules/teamDashboard/components/TeamDashIntegrationsTab/TeamDashIntegrationsTab.tsx
index 14addd7db13..77ef807fcb3 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashIntegrationsTab/TeamDashIntegrationsTab.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashIntegrationsTab/TeamDashIntegrationsTab.tsx
@@ -1,4 +1,4 @@
-import React, {lazy} from 'react'
+import {lazy} from 'react'
 
 interface Props {
   teamRef: string
diff --git a/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx b/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx
index 2b4d80ef024..67c0deec423 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {Route, Switch} from 'react-router-dom'
 import {TeamDashMainQuery} from '~/__generated__/TeamDashMainQuery.graphql'
diff --git a/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDrawer.tsx b/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDrawer.tsx
index 39df0f6518e..d9ea2c7f6d0 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDrawer.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDrawer.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useRef} from 'react'
+import {useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {TeamDrawer_viewer$key} from '~/__generated__/TeamDrawer_viewer.graphql'
 import {TeamDrawer as TeamDrawerType} from '~/__generated__/ToggleTeamDrawerMutation.graphql'
diff --git a/packages/client/modules/teamDashboard/components/TeamDashMainRoot.tsx b/packages/client/modules/teamDashboard/components/TeamDashMainRoot.tsx
index e689777851d..335eaed37e2 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashMainRoot.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashMainRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import setPreferredTeamId from '~/utils/relay/setPreferredTeamId'
 import teamDashMainQuery, {
   TeamDashMainQuery
diff --git a/packages/client/modules/teamDashboard/components/TeamDashTasksTab/TeamDashTasksTab.tsx b/packages/client/modules/teamDashboard/components/TeamDashTasksTab/TeamDashTasksTab.tsx
index 0b10307db31..bac08e335de 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashTasksTab/TeamDashTasksTab.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashTasksTab/TeamDashTasksTab.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {TeamDashTasksTab_viewer$key} from '~/__generated__/TeamDashTasksTab_viewer.graphql'
 import DashFilterToggle from '~/components/DashFilterToggle/DashFilterToggle'
diff --git a/packages/client/modules/teamDashboard/components/TeamRoot.tsx b/packages/client/modules/teamDashboard/components/TeamRoot.tsx
index 4a76301379b..1f556cffaef 100644
--- a/packages/client/modules/teamDashboard/components/TeamRoot.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import teamContainerQuery, {
   TeamContainerQuery
 } from '../../../__generated__/TeamContainerQuery.graphql'
diff --git a/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx b/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx
index 07b1ba2d9c5..6d43911a4f3 100644
--- a/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {TeamSettingsQuery} from '../../../../__generated__/TeamSettingsQuery.graphql'
 import Panel from '../../../../components/Panel/Panel'
diff --git a/packages/client/modules/teamDashboard/components/TeamSettingsRoot.tsx b/packages/client/modules/teamDashboard/components/TeamSettingsRoot.tsx
index 4e5150bd2b2..031120f7259 100644
--- a/packages/client/modules/teamDashboard/components/TeamSettingsRoot.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamSettingsRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import teamSettingsQuery, {
   TeamSettingsQuery
 } from '../../../__generated__/TeamSettingsQuery.graphql'
diff --git a/packages/client/modules/teamDashboard/components/TeamSettingsToggleNav/TeamSettingsToggleNav.tsx b/packages/client/modules/teamDashboard/components/TeamSettingsToggleNav/TeamSettingsToggleNav.tsx
index e664fa64d13..f72a9cc60d7 100644
--- a/packages/client/modules/teamDashboard/components/TeamSettingsToggleNav/TeamSettingsToggleNav.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamSettingsToggleNav/TeamSettingsToggleNav.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import ToggleNav from '../../../../components/ToggleNav/ToggleNav'
 import useRouter from '../../../../hooks/useRouter'
 
diff --git a/packages/client/modules/teamDashboard/components/UnpaidTeamModal/UnpaidTeamModal.tsx b/packages/client/modules/teamDashboard/components/UnpaidTeamModal/UnpaidTeamModal.tsx
index d1ac56e0df8..6e3b0f65252 100644
--- a/packages/client/modules/teamDashboard/components/UnpaidTeamModal/UnpaidTeamModal.tsx
+++ b/packages/client/modules/teamDashboard/components/UnpaidTeamModal/UnpaidTeamModal.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {UnpaidTeamModalQuery} from '../../../../__generated__/UnpaidTeamModalQuery.graphql'
 import DashModal from '../../../../components/Dashboard/DashModal'
diff --git a/packages/client/modules/teamDashboard/containers/Team/TeamContainer.tsx b/packages/client/modules/teamDashboard/containers/Team/TeamContainer.tsx
index de50dd49dcf..9113bcb4547 100644
--- a/packages/client/modules/teamDashboard/containers/Team/TeamContainer.tsx
+++ b/packages/client/modules/teamDashboard/containers/Team/TeamContainer.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {lazy, Suspense, useEffect} from 'react'
+import {lazy, Suspense, useEffect} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {Route} from 'react-router'
 import {matchPath, Switch} from 'react-router-dom'
diff --git a/packages/client/modules/teamDashboard/containers/TeamColumns/TeamColumnsContainer.tsx b/packages/client/modules/teamDashboard/containers/TeamColumns/TeamColumnsContainer.tsx
index 72ff4bc1337..1d760b0da36 100644
--- a/packages/client/modules/teamDashboard/containers/TeamColumns/TeamColumnsContainer.tsx
+++ b/packages/client/modules/teamDashboard/containers/TeamColumns/TeamColumnsContainer.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import getSafeRegex from '~/utils/getSafeRegex'
 import {TeamColumnsContainer_viewer$key} from '../../../../__generated__/TeamColumnsContainer_viewer.graphql'
diff --git a/packages/client/modules/teamDashboard/containers/TeamIntegrationsRoot/TeamIntegrationsRoot.tsx b/packages/client/modules/teamDashboard/containers/TeamIntegrationsRoot/TeamIntegrationsRoot.tsx
index a4565a06ecf..67d95d928cc 100644
--- a/packages/client/modules/teamDashboard/containers/TeamIntegrationsRoot/TeamIntegrationsRoot.tsx
+++ b/packages/client/modules/teamDashboard/containers/TeamIntegrationsRoot/TeamIntegrationsRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import providerListQuery, {
   ProviderListQuery
 } from '../../../../__generated__/ProviderListQuery.graphql'
diff --git a/packages/client/modules/teamDashboard/containers/TeamTasksHeader/TeamTasksHeaderContainer.tsx b/packages/client/modules/teamDashboard/containers/TeamTasksHeader/TeamTasksHeaderContainer.tsx
index bf71e5944e9..f7fc3e788ba 100644
--- a/packages/client/modules/teamDashboard/containers/TeamTasksHeader/TeamTasksHeaderContainer.tsx
+++ b/packages/client/modules/teamDashboard/containers/TeamTasksHeader/TeamTasksHeaderContainer.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect} from 'react'
+import {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {TeamTasksHeaderContainer_team$key} from '~/__generated__/TeamTasksHeaderContainer_team.graphql'
 import filterTeamMember from '~/utils/relay/filterTeamMember'
diff --git a/packages/client/modules/teamDashboard/containers/UnpaidTeamModal/UnpaidTeamModalRoot.tsx b/packages/client/modules/teamDashboard/containers/UnpaidTeamModal/UnpaidTeamModalRoot.tsx
index c7abd8412ad..59e987da212 100644
--- a/packages/client/modules/teamDashboard/containers/UnpaidTeamModal/UnpaidTeamModalRoot.tsx
+++ b/packages/client/modules/teamDashboard/containers/UnpaidTeamModal/UnpaidTeamModalRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import unpaidTeamModalQuery, {
   UnpaidTeamModalQuery
 } from '../../../../__generated__/UnpaidTeamModalQuery.graphql'
diff --git a/packages/client/modules/userDashboard/components/BillingMembersToggle/BillingMembersToggle.tsx b/packages/client/modules/userDashboard/components/BillingMembersToggle/BillingMembersToggle.tsx
index 24c8561aa37..274efb0808c 100644
--- a/packages/client/modules/userDashboard/components/BillingMembersToggle/BillingMembersToggle.tsx
+++ b/packages/client/modules/userDashboard/components/BillingMembersToggle/BillingMembersToggle.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import {matchPath} from 'react-router-dom'
 import ToggleNav, {Item} from '../../../../components/ToggleNav/ToggleNav'
 import useRouter from '../../../../hooks/useRouter'
diff --git a/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardErrorLine.tsx b/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardErrorLine.tsx
index cfbc58a95cd..0f7592f67dd 100644
--- a/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardErrorLine.tsx
+++ b/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardErrorLine.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {Error as ErrorIcon, Lock as LockIcon} from '@mui/icons-material'
-import React, {useEffect, useState} from 'react'
+import {useEffect, useState} from 'react'
 import CreditCardIcon from '../../../../components/CreditCardIcon'
 import {UseFormField} from '../../../../hooks/useForm'
 import {PALETTE} from '../../../../styles/paletteV3'
diff --git a/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardForm.tsx b/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardForm.tsx
index 05f9f708770..5ca7b81ee7f 100644
--- a/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardForm.tsx
+++ b/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardForm.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
-import React, {useEffect, useState} from 'react'
+import * as React from 'react'
+import {useEffect, useState} from 'react'
 import PlainButton from '../../../../components/PlainButton/PlainButton'
 import PrimaryButton from '../../../../components/PrimaryButton'
 import UpgradeCreditCardFormField from '../../../../components/UpgradeCreditCardFormField'
diff --git a/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardModal.tsx b/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardModal.tsx
index c61c4e27d58..568db8becdd 100644
--- a/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardModal.tsx
+++ b/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardModal.tsx
@@ -1,6 +1,7 @@
 import styled from '@emotion/styled'
 import {Info as InfoIcon} from '@mui/icons-material'
-import React, {useState} from 'react'
+import * as React from 'react'
+import {useState} from 'react'
 import DialogTitle from '~/components/DialogTitle'
 import DialogContainer from '../../../../components/DialogContainer'
 import UpgradeLater from '../../../../components/UpgradeLater'
diff --git a/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardPricingLine.tsx b/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardPricingLine.tsx
index cccd8fcc947..16e4dffc1f9 100644
--- a/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardPricingLine.tsx
+++ b/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardPricingLine.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {PALETTE} from '../../../../styles/paletteV3'
 import {Pricing} from '../../../../types/constEnums'
 import plural from '../../../../utils/plural'
diff --git a/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardReassurance.tsx b/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardReassurance.tsx
index df0a10b7b5e..9039334bf5f 100644
--- a/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardReassurance.tsx
+++ b/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardReassurance.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import MenuItemHR from '../../../../components/MenuItemHR'
 import OrgBillingReassuranceQuote from '../OrgBilling/OrgBillingReassuranceQuote'
 import {CreditCardModalActionType} from './CreditCardModal'
diff --git a/packages/client/modules/userDashboard/components/EmptyOrgsCallOut/EmptyOrgsCallOut.tsx b/packages/client/modules/userDashboard/components/EmptyOrgsCallOut/EmptyOrgsCallOut.tsx
index 81f3250f603..8a37c483e22 100644
--- a/packages/client/modules/userDashboard/components/EmptyOrgsCallOut/EmptyOrgsCallOut.tsx
+++ b/packages/client/modules/userDashboard/components/EmptyOrgsCallOut/EmptyOrgsCallOut.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import Panel from '../../../../components/Panel/Panel'
 import PrimaryButton from '../../../../components/PrimaryButton'
 import useRouter from '../../../../hooks/useRouter'
diff --git a/packages/client/modules/userDashboard/components/GcalModal/DateTimePickers.tsx b/packages/client/modules/userDashboard/components/GcalModal/DateTimePickers.tsx
index 55a6425c050..6dfc9234ff0 100644
--- a/packages/client/modules/userDashboard/components/GcalModal/DateTimePickers.tsx
+++ b/packages/client/modules/userDashboard/components/GcalModal/DateTimePickers.tsx
@@ -2,7 +2,7 @@ import {DatePicker, TimePicker} from '@mui/x-date-pickers'
 import {AdapterDayjs} from '@mui/x-date-pickers/AdapterDayjs'
 import {LocalizationProvider} from '@mui/x-date-pickers/LocalizationProvider'
 import {Dayjs} from 'dayjs'
-import React from 'react'
+import * as React from 'react'
 import {PALETTE} from '../../../../styles/paletteV3'
 
 const customStyles = {
diff --git a/packages/client/modules/userDashboard/components/GcalModal/GcalModal.tsx b/packages/client/modules/userDashboard/components/GcalModal/GcalModal.tsx
index 98bef3b7751..fb668889c24 100644
--- a/packages/client/modules/userDashboard/components/GcalModal/GcalModal.tsx
+++ b/packages/client/modules/userDashboard/components/GcalModal/GcalModal.tsx
@@ -2,7 +2,8 @@ import styled from '@emotion/styled'
 import {Close} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import dayjs, {Dayjs} from 'dayjs'
-import React, {useEffect, useState} from 'react'
+import * as React from 'react'
+import {useEffect, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {GcalModal_team$key} from '../../../../__generated__/GcalModal_team.graphql'
 import {CreateGcalEventInput} from '../../../../__generated__/StartRetrospectiveMutation.graphql'
diff --git a/packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx b/packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx
index 48e6d0d39d3..15661110222 100644
--- a/packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx
+++ b/packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx
@@ -1,7 +1,8 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import dayjs, {Dayjs} from 'dayjs'
-import React, {useEffect, useState} from 'react'
+import * as React from 'react'
+import {useEffect, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {GcalModal_team$key} from '../../../../__generated__/GcalModal_team.graphql'
 import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql'
diff --git a/packages/client/modules/userDashboard/components/GcalModal/VideoConferencing.tsx b/packages/client/modules/userDashboard/components/GcalModal/VideoConferencing.tsx
index 7e06895ceb5..7026f79166a 100644
--- a/packages/client/modules/userDashboard/components/GcalModal/VideoConferencing.tsx
+++ b/packages/client/modules/userDashboard/components/GcalModal/VideoConferencing.tsx
@@ -1,6 +1,5 @@
 import {Close} from '@mui/icons-material'
 import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown'
-import React from 'react'
 import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql'
 import GoogleMeetProviderLogo from '../../../../components/GoogleMeetProviderLogo'
 import RaisedButton from '../../../../components/RaisedButton'
diff --git a/packages/client/modules/userDashboard/components/GcalModal/VideoConferencingMenu.tsx b/packages/client/modules/userDashboard/components/GcalModal/VideoConferencingMenu.tsx
index 8f6f67e68bb..b5ac7876a94 100644
--- a/packages/client/modules/userDashboard/components/GcalModal/VideoConferencingMenu.tsx
+++ b/packages/client/modules/userDashboard/components/GcalModal/VideoConferencingMenu.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql'
 import GoogleMeetProviderLogo from '../../../../components/GoogleMeetProviderLogo'
 import Menu from '../../../../components/Menu'
diff --git a/packages/client/modules/userDashboard/components/InvoiceRow/InvoiceRow.tsx b/packages/client/modules/userDashboard/components/InvoiceRow/InvoiceRow.tsx
index f9a28f7b28e..8dfbf11f19a 100644
--- a/packages/client/modules/userDashboard/components/InvoiceRow/InvoiceRow.tsx
+++ b/packages/client/modules/userDashboard/components/InvoiceRow/InvoiceRow.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {Receipt} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {InvoiceRow_invoice$key} from '~/__generated__/InvoiceRow_invoice.graphql'
 import Row from '../../../../components/Row/Row'
diff --git a/packages/client/modules/userDashboard/components/LeaveOrgModal/LeaveOrgModal.tsx b/packages/client/modules/userDashboard/components/LeaveOrgModal/LeaveOrgModal.tsx
index 3cd6838ad8c..5944f544985 100644
--- a/packages/client/modules/userDashboard/components/LeaveOrgModal/LeaveOrgModal.tsx
+++ b/packages/client/modules/userDashboard/components/LeaveOrgModal/LeaveOrgModal.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import DialogContainer from '../../../../components/DialogContainer'
 import DialogContent from '../../../../components/DialogContent'
 import DialogTitle from '../../../../components/DialogTitle'
diff --git a/packages/client/modules/userDashboard/components/OrgAuthentication/CopyServiceProviderURL.tsx b/packages/client/modules/userDashboard/components/OrgAuthentication/CopyServiceProviderURL.tsx
index 1d087626928..bc1bfe3f32c 100644
--- a/packages/client/modules/userDashboard/components/OrgAuthentication/CopyServiceProviderURL.tsx
+++ b/packages/client/modules/userDashboard/components/OrgAuthentication/CopyServiceProviderURL.tsx
@@ -1,5 +1,5 @@
 import {ContentCopy} from '@mui/icons-material'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import CopyToClipboard from 'react-copy-to-clipboard'
 import {Tooltip} from '../../../../ui/Tooltip/Tooltip'
 import {TooltipContent} from '../../../../ui/Tooltip/TooltipContent'
diff --git a/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthentication.tsx b/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthentication.tsx
index 31d7e70130e..6026f9de315 100644
--- a/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthentication.tsx
+++ b/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthentication.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {OrgAuthenticationQuery} from '../../../../__generated__/OrgAuthenticationQuery.graphql'
 import DialogTitle from '../../../../components/DialogTitle'
diff --git a/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthenticationMetadata.tsx b/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthenticationMetadata.tsx
index ba2d6ece67c..8716558ba3a 100644
--- a/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthenticationMetadata.tsx
+++ b/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthenticationMetadata.tsx
@@ -1,6 +1,7 @@
 import UploadFileIcon from '@mui/icons-material/UploadFile'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useRef, useState} from 'react'
+import * as React from 'react'
+import {useRef, useState} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import orgAuthenticationMetadataQuery, {
   OrgAuthenticationMetadataQuery
diff --git a/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthenticationSSOFrame.tsx b/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthenticationSSOFrame.tsx
index 2097debd1e6..85f7233fb5d 100644
--- a/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthenticationSSOFrame.tsx
+++ b/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthenticationSSOFrame.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {Add, Check} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {OrgAuthenticationSSOFrame_saml$key} from '../../../../__generated__/OrgAuthenticationSSOFrame_saml.graphql'
 import DialogTitle from '../../../../components/DialogTitle'
diff --git a/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthenticationSignOnUrl.tsx b/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthenticationSignOnUrl.tsx
index da4482aec01..de61a7fbbf5 100644
--- a/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthenticationSignOnUrl.tsx
+++ b/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthenticationSignOnUrl.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {OrgAuthenticationSignOnUrl_saml$key} from '../../../../__generated__/OrgAuthenticationSignOnUrl_saml.graphql'
 import makeAppURL from '../../../../utils/makeAppURL'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/BillingForm.tsx b/packages/client/modules/userDashboard/components/OrgBilling/BillingForm.tsx
index 626009930b6..a40371a6d4e 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/BillingForm.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/BillingForm.tsx
@@ -11,7 +11,8 @@ import {
   StripeCardNumberElementOptions,
   StripeElementChangeEvent
 } from '@stripe/stripe-js'
-import React, {MutableRefObject, useState} from 'react'
+import * as React from 'react'
+import {MutableRefObject, useState} from 'react'
 import {commitLocalUpdate} from 'relay-runtime'
 import {CreateStripeSubscriptionMutation$data} from '../../../../__generated__/CreateStripeSubscriptionMutation.graphql'
 import Ellipsis from '../../../../components/Ellipsis/Ellipsis'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/BillingLeader.tsx b/packages/client/modules/userDashboard/components/OrgBilling/BillingLeader.tsx
index 40d40e83b76..9cd6c11f043 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/BillingLeader.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/BillingLeader.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {BillingLeader_orgUser$key} from '../../../../__generated__/BillingLeader_orgUser.graphql'
 import {BillingLeader_organization$key} from '../../../../__generated__/BillingLeader_organization.graphql'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/BillingLeaders.tsx b/packages/client/modules/userDashboard/components/OrgBilling/BillingLeaders.tsx
index 935b199cf86..122a6275d33 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/BillingLeaders.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/BillingLeaders.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {BillingLeaders_organization$key} from '../../../../__generated__/BillingLeaders_organization.graphql'
 import FlatButton from '../../../../components/FlatButton'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/DowngradeModal.tsx b/packages/client/modules/userDashboard/components/OrgBilling/DowngradeModal.tsx
index 3f00b0790a7..5b91bfcc3f6 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/DowngradeModal.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/DowngradeModal.tsx
@@ -2,7 +2,7 @@ import styled from '@emotion/styled'
 import {Close, Error as ErrorIcon} from '@mui/icons-material'
 import {Checkbox} from '@mui/material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {ReadableReasonToDowngradeEnum} from '../../../../../server/graphql/types/ReasonToDowngrade'
 import {DowngradeModal_organization$key} from '../../../../__generated__/DowngradeModal_organization.graphql'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderInput.tsx b/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderInput.tsx
index 0d7bf3a8acc..4d1d3927ad1 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderInput.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderInput.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {Person} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useRef} from 'react'
+import {useEffect, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {NewBillingLeaderInput_organization$key} from '~/__generated__/NewBillingLeaderInput_organization.graphql'
 import {MenuPosition} from '~/hooks/useCoords'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderMenu.tsx b/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderMenu.tsx
index afc5e19e565..a65168ab087 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderMenu.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderMenu.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {forwardRef, useMemo} from 'react'
+import {forwardRef, useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {
   NewBillingLeaderMenu_organization$data,
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgBilling.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgBilling.tsx
index 94d57b149df..27674f23bc0 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgBilling.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgBilling.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, useFragment, usePreloadedQuery, useRefetchableFragment} from 'react-relay'
 import {OrgBillingQuery} from '../../../../__generated__/OrgBillingQuery.graphql'
 import {OrgBillingRefetchQuery} from '../../../../__generated__/OrgBillingRefetchQuery.graphql'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingCreditCardInfo.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingCreditCardInfo.tsx
index d9716ac0906..a7e9e9af5f5 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingCreditCardInfo.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingCreditCardInfo.tsx
@@ -3,7 +3,7 @@ import {CreditCard} from '@mui/icons-material'
 import {Elements} from '@stripe/react-stripe-js'
 import {loadStripe} from '@stripe/stripe-js'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {OrgBillingCreditCardInfo_organization$key} from '~/__generated__/OrgBillingCreditCardInfo_organization.graphql'
 import Panel from '../../../../components/Panel/Panel'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingCreditCardInfoOld.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingCreditCardInfoOld.tsx
index 371f9bdef59..5a4cebd07dd 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingCreditCardInfoOld.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingCreditCardInfoOld.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {CreditCard} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {OrgBillingCreditCardInfoOld_organization$key} from '~/__generated__/OrgBillingCreditCardInfoOld_organization.graphql'
 import Panel from '../../../../components/Panel/Panel'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingDangerZone.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingDangerZone.tsx
index ac4385185c7..c9909b4fcaf 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingDangerZone.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingDangerZone.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {Email as EmailIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {OrgBillingDangerZone_organization$key} from '~/__generated__/OrgBillingDangerZone_organization.graphql'
 import ArchiveOrganization from '~/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganization'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingInvoices.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingInvoices.tsx
index de77f5392a5..3b7fb634522 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingInvoices.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingInvoices.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {usePaginationFragment} from 'react-relay'
 import {OrgBillingInvoices_query$key} from '~/__generated__/OrgBillingInvoices_query.graphql'
 import {OrgBillingInvoicesPaginationQuery} from '../../../../__generated__/OrgBillingInvoicesPaginationQuery.graphql'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingReassuranceQuote.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingReassuranceQuote.tsx
index 28175590342..7f4dcc688e9 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingReassuranceQuote.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingReassuranceQuote.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import adam from '~/styles/theme/images/adam.jpeg'
 import cliff from '~/styles/theme/images/cliff.jpeg'
 import ian from '~/styles/theme/images/ian.png'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingUpgrade.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingUpgrade.tsx
index c2d5c3fe876..e76d73471a0 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingUpgrade.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingUpgrade.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {OrgBillingUpgrade_organization$key} from '~/__generated__/OrgBillingUpgrade_organization.graphql'
 import DialogTitle from '../../../../components/DialogTitle'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgDetails.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgDetails.tsx
index 6784b5bb14b..e08abccc88a 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgDetails.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgDetails.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import {OrgDetails_organization$key} from '../../../../__generated__/OrgDetails_organization.graphql'
 import Avatar from '../../../../components/Avatar/Avatar'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx
index 0587c683d45..67ec2c308bc 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {Info} from '@mui/icons-material'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {TierEnum} from '../../../../__generated__/OrganizationSubscription.graphql'
 import BaseButton from '../../../../components/BaseButton'
 import {MenuPosition} from '../../../../hooks/useCoords'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawer.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawer.tsx
index 1ef02c9c0bc..e144ca85ddb 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawer.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawer.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {Close} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {OrgPlanDrawer_organization$key} from '../../../../__generated__/OrgPlanDrawer_organization.graphql'
 import Confetti from '../../../../components/Confetti'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawerContent.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawerContent.tsx
index ddd78c4a89c..2e720ffe8b6 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawerContent.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawerContent.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {TierEnum} from '../../../../__generated__/DowngradeToStarterMutation.graphql'
 import {PALETTE} from '../../../../styles/paletteV3'
 import {EnterpriseBenefits, TeamBenefits} from '../../../../utils/constants'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx
index 877d843159d..da9591259ef 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useBreakpoint from '~/hooks/useBreakpoint'
 import {Breakpoint} from '~/types/constEnums'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBilling.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBilling.tsx
index dee6eb069aa..55da8c1beff 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBilling.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBilling.tsx
@@ -1,6 +1,6 @@
 import {StripeCardNumberElement} from '@stripe/stripe-js'
 import graphql from 'babel-plugin-relay/macro'
-import React, {Suspense, useEffect, useRef, useState} from 'react'
+import {Suspense, useEffect, useRef, useState} from 'react'
 import {PreloadedQuery, useFragment, usePreloadedQuery, useRefetchableFragment} from 'react-relay'
 import {OrgPlansAndBillingQuery} from '../../../../__generated__/OrgPlansAndBillingQuery.graphql'
 import {OrgPlansAndBillingRefetchQuery} from '../../../../__generated__/OrgPlansAndBillingRefetchQuery.graphql'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingHeading.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingHeading.tsx
index c2f874e8e62..819522676cd 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingHeading.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingHeading.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {Article} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {OrgPlansAndBillingHeading_organization$key} from '../../../../__generated__/OrgPlansAndBillingHeading_organization.graphql'
 import PlainButton from '../../../../components/PlainButton/PlainButton'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingRoot.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingRoot.tsx
index a3ef216c0ac..58d2f88e8d0 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingRoot.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingRoot.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import orgPlansAndBillingQuery, {
   OrgPlansAndBillingQuery
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgUsage.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgUsage.tsx
index 86034698525..dda72697f99 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgUsage.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgUsage.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {OrgUsage_organization$key} from '../../../../__generated__/OrgUsage_organization.graphql'
 import Panel from '../../../../components/Panel/Panel'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/Organization.tsx b/packages/client/modules/userDashboard/components/OrgBilling/Organization.tsx
index 6f37d620d23..3356c009211 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/Organization.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/Organization.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {lazy} from 'react'
+import {lazy} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {Redirect, Route, Switch, useRouteMatch} from 'react-router'
 import {OrganizationQuery} from '../../../../__generated__/OrganizationQuery.graphql'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/PaymentDetails.tsx b/packages/client/modules/userDashboard/components/OrgBilling/PaymentDetails.tsx
index 11250aa1069..071a24943df 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/PaymentDetails.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/PaymentDetails.tsx
@@ -3,7 +3,7 @@ import {Divider} from '@mui/material'
 import {Elements} from '@stripe/react-stripe-js'
 import {StripeCardNumberElement, loadStripe} from '@stripe/stripe-js'
 import graphql from 'babel-plugin-relay/macro'
-import React, {MutableRefObject, useRef} from 'react'
+import {MutableRefObject, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {PaymentDetails_organization$key} from '../../../../__generated__/PaymentDetails_organization.graphql'
 import Panel from '../../../../components/Panel/Panel'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/UpdatePayment.tsx b/packages/client/modules/userDashboard/components/OrgBilling/UpdatePayment.tsx
index be005030d6c..4f26972b825 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/UpdatePayment.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/UpdatePayment.tsx
@@ -7,7 +7,8 @@ import {
   useStripe
 } from '@stripe/react-stripe-js'
 import {StripeElementChangeEvent} from '@stripe/stripe-js'
-import React, {useState} from 'react'
+import * as React from 'react'
+import {useState} from 'react'
 import {UpdateCreditCardMutation$data} from '../../../../__generated__/UpdateCreditCardMutation.graphql'
 import PrimaryButton from '../../../../components/PrimaryButton'
 import SecondaryButton from '../../../../components/SecondaryButton'
diff --git a/packages/client/modules/userDashboard/components/OrgIntegrations/AddGitLabProviderDialog.tsx b/packages/client/modules/userDashboard/components/OrgIntegrations/AddGitLabProviderDialog.tsx
index 5442fe6eebb..3ece3afa89d 100644
--- a/packages/client/modules/userDashboard/components/OrgIntegrations/AddGitLabProviderDialog.tsx
+++ b/packages/client/modules/userDashboard/components/OrgIntegrations/AddGitLabProviderDialog.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import useMutationProps from '../../../../hooks/useMutationProps'
 import AddIntegrationProviderMutation from '../../../../mutations/AddIntegrationProviderMutation'
diff --git a/packages/client/modules/userDashboard/components/OrgIntegrations/EditGitLabProviderDialog.tsx b/packages/client/modules/userDashboard/components/OrgIntegrations/EditGitLabProviderDialog.tsx
index 6ea390e5753..51d5e36a3b8 100644
--- a/packages/client/modules/userDashboard/components/OrgIntegrations/EditGitLabProviderDialog.tsx
+++ b/packages/client/modules/userDashboard/components/OrgIntegrations/EditGitLabProviderDialog.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {EditGitLabProviderDialog_integrationProvider$key} from '../../../../__generated__/EditGitLabProviderDialog_integrationProvider.graphql'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
diff --git a/packages/client/modules/userDashboard/components/OrgIntegrations/GitLabProviderRow.tsx b/packages/client/modules/userDashboard/components/OrgIntegrations/GitLabProviderRow.tsx
index cf8199bd709..5e25a2a5c4d 100644
--- a/packages/client/modules/userDashboard/components/OrgIntegrations/GitLabProviderRow.tsx
+++ b/packages/client/modules/userDashboard/components/OrgIntegrations/GitLabProviderRow.tsx
@@ -1,6 +1,5 @@
 import {MoreVert as MoreVertIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {GitLabProviderRow_integrationProvider$key} from '../../../../__generated__/GitLabProviderRow_integrationProvider.graphql'
 import FlatButton from '../../../../components/FlatButton'
diff --git a/packages/client/modules/userDashboard/components/OrgIntegrations/GitLabProviders.tsx b/packages/client/modules/userDashboard/components/OrgIntegrations/GitLabProviders.tsx
index 04adca53e2c..4d0128b348b 100644
--- a/packages/client/modules/userDashboard/components/OrgIntegrations/GitLabProviders.tsx
+++ b/packages/client/modules/userDashboard/components/OrgIntegrations/GitLabProviders.tsx
@@ -1,6 +1,5 @@
 import {Add as AddIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {GitLabProviders_organization$key} from '../../../../__generated__/GitLabProviders_organization.graphql'
 import GitLabProviderLogo from '../../../../components/GitLabProviderLogo'
diff --git a/packages/client/modules/userDashboard/components/OrgIntegrations/OrgIntegrations.tsx b/packages/client/modules/userDashboard/components/OrgIntegrations/OrgIntegrations.tsx
index 8268ff292ea..ae45392db54 100644
--- a/packages/client/modules/userDashboard/components/OrgIntegrations/OrgIntegrations.tsx
+++ b/packages/client/modules/userDashboard/components/OrgIntegrations/OrgIntegrations.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import {OrgIntegrations_organization$key} from '../../../../__generated__/OrgIntegrations_organization.graphql'
 import {Loader} from '../../../../utils/relay/renderLoader'
diff --git a/packages/client/modules/userDashboard/components/OrgIntegrations/RemoveIntegrationProviderDialog.tsx b/packages/client/modules/userDashboard/components/OrgIntegrations/RemoveIntegrationProviderDialog.tsx
index 6c72c6d7904..16d5317e11c 100644
--- a/packages/client/modules/userDashboard/components/OrgIntegrations/RemoveIntegrationProviderDialog.tsx
+++ b/packages/client/modules/userDashboard/components/OrgIntegrations/RemoveIntegrationProviderDialog.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {RemoveIntegrationProviderDialog_integrationProvider$key} from '../../../../__generated__/RemoveIntegrationProviderDialog_integrationProvider.graphql'
diff --git a/packages/client/modules/userDashboard/components/OrgIntegrations/UpsertGitLabProviderDialog.tsx b/packages/client/modules/userDashboard/components/OrgIntegrations/UpsertGitLabProviderDialog.tsx
index 60f1b6b76d4..40c0ec092b8 100644
--- a/packages/client/modules/userDashboard/components/OrgIntegrations/UpsertGitLabProviderDialog.tsx
+++ b/packages/client/modules/userDashboard/components/OrgIntegrations/UpsertGitLabProviderDialog.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import ErrorAlert from '../../../../components/ErrorAlert/ErrorAlert'
 import GitLabProviderLogo from '../../../../components/GitLabProviderLogo'
 import BasicInput from '../../../../components/InputField/BasicInput'
diff --git a/packages/client/modules/userDashboard/components/OrgMembers/OrgMembers.tsx b/packages/client/modules/userDashboard/components/OrgMembers/OrgMembers.tsx
index 91f8937af69..55c3d7d025f 100644
--- a/packages/client/modules/userDashboard/components/OrgMembers/OrgMembers.tsx
+++ b/packages/client/modules/userDashboard/components/OrgMembers/OrgMembers.tsx
@@ -2,7 +2,8 @@ import graphql from 'babel-plugin-relay/macro'
 import {format} from 'date-fns'
 import type {Parser as JSON2CSVParser} from 'json2csv'
 import Parser from 'json2csv/lib/JSON2CSVParser' // only grab the sync parser
-import React, {useCallback, useMemo, useState} from 'react'
+import * as React from 'react'
+import {useCallback, useMemo, useState} from 'react'
 import {PreloadedQuery, usePaginationFragment, usePreloadedQuery} from 'react-relay'
 import {OrgMembersPaginationQuery} from '~/__generated__/OrgMembersPaginationQuery.graphql'
 import {OrgMembersQuery} from '~/__generated__/OrgMembersQuery.graphql'
diff --git a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMemberMenu.tsx b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMemberMenu.tsx
index 7c9731c18af..ab8cf82289d 100644
--- a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMemberMenu.tsx
+++ b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMemberMenu.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {OrgTeamMemberMenu_teamMember$key} from '../../../../__generated__/OrgTeamMemberMenu_teamMember.graphql'
diff --git a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembers.tsx b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembers.tsx
index 395c7833334..8fa494099ca 100644
--- a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembers.tsx
+++ b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembers.tsx
@@ -1,6 +1,5 @@
 import {ArrowBack, MoreVert} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {Link} from 'react-router-dom'
 import {OrgTeamMembersQuery} from '../../../../__generated__/OrgTeamMembersQuery.graphql'
diff --git a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersMenu.tsx b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersMenu.tsx
index ddee4aae676..e04ade63ffc 100644
--- a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersMenu.tsx
+++ b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersMenu.tsx
@@ -1,5 +1,4 @@
 import {MenuItem} from '@mui/material'
-import React from 'react'
 import IconLabel from '../../../../components/IconLabel'
 import LinkButton from '../../../../components/LinkButton'
 import Menu from '../../../../components/Menu'
diff --git a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRoot.tsx b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRoot.tsx
index ec85d790003..8c233bdadbe 100644
--- a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRoot.tsx
+++ b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import orgTeamMembersQuery, {OrgTeamMembersQuery} from '~/__generated__/OrgTeamMembersQuery.graphql'
 import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow'
 import useRouter from '../../../../hooks/useRouter'
diff --git a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRow.tsx b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRow.tsx
index 3bc1c8a6836..047d3e9b543 100644
--- a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRow.tsx
+++ b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRow.tsx
@@ -1,6 +1,5 @@
 import {MoreVert} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {OrgTeamMembersRow_teamMember$key} from '../../../../__generated__/OrgTeamMembersRow_teamMember.graphql'
 import Avatar from '../../../../components/Avatar/Avatar'
diff --git a/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx b/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx
index e16c2371d6a..c6c2f5b764d 100644
--- a/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx
+++ b/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {OrgTeams_organization$key} from '../../../../__generated__/OrgTeams_organization.graphql'
 import AddTeamDialogRoot from '../../../../components/AddTeamDialogRoot'
diff --git a/packages/client/modules/userDashboard/components/OrgTeams/OrgTeamsRow.tsx b/packages/client/modules/userDashboard/components/OrgTeams/OrgTeamsRow.tsx
index 7dce86773b0..4346da9c509 100644
--- a/packages/client/modules/userDashboard/components/OrgTeams/OrgTeamsRow.tsx
+++ b/packages/client/modules/userDashboard/components/OrgTeams/OrgTeamsRow.tsx
@@ -1,6 +1,5 @@
 import {ChevronRight} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {Link} from 'react-router-dom'
 
diff --git a/packages/client/modules/userDashboard/components/OrgTeams/TeaserOrgTeamsRow.tsx b/packages/client/modules/userDashboard/components/OrgTeams/TeaserOrgTeamsRow.tsx
index 7edbe7290b3..c87a9e2eeae 100644
--- a/packages/client/modules/userDashboard/components/OrgTeams/TeaserOrgTeamsRow.tsx
+++ b/packages/client/modules/userDashboard/components/OrgTeams/TeaserOrgTeamsRow.tsx
@@ -1,5 +1,4 @@
 import {Lock} from '@mui/icons-material'
-import React from 'react'
 import {useHistory} from 'react-router'
 import plural from '../../../../utils/plural'
 
diff --git a/packages/client/modules/userDashboard/components/OrgUserRow/OrgMemberRow.tsx b/packages/client/modules/userDashboard/components/OrgUserRow/OrgMemberRow.tsx
index 1bd749571c6..d6a7be59f8f 100644
--- a/packages/client/modules/userDashboard/components/OrgUserRow/OrgMemberRow.tsx
+++ b/packages/client/modules/userDashboard/components/OrgUserRow/OrgMemberRow.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import {format} from 'date-fns'
-import React from 'react'
+import * as React from 'react'
 import {useFragment} from 'react-relay'
 import {
   OrgMemberRow_organization$data,
diff --git a/packages/client/modules/userDashboard/components/Organization/OrgNav.tsx b/packages/client/modules/userDashboard/components/Organization/OrgNav.tsx
index e839fa3b55e..fd62de041a5 100644
--- a/packages/client/modules/userDashboard/components/Organization/OrgNav.tsx
+++ b/packages/client/modules/userDashboard/components/Organization/OrgNav.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {NavigateNext} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {useHistory} from 'react-router'
 import {OrgNav_organization$key} from '../../../../__generated__/OrgNav_organization.graphql'
diff --git a/packages/client/modules/userDashboard/components/Organization/OrganizationDetails.tsx b/packages/client/modules/userDashboard/components/Organization/OrganizationDetails.tsx
index fe1542600ef..f4c4773663e 100644
--- a/packages/client/modules/userDashboard/components/Organization/OrganizationDetails.tsx
+++ b/packages/client/modules/userDashboard/components/Organization/OrganizationDetails.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import {TierEnum} from '../../../../__generated__/DowngradeToStarterMutation.graphql'
 import TagBlock from '../../../../components/Tag/TagBlock'
 import TierTag from '../../../../components/Tag/TierTag'
diff --git a/packages/client/modules/userDashboard/components/OrganizationRow/OrganizationRow.tsx b/packages/client/modules/userDashboard/components/OrganizationRow/OrganizationRow.tsx
index c3cf18a3a59..a239b807f5a 100644
--- a/packages/client/modules/userDashboard/components/OrganizationRow/OrganizationRow.tsx
+++ b/packages/client/modules/userDashboard/components/OrganizationRow/OrganizationRow.tsx
@@ -1,7 +1,6 @@
 import styled from '@emotion/styled'
 import {Settings as SettingsIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {useFragment} from 'react-relay'
 import {OrganizationRow_organization$key} from '~/__generated__/OrganizationRow_organization.graphql'
 import Avatar from '../../../../components/Avatar/Avatar'
diff --git a/packages/client/modules/userDashboard/components/Organizations/Organizations.tsx b/packages/client/modules/userDashboard/components/Organizations/Organizations.tsx
index a652e9aab41..03bc5a40c61 100644
--- a/packages/client/modules/userDashboard/components/Organizations/Organizations.tsx
+++ b/packages/client/modules/userDashboard/components/Organizations/Organizations.tsx
@@ -1,5 +1,4 @@
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {OrganizationsQuery} from '../../../../__generated__/OrganizationsQuery.graphql'
 import LinkButton from '../../../../components/LinkButton'
diff --git a/packages/client/modules/userDashboard/components/RemoveFromOrgModal/RemoveFromOrgModal.tsx b/packages/client/modules/userDashboard/components/RemoveFromOrgModal/RemoveFromOrgModal.tsx
index 5d8a079bba8..13d2fd81df3 100644
--- a/packages/client/modules/userDashboard/components/RemoveFromOrgModal/RemoveFromOrgModal.tsx
+++ b/packages/client/modules/userDashboard/components/RemoveFromOrgModal/RemoveFromOrgModal.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import DialogContainer from '../../../../components/DialogContainer'
 import DialogContent from '../../../../components/DialogContent'
 import DialogTitle from '../../../../components/DialogTitle'
diff --git a/packages/client/modules/userDashboard/components/UserDashMain.tsx b/packages/client/modules/userDashboard/components/UserDashMain.tsx
index 2d933840e2a..3ad65b55ca3 100644
--- a/packages/client/modules/userDashboard/components/UserDashMain.tsx
+++ b/packages/client/modules/userDashboard/components/UserDashMain.tsx
@@ -1,4 +1,4 @@
-import React, {lazy, Suspense} from 'react'
+import {lazy, Suspense} from 'react'
 import {Route, RouteComponentProps, Switch} from 'react-router'
 import DashContent from '~/components/Dashboard/DashContent'
 import LoadingComponent from '~/components/LoadingComponent/LoadingComponent'
diff --git a/packages/client/modules/userDashboard/components/UserDashboard/UserDashboard.tsx b/packages/client/modules/userDashboard/components/UserDashboard/UserDashboard.tsx
index 9b666042d9d..2c70b12b718 100644
--- a/packages/client/modules/userDashboard/components/UserDashboard/UserDashboard.tsx
+++ b/packages/client/modules/userDashboard/components/UserDashboard/UserDashboard.tsx
@@ -1,4 +1,4 @@
-import React, {lazy} from 'react'
+import {lazy} from 'react'
 import {Route} from 'react-router'
 import {Switch} from 'react-router-dom'
 
diff --git a/packages/client/modules/userDashboard/components/UserProfile.tsx b/packages/client/modules/userDashboard/components/UserProfile.tsx
index e1252b7e82f..708d27ff758 100644
--- a/packages/client/modules/userDashboard/components/UserProfile.tsx
+++ b/packages/client/modules/userDashboard/components/UserProfile.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {UserProfileQuery} from '../../../__generated__/UserProfileQuery.graphql'
 import DeleteAccount from '../../../components/DeleteAccount'
diff --git a/packages/client/modules/userDashboard/components/UserProfileRoot.tsx b/packages/client/modules/userDashboard/components/UserProfileRoot.tsx
index 487779c6137..5d20decb6f5 100644
--- a/packages/client/modules/userDashboard/components/UserProfileRoot.tsx
+++ b/packages/client/modules/userDashboard/components/UserProfileRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {RouteComponentProps, withRouter} from 'react-router-dom'
 import userProfileQuery, {UserProfileQuery} from '../../../__generated__/UserProfileQuery.graphql'
 import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
diff --git a/packages/client/modules/userDashboard/components/UserSettingsForm/UserSettingsForm.tsx b/packages/client/modules/userDashboard/components/UserSettingsForm/UserSettingsForm.tsx
index 93bb10e792d..6ae654e9888 100644
--- a/packages/client/modules/userDashboard/components/UserSettingsForm/UserSettingsForm.tsx
+++ b/packages/client/modules/userDashboard/components/UserSettingsForm/UserSettingsForm.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
-import React, {lazy} from 'react'
+import * as React from 'react'
+import {lazy} from 'react'
 import {UserProfileQuery} from '../../../../__generated__/UserProfileQuery.graphql'
 import EditableAvatar from '../../../../components/EditableAvatar/EditableAvatar'
 import FieldLabel from '../../../../components/FieldLabel/FieldLabel'
diff --git a/packages/client/modules/userDashboard/components/UserSettingsWrapper/UserSettingsWrapper.tsx b/packages/client/modules/userDashboard/components/UserSettingsWrapper/UserSettingsWrapper.tsx
index b04e6705e56..0152537ffa6 100644
--- a/packages/client/modules/userDashboard/components/UserSettingsWrapper/UserSettingsWrapper.tsx
+++ b/packages/client/modules/userDashboard/components/UserSettingsWrapper/UserSettingsWrapper.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {ReactNode} from 'react'
+import {ReactNode} from 'react'
 import {Layout} from '~/types/constEnums'
 import DashContent from '../../../../components/Dashboard/DashContent'
 
diff --git a/packages/client/modules/userDashboard/components/UserTasksHeader/UserTasksHeader.tsx b/packages/client/modules/userDashboard/components/UserTasksHeader/UserTasksHeader.tsx
index 7e81abbe0d7..3df45f5e658 100644
--- a/packages/client/modules/userDashboard/components/UserTasksHeader/UserTasksHeader.tsx
+++ b/packages/client/modules/userDashboard/components/UserTasksHeader/UserTasksHeader.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo, useRef} from 'react'
+import {useMemo, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {
   UserTasksHeader_viewer$data,
diff --git a/packages/client/modules/userDashboard/containers/OrgAuthentication/OrgAuthenticationRoot.tsx b/packages/client/modules/userDashboard/containers/OrgAuthentication/OrgAuthenticationRoot.tsx
index 1ebb44bb97d..3e3c8b1c147 100644
--- a/packages/client/modules/userDashboard/containers/OrgAuthentication/OrgAuthenticationRoot.tsx
+++ b/packages/client/modules/userDashboard/containers/OrgAuthentication/OrgAuthenticationRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import orgAuthenticationQuery, {
   OrgAuthenticationQuery
 } from '../../../../__generated__/OrgAuthenticationQuery.graphql'
diff --git a/packages/client/modules/userDashboard/containers/OrgBilling/OrgBillingRoot.tsx b/packages/client/modules/userDashboard/containers/OrgBilling/OrgBillingRoot.tsx
index 893d4082eaa..34fb2357318 100644
--- a/packages/client/modules/userDashboard/containers/OrgBilling/OrgBillingRoot.tsx
+++ b/packages/client/modules/userDashboard/containers/OrgBilling/OrgBillingRoot.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import orgBillingQuery, {OrgBillingQuery} from '../../../../__generated__/OrgBillingQuery.graphql'
 import {OrgBillingRoot_organization$key} from '../../../../__generated__/OrgBillingRoot_organization.graphql'
diff --git a/packages/client/modules/userDashboard/containers/OrgMembers/OrgMembersRoot.tsx b/packages/client/modules/userDashboard/containers/OrgMembers/OrgMembersRoot.tsx
index 8242ebf2b8e..4fb6ea2e040 100644
--- a/packages/client/modules/userDashboard/containers/OrgMembers/OrgMembersRoot.tsx
+++ b/packages/client/modules/userDashboard/containers/OrgMembers/OrgMembersRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import orgMembersQuery, {OrgMembersQuery} from '~/__generated__/OrgMembersQuery.graphql'
 import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow'
 import {LoaderSize} from '../../../../types/constEnums'
diff --git a/packages/client/modules/userDashboard/containers/Organization/OrganizationRoot.tsx b/packages/client/modules/userDashboard/containers/Organization/OrganizationRoot.tsx
index 994ee399c4e..0db6cda47a0 100644
--- a/packages/client/modules/userDashboard/containers/Organization/OrganizationRoot.tsx
+++ b/packages/client/modules/userDashboard/containers/Organization/OrganizationRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import {RouteComponentProps} from 'react-router'
 import organizationQuery, {
   OrganizationQuery
diff --git a/packages/client/modules/userDashboard/containers/Organizations/OrganizationsRoot.tsx b/packages/client/modules/userDashboard/containers/Organizations/OrganizationsRoot.tsx
index 614fa4d17cb..fe9756ce2b8 100644
--- a/packages/client/modules/userDashboard/containers/Organizations/OrganizationsRoot.tsx
+++ b/packages/client/modules/userDashboard/containers/Organizations/OrganizationsRoot.tsx
@@ -1,4 +1,4 @@
-import React, {Suspense} from 'react'
+import {Suspense} from 'react'
 import organizationsQuery, {
   OrganizationsQuery
 } from '../../../../__generated__/OrganizationsQuery.graphql'
diff --git a/packages/client/modules/userDashboard/containers/UserColumns/UserColumnsContainer.tsx b/packages/client/modules/userDashboard/containers/UserColumns/UserColumnsContainer.tsx
index 807d484a5ca..05ab913cc92 100644
--- a/packages/client/modules/userDashboard/containers/UserColumns/UserColumnsContainer.tsx
+++ b/packages/client/modules/userDashboard/containers/UserColumns/UserColumnsContainer.tsx
@@ -1,5 +1,5 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import toTeamMemberId from '~/utils/relay/toTeamMemberId'
 import {useQueryParameterParser} from '~/utils/useQueryParameterParser'
diff --git a/packages/client/modules/userDashboard/helpers/getRallyLink.tsx b/packages/client/modules/userDashboard/helpers/getRallyLink.tsx
index ca7288ca227..2b100dd7e2f 100644
--- a/packages/client/modules/userDashboard/helpers/getRallyLink.tsx
+++ b/packages/client/modules/userDashboard/helpers/getRallyLink.tsx
@@ -1,6 +1,3 @@
-import React from 'react'
-
-// The trailing exclamation mark “!” is added in the presentation component.
 const rallyList = [
   {
     phrase: 'You’re A Maniac',
diff --git a/packages/client/ui/Avatar/Avatar.tsx b/packages/client/ui/Avatar/Avatar.tsx
index 73506f3d62e..68d4aa5fffe 100644
--- a/packages/client/ui/Avatar/Avatar.tsx
+++ b/packages/client/ui/Avatar/Avatar.tsx
@@ -1,6 +1,5 @@
 import * as AvatarPrimitive from '@radix-ui/react-avatar'
 import clsx from 'clsx'
-import React from 'react'
 import {forwardRadix} from '../forwardRadix'
 
 export const Avatar = forwardRadix<typeof AvatarPrimitive.Root>(({className, ...props}, ref) => (
diff --git a/packages/client/ui/Avatar/AvatarFallback.tsx b/packages/client/ui/Avatar/AvatarFallback.tsx
index ac2676858d4..8ff9c1440df 100644
--- a/packages/client/ui/Avatar/AvatarFallback.tsx
+++ b/packages/client/ui/Avatar/AvatarFallback.tsx
@@ -1,8 +1,8 @@
 import * as AvatarPrimitive from '@radix-ui/react-avatar'
 import clsx from 'clsx'
-import React from 'react'
+import {forwardRef} from 'react'
 
-export const AvatarFallback = React.forwardRef<
+export const AvatarFallback = forwardRef<
   HTMLSpanElement,
   React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Fallback>
 >(({className, ...props}, ref) => (
diff --git a/packages/client/ui/Avatar/AvatarImage.tsx b/packages/client/ui/Avatar/AvatarImage.tsx
index 19a90bc1f90..7792f0d7154 100644
--- a/packages/client/ui/Avatar/AvatarImage.tsx
+++ b/packages/client/ui/Avatar/AvatarImage.tsx
@@ -1,8 +1,8 @@
 import * as AvatarPrimitive from '@radix-ui/react-avatar'
 import clsx from 'clsx'
-import React from 'react'
+import {forwardRef} from 'react'
 
-export const AvatarImage = React.forwardRef<
+export const AvatarImage = forwardRef<
   HTMLImageElement,
   React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Image>
 >(({className, ...props}, ref) => (
diff --git a/packages/client/ui/Button/Button.tsx b/packages/client/ui/Button/Button.tsx
index c93a4a4b353..82f4b98cf20 100644
--- a/packages/client/ui/Button/Button.tsx
+++ b/packages/client/ui/Button/Button.tsx
@@ -1,6 +1,6 @@
 import {Slot} from '@radix-ui/react-slot'
 import clsx from 'clsx'
-import React from 'react'
+import * as React from 'react'
 import {twMerge} from 'tailwind-merge'
 
 type Variant = 'primary' | 'secondary' | 'destructive' | 'ghost' | 'link' | 'outline' | 'flat'
diff --git a/packages/client/ui/Chip/Chip.tsx b/packages/client/ui/Chip/Chip.tsx
index bfa9da0bc61..834e089fdd7 100644
--- a/packages/client/ui/Chip/Chip.tsx
+++ b/packages/client/ui/Chip/Chip.tsx
@@ -1,5 +1,5 @@
 import {Close} from '@mui/icons-material'
-import React from 'react'
+import * as React from 'react'
 import {twMerge} from 'tailwind-merge'
 
 interface Props {
diff --git a/packages/client/ui/Dialog/DialogActions.tsx b/packages/client/ui/Dialog/DialogActions.tsx
index 1da400eb46e..2811b361cd7 100644
--- a/packages/client/ui/Dialog/DialogActions.tsx
+++ b/packages/client/ui/Dialog/DialogActions.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 import {twMerge} from 'tailwind-merge'
 
 export const DialogActions = ({className, ...props}: React.HTMLAttributes<HTMLDivElement>) => (
diff --git a/packages/client/ui/Dialog/DialogClose.tsx b/packages/client/ui/Dialog/DialogClose.tsx
index cbaf9d3715d..35243e1db1c 100644
--- a/packages/client/ui/Dialog/DialogClose.tsx
+++ b/packages/client/ui/Dialog/DialogClose.tsx
@@ -1,9 +1,9 @@
 import {Close} from '@mui/icons-material'
 import * as RadixDialog from '@radix-ui/react-dialog'
-import React from 'react'
+import {forwardRef} from 'react'
 import {twMerge} from 'tailwind-merge'
 
-export const DialogClose = React.forwardRef<
+export const DialogClose = forwardRef<
   HTMLButtonElement,
   React.ComponentPropsWithoutRef<typeof RadixDialog.Close>
 >(({className, ...props}, ref) => (
diff --git a/packages/client/ui/Dialog/DialogDescription.tsx b/packages/client/ui/Dialog/DialogDescription.tsx
index 6d837e411af..fde20c3a7b7 100644
--- a/packages/client/ui/Dialog/DialogDescription.tsx
+++ b/packages/client/ui/Dialog/DialogDescription.tsx
@@ -1,8 +1,8 @@
 import * as RadixDialog from '@radix-ui/react-dialog'
-import React from 'react'
+import {forwardRef} from 'react'
 import {twMerge} from 'tailwind-merge'
 
-export const DialogDescription = React.forwardRef<
+export const DialogDescription = forwardRef<
   HTMLDivElement,
   React.ComponentPropsWithoutRef<typeof RadixDialog.Description>
 >(({className, children, ...props}, ref) => (
diff --git a/packages/client/ui/Dialog/DialogTitle.tsx b/packages/client/ui/Dialog/DialogTitle.tsx
index ecd9e9ba621..08358d715fe 100644
--- a/packages/client/ui/Dialog/DialogTitle.tsx
+++ b/packages/client/ui/Dialog/DialogTitle.tsx
@@ -1,8 +1,8 @@
 import * as RadixDialog from '@radix-ui/react-dialog'
-import React from 'react'
+import {forwardRef} from 'react'
 import {twMerge} from 'tailwind-merge'
 
-export const DialogTitle = React.forwardRef<
+export const DialogTitle = forwardRef<
   HTMLDivElement,
   React.ComponentPropsWithoutRef<typeof RadixDialog.Title>
 >(({className, children, ...props}, ref) => (
diff --git a/packages/client/ui/Dialog/DialogTrigger.tsx b/packages/client/ui/Dialog/DialogTrigger.tsx
index 5fa0ae42530..4a58eca4af7 100644
--- a/packages/client/ui/Dialog/DialogTrigger.tsx
+++ b/packages/client/ui/Dialog/DialogTrigger.tsx
@@ -1,7 +1,7 @@
 import * as RadixDialog from '@radix-ui/react-dialog'
-import React from 'react'
+import {forwardRef} from 'react'
 
-export const DialogTrigger = React.forwardRef<
+export const DialogTrigger = forwardRef<
   HTMLButtonElement,
   React.ComponentPropsWithoutRef<typeof RadixDialog.Trigger>
 >(({className, children, ...props}, ref) => (
diff --git a/packages/client/ui/Menu/Menu.tsx b/packages/client/ui/Menu/Menu.tsx
index 3a9cd3135b6..f0547bf0d77 100644
--- a/packages/client/ui/Menu/Menu.tsx
+++ b/packages/client/ui/Menu/Menu.tsx
@@ -1,5 +1,5 @@
 import * as DropdownMenu from '@radix-ui/react-dropdown-menu'
-import React from 'react'
+import * as React from 'react'
 
 interface MenuProps extends DropdownMenu.DropdownMenuProps {
   className?: string
diff --git a/packages/client/ui/Menu/MenuContent.tsx b/packages/client/ui/Menu/MenuContent.tsx
index 941939a2b20..8096ce0aad0 100644
--- a/packages/client/ui/Menu/MenuContent.tsx
+++ b/packages/client/ui/Menu/MenuContent.tsx
@@ -1,5 +1,5 @@
 import * as DropdownMenu from '@radix-ui/react-dropdown-menu'
-import React from 'react'
+import * as React from 'react'
 import {twMerge} from 'tailwind-merge'
 
 interface MenuContentProps extends DropdownMenu.MenuContentProps {
diff --git a/packages/client/ui/Menu/MenuItem.tsx b/packages/client/ui/Menu/MenuItem.tsx
index fe117676eb0..0d49aded974 100644
--- a/packages/client/ui/Menu/MenuItem.tsx
+++ b/packages/client/ui/Menu/MenuItem.tsx
@@ -1,5 +1,5 @@
 import * as DropdownMenu from '@radix-ui/react-dropdown-menu'
-import React from 'react'
+import * as React from 'react'
 import {twMerge} from 'tailwind-merge'
 
 interface MenuItemProps {
diff --git a/packages/client/ui/Tooltip/TooltipContent.tsx b/packages/client/ui/Tooltip/TooltipContent.tsx
index 90db80a769b..f107a15e904 100644
--- a/packages/client/ui/Tooltip/TooltipContent.tsx
+++ b/packages/client/ui/Tooltip/TooltipContent.tsx
@@ -1,5 +1,4 @@
 import {Content, Portal} from '@radix-ui/react-tooltip'
-import * as React from 'react'
 import {twMerge} from 'tailwind-merge'
 import {forwardRadix} from '../forwardRadix'
 
diff --git a/packages/client/ui/Tooltip/TooltipTrigger.tsx b/packages/client/ui/Tooltip/TooltipTrigger.tsx
index 2a0b7b0ca36..e104a0e2d92 100644
--- a/packages/client/ui/Tooltip/TooltipTrigger.tsx
+++ b/packages/client/ui/Tooltip/TooltipTrigger.tsx
@@ -1,5 +1,4 @@
 import {Trigger} from '@radix-ui/react-tooltip'
-import * as React from 'react'
 import {forwardRadix} from '../forwardRadix'
 
 export const TooltipTrigger = forwardRadix<typeof Trigger>(
diff --git a/packages/client/ui/forwardRadix.tsx b/packages/client/ui/forwardRadix.tsx
index 146c24f42e0..91d667b0508 100644
--- a/packages/client/ui/forwardRadix.tsx
+++ b/packages/client/ui/forwardRadix.tsx
@@ -1,7 +1,9 @@
 // When building from radix primitives, use this instead of React.forwardRef
 // To get type safety directly from radix
 
-import React, {RefForwardingComponent, forwardRef} from 'react'
+import {RefForwardingComponent, forwardRef} from 'react'
+
+import * as React from 'react'
 
 type RadixProps<T> = T extends React.ForwardRefExoticComponent<infer U> ? U : T
 type RadixAttrib<T> = T extends React.RefAttributes<infer U> ? U : T
diff --git a/packages/client/utils/meetings/lookups.ts b/packages/client/utils/meetings/lookups.ts
index b0a59f46588..c60fb2cb8ff 100644
--- a/packages/client/utils/meetings/lookups.ts
+++ b/packages/client/utils/meetings/lookups.ts
@@ -1,4 +1,4 @@
-import React from 'react'
+import * as React from 'react'
 import {NewMeetingPhaseTypeEnum} from '~/__generated__/ActionMeetingSidebar_meeting.graphql'
 import {MeetingTypeEnum} from '../../__generated__/SummarySheet_meeting.graphql'
 import CardsSVG from '../../components/CardsSVG'
diff --git a/packages/client/utils/relay/renderLoader.tsx b/packages/client/utils/relay/renderLoader.tsx
index 49b37fc4152..baba4270afc 100644
--- a/packages/client/utils/relay/renderLoader.tsx
+++ b/packages/client/utils/relay/renderLoader.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import LoadingComponent from '../../components/LoadingComponent/LoadingComponent'
 
 interface LoaderOptions {
diff --git a/packages/client/utils/relay/withForm.tsx b/packages/client/utils/relay/withForm.tsx
index 0d88678d25f..3b1a51385bd 100644
--- a/packages/client/utils/relay/withForm.tsx
+++ b/packages/client/utils/relay/withForm.tsx
@@ -1,4 +1,5 @@
-import React, {Component, Ref} from 'react'
+import * as React from 'react'
+import {Component, Ref} from 'react'
 import {Subtract} from '../../types/generics'
 import Legitity from '../../validation/Legitity'
 import getDisplayName from '../getDisplayName'
diff --git a/packages/client/utils/relay/withMutationProps.tsx b/packages/client/utils/relay/withMutationProps.tsx
index 6e59aa460be..49950b13df2 100644
--- a/packages/client/utils/relay/withMutationProps.tsx
+++ b/packages/client/utils/relay/withMutationProps.tsx
@@ -1,4 +1,5 @@
-import React, {Component, Ref} from 'react'
+import * as React from 'react'
+import {Component, Ref} from 'react'
 import {Subtract} from '../../types/generics'
 import getDisplayName from '../getDisplayName'
 import getGraphQLError from './getGraphQLError'
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index 17b3bf267d2..2f0b0d2e426 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -31,7 +31,6 @@
     "jest-extended": "^3.2.4",
     "jest-junit": "^16.0.0",
     "openapi-fetch": "^0.10.0",
-    "sucrase": "^3.32.0",
     "ts-jest": "^29.1.0",
     "ts-node-dev": "^1.0.0-pre.44"
   },
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index a4db676f914..0c79b2df986 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -21,7 +21,6 @@
     "@types/node": "^20.11.17",
     "babel-plugin-inline-import": "^3.0.0",
     "chokidar": "^3.3.1",
-    "sucrase": "^3.32.0",
     "ts-node-dev": "^1.0.0-pre.44"
   },
   "dependencies": {
diff --git a/packages/server/email/emailVerificationEmailCreator.tsx b/packages/server/email/emailVerificationEmailCreator.tsx
index 3067bc64ad0..bd0378e81c2 100644
--- a/packages/server/email/emailVerificationEmailCreator.tsx
+++ b/packages/server/email/emailVerificationEmailCreator.tsx
@@ -1,6 +1,5 @@
 import EmailVerificationEmail from 'parabol-client/modules/email/components/EmailVerificationEmail'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
-import React from 'react'
 import ReactDOMServer from 'react-dom/server'
 import makeAppURL from '../../client/utils/makeAppURL'
 import appOrigin from '../appOrigin'
diff --git a/packages/server/email/newMeetingSummaryEmailCreator.tsx b/packages/server/email/newMeetingSummaryEmailCreator.tsx
index 811e20e6687..fdbe1bcf52c 100644
--- a/packages/server/email/newMeetingSummaryEmailCreator.tsx
+++ b/packages/server/email/newMeetingSummaryEmailCreator.tsx
@@ -1,6 +1,5 @@
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {MEETING_SUMMARY_LABEL} from 'parabol-client/utils/constants'
-import React from 'react'
 import appOrigin from '../appOrigin'
 import AuthToken from '../database/types/AuthToken'
 import {GQLContext} from '../graphql/graphql'
diff --git a/packages/server/email/notificationSummaryCreator.tsx b/packages/server/email/notificationSummaryCreator.tsx
index 07b7d170bda..364968d0090 100644
--- a/packages/server/email/notificationSummaryCreator.tsx
+++ b/packages/server/email/notificationSummaryCreator.tsx
@@ -3,7 +3,6 @@ import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {ContactInfo, ExternalLinks} from 'parabol-client/types/constEnums'
 import makeAppURL from 'parabol-client/utils/makeAppURL'
 import plural from 'parabol-client/utils/plural'
-import React from 'react'
 import ServerEnvironment from './ServerEnvironment'
 import emailTemplate from './emailTemplate'
 import renderSSRElement from './renderSSRElement'
diff --git a/packages/server/email/renderSSRElement.tsx b/packages/server/email/renderSSRElement.tsx
index 23f7ae1968a..f9854144d7b 100644
--- a/packages/server/email/renderSSRElement.tsx
+++ b/packages/server/email/renderSSRElement.tsx
@@ -1,4 +1,4 @@
-import React, {ReactElement} from 'react'
+import {ReactElement} from 'react'
 import ReactDOMServer from 'react-dom/server'
 import {RelayEnvironmentProvider} from 'react-relay'
 import ServerEnvironment from './ServerEnvironment'
diff --git a/packages/server/email/resetPasswordEmailCreator.tsx b/packages/server/email/resetPasswordEmailCreator.tsx
index c22469fc7be..db8ace49720 100644
--- a/packages/server/email/resetPasswordEmailCreator.tsx
+++ b/packages/server/email/resetPasswordEmailCreator.tsx
@@ -1,5 +1,4 @@
 import {PALETTE} from 'parabol-client/styles/paletteV3'
-import React from 'react'
 import ReactDOMServer from 'react-dom/server'
 import ResetPasswordEmail from '../../client/modules/email/components/ResetPasswordEmail'
 import makeAppURL from '../../client/utils/makeAppURL'
diff --git a/packages/server/email/teamInviteEmailCreator.tsx b/packages/server/email/teamInviteEmailCreator.tsx
index 71a75c88b35..b1df82dbd17 100644
--- a/packages/server/email/teamInviteEmailCreator.tsx
+++ b/packages/server/email/teamInviteEmailCreator.tsx
@@ -1,7 +1,6 @@
 import Oy from 'oy-vey'
 import TeamInvite, {TeamInviteProps} from 'parabol-client/modules/email/components/TeamInvite'
 import {headCSS} from 'parabol-client/modules/email/styles'
-import React from 'react'
 
 const subjectLine = (inviterName: string): string => `${inviterName} has invited you to Parabol`
 
diff --git a/packages/server/email/teamLimitsEmailCreator.tsx b/packages/server/email/teamLimitsEmailCreator.tsx
index 337be985c06..ebce0d5a225 100644
--- a/packages/server/email/teamLimitsEmailCreator.tsx
+++ b/packages/server/email/teamLimitsEmailCreator.tsx
@@ -2,7 +2,6 @@ import LockedEmail from 'parabol-client/modules/email/components/LimitsEmails/Lo
 import SevenDayWarningEmail from 'parabol-client/modules/email/components/LimitsEmails/SevenDayWarningEmail'
 import ThirtyDayWarningEmail from 'parabol-client/modules/email/components/LimitsEmails/ThirtyDayWarningEmail'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
-import React from 'react'
 import ReactDOMServer from 'react-dom/server'
 import {Threshold} from '../../client/types/constEnums'
 import makeAppURL from '../../client/utils/makeAppURL'
diff --git a/packages/server/jest.config.js b/packages/server/jest.config.js
index 685b60f917d..dfe76d4d6aa 100644
--- a/packages/server/jest.config.js
+++ b/packages/server/jest.config.js
@@ -9,6 +9,9 @@ module.exports = {
       {
         jsc: {
           transform: {
+            react: {
+              runtime: 'automatic'
+            },
             // abstract classes will lose their default values when compiled with SWC
             useDefineForClassFields: false
           }
diff --git a/packages/server/package.json b/packages/server/package.json
index fa83848b581..847a10ae992 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -63,7 +63,6 @@
     "json-loader": "^0.5.7",
     "lint-staged": "^10.1.7",
     "style-loader": "2.0.0",
-    "sucrase": "^3.32.0",
     "ts-jest": "^29.1.0",
     "ts-node": "10.9.2",
     "url-loader": "4.1.1",
diff --git a/scripts/webpack/dev.client.config.js b/scripts/webpack/dev.client.config.js
index 10117087193..1ae6ae2481d 100644
--- a/scripts/webpack/dev.client.config.js
+++ b/scripts/webpack/dev.client.config.js
@@ -119,7 +119,8 @@ module.exports = {
         github: process.env.GITHUB_CLIENT_ID,
         google: process.env.GOOGLE_OAUTH_CLIENT_ID,
         googleAnalytics: process.env.GA_TRACKING_ID,
-        mattermostDisabled: !!process.env.MATTERMOST_SECRET || process.env.MATTERMOST_DISABLED === 'true',
+        mattermostDisabled:
+          !!process.env.MATTERMOST_SECRET || process.env.MATTERMOST_DISABLED === 'true',
         msTeamsDisabled: process.env.MSTEAMS_DISABLED === 'true',
         sentry: process.env.SENTRY_DSN,
         slack: process.env.SLACK_CLIENT_ID,
@@ -178,7 +179,8 @@ module.exports = {
           {
             loader: '@sucrase/webpack-loader',
             options: {
-              transforms: ['jsx']
+              transforms: ['jsx'],
+              jsxRuntime: 'automatic'
             }
           }
         ]
diff --git a/scripts/webpack/dev.servers.config.js b/scripts/webpack/dev.servers.config.js
index 198cebc52b4..8b24ac27119 100644
--- a/scripts/webpack/dev.servers.config.js
+++ b/scripts/webpack/dev.servers.config.js
@@ -73,7 +73,8 @@ module.exports = {
           {
             loader: '@sucrase/webpack-loader',
             options: {
-              transforms: ['jsx']
+              transforms: ['jsx'],
+              jsxRuntime: 'automatic'
             }
           }
         ]
diff --git a/scripts/webpack/prod.client.config.js b/scripts/webpack/prod.client.config.js
index 4cc8788abcf..90cedafc53f 100644
--- a/scripts/webpack/prod.client.config.js
+++ b/scripts/webpack/prod.client.config.js
@@ -161,7 +161,8 @@ module.exports = (config) => {
               loader: '@sucrase/webpack-loader',
               options: {
                 production: true,
-                transforms: ['jsx', 'typescript']
+                transforms: ['jsx', 'typescript'],
+                jsxRuntime: 'automatic'
               }
             }
           ]
@@ -192,7 +193,8 @@ module.exports = (config) => {
               loader: '@sucrase/webpack-loader',
               options: {
                 production: true,
-                transforms: ['jsx']
+                transforms: ['jsx'],
+                jsxRuntime: 'automatic'
               }
             }
           ]
diff --git a/scripts/webpack/toolbox.config.js b/scripts/webpack/toolbox.config.js
index 254db481b3b..fa7ba05ba44 100644
--- a/scripts/webpack/toolbox.config.js
+++ b/scripts/webpack/toolbox.config.js
@@ -88,7 +88,8 @@ module.exports = {
             loader: '@sucrase/webpack-loader',
             options: {
               production: true,
-              transforms: ['jsx']
+              transforms: ['jsx'],
+              jsxRuntime: 'automatic'
             }
           }
         ]
diff --git a/scripts/webpack/utils/clientTransformRules.js b/scripts/webpack/utils/clientTransformRules.js
index b05cae5373a..a65e0c54666 100644
--- a/scripts/webpack/utils/clientTransformRules.js
+++ b/scripts/webpack/utils/clientTransformRules.js
@@ -29,7 +29,8 @@ const clientTransformRules = (projectRoot, USE_REFRESH) => {
         {
           loader: '@sucrase/webpack-loader',
           options: {
-            transforms: ['jsx', 'typescript']
+            transforms: ['jsx', 'typescript'],
+            jsxRuntime: 'automatic'
           }
         }
       ]
diff --git a/scripts/webpack/utils/transformRules.js b/scripts/webpack/utils/transformRules.js
index ef6b4c01fc5..1ded2a2366d 100644
--- a/scripts/webpack/utils/transformRules.js
+++ b/scripts/webpack/utils/transformRules.js
@@ -41,7 +41,8 @@ const transformRules = (projectRoot, isProd) => {
           loader: '@sucrase/webpack-loader',
           options: {
             production: isProd,
-            transforms: ['jsx', 'typescript']
+            transforms: ['jsx', 'typescript'],
+            jsxRuntime: 'automatic'
           }
         }
       ]
@@ -58,7 +59,8 @@ const transformRules = (projectRoot, isProd) => {
           production: isProd,
           // imports is needed for applyEnvVarsToClientAssets since it uses CJS
           // otherwise it gets ignored and treated as an unused export in the build
-          transforms: ['jsx', 'typescript', 'imports']
+          transforms: ['jsx', 'typescript', 'imports'],
+          jsxRuntime: 'automatic'
         }
       }
     },
@@ -87,7 +89,8 @@ const transformRules = (projectRoot, isProd) => {
           loader: '@sucrase/webpack-loader',
           options: {
             production: isProd,
-            transforms: ['jsx', 'typescript']
+            transforms: ['jsx', 'typescript'],
+            jsxRuntime: 'automatic'
           }
         }
       ]
diff --git a/tsconfig.base.json b/tsconfig.base.json
index c207d6f1c07..9d8d72577ed 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -7,7 +7,7 @@
     // "composite": true,
     "target": "es2019",
     "module": "commonjs",
-    "jsx": "react",
+    "jsx": "react-jsx",
     "importHelpers": true,
     "strict": true,
     "noImplicitAny": true,
diff --git a/yarn.lock b/yarn.lock
index b9cad27c095..6552b8bf984 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8473,10 +8473,10 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-dom@16.9.4":
-  version "16.9.4"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.4.tgz#0b58df09a60961dcb77f62d4f1832427513420df"
-  integrity sha512-fya9xteU/n90tda0s+FtN5Ym4tbgxpq/hb/Af24dvs6uYnYn+fspaxw5USlw0R8apDNwxsqumdRoCoKitckQqw==
+"@types/react-dom@16.9.4", "@types/react-dom@17.0.2":
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.2.tgz#35654cf6c49ae162d5bc90843d5437dc38008d43"
+  integrity sha512-Icd9KEgdnFfJs39KyRyr0jQ7EKhq8U6CcHRMGAS45fp5qgUvxL3ujUCfWFttUK2UErqZNj97t9gsVPNAqcwoCg==
   dependencies:
     "@types/react" "*"
 
@@ -8544,13 +8544,13 @@
     "@types/prop-types" "*"
     "@types/react" "*"
 
-"@types/react@*", "@types/react@16.9.11":
-  version "16.9.11"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.11.tgz#70e0b7ad79058a7842f25ccf2999807076ada120"
-  integrity sha512-UBT4GZ3PokTXSWmdgC/GeCGEJXE5ofWyibCcecRLUVN2ZBpXQGVgQGtG2foS7CrTKFKlQVVswLvf7Js6XA/CVQ==
+"@types/react@*", "@types/react@16.9.11", "@types/react@17.0.2":
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8"
+  integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==
   dependencies:
     "@types/prop-types" "*"
-    csstype "^2.2.0"
+    csstype "^3.0.2"
 
 "@types/relay-runtime@*", "@types/relay-runtime@^18.1.1":
   version "18.1.1"
@@ -11340,7 +11340,7 @@ cssstyle@^2.3.0:
   dependencies:
     cssom "~0.3.6"
 
-csstype@^2.2.0, csstype@^2.5.7:
+csstype@^2.5.7:
   version "2.6.21"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e"
   integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==
@@ -21676,7 +21676,7 @@ stylis@4.2.0:
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.2.0.tgz#79daee0208964c8fe695a42fcffcac633a211a51"
   integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==
 
-sucrase@^3.32.0:
+sucrase@^3.32.0, sucrase@^3.35.0:
   version "3.35.0"
   resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.0.tgz#57f17a3d7e19b36d8995f06679d121be914ae263"
   integrity sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==