diff --git a/packages/manager/CHANGELOG.md b/packages/manager/CHANGELOG.md
index 28a1647bd1b..ae479346b6f 100644
--- a/packages/manager/CHANGELOG.md
+++ b/packages/manager/CHANGELOG.md
@@ -4,8 +4,17 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [2023-06-27] - v1.96.1
+## [2023-06-29] - v1.96.2
+
+### Fixed:
+- Issue where Cloud Manager was not displaying all linodes capable of being "cloned" ([#9294](https://github.com/linode/manager/pull/9294))
+- Firewall custom ports validation w/ unit tests ([#9336](https://github.com/linode/manager/pull/9336))
 
+### Tech Stories:
+
+- React Query - Linodes - General Refactors ([#9294](https://github.com/linode/manager/pull/9294))
+
+## [2023-06-27] - v1.96.1
 
 ### Fixed:
 
diff --git a/packages/manager/package.json b/packages/manager/package.json
index 81fd42b037a..ffe433c5228 100644
--- a/packages/manager/package.json
+++ b/packages/manager/package.json
@@ -2,7 +2,7 @@
   "name": "linode-manager",
   "author": "Linode",
   "description": "The Linode Manager website",
-  "version": "1.96.1",
+  "version": "1.96.2",
   "private": true,
   "bugs": {
     "url": "https://github.com/Linode/manager/issues"
diff --git a/packages/manager/src/App.tsx b/packages/manager/src/App.tsx
index 61ce13db465..aeee3c078f4 100644
--- a/packages/manager/src/App.tsx
+++ b/packages/manager/src/App.tsx
@@ -20,7 +20,6 @@ import { ADOBE_ANALYTICS_URL, NUM_ADOBE_SCRIPTS } from './constants';
 import { reportException } from './exceptionReporting';
 import { useAuthentication } from './hooks/useAuthentication';
 import useFeatureFlagsLoad from './hooks/useFeatureFlagLoad';
-import useLinodes from './hooks/useLinodes';
 import { loadScript } from './hooks/useScript';
 import { oauthClientsEventHandler } from './queries/accountOAuth';
 import { databaseEventsHandler } from './queries/databases';
@@ -59,12 +58,6 @@ const BaseApp = withFeatureFlagProvider(
 
     const { enqueueSnackbar } = useSnackbar();
 
-    const {
-      linodes: {
-        error: { read: linodesError },
-      },
-    } = useLinodes();
-
     const [goToOpen, setGoToOpen] = React.useState(false);
 
     const theme = preferences?.theme;
@@ -263,15 +256,6 @@ const BaseApp = withFeatureFlagProvider(
       };
     }, [handleMigrationEvent]);
 
-    /**
-     * in the event that we encounter an "invalid OAuth token" error from the API,
-     * we can simply refrain from rendering any content since the user will
-     * imminently be redirected to the login page.
-     */
-    if (hasOauthError(linodesError)) {
-      return null;
-    }
-
     return (
       <ErrorBoundary fallback={<TheApplicationIsOnFire />}>
         {/** Accessibility helper */}
diff --git a/packages/manager/src/containers/withLinodes.container.ts b/packages/manager/src/containers/withLinodes.container.ts
index 7655fc204b8..cf3fc95186d 100644
--- a/packages/manager/src/containers/withLinodes.container.ts
+++ b/packages/manager/src/containers/withLinodes.container.ts
@@ -1,91 +1,40 @@
-import { Linode } from '@linode/api-v4/lib/linodes';
-import { APIError, Filter, Params } from '@linode/api-v4/lib/types';
-import { path } from 'ramda';
-import { connect, InferableComponentEnhancerWithProps } from 'react-redux';
-import { ApplicationState } from 'src/store';
-import { requestLinodes } from 'src/store/linodes/linode.requests';
-import { State } from 'src/store/linodes/linodes.reducer';
-import { LinodeWithMaintenanceAndDisplayStatus } from 'src/store/linodes/types';
-import { ThunkDispatch } from 'src/store/types';
-import { GetAllData } from 'src/utilities/getAll';
-
-export interface DispatchProps {
-  getLinodes: (
-    params?: Params,
-    filters?: Filter
-  ) => Promise<GetAllData<Linode>>;
+import React from 'react';
+import { CreateLinodeRequest, Linode } from '@linode/api-v4/lib/linodes';
+import { APIError } from '@linode/api-v4/lib/types';
+import {
+  useAllLinodesQuery,
+  useCreateLinodeMutation,
+} from 'src/queries/linodes/linodes';
+
+interface Actions {
+  createLinode: (data: CreateLinodeRequest) => Promise<Linode>;
 }
 
-/* tslint:disable-next-line */
-export interface StateProps {
-  linodesError?: APIError[];
-  linodesLoading: State['loading'];
-  linodesData: LinodeWithMaintenanceAndDisplayStatus[];
-  linodesLastUpdated: State['lastUpdated'];
-  linodesResults: State['results'];
+export interface WithLinodesProps {
+  linodesError: APIError[] | null;
+  linodesLoading: boolean;
+  linodesData: Linode[] | undefined;
+  linodeActions: Actions;
 }
 
-type MapProps<ReduxStateProps, OwnProps> = (
-  ownProps: OwnProps,
-  linodes: Linode[],
-  loading: boolean,
-  error?: APIError[]
-) => ReduxStateProps & Partial<StateProps>;
-
-export type Props = DispatchProps & StateProps;
-
-interface Connected {
-  <ReduxStateProps, OwnProps>(
-    mapStateToProps: MapProps<ReduxStateProps, OwnProps>
-  ): InferableComponentEnhancerWithProps<
-    ReduxStateProps & Partial<StateProps> & DispatchProps & OwnProps,
-    OwnProps
-  >;
-  <ReduxStateProps, OwnProps>(): InferableComponentEnhancerWithProps<
-    ReduxStateProps & DispatchProps & OwnProps,
-    OwnProps
-  >;
-}
-
-const connected: Connected = <ReduxState extends {}, OwnProps extends {}>(
-  mapStateToProps?: MapProps<ReduxState, OwnProps>
-) =>
-  connect<
-    (ReduxState & Partial<StateProps>) | StateProps,
-    DispatchProps,
-    OwnProps,
-    ApplicationState
-  >(
-    (state, ownProps) => {
-      const {
-        loading,
-        error,
-        itemsById,
-        lastUpdated,
-        results,
-      } = state.__resources.linodes;
-      const linodes = Object.values(itemsById);
-      if (mapStateToProps) {
-        return mapStateToProps(
-          ownProps,
-          linodes,
-          loading,
-          path(['read'], error)
-        );
-      }
-
-      return {
-        linodesError: path(['read'], error),
-        linodesLoading: loading,
-        linodesData: linodes,
-        linodesResults: results,
-        linodesLastUpdated: lastUpdated,
-      };
+export const withLinodes = <Props>(
+  Component: React.ComponentType<Props & WithLinodesProps>
+) => (props: Props) => {
+  const {
+    data: linodesData,
+    isLoading: linodesLoading,
+    error: linodesError,
+  } = useAllLinodesQuery();
+
+  const { mutateAsync: createLinode } = useCreateLinodeMutation();
+
+  return React.createElement(Component, {
+    ...props,
+    linodesData,
+    linodesLoading,
+    linodesError,
+    linodeActions: {
+      createLinode,
     },
-    (dispatch: ThunkDispatch) => ({
-      getLinodes: (params, filter) =>
-        dispatch(requestLinodes({ params, filter })),
-    })
-  );
-
-export default connected;
+  });
+};
diff --git a/packages/manager/src/features/Account/EnableManaged.tsx b/packages/manager/src/features/Account/EnableManaged.tsx
index 84e2a859676..486c9682966 100644
--- a/packages/manager/src/features/Account/EnableManaged.tsx
+++ b/packages/manager/src/features/Account/EnableManaged.tsx
@@ -9,27 +9,20 @@ import Typography from 'src/components/core/Typography';
 import ExternalLink from 'src/components/ExternalLink';
 import Grid from '@mui/material/Unstable_Grid2';
 import { SupportLink } from 'src/components/SupportLink';
-import withLinodes, {
-  DispatchProps,
-} from 'src/containers/withLinodes.container';
 import { pluralize } from 'src/utilities/pluralize';
 import { updateAccountSettingsData } from 'src/queries/accountSettings';
 import { useQueryClient } from 'react-query';
+import { useLinodesQuery } from 'src/queries/linodes/linodes';
 
 interface Props {
   isManaged: boolean;
 }
 
-interface StateProps {
-  linodeCount: number;
-}
-
-type CombinedProps = Props & StateProps & DispatchProps;
-
 interface ContentProps {
   isManaged: boolean;
   openConfirmationModal: () => void;
 }
+
 export const ManagedContent = (props: ContentProps) => {
   const { isManaged, openConfirmationModal } = props;
 
@@ -66,13 +59,16 @@ export const ManagedContent = (props: ContentProps) => {
   );
 };
 
-export const EnableManaged = (props: CombinedProps) => {
-  const { isManaged, linodeCount } = props;
+export const EnableManaged = (props: Props) => {
+  const { isManaged } = props;
   const queryClient = useQueryClient();
+  const { data: linodes } = useLinodesQuery();
   const [isOpen, setOpen] = React.useState<boolean>(false);
   const [error, setError] = React.useState<string | undefined>();
   const [isLoading, setLoading] = React.useState<boolean>(false);
 
+  const linodeCount = linodes?.results ?? 0;
+
   const handleClose = () => {
     setOpen(false);
     setError(undefined);
@@ -94,7 +90,7 @@ export const EnableManaged = (props: CombinedProps) => {
       .catch(handleError);
   };
 
-  const actions = () => (
+  const actions = (
     <ActionsPanel>
       <Button buttonType="secondary" onClick={handleClose} data-qa-cancel>
         Cancel
@@ -137,9 +133,3 @@ export const EnableManaged = (props: CombinedProps) => {
     </>
   );
 };
-
-export default withLinodes<StateProps, Props>(
-  (ownProps, entities, loading, error) => ({
-    linodeCount: entities.length,
-  })
-)(EnableManaged);
diff --git a/packages/manager/src/features/Account/GlobalSettings.tsx b/packages/manager/src/features/Account/GlobalSettings.tsx
index af01e4f4931..36d9bd48018 100644
--- a/packages/manager/src/features/Account/GlobalSettings.tsx
+++ b/packages/manager/src/features/Account/GlobalSettings.tsx
@@ -1,23 +1,17 @@
-import { Linode } from '@linode/api-v4/lib/linodes';
 import { APIError } from '@linode/api-v4/lib/types';
 import { useSnackbar } from 'notistack';
 import { isEmpty } from 'ramda';
 import * as React from 'react';
 import { connect, MapDispatchToProps } from 'react-redux';
-import { RouteComponentProps } from 'react-router-dom';
-import { compose } from 'recompose';
 import { AnyAction } from 'redux';
 import { ThunkDispatch } from 'redux-thunk';
 import { CircleProgress } from 'src/components/CircleProgress';
 import { ErrorState } from 'src/components/ErrorState/ErrorState';
-import { useReduxLoad } from 'src/hooks/useReduxLoad';
 import { ApplicationState } from 'src/store';
 import { handleOpen } from 'src/store/backupDrawer';
-import { getLinodesWithoutBackups } from 'src/store/selectors/getLinodesWithBackups';
-import { MapState } from 'src/store/types';
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
 import AutoBackups from './AutoBackups';
-import EnableManaged from './EnableManaged';
+import { EnableManaged } from './EnableManaged';
 import EnableObjectStorage from './EnableObjectStorage';
 import NetworkHelper from './NetworkHelper';
 import CloseAccountSetting from './CloseAccountSetting';
@@ -25,23 +19,17 @@ import {
   useAccountSettings,
   useMutateAccountSettings,
 } from 'src/queries/accountSettings';
+import { useAllLinodesQuery } from 'src/queries/linodes/linodes';
 
-interface StateProps {
-  linodesWithoutBackups: Linode[];
-}
-
-interface DispatchProps {
+interface Props {
   actions: {
     openBackupsDrawer: () => void;
   };
 }
 
-type CombinedProps = StateProps & DispatchProps & RouteComponentProps<{}>;
-
-const GlobalSettings = (props: CombinedProps) => {
+const GlobalSettings = (props: Props) => {
   const {
     actions: { openBackupsDrawer },
-    linodesWithoutBackups,
   } = props;
 
   const {
@@ -50,12 +38,15 @@ const GlobalSettings = (props: CombinedProps) => {
     error: accountSettingsError,
   } = useAccountSettings();
 
+  const { data: linodes } = useAllLinodesQuery();
+
+  const linodesWithoutBackups =
+    linodes?.filter((linode) => !linode.backups.enabled) ?? [];
+
   const { enqueueSnackbar } = useSnackbar();
 
   const { mutateAsync: updateAccount } = useMutateAccountSettings();
 
-  const { _loading } = useReduxLoad(['linodes']);
-
   const displayError = (errors: APIError[] | undefined) => {
     if (!errors) {
       return;
@@ -70,9 +61,10 @@ const GlobalSettings = (props: CombinedProps) => {
     });
   };
 
-  if (accountSettingsLoading || _loading) {
+  if (accountSettingsLoading) {
     return <CircleProgress />;
   }
+
   if (accountSettingsError) {
     return (
       <ErrorState
@@ -119,11 +111,8 @@ const GlobalSettings = (props: CombinedProps) => {
     </div>
   );
 };
-const mapStateToProps: MapState<StateProps, {}> = (state) => ({
-  linodesWithoutBackups: getLinodesWithoutBackups(state.__resources),
-});
 
-const mapDispatchToProps: MapDispatchToProps<DispatchProps, {}> = (
+const mapDispatchToProps: MapDispatchToProps<Props, {}> = (
   dispatch: ThunkDispatch<ApplicationState, undefined, AnyAction>
 ) => {
   return {
@@ -133,8 +122,6 @@ const mapDispatchToProps: MapDispatchToProps<DispatchProps, {}> = (
   };
 };
 
-const connected = connect(mapStateToProps, mapDispatchToProps);
-
-const enhanced = compose<CombinedProps, {}>(connected)(GlobalSettings);
+const connected = connect(undefined, mapDispatchToProps);
 
-export default enhanced;
+export default connected(GlobalSettings);
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
index 124d37fddb7..2715d6b6de8 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.test.tsx
@@ -121,7 +121,8 @@ describe('utilities', () => {
         label: 'Firewalllabel',
         addresses: 'All IPv4',
       };
-      expect(validateForm({ protocol: 'TCP', ports: '1', ...rest })).toEqual(
+      // SUCCESS CASES
+      expect(validateForm({ protocol: 'TCP', ports: '1234', ...rest })).toEqual(
         {}
       );
       expect(
@@ -134,28 +135,46 @@ describe('utilities', () => {
         {}
       );
       expect(
-        validateForm({ protocol: 'TCP', ports: 'abc', ...rest })
-      ).toHaveProperty(
-        'ports',
-        'Ports must be an integer, range of integers, or a comma-separated list of integers.'
-      );
-      expect(
-        validateForm({ protocol: 'TCP', ports: '1--20', ...rest })
-      ).toHaveProperty(
-        'ports',
-        'Ports must be an integer, range of integers, or a comma-separated list of integers.'
-      );
+        validateForm({
+          protocol: 'TCP',
+          ports: '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15',
+          ...rest,
+        })
+      ).toEqual({});
       expect(
         validateForm({ protocol: 'TCP', ports: '1-2,3-4', ...rest })
+      ).toEqual({});
+      expect(
+        validateForm({ protocol: 'TCP', ports: '1,5-12', ...rest })
+      ).toEqual({});
+      // FAILURE CASES
+      expect(
+        validateForm({ protocol: 'TCP', ports: '1,21-12', ...rest })
       ).toHaveProperty(
         'ports',
-        'Ports must be an integer, range of integers, or a comma-separated list of integers.'
+        'Range must start with a smaller number and end with a larger number'
       );
+      expect(
+        validateForm({ protocol: 'TCP', ports: '1-21-45', ...rest })
+      ).toHaveProperty('ports', 'Ranges must have 2 values');
+      expect(
+        validateForm({ protocol: 'TCP', ports: 'abc', ...rest })
+      ).toHaveProperty('ports', 'Must be 1-65535');
+      expect(
+        validateForm({ protocol: 'TCP', ports: '1--20', ...rest })
+      ).toHaveProperty('ports', 'Must be 1-65535');
       expect(
         validateForm({ protocol: 'TCP', ports: '-20', ...rest })
+      ).toHaveProperty('ports', 'Must be 1-65535');
+      expect(
+        validateForm({
+          protocol: 'TCP',
+          ports: '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16',
+          ...rest,
+        })
       ).toHaveProperty(
         'ports',
-        'Ports must be an integer, range of integers, or a comma-separated list of integers.'
+        'Number of ports or port range endpoints exceeded. Max allowed is 15'
       );
     });
     it('validates label', () => {
diff --git a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.utils.ts b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.utils.ts
index fad2eb3658b..e19971e62a5 100644
--- a/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.utils.ts
+++ b/packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.utils.ts
@@ -12,8 +12,8 @@ import {
   predefinedFirewallFromRule,
 } from 'src/features/Firewalls/shared';
 import {
-  CUSTOM_PORTS_VALIDATION_REGEX,
   CUSTOM_PORTS_ERROR_MESSAGE,
+  isCustomPortsValid,
 } from '@linode/validation';
 import type {
   FirewallRuleProtocol,
@@ -332,7 +332,7 @@ export const validateForm = ({
 
   if ((protocol === 'ICMP' || protocol === 'IPENCAP') && ports) {
     errors.ports = `Ports are not allowed for ${protocol} protocols.`;
-  } else if (ports && !ports.match(CUSTOM_PORTS_VALIDATION_REGEX)) {
+  } else if (ports && !isCustomPortsValid(ports)) {
     errors.ports = CUSTOM_PORTS_ERROR_MESSAGE;
   }
 
diff --git a/packages/manager/src/features/Images/ImageSelect.test.tsx b/packages/manager/src/features/Images/ImageSelect.test.tsx
index 9038ae28105..a42cec59c3f 100644
--- a/packages/manager/src/features/Images/ImageSelect.test.tsx
+++ b/packages/manager/src/features/Images/ImageSelect.test.tsx
@@ -1,11 +1,7 @@
 import * as React from 'react';
 import { renderWithTheme } from 'src/utilities/testHelpers';
-
 import { imageFactory } from 'src/factories/images';
 
-jest.mock('src/hooks/useReduxLoad', () => ({
-  useReduxLoad: () => jest.fn().mockReturnValue({ _loading: false }),
-}));
 jest.mock('src/components/EnhancedSelect/Select');
 
 import { getImagesOptions, groupNameMap, ImageSelect } from './ImageSelect';
diff --git a/packages/manager/src/features/Images/ImagesDrawer.tsx b/packages/manager/src/features/Images/ImagesDrawer.tsx
index 5a1a5b2f32a..9ec61a7ae59 100644
--- a/packages/manager/src/features/Images/ImagesDrawer.tsx
+++ b/packages/manager/src/features/Images/ImagesDrawer.tsx
@@ -17,7 +17,7 @@ import TextField from 'src/components/TextField';
 import { IMAGE_DEFAULT_LIMIT } from 'src/constants';
 import { resetEventsPolling } from 'src/eventsPolling';
 import DiskSelect from 'src/features/Linodes/DiskSelect';
-import LinodeSelect from 'src/features/Linodes/LinodeSelect';
+import { LinodeSelect } from 'src/features/Linodes/LinodeSelect/LinodeSelect';
 import { useImageAndLinodeGrantCheck } from './utils';
 import {
   useCreateImageMutation,
@@ -331,13 +331,6 @@ export const ImageDrawer: React.FC<CombinedProps> = (props) => {
           filterCondition={(linode) =>
             availableLinodes ? availableLinodes.includes(linode.id) : true
           }
-          updateFor={[
-            selectedLinode,
-            linodeError,
-            classes,
-            canCreateImage,
-            availableLinodes,
-          ]}
           isClearable={false}
         />
       )}
diff --git a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/NodeTable.tsx b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/NodeTable.tsx
index 6c863ddfaf2..e63561d95f5 100644
--- a/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/NodeTable.tsx
+++ b/packages/manager/src/features/Kubernetes/KubernetesClusterDetail/NodePoolsDisplay/NodeTable.tsx
@@ -20,11 +20,10 @@ import { TableContentWrapper } from 'src/components/TableContentWrapper/TableCon
 import { TableRow } from 'src/components/TableRow';
 import { TableSortCell } from 'src/components/TableSortCell';
 import { transitionText } from 'src/features/Linodes/transitions';
-import useLinodes from 'src/hooks/useLinodes';
-import { useReduxLoad } from 'src/hooks/useReduxLoad';
 import { LinodeWithMaintenanceAndDisplayStatus } from 'src/store/linodes/types';
 import { useRecentEventForLinode } from 'src/store/selectors/recentEventForLinode';
 import NodeActionMenu from './NodeActionMenu';
+import { useAllLinodesQuery } from 'src/queries/linodes/linodes';
 
 const useStyles = makeStyles((theme: Theme) => ({
   table: {
@@ -80,12 +79,9 @@ export const NodeTable: React.FC<Props> = (props) => {
 
   const classes = useStyles();
 
-  const { _loading } = useReduxLoad(['linodes']);
-  const { linodes } = useLinodes();
+  const { data: linodes, isLoading, error } = useAllLinodesQuery();
 
-  const rowData = nodes.map((thisNode) =>
-    nodeToRow(thisNode, Object.values(linodes.itemsById))
-  );
+  const rowData = nodes.map((thisNode) => nodeToRow(thisNode, linodes ?? []));
 
   return (
     <OrderBy data={rowData} orderBy={'label'} order={'asc'}>
@@ -139,8 +135,7 @@ export const NodeTable: React.FC<Props> = (props) => {
                 <TableBody>
                   <TableContentWrapper
                     loadingProps={{ columns: 4 }}
-                    loading={linodes.loading || _loading}
-                    lastUpdated={linodes.lastUpdated}
+                    loading={isLoading}
                     length={paginatedAndOrderedData.length}
                   >
                     {paginatedAndOrderedData.map((eachRow) => {
@@ -154,7 +149,7 @@ export const NodeTable: React.FC<Props> = (props) => {
                           ip={eachRow.ip}
                           nodeStatus={eachRow.nodeStatus}
                           typeLabel={typeLabel}
-                          linodeError={linodes.error?.read}
+                          linodeError={error ?? undefined}
                           openRecycleNodeDialog={openRecycleNodeDialog}
                         />
                       );
diff --git a/packages/manager/src/features/Linodes/CloneLanding/CloneLanding.tsx b/packages/manager/src/features/Linodes/CloneLanding/CloneLanding.tsx
index ba094e2d7d1..04fec37db69 100644
--- a/packages/manager/src/features/Linodes/CloneLanding/CloneLanding.tsx
+++ b/packages/manager/src/features/Linodes/CloneLanding/CloneLanding.tsx
@@ -1,26 +1,20 @@
 import { castDraft } from 'immer';
-import { Event } from '@linode/api-v4/lib/account';
 import {
   cloneLinode,
   cloneLinodeDisk,
-  Config,
   Disk,
   Linode,
-  LinodeStatus,
 } from '@linode/api-v4/lib/linodes';
 import { APIError } from '@linode/api-v4/lib/types';
 import { intersection, pathOr } from 'ramda';
 import * as React from 'react';
-import { connect, MapDispatchToProps } from 'react-redux';
 import {
   matchPath,
-  RouteComponentProps,
-  Switch,
-  withRouter,
+  useHistory,
+  useLocation,
+  useParams,
+  useRouteMatch,
 } from 'react-router-dom';
-import { compose } from 'recompose';
-import { AnyAction } from 'redux';
-import { ThunkDispatch } from 'redux-thunk';
 import Paper from 'src/components/core/Paper';
 import { makeStyles } from '@mui/styles';
 import { Theme } from '@mui/material/styles';
@@ -31,14 +25,9 @@ import { TabLinkList } from 'src/components/TabLinkList/TabLinkList';
 import Typography from 'src/components/core/Typography';
 import { DocumentTitleSegment } from 'src/components/DocumentTitle';
 import Grid from '@mui/material/Unstable_Grid2';
-import SuspenseLoader from 'src/components/SuspenseLoader';
-import withLinodes from 'src/containers/withLinodes.container';
 import { resetEventsPolling } from 'src/eventsPolling';
-import { ApplicationState } from 'src/store';
-import { getAllLinodeDisks } from 'src/store/linodes/disk/disk.requests';
 import { getErrorMap } from 'src/utilities/errorUtils';
 import { getQueryParamsFromQueryString } from 'src/utilities/queryParams';
-import { withLinodeDetailContext } from '../LinodesDetail/linodeDetailContext';
 import { MutationNotification } from '../LinodesDetail/LinodesDetailHeader/MutationNotification';
 import Notifications from '../LinodesDetail/LinodesDetailHeader/Notifications';
 import Details from './Details';
@@ -47,6 +36,12 @@ import {
   curriedCloneLandingReducer,
   defaultState,
 } from './utilities';
+import {
+  useAllLinodeConfigsQuery,
+  useAllLinodesQuery,
+  useLinodeQuery,
+} from 'src/queries/linodes/linodes';
+import { useAllLinodeDisksQuery } from 'src/queries/linodes/disks';
 
 const Configs = React.lazy(() => import('./Configs'));
 const Disks = React.lazy(() => import('./Disks'));
@@ -79,30 +74,24 @@ const useStyles = makeStyles((theme: Theme) => ({
   },
 }));
 
-interface WithLinodesProps {
-  linodesData: Linode[];
-  linodesLoading: boolean;
-  linodesError?: APIError[];
-}
-
-type CombinedProps = RouteComponentProps<{}> &
-  LinodeContextProps &
-  WithLinodesProps &
-  DispatchProps;
-
-export const CloneLanding: React.FC<CombinedProps> = (props) => {
-  const {
-    configs,
-    disks,
-    history,
-    region,
-    requestDisks,
-    linodeId,
-    linodesData,
-  } = props;
+const CloneLanding = () => {
+  const { linodeId: _linodeId } = useParams<{ linodeId: string }>();
+  const history = useHistory();
+  const match = useRouteMatch();
+  const location = useLocation();
+
+  const linodeId = Number(_linodeId);
+
+  const { data: _configs } = useAllLinodeConfigsQuery(linodeId);
+  const { data: _disks } = useAllLinodeDisksQuery(linodeId);
+  const { data: linodes } = useAllLinodesQuery();
+  const { data: linode } = useLinodeQuery(linodeId);
 
   const classes = useStyles();
 
+  const configs = _configs ?? [];
+  const disks = _disks ?? [];
+
   /**
    * ROUTING
    */
@@ -110,21 +99,21 @@ export const CloneLanding: React.FC<CombinedProps> = (props) => {
     // These must correspond to the routes inside the Switch
     {
       title: 'Configuration Profiles',
-      routeName: `${props.match.url}/configs`,
+      routeName: `${match.url}/configs`,
     },
     {
       title: 'Disks',
-      routeName: `${props.match.url}/disks`,
+      routeName: `${match.url}/disks`,
     },
   ];
 
   // Helper function for the <Tabs /> component
   const matches = (p: string) => {
-    return Boolean(matchPath(p, { path: props.location.pathname }));
+    return Boolean(matchPath(p, { path: location.pathname }));
   };
 
   const navToURL = (index: number) => {
-    props.history.push(tabs[index].routeName);
+    history.push(tabs[index].routeName);
   };
 
   /**
@@ -165,18 +154,18 @@ export const CloneLanding: React.FC<CombinedProps> = (props) => {
   // Toggle config if a valid configId is specified as a query param.
   React.useEffect(() => {
     const configFromQS = Number(queryParams.selectedConfig);
-    if (configFromQS) {
+    if (configFromQS && configs) {
       return dispatch({ type: 'toggleConfig', id: configFromQS });
     }
-  }, [queryParams]);
+  }, [queryParams, configs]);
 
   // Toggle disk if a valid diskId is specified as a query param.
   React.useEffect(() => {
     const diskFromQS = Number(queryParams.selectedDisk);
-    if (diskFromQS) {
+    if (diskFromQS && disks) {
       return dispatch({ type: 'toggleDisk', id: diskFromQS });
     }
-  }, [queryParams]);
+  }, [queryParams, disks]);
 
   // Helper functions for updating the state.
   const toggleConfig = (id: number) => {
@@ -275,7 +264,6 @@ export const CloneLanding: React.FC<CombinedProps> = (props) => {
       .then(() => {
         setSubmitting(false);
         resetEventsPolling();
-        requestDisks(linodeId);
         history.push(`/linodes/${linodeId}/configurations`);
       })
       .catch((errors) => {
@@ -287,14 +275,14 @@ export const CloneLanding: React.FC<CombinedProps> = (props) => {
   // Cast the results of the Immer state to a mutable data structure.
   const errorMap = getErrorMap(['disk_size'], castDraft(state.errors));
 
-  const selectedLinode = linodesData.find(
+  const selectedLinode = linodes?.find(
     (eachLinode) => eachLinode.id === state.selectedLinodeId
   );
   const selectedLinodeRegion = selectedLinode && selectedLinode.region;
   return (
     <React.Fragment>
       <DocumentTitleSegment segment="Clone" />
-      <MutationNotification linodeId={props.linodeId} />
+      <MutationNotification linodeId={linodeId} />
       <Notifications />
       <LinodesDetailHeader />
       <Grid container className={classes.root}>
@@ -380,7 +368,7 @@ export const CloneLanding: React.FC<CombinedProps> = (props) => {
             })}
             selectedLinodeId={state.selectedLinodeId}
             selectedLinodeRegion={selectedLinodeRegion}
-            thisLinodeRegion={region}
+            thisLinodeRegion={linode?.region ?? ''}
             handleSelectLinode={setSelectedLinodeId}
             handleToggleConfig={toggleConfig}
             handleToggleDisk={toggleDisk}
@@ -391,56 +379,8 @@ export const CloneLanding: React.FC<CombinedProps> = (props) => {
           />
         </Grid>
       </Grid>
-      <React.Suspense fallback={<SuspenseLoader />}>
-        <Switch />
-      </React.Suspense>
     </React.Fragment>
   );
 };
 
-interface LinodeContextProps {
-  linodeId: number;
-  configs: Config[];
-  disks: Disk[];
-  region: string;
-  label: string;
-  linodeStatus: LinodeStatus;
-  linodeEvents: Event[];
-}
-const linodeContext = withLinodeDetailContext(({ linode }) => ({
-  linodeId: linode.id,
-  configs: linode._configs,
-  disks: linode._disks,
-  region: linode.region,
-  label: linode.label,
-  linodeStatus: linode.status,
-  linodeEvents: linode._events,
-}));
-
-interface DispatchProps {
-  requestDisks: (linodeId: number) => void;
-}
-
-const mapDispatchToProps: MapDispatchToProps<DispatchProps, {}> = (
-  dispatch: ThunkDispatch<ApplicationState, undefined, AnyAction>
-) => {
-  return {
-    requestDisks: (linodeId: number) =>
-      dispatch(getAllLinodeDisks({ linodeId })),
-  };
-};
-
-const connected = connect(undefined, mapDispatchToProps);
-
-const enhanced = compose<CombinedProps, {}>(
-  connected,
-  linodeContext,
-  withLinodes((ownProps, linodesData, linodesLoading, linodesError) => ({
-    linodesData,
-    linodesLoading,
-    linodesError,
-  })),
-  withRouter
-);
-
-export default enhanced(CloneLanding);
+export default CloneLanding;
diff --git a/packages/manager/src/features/Linodes/CloneLanding/Details.tsx b/packages/manager/src/features/Linodes/CloneLanding/Details.tsx
index 80be16f8cc3..722a91e01e8 100644
--- a/packages/manager/src/features/Linodes/CloneLanding/Details.tsx
+++ b/packages/manager/src/features/Linodes/CloneLanding/Details.tsx
@@ -11,7 +11,7 @@ import { Theme } from '@mui/material/styles';
 import Typography from 'src/components/core/Typography';
 import { Notice } from 'src/components/Notice/Notice';
 import { useRegionsQuery } from 'src/queries/regions';
-import LinodeSelect from '../LinodeSelect';
+import { LinodeSelect } from '../LinodeSelect/LinodeSelect';
 import {
   EstimatedCloneTimeMode,
   ExtendedConfig,
@@ -267,12 +267,6 @@ export const Configs: React.FC<Props> = (props) => {
         textFieldProps={{
           error: !!linodeError,
         }}
-        updateFor={[
-          selectedLinodeId,
-          shouldExcludeCurrentLinode,
-          errorMap,
-          classes,
-        ]}
         isClearable={false}
       />
 
diff --git a/packages/manager/src/features/Linodes/LinodeSelect/LinodeSelect.tsx b/packages/manager/src/features/Linodes/LinodeSelect/LinodeSelect.tsx
index a0373aa1cb9..f469a25f7c7 100644
--- a/packages/manager/src/features/Linodes/LinodeSelect/LinodeSelect.tsx
+++ b/packages/manager/src/features/Linodes/LinodeSelect/LinodeSelect.tsx
@@ -1,26 +1,16 @@
 import { Linode } from '@linode/api-v4/lib/linodes';
 import { Region } from '@linode/api-v4/lib/regions';
-import { APIError } from '@linode/api-v4/lib/types';
 import { groupBy } from 'ramda';
 import * as React from 'react';
-import { compose } from 'recompose';
 import EnhancedSelect, {
   GroupType,
   Item,
 } from 'src/components/EnhancedSelect/Select';
-import RenderGuard, { RenderGuardProps } from 'src/components/RenderGuard';
 import { Props as TextFieldProps } from 'src/components/TextField';
-import withLinodes from 'src/containers/withLinodes.container';
-import { useReduxLoad } from 'src/hooks/useReduxLoad';
+import { useAllLinodesQuery } from 'src/queries/linodes/linodes';
 import { useRegionsQuery } from 'src/queries/regions';
 import { getErrorStringOrDefault } from 'src/utilities/errorUtils';
 
-interface WithLinodesProps {
-  linodesData: Linode[];
-  linodesLoading: boolean;
-  linodesError?: APIError[];
-}
-
 type Override = keyof Linode | ((linode: Linode) => any);
 
 interface Props {
@@ -51,17 +41,12 @@ interface Props {
   required?: boolean;
 }
 
-type CombinedProps = Props & WithLinodesProps;
-
-const LinodeSelect: React.FC<CombinedProps> = (props) => {
+export const LinodeSelect = (props: Props) => {
   const {
     disabled,
     generalError,
     handleChange,
     linodeError,
-    linodesError,
-    linodesLoading,
-    linodesData,
     region,
     selectedLinode,
     groupByRegion,
@@ -78,6 +63,8 @@ const LinodeSelect: React.FC<CombinedProps> = (props) => {
     ...rest
   } = props;
 
+  const { data: allLinodes, isLoading, error } = useAllLinodesQuery();
+
   const { data: regions } = useRegionsQuery();
 
   const onChange = React.useCallback(
@@ -91,7 +78,7 @@ const LinodeSelect: React.FC<CombinedProps> = (props) => {
     [handleChange]
   );
 
-  const { _loading } = useReduxLoad(['linodes']);
+  const linodesData = allLinodes ?? [];
 
   const linodes = region
     ? linodesData.filter((thisLinode) => thisLinode.region === region)
@@ -108,7 +95,7 @@ const LinodeSelect: React.FC<CombinedProps> = (props) => {
     : linodesToItems(linodes, valueOverride, labelOverride, filterCondition);
 
   const defaultNoOptionsMessage =
-    !linodeError && !linodesLoading && options.length === 0
+    !linodeError && !isLoading && options.length === 0
       ? 'You have no Linodes to choose from'
       : 'No Options';
 
@@ -133,11 +120,11 @@ const LinodeSelect: React.FC<CombinedProps> = (props) => {
         options={options}
         disabled={disabled}
         small={props.small}
-        isLoading={linodesLoading || _loading}
+        isLoading={isLoading}
         inputId={inputId}
         onChange={onChange}
         errorText={getErrorStringOrDefault(
-          generalError || linodeError || linodesError || ''
+          generalError || linodeError || error || ''
         )}
         isClearable={isClearable}
         textFieldProps={props.textFieldProps}
@@ -148,15 +135,6 @@ const LinodeSelect: React.FC<CombinedProps> = (props) => {
   );
 };
 
-export default compose<CombinedProps, Props & RenderGuardProps>(
-  RenderGuard,
-  withLinodes((ownProps, linodesData, linodesLoading, linodesError) => ({
-    linodesData,
-    linodesLoading,
-    linodesError,
-  }))
-)(LinodeSelect);
-
 /**
  * UTILITIES
  */
diff --git a/packages/manager/src/features/Linodes/LinodeSelect/index.tsx b/packages/manager/src/features/Linodes/LinodeSelect/index.tsx
deleted file mode 100644
index c72832c4032..00000000000
--- a/packages/manager/src/features/Linodes/LinodeSelect/index.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-import LinodeSelect from './LinodeSelect';
-export default LinodeSelect;
diff --git a/packages/manager/src/features/Linodes/LinodesCreate/LinodeCreate.tsx b/packages/manager/src/features/Linodes/LinodesCreate/LinodeCreate.tsx
index e7e2a54adc4..bc0e873ce4a 100644
--- a/packages/manager/src/features/Linodes/LinodesCreate/LinodeCreate.tsx
+++ b/packages/manager/src/features/Linodes/LinodesCreate/LinodeCreate.tsx
@@ -68,13 +68,13 @@ import {
   StackScriptFormStateHandlers,
   TypeInfo,
   WithDisplayData,
-  WithLinodesProps,
   WithTypesRegionsAndImages,
 } from './types';
 import { UserDataAccordion } from './UserDataAccordion/UserDataAccordion';
 import { extendType } from 'src/utilities/extendType';
 import { WithTypesProps } from 'src/containers/types.container';
 import { RegionsProps } from 'src/containers/regions.container';
+import { WithLinodesProps } from 'src/containers/withLinodes.container';
 
 type ClassNames =
   | 'form'
diff --git a/packages/manager/src/features/Linodes/LinodesCreate/LinodeCreateContainer.tsx b/packages/manager/src/features/Linodes/LinodesCreate/LinodeCreateContainer.tsx
index 0020a02e11e..88bf7929c71 100644
--- a/packages/manager/src/features/Linodes/LinodesCreate/LinodeCreateContainer.tsx
+++ b/packages/manager/src/features/Linodes/LinodesCreate/LinodeCreateContainer.tsx
@@ -32,7 +32,10 @@ import { withTypes, WithTypesProps } from 'src/containers/types.container';
 import withFlags, {
   FeatureFlagConsumerProps,
 } from 'src/containers/withFeatureFlagConsumer.container';
-import withLinodes from 'src/containers/withLinodes.container';
+import {
+  WithLinodesProps,
+  withLinodes,
+} from 'src/containers/withLinodes.container';
 import { resetEventsPolling } from 'src/eventsPolling';
 import withAgreements, {
   AgreementsProps,
@@ -48,10 +51,6 @@ import {
 import { simpleMutationHandlers } from 'src/queries/base';
 import { getAllOCAsRequest } from 'src/queries/stackscripts';
 import { CreateTypes } from 'src/store/linodeCreate/linodeCreate.actions';
-import {
-  LinodeActionsProps,
-  withLinodeActions,
-} from 'src/store/linodes/linode.containers';
 import { upsertLinode } from 'src/store/linodes/linodes.actions';
 import { MapState } from 'src/store/types';
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
@@ -64,13 +63,7 @@ import { getQueryParamsFromQueryString } from 'src/utilities/queryParams';
 import scrollErrorIntoView from 'src/utilities/scrollErrorIntoView';
 import { validatePassword } from 'src/utilities/validatePassword';
 import LinodeCreate from './LinodeCreate';
-import {
-  HandleSubmit,
-  LinodeCreateValidation,
-  Info,
-  TypeInfo,
-  WithLinodesProps,
-} from './types';
+import { HandleSubmit, LinodeCreateValidation, Info, TypeInfo } from './types';
 import { getRegionIDFromLinodeID } from './utilities';
 import { ExtendedType, extendType } from 'src/utilities/extendType';
 import LandingHeader from 'src/components/LandingHeader';
@@ -120,7 +113,6 @@ interface State {
 
 type CombinedProps = WithSnackbarProps &
   CreateType &
-  LinodeActionsProps &
   ImagesProps &
   WithTypesProps &
   WithLinodesProps &
@@ -830,14 +822,9 @@ const connected = connect(mapStateToProps, { upsertLinode });
 
 export default recompose<CombinedProps, {}>(
   withImages,
-  withLinodes((ownProps, linodesData, linodesLoading, linodesError) => ({
-    linodesData,
-    linodesLoading,
-    linodesError,
-  })),
+  withLinodes,
   withRegions,
   withTypes,
-  withLinodeActions,
   connected,
   withSnackbar,
   withLabelGenerator,
diff --git a/packages/manager/src/features/Linodes/LinodesCreate/types.ts b/packages/manager/src/features/Linodes/LinodesCreate/types.ts
index fc8e44c0f50..c3d26b42b24 100644
--- a/packages/manager/src/features/Linodes/LinodesCreate/types.ts
+++ b/packages/manager/src/features/Linodes/LinodesCreate/types.ts
@@ -38,12 +38,6 @@ export interface WithDisplayData {
   backupsMonthlyPrice?: number | null;
 }
 
-export interface WithLinodesProps {
-  linodesData?: Linode[];
-  linodesLoading: boolean;
-  linodesError?: APIError[];
-}
-
 /**
  * Pure Data without the loading and error
  * keys. Component with these props have already been
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/HostMaintenanceError.tsx b/packages/manager/src/features/Linodes/LinodesDetail/HostMaintenanceError.tsx
index 254705d37c8..175e2af8102 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/HostMaintenanceError.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/HostMaintenanceError.tsx
@@ -1,11 +1,9 @@
 import * as React from 'react';
 import { Notice } from 'src/components/Notice/Notice';
 
-const HostMaintenanceError = () => (
+export const HostMaintenanceError = () => (
   <Notice
     warning
     text="This action is unavailable while your Linode&rsquo;s host is undergoing maintenance."
   />
 );
-
-export default HostMaintenanceError;
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeActivity/LinodeActivity.test.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeActivity/LinodeActivity.test.tsx
deleted file mode 100644
index 9a6c38f9384..00000000000
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeActivity/LinodeActivity.test.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { shallow } from 'enzyme';
-import * as React from 'react';
-import { LinodeActivity } from './LinodeActivity';
-
-describe('LinodeActivity', () => {
-  const wrapper = shallow(<LinodeActivity linodeID={123} />);
-
-  it('should return an EventsLanding component', () => {
-    expect(wrapper.find('[data-qa-events-landing-for-linode]')).toHaveLength(1);
-  });
-
-  it('should specify that the EventsLanding component is for an entity', () => {
-    const props: any = wrapper
-      .find('[data-qa-events-landing-for-linode]')
-      .props();
-    expect(props.entityId).toBe(123);
-  });
-});
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeActivity/LinodeActivity.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeActivity/LinodeActivity.tsx
index 512804f839d..91b6e8556c6 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeActivity/LinodeActivity.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeActivity/LinodeActivity.tsx
@@ -1,35 +1,24 @@
 import { Params } from '@linode/api-v4';
 import * as React from 'react';
-import { compose } from 'recompose';
 import EventsLanding from 'src/features/Events/EventsLanding';
 import { getEventsForEntity } from 'src/utilities/getEventsForEntity';
-import { withLinodeDetailContext } from '../linodeDetailContext';
+import { useParams } from 'react-router-dom';
 
-type CombinedProps = StateProps;
-
-export const LinodeActivity: React.FC<CombinedProps> = (props) => {
-  const { linodeID } = props;
+const LinodeActivity = () => {
+  const { linodeId } = useParams<{ linodeId: string }>();
+  const id = Number(linodeId);
 
   return (
     <EventsLanding
-      entityId={linodeID}
+      entityId={id}
       getEventsRequest={(params: Params = {}) =>
-        getEventsForEntity(params, 'linode', props.linodeID)
+        getEventsForEntity(params, 'linode', id)
       }
       errorMessage="There was an error retrieving activity for this Linode."
       emptyMessage="No recent activity for this Linode."
-      data-qa-events-landing-for-linode
+      data-testid="linode-events-table"
     />
   );
 };
 
-interface StateProps {
-  linodeID: number;
-}
-const linodeContext = withLinodeDetailContext(({ linode }) => ({
-  linodeID: linode.id,
-}));
-
-const enhanced = compose<CombinedProps, {}>(linodeContext);
-
-export default enhanced(LinodeActivity);
+export default LinodeActivity;
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeActivity/index.ts b/packages/manager/src/features/Linodes/LinodesDetail/LinodeActivity/index.ts
deleted file mode 100644
index 95cf7856c6c..00000000000
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeActivity/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import LinodeActivity from './LinodeActivity';
-export default LinodeActivity;
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/BackupsPlaceholder.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/BackupsPlaceholder.tsx
index 1910e072cdb..95db98d449f 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/BackupsPlaceholder.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/BackupsPlaceholder.tsx
@@ -4,7 +4,7 @@ import { makeStyles } from 'tss-react/mui';
 import Typography from 'src/components/core/Typography';
 import { Currency } from 'src/components/Currency';
 import { Placeholder } from 'src/components/Placeholder/Placeholder';
-import LinodePermissionsError from '../LinodePermissionsError';
+import { LinodePermissionsError } from '../LinodePermissionsError';
 import { EnableBackupsDialog } from './EnableBackupsDialog';
 
 interface Props {
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/LinodeBackups.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/LinodeBackups.tsx
index a3b95c1c260..b66d977f7f6 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/LinodeBackups.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeBackup/LinodeBackups.tsx
@@ -9,7 +9,7 @@ import Typography from 'src/components/core/Typography';
 import { ErrorState } from 'src/components/ErrorState/ErrorState';
 import { TableCell } from 'src/components/TableCell';
 import { TableRow } from 'src/components/TableRow';
-import LinodePermissionsError from '../LinodePermissionsError';
+import { LinodePermissionsError } from '../LinodePermissionsError';
 import BackupsPlaceholder from './BackupsPlaceholder';
 import BackupTableRow from './BackupTableRow';
 import { Box, Stack } from '@mui/material';
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeDetailErrorBoundary.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeDetailErrorBoundary.tsx
deleted file mode 100644
index 24bb3082847..00000000000
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeDetailErrorBoundary.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import * as React from 'react';
-import { ErrorState } from 'src/components/ErrorState/ErrorState';
-import { reportException } from 'src/exceptionReporting';
-
-interface State {
-  error?: Error;
-  info?: any;
-}
-
-export default <T extends {}>(Component: React.ComponentType) => {
-  class LinodeDetailErrorBoundary extends React.Component<T, State> {
-    state: State = {};
-
-    componentDidCatch(error: Error, info: any) {
-      this.setState({ error, info });
-      reportException(error, info);
-    }
-
-    render() {
-      if (this.state.error) {
-        return (
-          <ErrorState errorText="Oops! There was an unexpected error loading your Linode. Don't worry, we're looking into it." />
-        );
-      }
-
-      return <Component {...this.props} />;
-    }
-  }
-
-  return LinodeDetailErrorBoundary;
-};
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeNetworking.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeNetworking.tsx
index c11c9b86e1d..49590f47839 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeNetworking.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeNetworking/LinodeNetworking.tsx
@@ -19,7 +19,7 @@ import { Table } from 'src/components/Table';
 import { TableCell } from 'src/components/TableCell';
 import { TableRow } from 'src/components/TableRow';
 import { TableSortCell } from 'src/components/TableSortCell';
-import LinodePermissionsError from '../LinodePermissionsError';
+import { LinodePermissionsError } from '../LinodePermissionsError';
 import AddIPDrawer from './AddIPDrawer';
 import { EditIPRDNSDrawer } from './EditIPRDNSDrawer';
 import IPSharing from './IPSharing';
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodePermissionsError.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodePermissionsError.tsx
index 62621076284..f3ec00ab9aa 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodePermissionsError.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodePermissionsError.tsx
@@ -1,11 +1,9 @@
 import * as React from 'react';
 import { Notice } from 'src/components/Notice/Notice';
 
-const LinodePermissionsError = () => (
+export const LinodePermissionsError = () => (
   <Notice
     error
     text="You don't have permission to modify this Linode. Please contact an account administrator for details."
   />
 );
-
-export default LinodePermissionsError;
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/LinodeRebuildDialog.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/LinodeRebuildDialog.tsx
index 77195a4d36b..1d3146b63af 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/LinodeRebuildDialog.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeRebuild/LinodeRebuildDialog.tsx
@@ -5,8 +5,8 @@ import Typography from 'src/components/core/Typography';
 import { Dialog } from 'src/components/Dialog/Dialog';
 import EnhancedSelect, { Item } from 'src/components/EnhancedSelect/Select';
 import { Notice } from 'src/components/Notice/Notice';
-import HostMaintenanceError from '../HostMaintenanceError';
-import LinodePermissionsError from '../LinodePermissionsError';
+import { HostMaintenanceError } from '../HostMaintenanceError';
+import { LinodePermissionsError } from '../LinodePermissionsError';
 import RebuildFromImage from './RebuildFromImage';
 import RebuildFromStackScript from './RebuildFromStackScript';
 import { useLinodeQuery } from 'src/queries/linodes/linodes';
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeRescue/StandardRescueDialog.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeRescue/StandardRescueDialog.tsx
index 539472fa157..b3add883d02 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeRescue/StandardRescueDialog.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeRescue/StandardRescueDialog.tsx
@@ -17,7 +17,7 @@ import { useAllVolumesQuery } from 'src/queries/volumes';
 import createDevicesFromStrings, {
   DevicesAsStrings,
 } from 'src/utilities/createDevicesFromStrings';
-import LinodePermissionsError from '../LinodePermissionsError';
+import { LinodePermissionsError } from '../LinodePermissionsError';
 import DeviceSelection, { ExtendedDisk } from './DeviceSelection';
 import RescueDescription from './RescueDescription';
 import { useLinodeQuery } from 'src/queries/linodes/linodes';
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeResize/LinodeResize.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeResize/LinodeResize.tsx
index cc1ad307809..c75bc94b899 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeResize/LinodeResize.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeResize/LinodeResize.tsx
@@ -17,8 +17,8 @@ import PlansPanel from 'src/features/Linodes/LinodesCreate/SelectPlanPanel/Plans
 import { linodeInTransition } from 'src/features/Linodes/transitions';
 import { getPermissionsForLinode } from 'src/store/linodes/permissions/permissions.selector';
 import scrollErrorIntoView from 'src/utilities/scrollErrorIntoView';
-import HostMaintenanceError from '../HostMaintenanceError';
-import LinodePermissionsError from '../LinodePermissionsError';
+import { HostMaintenanceError } from '../HostMaintenanceError';
+import { LinodePermissionsError } from '../LinodePermissionsError';
 import { extendType } from 'src/utilities/extendType';
 import { useFormik } from 'formik';
 import { useAllLinodeDisksQuery } from 'src/queries/linodes/disks';
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/ImageAndPassword.test.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/ImageAndPassword.test.tsx
index 9984c0345c4..5ddd3e7b05f 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/ImageAndPassword.test.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/ImageAndPassword.test.tsx
@@ -19,7 +19,7 @@ const props = {
   onPasswordChange: jest.fn(),
   authorizedUsers: [],
   setAuthorizedUsers: jest.fn(),
-  permissions: null,
+  linodeId: 0,
 };
 
 const component = shallow(wrapWithTheme(<ImageAndPassword {...props} />));
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/ImageAndPassword.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/ImageAndPassword.tsx
index 0d6bd530c8f..afe798ec6d0 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/ImageAndPassword.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/ImageAndPassword.tsx
@@ -1,6 +1,4 @@
-import { GrantLevel } from '@linode/api-v4/lib/account';
 import * as React from 'react';
-import { compose } from 'recompose';
 import AccessPanel from 'src/components/AccessPanel/AccessPanel';
 import { makeStyles } from '@mui/styles';
 import { Theme } from '@mui/material/styles';
@@ -8,8 +6,8 @@ import { Item } from 'src/components/EnhancedSelect/Select';
 import { ImageSelect } from 'src/features/Images';
 import { useAllImagesQuery } from 'src/queries/images';
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
-import { withLinodeDetailContext } from '../linodeDetailContext';
-import LinodePermissionsError from '../LinodePermissionsError';
+import { LinodePermissionsError } from '../LinodePermissionsError';
+import { useGrants } from 'src/queries/profile';
 
 const useStyles = makeStyles((theme: Theme) => ({
   root: {
@@ -18,25 +16,18 @@ const useStyles = makeStyles((theme: Theme) => ({
   },
 }));
 
-interface ContextProps {
-  permissions: GrantLevel;
-}
-
 interface Props {
   onImageChange: (selected: Item<string>) => void;
   imageFieldError?: string;
-
   password: string;
   passwordError?: string;
   onPasswordChange: (password: string) => void;
-
   setAuthorizedUsers: (usernames: string[]) => void;
   authorizedUsers: string[];
+  linodeId: number;
 }
 
-type CombinedProps = Props & ContextProps;
-
-export const ImageAndPassword: React.FC<CombinedProps> = (props) => {
+export const ImageAndPassword = (props: Props) => {
   const {
     imageFieldError,
     onImageChange,
@@ -45,9 +36,11 @@ export const ImageAndPassword: React.FC<CombinedProps> = (props) => {
     passwordError,
     setAuthorizedUsers,
     authorizedUsers,
-    permissions,
+    linodeId,
   } = props;
 
+  const { data: grants } = useGrants();
+
   const classes = useStyles();
 
   const { data: imagesData, error: imagesError } = useAllImagesQuery();
@@ -55,7 +48,9 @@ export const ImageAndPassword: React.FC<CombinedProps> = (props) => {
     ? getAPIErrorOrDefault(imagesError, 'Unable to load Images')[0].reason
     : undefined;
 
-  const disabled = permissions === 'read_only';
+  const disabled =
+    grants !== undefined &&
+    grants.linode.find((g) => g.id === linodeId)?.permissions === 'read_only';
 
   return (
     <React.Fragment>
@@ -84,11 +79,3 @@ export const ImageAndPassword: React.FC<CombinedProps> = (props) => {
     </React.Fragment>
   );
 };
-
-const linodeContext = withLinodeDetailContext<ContextProps>(({ linode }) => ({
-  permissions: linode._permissions,
-}));
-
-const enhanced = compose<CombinedProps, Props>(linodeContext)(ImageAndPassword);
-
-export default enhanced;
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/LinodeSettings.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/LinodeSettings.tsx
index 7c0cd79cd05..7221506582e 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/LinodeSettings.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/LinodeSettings.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import LinodePermissionsError from '../LinodePermissionsError';
+import { LinodePermissionsError } from '../LinodePermissionsError';
 import { LinodeSettingsAlertsPanel } from './LinodeSettingsAlertsPanel';
 import { LinodeSettingsLabelPanel } from './LinodeSettingsLabelPanel';
 import { LinodeSettingsPasswordPanel } from './LinodeSettingsPasswordPanel';
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/CreateDiskDrawer.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/CreateDiskDrawer.tsx
index cc79422ecee..731a1c4184c 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/CreateDiskDrawer.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/CreateDiskDrawer.tsx
@@ -17,7 +17,7 @@ import {
   useLinodeDiskCreateMutation,
 } from 'src/queries/linodes/disks';
 import { useLinodeQuery } from 'src/queries/linodes/linodes';
-import ImageAndPassword from '../LinodeSettings/ImageAndPassword';
+import { ImageAndPassword } from '../LinodeSettings/ImageAndPassword';
 import { resetEventsPolling } from 'src/eventsPolling';
 import {
   CreateLinodeDiskFromImageSchema,
@@ -179,6 +179,7 @@ export const CreateDiskDrawer = (props: Props) => {
             setAuthorizedUsers={(value) =>
               formik.setFieldValue('authorized_users', value)
             }
+            linodeId={linodeId}
           />
         )}
         <TextField
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetail.container.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetail.container.tsx
deleted file mode 100644
index 0b2da249f4d..00000000000
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetail.container.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import * as React from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { useParams } from 'react-router-dom';
-import { CircleProgress } from 'src/components/CircleProgress';
-import { useLinodes } from 'src/hooks/useLinodes';
-import { useAllImagesQuery } from 'src/queries/images';
-import { ApplicationState } from 'src/store';
-import { getAllLinodeConfigs } from 'src/store/linodes/config/config.requests';
-import { getAllLinodeDisks } from 'src/store/linodes/disk/disk.requests';
-import { getLinode as _getLinode } from 'src/store/linodes/linode.requests';
-import { ThunkDispatch } from 'src/store/types';
-import { shouldRequestEntity } from 'src/utilities/shouldRequestEntity';
-import LinodesDetail from './LinodesDetail';
-
-// @todo delete this file after we react queryify most linode features
-// React Query will fetch data when it needs to. A file like this won't be needed
-
-/**
- * We want to hold off loading this screen until Linode data is available.
- * If we have recently requested all Linode data, we're good. If not,
- * we show a loading spinner until the requests are complete.
- */
-export const LinodesDetailContainer = () => {
-  const { linodes } = useLinodes();
-  const dispatch = useDispatch<ThunkDispatch>();
-
-  const params = useParams<{ linodeId: string }>();
-  const linodeId = params.linodeId;
-
-  const { isLoading: imagesLoading } = useAllImagesQuery({}, {});
-
-  const { configs, disks } = useSelector((state: ApplicationState) => {
-    const disks = state.__resources.linodeDisks[linodeId];
-    const configs = state.__resources.linodeConfigs[linodeId];
-    return { disks, configs };
-  });
-
-  React.useEffect(() => {
-    // Unconditionally request data for the Linode being viewed
-    dispatch(_getLinode({ linodeId: +linodeId })).catch((_) => null);
-  }, [linodeId, dispatch]);
-
-  React.useEffect(() => {
-    if (!linodes.itemsById[linodeId]) {
-      // Most likely a 404
-      return;
-    }
-
-    if (configs?.error.read || disks?.error.read) {
-      // We don't want an infinite loop.
-      return;
-    }
-
-    // Make sure we've requested config, disk, and interface information for this Linode
-    if (shouldRequestEntity(configs)) {
-      dispatch(getAllLinodeConfigs({ linodeId: +linodeId }));
-    }
-
-    if (shouldRequestEntity(disks)) {
-      dispatch(getAllLinodeDisks({ linodeId: +linodeId }));
-    }
-  }, [dispatch, configs, disks, linodeId, linodes]);
-
-  if ((linodes.lastUpdated === 0 && linodes.loading) || imagesLoading) {
-    return <CircleProgress />;
-  }
-
-  return <LinodesDetail />;
-};
-
-export default React.memo(LinodesDetailContainer);
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetail.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetail.tsx
index d3346f8a117..06890ffd2e6 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetail.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetail.tsx
@@ -1,5 +1,4 @@
 import * as React from 'react';
-import { useDispatch } from 'react-redux';
 import {
   Redirect,
   Route,
@@ -8,12 +7,6 @@ import {
   useRouteMatch,
 } from 'react-router-dom';
 import SuspenseLoader from 'src/components/SuspenseLoader';
-import useExtendedLinode from 'src/hooks/useExtendedLinode';
-import {
-  LinodeDetailContext,
-  linodeDetailContextFactory as createLinodeDetailContext,
-  LinodeDetailContextProvider,
-} from './linodeDetailContext';
 import { useLinodeQuery } from 'src/queries/linodes/linodes';
 import { ErrorState } from 'src/components/ErrorState/ErrorState';
 import { CircleProgress } from 'src/components/CircleProgress';
@@ -32,65 +25,44 @@ const LinodeDetail = () => {
 
   const id = Number(linodeId);
 
-  const dispatch = useDispatch();
   const { data: linode, isLoading, error } = useLinodeQuery(id);
 
-  // We can remove this when we remove the context below
-  const extendedLinode = useExtendedLinode(id);
-
   if (error) {
     return <ErrorState errorText={error?.[0].reason} />;
   }
 
-  if (isLoading || !linode || !extendedLinode) {
+  if (isLoading || !linode) {
     return <CircleProgress />;
   }
 
-  // We will delete this as soon as we react query all consumers of this context
-  const ctx: LinodeDetailContext = createLinodeDetailContext(
-    extendedLinode,
-    dispatch
-  );
-
   return (
-    <LinodeDetailContextProvider value={ctx}>
-      <React.Suspense fallback={<SuspenseLoader />}>
-        <Switch>
-          {/*
+    <React.Suspense fallback={<SuspenseLoader />}>
+      <Switch>
+        {/*
           Currently, the "Clone Configs and Disks" feature exists OUTSIDE of LinodeDetail.
           Or... at least it appears that way to the user. We would like it to live WITHIN
           LinodeDetail, though, because we'd like to use the same context, so we don't
           have to reload all the configs, disks, etc. once we get to the CloneLanding page.
           */}
-          <Route path={`${path}/clone`} component={CloneLanding} />
+        <Route path={`${path}/clone`} component={CloneLanding} />
 
-          <Route
-            render={() => (
-              <React.Fragment>
-                <LinodesDetailHeader />
-                <LinodesDetailNavigation />
-                <Switch>
-                  <Redirect from={`${url}/resize`} to={`${url}?resize=true`} />
-                  <Redirect
-                    from={`${url}/rebuild`}
-                    to={`${url}?rebuild=true`}
-                  />
-                  <Redirect from={`${url}/rescue`} to={`${url}?rescue=true`} />
-                  <Redirect
-                    from={`${url}/migrate`}
-                    to={`${url}?migrate=true`}
-                  />
-                  <Redirect
-                    from={`${url}/upgrade`}
-                    to={`${url}?upgrade=true`}
-                  />
-                </Switch>
-              </React.Fragment>
-            )}
-          />
-        </Switch>
-      </React.Suspense>
-    </LinodeDetailContextProvider>
+        <Route
+          render={() => (
+            <React.Fragment>
+              <LinodesDetailHeader />
+              <LinodesDetailNavigation />
+              <Switch>
+                <Redirect from={`${url}/resize`} to={`${url}?resize=true`} />
+                <Redirect from={`${url}/rebuild`} to={`${url}?rebuild=true`} />
+                <Redirect from={`${url}/rescue`} to={`${url}?rescue=true`} />
+                <Redirect from={`${url}/migrate`} to={`${url}?migrate=true`} />
+                <Redirect from={`${url}/upgrade`} to={`${url}?upgrade=true`} />
+              </Switch>
+            </React.Fragment>
+          )}
+        />
+      </Switch>
+    </React.Suspense>
   );
 };
 
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetailHeader/Notifications.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetailHeader/Notifications.tsx
index aa1c79302cd..fdd8e4d4a85 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetailHeader/Notifications.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodesDetailHeader/Notifications.tsx
@@ -6,12 +6,11 @@ import { useAllAccountMaintenanceQuery } from 'src/queries/accountMaintenance';
 import { useNotificationsQuery } from 'src/queries/accountNotifications';
 import MigrationNotification from './MigrationNotification';
 import { useParams } from 'react-router-dom';
-import { useLinodes } from 'src/hooks/useLinodes';
+import { useLinodeQuery } from 'src/queries/linodes/linodes';
 
 const Notifications = () => {
   const { linodeId } = useParams<{ linodeId: string }>();
-  const { linodes } = useLinodes();
-  const linode = linodes.itemsById[Number(linodeId)];
+  const { data: linode } = useLinodeQuery(Number(linodeId));
 
   const { data: notifications, refetch } = useNotificationsQuery();
 
@@ -47,7 +46,7 @@ const Notifications = () => {
         }
         return (
           <MigrationNotification
-            linodeID={linode.id}
+            linodeID={Number(linode?.id)}
             requestNotifications={refetch}
             notificationMessage={notification.message}
             notificationType={notification.type}
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/README.md b/packages/manager/src/features/Linodes/LinodesDetail/README.md
deleted file mode 100644
index 937d7c34ee5..00000000000
--- a/packages/manager/src/features/Linodes/LinodesDetail/README.md
+++ /dev/null
@@ -1,159 +0,0 @@
-# LinodesDetail
-
-The purpose of LinodesDetail is displaying the header, routing, and the creation and implementation of a context.
-
-# Linode Detail Context
-
-The Linode Detail Context contains an extended Linode property and preconfigured handlers for that specific Linode. This context is made available to nested components by the [React ContextAPI](https://reactjs.org/docs/context.html).
-
-The Linode Detail Context is availble to any component rendered below the LinodesDetail component via [withLinodeDetailContext](linodeDetailContext.tsx#149) high-order component or the [LinodeDetailContextConsumer](linodeDetailContext.tsx#147).
-
-## Context Data
-
-The current Linode details, events, notifications, volumes, disks, and configs (so far) are provided on the `linode` property. This data is currently created by LinodeDetail.container, but the context doesn't care where it comes from. You could easily swap out the source of this information.
-
-## Context Handlers
-
-The context also exposes handlers that are preconfigured for the current Linode. Normally to update a Linode you would invoke `updateLinode(123, { label: 'whatever' })` but we've preconfigured the request to be `updateLinode({ label: 'whatever '})`. `updateLinode` already has the ID by creating an anoymous fascade function. This can be found in [linodeDetailContext.tsx](linodeDetailContext.tsx#L104).
-
-## Usage
-
-### withLinodeDetailContext.
-
-withLinodeDetailContext is a high-order component that takes a function which allows you to map the Linode Detail Context object to props.
-
-```jsx
-// src/features/Linodes/LinodesDetail/MyComponent.tsx
-/** Hooks used for berevity, they are not used in this PR. */
-import { withLinodeDetailContext } from './context'
-
-const MyComponent = (props) => {
-  const { linode, updateLinode } = props;
-  const [newLabel, setNewLabel] = useState(linode.label);
-
-  return  (
-    <h1>Rename {linode.label}</h1>
-    <input onChange={(e) => setLabel(e.target.value)} value={label} />
-    <button onClick={() => updateLinode({ label: newLabel })}>Submit</button>
-  )
-};
-
-const enhanced = withLinodeDetailContext(({ linode, updateLinode }) => ({
-  linode,
-  updateLinode,
-}));
-
-export default enhanced(myComponent);
-```
-
-### LinodeDetailContextConsumer.
-
-The `LinodeDetailContextConsumer` is a render function as children component which allows you to subscribe the wrapped component to prop changes.
-
-```jsx
-// src/features/Linodes/LinodesDetail/MyComponent.tsx
-/** Hooks used for berevity, they are not used in this PR. */
-import { LinodeDetailContextConsumer } from './context'
-
-const MyComponent = (props) => {
-  const [newLabel, setNewLabel] = useState(linode.label);
-
-  return  (
-    <LinodeDetailContextConsumer>
-      {({ linode, updateLinode }) => (
-        <h1>Rename {linode.label}</h1>
-        <input onChange={(e) => setLabel(e.target.value)} value={label} />
-        <button onClick={() => updateLinode({ label: newLabel })}>Submit</button>
-      )}
-    </LinodeDetailContextConsumer>
-  )
-};
-
-export default myComponent;
-```
-
-### useLinodeDetailContext (NYI)
-
-**N**ot **Y**et **I**mplemented - This is an example of what the Linode Detail Context usage could look like with hooks. This is possible, with all of 1 line of code, but you should wait for Enzyme to be updated for Hooks or agree on a [new testing strategy](https://github.com/kentcdodds/react-testing-library).
-
-```jsx
-// src/features/Linodes/LinodesDetail/MyComponent.tsx
-import { LinodeDetailContextConsumer } from './context';
-
-const MyComponent = props => {
-  const [newLabel, setNewLabel] = useState(linode.label);
-  const { linode, updateLinode } = useLinodeDetailContext();
-
-  return (
-    <>
-      <h1>Rename {linode.label}</h1>
-      <input onChange={e => setLabel(e.target.value)} value={label} />
-      <button onClick={() => updateLinode({ label: newLabel })}>Submit</button>
-    </>
-  );
-};
-
-export default myComponent;
-```
-
-# LinodesDetail Container
-
-_Note: This could probably be better named._
-
-LinodesDetail.container will create a data object or rendering a error/loading/empty state component based on the state of Redux.
-
-The LinodesDetail.container file exists to build an extended Linode object, or render a loading, error, or empty components given the state of Redux.
-
-The LinodesDetail.container file exists to build an extended Linode object, or render a
-loading, error, or empty components given the state of that object.
-
-1. Request all the configs for the Linode. If the linodeId changes we make the request again. No additional props are injected.
-
-2. Request all the disks for the Linode. If the linodeId changes we make the request again. No additional props are injected.
-
-3. Combine error states of relevant requests. Render the ErrorState component if any error is defined. This is an early return. No additional props are injected.
-
-4. Combine loading states of relevant requests. Render the CircleProgress if any are true. This is an early return. No additional props are injected.
-
-5. Finally if the Linode object is defined, we merge the secondary data onto the Linode and pass it as a prop `linode` to the wrapped component. Render the NotFound component if the Linode object is undefined, as it was not found in Redux.
-
-The maybeRenderError, maybeRenderLoading, and maybeWithExtendedLinode all use Recompose's [branch](https://github.com/acdlite/recompose/blob/master/docs/API.md#branch) function. This is a great way to early return and prevent unnecessary computation.
-
-# A Working Work in Progress
-
-Not all nested components have been updated to make use of this new pattern. The LinodeConfigSelectionDrawer could probably benefit from some work. Any nested components that are directly requesting the Linode, configs, or disks (or really any data at this point) should probably be going through Redux, and thus the context.
-
-Should we add `_backups`? Probably.
-Should we add `_networking`? Probably.
-
-Have a look at disks and configs state management. Notice a very obvious pattern? Would could extract that to some sort of factory pattern. But should we? The indirection comes at cost.
-
-# Todo
-
-The following requests are not on the Linode Context Detail. Each should be reviewed for their effect on the state of the Linode and maybe added as preconfigured handlers. The more information you pump through the Store the more reactive you can make the application.
-
-- [ ] getLinode
-- [ ] deleteLinode
-- [ ] getBackups
-- [ ] createSnapshot
-- [ ] cancelBackups
-- [ ] enableBackups
-- [ ] getBackup
-- [ ] restoreBackup
-- [ ] bootLinode
-- [ ] cloneLinode
-- [ ] resetDiskRootPassword
-- [ ] getNetworkingInformation
-- [ ] allocateIPv4Address
-- [ ] getIPAddress
-- [ ] updateIPAddress
-- [ ] deleteIPAddress
-- [ ] initiatePendingMigration
-- [ ] updateLinode
-- [ ] rebootLinode
-- [ ] rebuildLinode
-- [ ] rescueLinode
-- [ ] resizeLinode
-- [ ] shutdownLinode
-- [ ] viewLinodeStats
-- [ ] viewLinodeYYMMStatis
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/index.tsx b/packages/manager/src/features/Linodes/LinodesDetail/index.tsx
deleted file mode 100644
index e40bf3a6f23..00000000000
--- a/packages/manager/src/features/Linodes/LinodesDetail/index.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-import LinodesDetail from './LinodesDetail.container';
-export default LinodesDetail;
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/linodeDetailContext.tsx b/packages/manager/src/features/Linodes/LinodesDetail/linodeDetailContext.tsx
deleted file mode 100644
index 4e4a12db159..00000000000
--- a/packages/manager/src/features/Linodes/LinodesDetail/linodeDetailContext.tsx
+++ /dev/null
@@ -1,155 +0,0 @@
-import { Linode } from '@linode/api-v4/lib/linodes';
-import * as React from 'react';
-import { createHOCForConsumer } from 'src/requestableContext';
-import {
-  CreateLinodeConfigResponse,
-  DeleteLinodeConfigResponse,
-  GetLinodeConfigResponse,
-  GetLinodeConfigsResponse,
-  LinodeConfigCreateFields,
-  LinodeConfigUpdateFields,
-  UpdateLinodeConfigResponse,
-} from 'src/store/linodes/config/config.actions';
-import {
-  createLinodeConfig as _createLinodeConfig,
-  deleteLinodeConfig as _deleteLinodeConfig,
-  getLinodeConfig as _getLinodeConfig,
-  getLinodeConfigs as _getLinodeConfigs,
-  updateLinodeConfig as _updateLinodeConfig,
-} from 'src/store/linodes/config/config.requests';
-import {
-  CreateLinodeDiskResponse,
-  DeleteLinodeDiskResponse,
-  GetLinodeDiskResponse,
-  GetLinodeDisksResponse,
-  LinodeDiskCreateFields,
-  LinodeDiskUpdateFields,
-  ResizeLinodeDiskResponse,
-  UpdateLinodeDiskResponse,
-} from 'src/store/linodes/disk/disk.actions';
-import {
-  createLinodeDisk as _createLinodeDisk,
-  deleteLinodeDisk as _deleteLinodeDisk,
-  getLinodeDisk as _getLinodeDisk,
-  getLinodeDisks as _getLinodeDisks,
-  resizeLinodeDisk as _resizeLinodeDisk,
-  updateLinodeDisk as _updateLinodeDisk,
-} from 'src/store/linodes/disk/disk.requests';
-import { updateLinode as _updateLinode } from 'src/store/linodes/linode.requests';
-import { ThunkDispatch } from 'src/store/types';
-import { ExtendedLinode } from './types';
-
-export type CreateLinodeConfig = (
-  data: LinodeConfigCreateFields
-) => CreateLinodeConfigResponse;
-
-export type DeleteLinodeConfig = (
-  configId: number
-) => DeleteLinodeConfigResponse;
-
-export type GetLinodeConfig = (configId: number) => GetLinodeConfigResponse;
-
-export type GetLinodeConfigs = () => GetLinodeConfigsResponse;
-
-export type UpdateLinodeConfig = (
-  configId: number,
-  data: LinodeConfigUpdateFields
-) => UpdateLinodeConfigResponse;
-
-export type CreateLinodeDisk = (
-  data: LinodeDiskCreateFields
-) => CreateLinodeDiskResponse;
-
-export type DeleteLinodeDisk = (diskId: number) => DeleteLinodeDiskResponse;
-
-export type ResizeLinodeDisk = (
-  diskId: number,
-  size: number
-) => ResizeLinodeDiskResponse;
-
-export type GetLinodeDisk = (diskId: number) => GetLinodeDiskResponse;
-
-export type GetLinodeDisks = () => GetLinodeDisksResponse;
-
-export type UpdateLinodeDisk = (
-  diskId: number,
-  data: LinodeDiskUpdateFields
-) => UpdateLinodeDiskResponse;
-
-export type UpdateLinode = (data: Partial<Linode>) => Promise<Linode>;
-
-export interface LinodeDetailContext {
-  linode: ExtendedLinode;
-
-  /** Linode Actions */
-  updateLinode: (data: Partial<Linode>) => Promise<Linode>;
-
-  /** Linode Config actions */
-  createLinodeConfig: CreateLinodeConfig;
-  deleteLinodeConfig: DeleteLinodeConfig;
-  getLinodeConfig: GetLinodeConfig;
-  getLinodeConfigs: GetLinodeConfigs;
-  updateLinodeConfig: UpdateLinodeConfig;
-
-  /** Linode Disk actions */
-  createLinodeDisk: CreateLinodeDisk;
-  deleteLinodeDisk: DeleteLinodeDisk;
-  getLinodeDisk: GetLinodeDisk;
-  getLinodeDisks: GetLinodeDisks;
-  updateLinodeDisk: UpdateLinodeDisk;
-  resizeLinodeDisk: ResizeLinodeDisk;
-}
-
-/**
- * Create the Linode Detail Context including handlers pre-configured with the
- * required Linode ID.
- */
-export const linodeDetailContextFactory = (
-  linode: ExtendedLinode,
-  dispatch: ThunkDispatch
-): LinodeDetailContext => {
-  const { id: linodeId } = linode;
-
-  return {
-    updateLinode: (data: Partial<Linode>) =>
-      dispatch(_updateLinode({ linodeId, ...data })),
-
-    /** Linode Config actions */
-    getLinodeConfig: (configId) =>
-      dispatch(_getLinodeConfig({ linodeId, configId })),
-    getLinodeConfigs: () =>
-      dispatch(_getLinodeConfigs({ linodeId })).then(({ data }) => data),
-    updateLinodeConfig: (configId, data) =>
-      dispatch(_updateLinodeConfig({ linodeId, configId, ...data })),
-    createLinodeConfig: (data) =>
-      dispatch(_createLinodeConfig({ linodeId, ...data })),
-    deleteLinodeConfig: (configId) =>
-      dispatch(_deleteLinodeConfig({ linodeId, configId })),
-
-    /** Linode Disk actions */
-    getLinodeDisk: (diskId) => dispatch(_getLinodeDisk({ linodeId, diskId })),
-    getLinodeDisks: () => dispatch(_getLinodeDisks({ linodeId })),
-    updateLinodeDisk: (diskId, data) =>
-      dispatch(_updateLinodeDisk({ linodeId, diskId, ...data })),
-    createLinodeDisk: (data) =>
-      dispatch(_createLinodeDisk({ linodeId, ...data })),
-    deleteLinodeDisk: (diskId) =>
-      dispatch(_deleteLinodeDisk({ linodeId, diskId })),
-    resizeLinodeDisk: (diskId, size) =>
-      dispatch(_resizeLinodeDisk({ linodeId, diskId, size })),
-    linode,
-  };
-};
-
-const linodeContext = React.createContext<LinodeDetailContext>(null as any);
-
-export default linodeContext;
-
-export const LinodeDetailContextProvider = linodeContext.Provider;
-
-export const LinodeDetailContextConsumer = linodeContext.Consumer;
-
-export const withLinodeDetailContext = createHOCForConsumer<LinodeDetailContext>(
-  linodeContext.Consumer,
-  'withLinodeDetailContext'
-);
diff --git a/packages/manager/src/features/Linodes/index.tsx b/packages/manager/src/features/Linodes/index.tsx
index 85bdc7b16b6..6a7769e0cb3 100644
--- a/packages/manager/src/features/Linodes/index.tsx
+++ b/packages/manager/src/features/Linodes/index.tsx
@@ -8,7 +8,7 @@ import { addMaintenanceToLinodes } from 'src/store/linodes/linodes.helpers';
 const LinodesLanding = React.lazy(
   () => import('./LinodesLanding/LinodesLanding')
 );
-const LinodesDetail = React.lazy(() => import('./LinodesDetail'));
+const LinodesDetail = React.lazy(() => import('./LinodesDetail/LinodesDetail'));
 const LinodesCreate = React.lazy(
   () => import('./LinodesCreate/LinodeCreateContainer')
 );
diff --git a/packages/manager/src/features/NodeBalancers/ConfigNodeIPSelect.tsx b/packages/manager/src/features/NodeBalancers/ConfigNodeIPSelect.tsx
index 0aed6f1563c..04a9750024f 100644
--- a/packages/manager/src/features/NodeBalancers/ConfigNodeIPSelect.tsx
+++ b/packages/manager/src/features/NodeBalancers/ConfigNodeIPSelect.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import LinodeSelect from 'src/features/Linodes/LinodeSelect';
+import { LinodeSelect } from 'src/features/Linodes/LinodeSelect/LinodeSelect';
 import { Linode } from '@linode/api-v4/lib/linodes';
 import { privateIPRegex } from 'src/utilities/ipUtils';
 import type { Props as TextFieldProps } from 'src/components/TextField';
diff --git a/packages/manager/src/features/NotificationCenter/NotificationData/RenderProgressEvent.tsx b/packages/manager/src/features/NotificationCenter/NotificationData/RenderProgressEvent.tsx
index 00ea13f3bd6..dfccfeb5868 100644
--- a/packages/manager/src/features/NotificationCenter/NotificationData/RenderProgressEvent.tsx
+++ b/packages/manager/src/features/NotificationCenter/NotificationData/RenderProgressEvent.tsx
@@ -3,7 +3,6 @@ import BarPercent from 'src/components/BarPercent';
 import Box from 'src/components/core/Box';
 import Divider from 'src/components/core/Divider';
 import Typography from 'src/components/core/Typography';
-import useLinodes from 'src/hooks/useLinodes';
 import { Duration } from 'luxon';
 import { Event } from '@linode/api-v4/lib/account/types';
 import { extendTypesQueryResult } from 'src/utilities/extendType';
@@ -18,24 +17,22 @@ import {
   RenderEventStyledBox,
   useRenderEventStyles,
 } from './RenderEvent.styles';
+import { useAllLinodesQuery } from 'src/queries/linodes/linodes';
 
 interface Props {
   event: Event;
   onClose: () => void;
 }
 
-export type CombinedProps = Props;
-
-export const RenderProgressEvent: React.FC<Props> = (props) => {
+export const RenderProgressEvent = (props: Props) => {
   const { classes } = useRenderEventStyles();
   const { event } = props;
-  const { linodes } = useLinodes();
-  const _linodes = Object.values(linodes.itemsById);
+  const { data: linodes } = useAllLinodesQuery();
   const typesQuery = useSpecificTypes(
-    _linodes.map((linode) => linode.type).filter(isNotNullOrUndefined)
+    (linodes ?? []).map((linode) => linode.type).filter(isNotNullOrUndefined)
   );
   const types = extendTypesQueryResult(typesQuery);
-  const message = eventMessageGenerator(event, _linodes, types);
+  const message = eventMessageGenerator(event, linodes, types);
 
   if (message === null) {
     return null;
diff --git a/packages/manager/src/features/Search/SearchLanding.test.tsx b/packages/manager/src/features/Search/SearchLanding.test.tsx
index 8eefb2dc1d0..d220189f017 100644
--- a/packages/manager/src/features/Search/SearchLanding.test.tsx
+++ b/packages/manager/src/features/Search/SearchLanding.test.tsx
@@ -33,10 +33,6 @@ const propsWithResults: Props = {
 
 const queryClient = new QueryClient();
 
-jest.mock('src/hooks/useReduxLoad', () => ({
-  useReduxLoad: () => jest.fn().mockReturnValue({ _loading: false }),
-}));
-
 describe('Component', () => {
   server.use(
     rest.get('*/domains', (req, res, ctx) => {
diff --git a/packages/manager/src/features/Search/SearchLanding.tsx b/packages/manager/src/features/Search/SearchLanding.tsx
index 2d25824a120..a78dccae174 100644
--- a/packages/manager/src/features/Search/SearchLanding.tsx
+++ b/packages/manager/src/features/Search/SearchLanding.tsx
@@ -1,6 +1,5 @@
 import { equals } from 'ramda';
 import * as React from 'react';
-import { useSelector } from 'react-redux';
 import { RouteComponentProps } from 'react-router-dom';
 import { compose } from 'recompose';
 import Error from 'src/assets/icons/error.svg';
@@ -11,10 +10,8 @@ import Typography from 'src/components/core/Typography';
 import Grid from '@mui/material/Unstable_Grid2';
 import { H1Header } from 'src/components/H1Header/H1Header';
 import { Notice } from 'src/components/Notice/Notice';
-import { REFRESH_INTERVAL } from 'src/constants';
 import useAPISearch from 'src/features/Search/useAPISearch';
 import useAccountManagement from 'src/hooks/useAccountManagement';
-import { useReduxLoad } from 'src/hooks/useReduxLoad';
 import { useAllDomainsQuery } from 'src/queries/domains';
 import { useAllImagesQuery } from 'src/queries/images';
 import { useAllKubernetesClustersQuery } from 'src/queries/kubernetes';
@@ -25,7 +22,6 @@ import {
 import { useSpecificTypes } from 'src/queries/types';
 import { useRegionsQuery } from 'src/queries/regions';
 import { useAllVolumesQuery } from 'src/queries/volumes';
-import { ApplicationState } from 'src/store';
 import { ErrorObject } from 'src/store/selectors/entitiesErrors';
 import { formatLinode } from 'src/store/selectors/getSearchEntities';
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
@@ -40,6 +36,7 @@ import { extendTypesQueryResult } from 'src/utilities/extendType';
 import { isNotNullOrUndefined } from 'src/utilities/nullOrUndefined';
 import { useAllNodeBalancersQuery } from 'src/queries/nodebalancers';
 import { getImageLabelForLinode } from '../Images/utils';
+import { useAllLinodesQuery } from 'src/queries/linodes/linodes';
 
 const useStyles = makeStyles((theme: Theme) => ({
   root: {
@@ -152,18 +149,20 @@ export const SearchLanding: React.FC<CombinedProps> = (props) => {
     !_isLargeAccount
   );
 
-  const { data: regions } = useRegionsQuery();
+  const {
+    data: linodes,
+    isLoading: areLinodesLoading,
+    error: linodesError,
+  } = useAllLinodesQuery({}, {}, !_isLargeAccount);
 
-  const linodes = useSelector((state: ApplicationState) =>
-    Object.values(state.__resources.linodes.itemsById)
-  );
+  const { data: regions } = useRegionsQuery();
 
   const typesQuery = useSpecificTypes(
-    linodes.map((linode) => linode.type).filter(isNotNullOrUndefined)
+    (linodes ?? []).map((linode) => linode.type).filter(isNotNullOrUndefined)
   );
   const types = extendTypesQueryResult(typesQuery);
 
-  const searchableLinodes = linodes.map((linode) => {
+  const searchableLinodes = (linodes ?? []).map((linode) => {
     const imageLabel = getImageLabelForLinode(linode, publicImages ?? []);
     return formatLinode(linode, types, imageLabel);
   });
@@ -180,12 +179,6 @@ export const SearchLanding: React.FC<CombinedProps> = (props) => {
     queryError = true;
   }
 
-  const { _loading: reduxLoading } = useReduxLoad(
-    ['linodes'],
-    REFRESH_INTERVAL,
-    !_isLargeAccount
-  );
-
   const { searchAPI } = useAPISearch(!isNilOrEmpty(query));
 
   const _searchAPI = React.useRef(
@@ -236,11 +229,12 @@ export const SearchLanding: React.FC<CombinedProps> = (props) => {
     _privateImages,
     regions,
     nodebalancers,
+    searchableLinodes,
   ]);
 
   const getErrorMessage = (errors: ErrorObject): string => {
     const errorString: string[] = [];
-    if (errors.linodes) {
+    if (linodesError) {
       errorString.push('Linodes');
     }
     if (domainsError) {
@@ -277,7 +271,7 @@ export const SearchLanding: React.FC<CombinedProps> = (props) => {
   const resultsEmpty = equals(finalResults, emptyResults);
 
   const loading =
-    reduxLoading ||
+    areLinodesLoading ||
     areBucketsLoading ||
     areClustersLoading ||
     areDomainsLoading ||
diff --git a/packages/manager/src/features/Support/SupportTickets/SupportTicketDrawer.tsx b/packages/manager/src/features/Support/SupportTickets/SupportTicketDrawer.tsx
index d7a9fa6f8d5..cadb5f98934 100644
--- a/packages/manager/src/features/Support/SupportTickets/SupportTicketDrawer.tsx
+++ b/packages/manager/src/features/Support/SupportTickets/SupportTicketDrawer.tsx
@@ -20,7 +20,6 @@ import { Notice } from 'src/components/Notice/Notice';
 import SectionErrorBoundary from 'src/components/SectionErrorBoundary';
 import { EntityForTicketDetails } from 'src/components/SupportLink/SupportLink';
 import TextField from 'src/components/TextField';
-import useEntities, { Entity } from 'src/hooks/useEntities';
 import { useAccount } from 'src/queries/account';
 import { useAllDatabasesQuery } from 'src/queries/databases';
 import { useAllDomainsQuery } from 'src/queries/domains';
@@ -46,6 +45,7 @@ import SupportTicketSMTPFields, {
   smtpHelperText,
 } from './SupportTicketSMTPFields';
 import { useAllNodeBalancersQuery } from 'src/queries/nodebalancers';
+import { useAllLinodesQuery } from 'src/queries/linodes/linodes';
 
 const useStyles = makeStyles((theme: Theme) => ({
   expPanelSummary: {
@@ -144,7 +144,7 @@ const entityMap: Record<string, EntityType> = {
   Firewalls: 'firewall_id',
 };
 
-const entityIdToNameMap: Partial<Record<EntityType, string>> = {
+const entityIdToNameMap: Record<EntityType, string> = {
   linode_id: 'Linode',
   volume_id: 'Volume',
   domain_id: 'Domain',
@@ -152,18 +152,8 @@ const entityIdToNameMap: Partial<Record<EntityType, string>> = {
   lkecluster_id: 'Kubernetes Cluster',
   database_id: 'Database Cluster',
   firewall_id: 'Firewall',
-};
-
-const entityIdToTypeMap: Record<EntityType, string> = {
-  linode_id: 'linodes',
-  volume_id: 'volumes',
-  domain_id: 'domains',
-  nodebalancer_id: 'nodeBalancers',
-  lkecluster_id: 'kubernetesClusters',
-  database_id: 'databases',
-  firewall_id: 'firewalls',
-  none: 'linodes',
-  general: 'linodes',
+  none: '',
+  general: '',
 };
 
 export const entitiesToItems = (type: string, entities: any) => {
@@ -221,55 +211,60 @@ export const SupportTicketDrawer: React.FC<CombinedProps> = (props) => {
     publicInfo: '',
   });
 
-  // Entities for populating dropdown
-  const [data, setData] = React.useState<Item<any>[]>([]);
-  const [entitiesLoading, setLoading] = React.useState<boolean>(false);
-
   const [files, setFiles] = React.useState<FileAttachment[]>([]);
 
   const [errors, setErrors] = React.useState<APIError[] | undefined>();
   const [submitting, setSubmitting] = React.useState<boolean>(false);
 
-  const entities = useEntities();
-
   const classes = useStyles();
 
   React.useEffect(() => {
     if (!open) {
       resetDrawer();
     }
-    if (prefilledEntity) {
-      loadSelectedEntities(prefilledEntity.type);
-    }
   }, [open]);
 
   // React Query entities
-  const { data: databases, isLoading: databasesLoading } = useAllDatabasesQuery(
-    entityType === 'database_id'
-  );
+  const {
+    data: databases,
+    isLoading: databasesLoading,
+    error: databasesError,
+  } = useAllDatabasesQuery(entityType === 'database_id');
 
-  const { data: firewalls, isLoading: firewallsLoading } = useAllFirewallsQuery(
-    entityType === 'firewall_id'
-  );
+  const {
+    data: firewalls,
+    isLoading: firewallsLoading,
+    error: firewallsError,
+  } = useAllFirewallsQuery(entityType === 'firewall_id');
 
-  const { data: domains, isLoading: domainsLoading } = useAllDomainsQuery(
-    entityType === 'domain_id'
-  );
+  const {
+    data: domains,
+    isLoading: domainsLoading,
+    error: domainsError,
+  } = useAllDomainsQuery(entityType === 'domain_id');
   const {
     data: nodebalancers,
     isLoading: nodebalancersLoading,
+    error: nodebalancersError,
   } = useAllNodeBalancersQuery(entityType === 'nodebalancer_id');
 
   const {
     data: clusters,
     isLoading: clustersLoading,
+    error: clustersError,
   } = useAllKubernetesClustersQuery(entityType === 'lkecluster_id');
 
-  const { data: volumes, isLoading: volumesLoading } = useAllVolumesQuery(
-    {},
-    {},
-    entityType === 'volume_id'
-  );
+  const {
+    data: linodes,
+    isLoading: linodesLoading,
+    error: linodesError,
+  } = useAllLinodesQuery({}, {}, entityType === 'linode_id');
+
+  const {
+    data: volumes,
+    isLoading: volumesLoading,
+    error: volumesError,
+  } = useAllVolumesQuery({}, {}, entityType === 'volume_id');
 
   const saveText = (_title: string, _description: string) => {
     storage.supportText.set({ title: _title, description: _description });
@@ -283,56 +278,6 @@ export const SupportTicketDrawer: React.FC<CombinedProps> = (props) => {
     debouncedSave(summary, description);
   }, [summary, description]);
 
-  const handleSetOrRequestEntities = (
-    _entity: Entity<any>,
-    _entityType: string
-  ) => {
-    if (_entity.lastUpdated === 0) {
-      setLoading(true);
-      setErrors(undefined);
-      _entity
-        .request()
-        .then((response) => {
-          setLoading(false);
-          setData(entitiesToItems(_entityType, response));
-        })
-        .catch((_) => setLoading(false)); // Errors through Redux
-    } else {
-      setData(entitiesToItems(_entityType, _entity.data));
-    }
-  };
-
-  /**
-   * When a new entity type is selected,
-   * 1. check to see if we have data for that type.
-   * 2. If we don't, request it and assign the result to the selectedEntities state
-   * 3. If we do, directly assign the data from Redux to the selectedEntities state
-   *
-   * NOTE: Using a switch here rather than the entities[entityIdToTypeMap] logic
-   * used for error handling below; it's more explicit and safer.
-   */
-  const loadSelectedEntities = (_entityType: EntityType) => {
-    switch (_entityType) {
-      case 'linode_id': {
-        handleSetOrRequestEntities(entities.linodes, _entityType);
-        return;
-      }
-      case 'nodebalancer_id':
-      case 'lkecluster_id':
-      case 'volume_id':
-      case 'firewall_id':
-      case 'domain_id':
-      case 'database_id': {
-        // intentionally do nothing for React Query entities
-        return;
-      }
-      default: {
-        setData([]);
-        return;
-      }
-    }
-  };
-
   const resetTicket = (clearValues: boolean = false) => {
     /**
      * Clear the drawer completely if clearValues is passed (as in when closing the drawer)
@@ -352,7 +297,6 @@ export const SupportTicketDrawer: React.FC<CombinedProps> = (props) => {
   };
 
   const resetDrawer = (clearValues: boolean = false) => {
-    setData([]);
     resetTicket(clearValues);
     setFiles([]);
 
@@ -377,10 +321,6 @@ export const SupportTicketDrawer: React.FC<CombinedProps> = (props) => {
     }
     setEntityType(e.value as EntityType);
     setEntityID('');
-    setErrors(undefined);
-    setData([]);
-
-    loadSelectedEntities(e.value as EntityType);
   };
 
   const handleEntityIDChange = (selected: Item | null) => {
@@ -551,10 +491,6 @@ export const SupportTicketDrawer: React.FC<CombinedProps> = (props) => {
   const generalError = hasErrorFor.none;
   const inputError = hasErrorFor.input;
 
-  const entityError = Boolean(entities[entityIdToTypeMap[entityType]]?.error)
-    ? `Error loading ${entityIdToNameMap[entityType]}s`
-    : undefined;
-
   const topicOptions = [
     { label: 'General/Account/Billing', value: 'general' },
     ...renderEntityTypes(),
@@ -572,11 +508,11 @@ export const SupportTicketDrawer: React.FC<CombinedProps> = (props) => {
       volume_id: volumes,
       lkecluster_id: clusters,
       nodebalancer_id: nodebalancers,
+      linode_id: linodes,
     };
 
     if (!reactQueryEntityDataMap[entityType]) {
-      // We are dealing with an entity found in Redux. Return the data from state.
-      return data;
+      return [];
     }
 
     // domain's don't have a label so we map the domain as the label
@@ -599,30 +535,35 @@ export const SupportTicketDrawer: React.FC<CombinedProps> = (props) => {
     );
   };
 
-  const getAreEntitiesLoading = () => {
-    if (entityType === 'database_id') {
-      return databasesLoading;
-    }
-    if (entityType === 'firewall_id') {
-      return firewallsLoading;
-    }
-    if (entityType === 'domain_id') {
-      return domainsLoading;
-    }
-    if (entityType === 'volume_id') {
-      return volumesLoading;
-    }
-    if (entityType === 'lkecluster_id') {
-      return clustersLoading;
-    }
-    if (entityType === 'nodebalancer_id') {
-      return nodebalancersLoading;
-    }
-    return entitiesLoading;
+  const loadingMap: Record<EntityType, boolean> = {
+    database_id: databasesLoading,
+    firewall_id: firewallsLoading,
+    domain_id: domainsLoading,
+    volume_id: volumesLoading,
+    lkecluster_id: clustersLoading,
+    nodebalancer_id: nodebalancersLoading,
+    linode_id: linodesLoading,
+    none: false,
+    general: false,
+  };
+
+  const errorMap: Record<EntityType, APIError[] | null> = {
+    database_id: databasesError,
+    firewall_id: firewallsError,
+    domain_id: domainsError,
+    volume_id: volumesError,
+    lkecluster_id: clustersError,
+    nodebalancer_id: nodebalancersError,
+    linode_id: linodesError,
+    none: null,
+    general: null,
   };
 
   const entityOptions = getEntityOptions();
-  const areEntitiesLoading = getAreEntitiesLoading();
+  const areEntitiesLoading = loadingMap[entityType];
+  const entityError = Boolean(errorMap[entityType])
+    ? `Error loading ${entityIdToNameMap[entityType]}s`
+    : undefined;
 
   const selectedEntity =
     entityOptions.find((thisEntity) => String(thisEntity.value) === entityID) ||
diff --git a/packages/manager/src/features/TopMenu/SearchBar/SearchBar.tsx b/packages/manager/src/features/TopMenu/SearchBar/SearchBar.tsx
index 6bf40cb58c1..1a547d71fe1 100644
--- a/packages/manager/src/features/TopMenu/SearchBar/SearchBar.tsx
+++ b/packages/manager/src/features/TopMenu/SearchBar/SearchBar.tsx
@@ -2,18 +2,16 @@ import Close from '@mui/icons-material/Close';
 import Search from '@mui/icons-material/Search';
 import { take } from 'ramda';
 import * as React from 'react';
-import { RouteComponentProps, withRouter } from 'react-router-dom';
+import { useHistory } from 'react-router-dom';
 import { components } from 'react-select';
 import { compose } from 'recompose';
 import { IconButton } from 'src/components/IconButton';
 import EnhancedSelect, { Item } from 'src/components/EnhancedSelect/Select';
-import { REFRESH_INTERVAL } from 'src/constants';
 import useAPISearch from 'src/features/Search/useAPISearch';
 import withStoreSearch, {
   SearchProps,
 } from 'src/features/Search/withStoreSearch';
 import useAccountManagement from 'src/hooks/useAccountManagement';
-import { ReduxEntity, useReduxLoad } from 'src/hooks/useReduxLoad';
 import { useAllDomainsQuery } from 'src/queries/domains';
 import { useAllImagesQuery } from 'src/queries/images';
 import {
@@ -26,8 +24,6 @@ import { isNilOrEmpty } from 'src/utilities/isNilOrEmpty';
 import { debounce } from 'throttle-debounce';
 import styled, { StyleProps } from './SearchBar.styles';
 import SearchSuggestion from './SearchSuggestion';
-import { useSelector } from 'react-redux';
-import { ApplicationState } from 'src/store';
 import { formatLinode } from 'src/store/selectors/getSearchEntities';
 import { useAllKubernetesClustersQuery } from 'src/queries/kubernetes';
 import { useSpecificTypes } from 'src/queries/types';
@@ -36,8 +32,9 @@ import { isNotNullOrUndefined } from 'src/utilities/nullOrUndefined';
 import { useRegionsQuery } from 'src/queries/regions';
 import { useAllNodeBalancersQuery } from 'src/queries/nodebalancers';
 import { getImageLabelForLinode } from 'src/features/Images/utils';
+import { useAllLinodesQuery } from 'src/queries/linodes/linodes';
 
-type CombinedProps = SearchProps & StyleProps & RouteComponentProps;
+type CombinedProps = SearchProps & StyleProps;
 
 const Control = (props: any) => <components.Control {...props} />;
 
@@ -77,8 +74,6 @@ export const selectStyles = {
   menu: (base: any) => ({ ...base, maxWidth: '100% !important' }),
 };
 
-const searchDeps: ReduxEntity[] = ['linodes'];
-
 export const SearchBar = (props: CombinedProps) => {
   const { classes, combinedResults, entitiesLoading, search } = props;
 
@@ -90,6 +85,8 @@ export const SearchBar = (props: CombinedProps) => {
   const [apiError, setAPIError] = React.useState<string | null>(null);
   const [apiSearchLoading, setAPILoading] = React.useState<boolean>(false);
 
+  const history = useHistory();
+
   const { _isLargeAccount } = useAccountManagement();
 
   // Only request things if the search bar is open/active.
@@ -124,24 +121,22 @@ export const SearchBar = (props: CombinedProps) => {
     searchActive
   );
 
-  const { data: regions } = useRegionsQuery();
-
-  const { _loading } = useReduxLoad(
-    searchDeps,
-    REFRESH_INTERVAL,
+  const { data: linodes, isLoading: linodesLoading } = useAllLinodesQuery(
+    {},
+    {},
     shouldMakeRequests
   );
 
-  const linodes = useSelector((state: ApplicationState) =>
-    Object.values(state.__resources.linodes.itemsById)
-  );
+  const { data: regions } = useRegionsQuery();
+
   const typesQuery = useSpecificTypes(
-    linodes.map((linode) => linode.type).filter(isNotNullOrUndefined),
+    (linodes ?? []).map((linode) => linode.type).filter(isNotNullOrUndefined),
     shouldMakeRequests
   );
+
   const types = extendTypesQueryResult(typesQuery);
 
-  const searchableLinodes = linodes.map((linode) => {
+  const searchableLinodes = (linodes ?? []).map((linode) => {
     const imageLabel = getImageLabelForLinode(linode, publicImages ?? []);
     return formatLinode(linode, types, imageLabel);
   });
@@ -188,7 +183,6 @@ export const SearchBar = (props: CombinedProps) => {
       );
     }
   }, [
-    _loading,
     imagesLoading,
     search,
     searchText,
@@ -235,13 +229,13 @@ export const SearchBar = (props: CombinedProps) => {
     const text = item?.data?.searchText ?? '';
 
     if (item.value === 'redirect') {
-      props.history.push({
+      history.push({
         pathname: `/search`,
         search: `?query=${encodeURIComponent(text)}`,
       });
       return;
     }
-    props.history.push(item.data.path);
+    history.push(item.data.path);
   };
 
   const onKeyDown = (e: any) => {
@@ -250,7 +244,7 @@ export const SearchBar = (props: CombinedProps) => {
       searchText !== '' &&
       (!combinedResults || combinedResults.length < 1)
     ) {
-      props.history.push({
+      history.push({
         pathname: `/search`,
         search: `?query=${encodeURIComponent(searchText)}`,
       });
@@ -282,7 +276,7 @@ export const SearchBar = (props: CombinedProps) => {
   const finalOptions = createFinalOptions(
     _isLargeAccount ? apiResults : combinedResults,
     searchText,
-    _loading || imagesLoading || apiSearchLoading,
+    apiSearchLoading || linodesLoading || imagesLoading,
     // Ignore "Unauthorized" errors, since these will always happen on LKE
     // endpoints for restricted users. It's not really an "error" in this case.
     // We still want these users to be able to use the search feature.
@@ -351,7 +345,6 @@ export const SearchBar = (props: CombinedProps) => {
 };
 
 export default compose<CombinedProps, {}>(
-  withRouter,
   withStoreSearch(),
   styled
 )(SearchBar) as React.ComponentType<{}>;
diff --git a/packages/manager/src/features/Volumes/DestructiveVolumeDialog.tsx b/packages/manager/src/features/Volumes/DestructiveVolumeDialog.tsx
index 6a31a4028cd..f66e7e5c374 100644
--- a/packages/manager/src/features/Volumes/DestructiveVolumeDialog.tsx
+++ b/packages/manager/src/features/Volumes/DestructiveVolumeDialog.tsx
@@ -6,12 +6,12 @@ import Typography from 'src/components/core/Typography';
 import { Notice } from 'src/components/Notice/Notice';
 import { TypeToConfirmDialog } from 'src/components/TypeToConfirmDialog/TypeToConfirmDialog';
 import { resetEventsPolling } from 'src/eventsPolling';
-import useLinodes from 'src/hooks/useLinodes';
 import {
   useDeleteVolumeMutation,
   useDetachVolumeMutation,
 } from 'src/queries/volumes';
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
+import { useLinodeQuery } from 'src/queries/linodes/linodes';
 
 const useStyles = makeStyles((theme: Theme) => ({
   warningCopy: {
@@ -36,10 +36,11 @@ export const DestructiveVolumeDialog = (props: Props) => {
   const { volumeLabel: label, volumeId, linodeId, mode, open, onClose } = props;
 
   const { enqueueSnackbar } = useSnackbar();
-  const linodes = useLinodes();
 
-  const linode =
-    linodeId !== undefined ? linodes.linodes.itemsById[linodeId] : undefined;
+  const { data: linode } = useLinodeQuery(
+    linodeId ?? -1,
+    linodeId !== undefined
+  );
 
   const {
     mutateAsync: detachVolume,
diff --git a/packages/manager/src/features/Volumes/VolumeAttachmentDrawer.tsx b/packages/manager/src/features/Volumes/VolumeAttachmentDrawer.tsx
index 65f8b7a2aac..455e632748e 100644
--- a/packages/manager/src/features/Volumes/VolumeAttachmentDrawer.tsx
+++ b/packages/manager/src/features/Volumes/VolumeAttachmentDrawer.tsx
@@ -9,7 +9,7 @@ import Drawer from 'src/components/Drawer';
 import Select, { Item } from 'src/components/EnhancedSelect';
 import { Notice } from 'src/components/Notice/Notice';
 import { resetEventsPolling } from 'src/eventsPolling';
-import LinodeSelect from 'src/features/Linodes/LinodeSelect';
+import { LinodeSelect } from 'src/features/Linodes/LinodeSelect/LinodeSelect';
 import { useAllLinodeConfigsQuery } from 'src/queries/linodes/linodes';
 import { useGrants, useProfile } from 'src/queries/profile';
 import { useAttachVolumeMutation } from 'src/queries/volumes';
diff --git a/packages/manager/src/features/Volumes/VolumeCreate/CreateVolumeForm.tsx b/packages/manager/src/features/Volumes/VolumeCreate/CreateVolumeForm.tsx
index 41f1fbfe77d..9ecccd8e203 100644
--- a/packages/manager/src/features/Volumes/VolumeCreate/CreateVolumeForm.tsx
+++ b/packages/manager/src/features/Volumes/VolumeCreate/CreateVolumeForm.tsx
@@ -18,7 +18,7 @@ import { TooltipIcon } from 'src/components/TooltipIcon/TooltipIcon';
 import { Notice } from 'src/components/Notice/Notice';
 import { MAX_VOLUME_SIZE } from 'src/constants';
 import EUAgreementCheckbox from 'src/features/Account/Agreements/EUAgreementCheckbox';
-import LinodeSelect from 'src/features/Linodes/LinodeSelect';
+import { LinodeSelect } from 'src/features/Linodes/LinodeSelect/LinodeSelect';
 import {
   reportAgreementSigningError,
   useAccountAgreements,
diff --git a/packages/manager/src/hooks/useEntities.ts b/packages/manager/src/hooks/useEntities.ts
deleted file mode 100644
index 1fcc5088887..00000000000
--- a/packages/manager/src/hooks/useEntities.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { APIError } from '@linode/api-v4/lib/types';
-import useLinodeActions from './useLinodeActions';
-import useLinodes from './useLinodes';
-
-export interface Entity<T> {
-  data: T[];
-  request: () => Promise<T[]>;
-  lastUpdated: number;
-  error?: APIError[];
-}
-
-/**
- * Returns data for each entity type in array format,
- * along with the request thunk for each of the entity types.
- *
- * @example
- *
- * const { linodes, volumes } = useEntities();
- * linodes.map(thisLinode => thisLinode.label);
- * if (linodes.lastUpdated === 0) { linodes.request(); }
- */
-export const useEntities = () => {
-  const { linodes: _linodes } = useLinodes();
-  const { requestLinodes } = useLinodeActions();
-
-  /** Our Redux store is currently inconsistent about
-   * the data shape for different entity types.
-   * The purpose of this meta-container is to expose
-   * a single, consistent interface so that consumers
-   * can map through different entity types without
-   * worrying about whether they should use data.entities
-   * or Object.value(data.itemsById).
-   */
-
-  const linodes = Object.values(_linodes.itemsById);
-
-  return {
-    linodes: {
-      data: linodes,
-      request: requestLinodes,
-      lastUpdated: _linodes.lastUpdated,
-      error: _linodes.error?.read,
-    },
-  };
-};
-
-export default useEntities;
diff --git a/packages/manager/src/hooks/useExtendedLinode.ts b/packages/manager/src/hooks/useExtendedLinode.ts
deleted file mode 100644
index 6642ece5025..00000000000
--- a/packages/manager/src/hooks/useExtendedLinode.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Event, GrantLevel } from '@linode/api-v4/lib/account';
-import { Config, Disk } from '@linode/api-v4/lib/linodes';
-import { useSelector } from 'react-redux';
-import { useGrants } from 'src/queries/profile';
-import { useSpecificTypes } from 'src/queries/types';
-import { ApplicationState } from 'src/store';
-import { eventsForLinode } from 'src/store/events/event.selectors';
-import { getLinodeConfigsForLinode } from 'src/store/linodes/config/config.selectors';
-import { getLinodeDisksForLinode } from 'src/store/linodes/disk/disk.selectors';
-import { LinodeWithMaintenance } from 'src/store/linodes/linodes.helpers';
-import { getPermissionsForLinode } from 'src/store/linodes/permissions/permissions.selector';
-import { ExtendedType, extendTypesQueryResult } from 'src/utilities/extendType';
-import { isNotNullOrUndefined } from 'src/utilities/nullOrUndefined';
-import useLinodes from './useLinodes';
-
-export interface ExtendedLinode extends LinodeWithMaintenance {
-  _configs: Config[];
-  _disks: Disk[];
-  _events: Event[];
-  _type?: null | ExtendedType;
-  _permissions: GrantLevel;
-}
-
-export const useExtendedLinodes = (linodeIds?: number[]): ExtendedLinode[] => {
-  const { data: grants } = useGrants();
-  const { linodes: linodesMap } = useLinodes();
-  const linodes = (linodeIds ?? Object.keys(linodesMap.itemsById))
-    .map((linodeId) => linodesMap.itemsById[linodeId])
-    .filter(isNotNullOrUndefined);
-  const typesQuery = useSpecificTypes(
-    linodes.map((linode) => linode.type).filter(isNotNullOrUndefined)
-  );
-  const types = extendTypesQueryResult(typesQuery);
-
-  const typeMap = new Map<string, ExtendedType>(
-    types.map((type) => [type.id, type])
-  );
-
-  return useSelector((state: ApplicationState) => {
-    const { events, __resources } = state;
-    const { linodeConfigs, linodeDisks } = __resources;
-
-    return linodes.map((linode) => ({
-      ...linode,
-      _type: linode.type ? typeMap.get(linode.type) : null,
-      _events: eventsForLinode(events, linode.id),
-      _configs: getLinodeConfigsForLinode(linodeConfigs, linode.id),
-      _disks: getLinodeDisksForLinode(linodeDisks, linode.id),
-      _permissions: getPermissionsForLinode(grants ?? null, linode.id),
-    }));
-  });
-};
-
-export const useExtendedLinode = (linodeId: number): ExtendedLinode | null =>
-  useExtendedLinodes([linodeId])[0] ?? null;
-
-export default useExtendedLinode;
diff --git a/packages/manager/src/hooks/useLinodeActions.ts b/packages/manager/src/hooks/useLinodeActions.ts
deleted file mode 100644
index 222bb2024d5..00000000000
--- a/packages/manager/src/hooks/useLinodeActions.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Linode } from '@linode/api-v4/lib/linodes/types';
-import { useQueryClient } from 'react-query';
-import { useDispatch } from 'react-redux';
-import {
-  deleteLinode as _deleteLinode,
-  getLinode as _getLinode,
-  requestLinodes as _requestLinodes,
-  updateLinode as _updateLinode,
-} from 'src/store/linodes/linode.requests';
-import { UpdateLinodeParams } from 'src/store/linodes/linodes.actions';
-import { Dispatch } from './types';
-
-export interface LinodesProps {
-  requestLinodes: () => Promise<Linode[]>;
-  getLinode: (linodeId: number) => Promise<Linode>;
-  deleteLinode: (linodeId: number) => Promise<{}>;
-  updateLinode: (params: UpdateLinodeParams) => Promise<Linode>;
-}
-
-export const useLinodeActions = (): LinodesProps => {
-  const dispatch: Dispatch = useDispatch();
-  const queryClient = useQueryClient();
-
-  const requestLinodes = () =>
-    dispatch(_requestLinodes({})).then((response) => response.data);
-
-  const getLinode = (linodeId: number) => dispatch(_getLinode({ linodeId }));
-
-  const deleteLinode = (linodeId: number) =>
-    dispatch(_deleteLinode({ linodeId, queryClient }));
-
-  const updateLinode = (params: UpdateLinodeParams) =>
-    dispatch(_updateLinode(params));
-
-  return {
-    requestLinodes,
-    getLinode,
-    deleteLinode,
-    updateLinode,
-  };
-};
-
-export default useLinodeActions;
diff --git a/packages/manager/src/hooks/useLinodes.ts b/packages/manager/src/hooks/useLinodes.ts
deleted file mode 100644
index d9deb4c9732..00000000000
--- a/packages/manager/src/hooks/useLinodes.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { useSelector } from 'react-redux';
-import { ApplicationState } from 'src/store';
-import { State } from 'src/store/linodes/linodes.reducer';
-
-export interface LinodesProps {
-  linodes: State;
-}
-
-export const useLinodes = (): LinodesProps => {
-  const linodes = useSelector(
-    (state: ApplicationState) => state.__resources.linodes
-  );
-
-  return {
-    linodes,
-  };
-};
-
-export default useLinodes;
diff --git a/packages/manager/src/hooks/useReduxLoad.test.ts b/packages/manager/src/hooks/useReduxLoad.test.ts
deleted file mode 100644
index 43e52ff7586..00000000000
--- a/packages/manager/src/hooks/useReduxLoad.test.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { hasError } from './useReduxLoad';
-
-const errorMessage = 'An error occurred.';
-
-describe('hasError utility function', () => {
-  it('EntityError: returns `true` only if a "read" error is present', () => {
-    expect(hasError({ read: errorMessage })).toBe(true);
-    expect(hasError({})).toBe(false);
-  });
-
-  it('APIError[]: returns `true` if an error is present', () => {
-    expect(hasError([{ reason: errorMessage }])).toBe(true);
-    expect(hasError([])).toBe(false);
-  });
-
-  it('handles any input you throw at it', () => {
-    expect(hasError(undefined)).toBe(false);
-    expect(hasError(null)).toBe(false);
-    expect(hasError(1234)).toBe(false);
-    expect(hasError('1234')).toBe(false);
-    expect(hasError(true)).toBe(false);
-    expect(hasError(false)).toBe(false);
-    expect(hasError([])).toBe(false);
-  });
-});
diff --git a/packages/manager/src/hooks/useReduxLoad.ts b/packages/manager/src/hooks/useReduxLoad.ts
deleted file mode 100644
index dfd49f4613b..00000000000
--- a/packages/manager/src/hooks/useReduxLoad.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import { useEffect, useRef, useState } from 'react';
-import { usePageVisibility } from 'react-page-visibility';
-import { useDispatch } from 'react-redux';
-import { Dispatch } from 'redux';
-import { REFRESH_INTERVAL } from 'src/constants';
-import { ApplicationState, useApplicationStore } from 'src/store';
-import { getEvents } from 'src/store/events/event.request';
-import { requestLinodes } from 'src/store/linodes/linode.requests';
-import { getAllLongviewClients } from 'src/store/longview/longview.requests';
-
-interface UseReduxPreload {
-  _loading: boolean;
-}
-
-export type ReduxEntity = 'linodes' | 'events' | 'longview';
-
-type RequestMap = Record<ReduxEntity, any>;
-
-const requestMap: RequestMap = {
-  linodes: () => requestLinodes({}),
-  events: getEvents,
-  longview: getAllLongviewClients,
-};
-
-export const useReduxLoad = (
-  deps: ReduxEntity[] = [],
-  refreshInterval: number = REFRESH_INTERVAL,
-  predicate: boolean = true
-): UseReduxPreload => {
-  const [_loading, setLoading] = useState<boolean>(false);
-  const dispatch = useDispatch();
-  const store = useApplicationStore();
-  const isVisible = usePageVisibility();
-  /**
-   * Restricted users get a 403 from /lke/clusters,
-   * which gums up the works. We want to prevent that particular
-   * request for a restricted user.
-   */
-  const mountedRef = useRef<boolean>(true);
-
-  const _setLoading = (val: boolean) => {
-    if (mountedRef.current) {
-      setLoading(val);
-    }
-  };
-
-  useEffect(() => {
-    if (isVisible && predicate && mountedRef.current) {
-      requestDeps(
-        store.getState(),
-        dispatch,
-        deps,
-        refreshInterval,
-        _setLoading
-      );
-    }
-  }, [predicate, refreshInterval, deps, dispatch, store, isVisible]);
-
-  useEffect(() => {
-    return () => {
-      mountedRef.current = false;
-    };
-  }, []);
-
-  return { _loading };
-};
-
-export const requestDeps = (
-  state: ApplicationState,
-  dispatch: Dispatch<any>,
-  deps: ReduxEntity[],
-  refreshInterval: number = 60000,
-  loadingCb: (l: boolean) => void = (_) => null
-) => {
-  let i = 0;
-  let needsToLoad = false;
-  const requests = [];
-  for (i; i < deps.length; i++) {
-    const currentResource = state.__resources[deps[i]] || state[deps[i]];
-
-    if (currentResource) {
-      const currentResourceHasError = hasError(currentResource?.error);
-      if (
-        currentResource.lastUpdated === 0 &&
-        !currentResource.loading &&
-        !currentResourceHasError
-      ) {
-        needsToLoad = true;
-        requests.push(requestMap[deps[i]]);
-      } else if (
-        Date.now() - currentResource.lastUpdated > refreshInterval &&
-        !currentResource.loading &&
-        !currentResourceHasError
-      ) {
-        requests.push(requestMap[deps[i]]);
-      }
-    }
-  }
-
-  if (requests.length === 0) {
-    return;
-  }
-
-  if (needsToLoad) {
-    loadingCb(true);
-  }
-
-  return Promise.all(requests.map((thisRequest) => dispatch(thisRequest())))
-    .then((_) => loadingCb(false))
-    .catch((_) => loadingCb(false));
-};
-
-export default useReduxLoad;
-
-export const hasError = (resourceError: any) => {
-  if (Array.isArray(resourceError) && resourceError.length > 0) {
-    return true;
-  }
-
-  return resourceError?.read !== undefined;
-};
diff --git a/packages/manager/src/queries/linodes/linodes.ts b/packages/manager/src/queries/linodes/linodes.ts
index 5e42a8c90b0..84d5d454b29 100644
--- a/packages/manager/src/queries/linodes/linodes.ts
+++ b/packages/manager/src/queries/linodes/linodes.ts
@@ -32,6 +32,8 @@ import {
   getLinodeKernel,
   resizeLinode,
   ResizeLinodePayload,
+  createLinode,
+  CreateLinodeRequest,
 } from '@linode/api-v4/lib/linodes';
 import { queryKey as accountQueryKey } from '../account';
 
@@ -167,6 +169,15 @@ export const useDeleteLinodeMutation = (id: number) => {
   });
 };
 
+export const useCreateLinodeMutation = () => {
+  const queryClient = useQueryClient();
+  return useMutation<Linode, APIError[], CreateLinodeRequest>(createLinode, {
+    onSuccess() {
+      queryClient.invalidateQueries([queryKey]);
+    },
+  });
+};
+
 export const useBootLinodeMutation = (id: number) => {
   const queryClient = useQueryClient();
   return useMutation<{}, APIError[], { config_id?: number }>(
diff --git a/packages/manager/src/store/linodes/linode.containers.ts b/packages/manager/src/store/linodes/linode.containers.ts
deleted file mode 100644
index 0cd4f0705d5..00000000000
--- a/packages/manager/src/store/linodes/linode.containers.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Linode } from '@linode/api-v4/lib/linodes';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import {
-  createLinode,
-  deleteLinode,
-  rebootLinode,
-  updateLinode,
-} from './linode.requests';
-import {
-  CreateLinodeParams,
-  DeleteLinodeParams,
-  RebootLinodeParams,
-  UpdateLinodeParams,
-} from './linodes.actions';
-
-export interface Actions {
-  createLinode: (params: CreateLinodeParams) => Promise<Linode>;
-  deleteLinode: (params: DeleteLinodeParams) => Promise<void>;
-  updateLinode: (params: UpdateLinodeParams) => Promise<Linode>;
-  rebootLinode: (params: RebootLinodeParams) => Promise<void>;
-}
-
-export interface LinodeActionsProps {
-  linodeActions: Actions;
-}
-
-export const withLinodeActions = connect(undefined, (dispatch) => ({
-  linodeActions: bindActionCreators(
-    { createLinode, deleteLinode, updateLinode, rebootLinode },
-    dispatch
-  ),
-}));
diff --git a/packages/manager/src/utilities/testHelpersStore.ts b/packages/manager/src/utilities/testHelpersStore.ts
deleted file mode 100644
index f5c47c1e07e..00000000000
--- a/packages/manager/src/utilities/testHelpersStore.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export const withLinodesLoaded = {
-  __resources: { linodes: { loading: false, lastUpdated: 1 } },
-};
diff --git a/packages/validation/CHANGELOG.md b/packages/validation/CHANGELOG.md
index f6d06f5a338..ff310bb7f49 100644
--- a/packages/validation/CHANGELOG.md
+++ b/packages/validation/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [2023-06-29] - v0.25.0
+
+### Fixed:
+- Firewall custom ports validation ([#9336](https://github.com/linode/manager/pull/9336))
+
 ## [2023-06-12] - v0.24.0
 
 ### Changed:
diff --git a/packages/validation/package.json b/packages/validation/package.json
index b76fc86ff12..a27b8acb573 100644
--- a/packages/validation/package.json
+++ b/packages/validation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@linode/validation",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "description": "Yup validation schemas for use with the Linode APIv4",
   "type": "module",
   "main": "lib/index.cjs",
diff --git a/packages/validation/src/firewalls.schema.ts b/packages/validation/src/firewalls.schema.ts
index b9aa0d36946..e1a2eeb6e4f 100644
--- a/packages/validation/src/firewalls.schema.ts
+++ b/packages/validation/src/firewalls.schema.ts
@@ -5,9 +5,6 @@ import { array, mixed, number, object, string } from 'yup';
 
 export const IP_ERROR_MESSAGE =
   'Must be a valid IPv4 or IPv6 address or range.';
-export const CUSTOM_PORTS_ERROR_MESSAGE =
-  'Ports must be an integer, range of integers, or a comma-separated list of integers.';
-export const CUSTOM_PORTS_VALIDATION_REGEX = /^(?:\d+|\d+-\d+|(?:\d+,\s*)*\d+)$/;
 
 export const validateIP = (ipAddress?: string | null): boolean => {
   if (!ipAddress) {
@@ -42,10 +39,104 @@ export const ipAddress = string().test({
   test: validateIP,
 });
 
-export const validateFirewallPorts = string().matches(
-  CUSTOM_PORTS_VALIDATION_REGEX,
-  CUSTOM_PORTS_ERROR_MESSAGE
-);
+export let CUSTOM_PORTS_ERROR_MESSAGE = '';
+
+/**
+ * @param port
+ * @returns boolean
+ * @description Validates a single port or port range and sets the error message
+ */
+const validatePort = (port: string): boolean => {
+  CUSTOM_PORTS_ERROR_MESSAGE =
+    'Ports must be an integer, range of integers, or a comma-separated list of integers.';
+
+  if (!port) {
+    CUSTOM_PORTS_ERROR_MESSAGE = 'Must be 1-65535';
+    return false;
+  }
+
+  const convertedPort = parseInt(port, 10);
+  if (!(1 <= convertedPort && convertedPort <= 65535)) {
+    CUSTOM_PORTS_ERROR_MESSAGE = 'Must be 1-65535';
+    return false;
+  }
+
+  if (port.startsWith('0')) {
+    CUSTOM_PORTS_ERROR_MESSAGE = 'Port must not have leading zeroes';
+    return false;
+  }
+
+  if (String(convertedPort) !== port) {
+    return false;
+  }
+
+  return true;
+};
+
+/**
+ * @param ports
+ * @returns boolean
+ * @description Validates a comma-separated list of ports and port ranges and sets the error message
+ */
+export const isCustomPortsValid = (ports: string): boolean => {
+  const portList = ports?.split(',') || [];
+  let portLimitCount = 0;
+
+  for (const port of portList) {
+    const cleanedPort = port.trim();
+
+    if (cleanedPort.includes('-')) {
+      const portRange = cleanedPort.split('-');
+
+      if (!validatePort(portRange[0]) || !validatePort(portRange[1])) {
+        return false;
+      }
+
+      if (portRange.length !== 2) {
+        CUSTOM_PORTS_ERROR_MESSAGE = 'Ranges must have 2 values';
+        return false;
+      }
+
+      if (parseInt(portRange[0], 10) >= parseInt(portRange[1], 10)) {
+        CUSTOM_PORTS_ERROR_MESSAGE =
+          'Range must start with a smaller number and end with a larger number';
+        return false;
+      }
+
+      portLimitCount += 2;
+    } else {
+      if (!validatePort(cleanedPort)) {
+        return false;
+      }
+      portLimitCount++;
+    }
+  }
+
+  if (portLimitCount > 15) {
+    CUSTOM_PORTS_ERROR_MESSAGE =
+      'Number of ports or port range endpoints exceeded. Max allowed is 15';
+    return false;
+  }
+
+  return true;
+};
+
+const validateFirewallPorts = string().test({
+  name: 'firewall-ports',
+  message: CUSTOM_PORTS_ERROR_MESSAGE,
+  test: (value) => {
+    if (!value) {
+      return false;
+    }
+
+    try {
+      isCustomPortsValid(value);
+    } catch (err) {
+      return false;
+    }
+    return true;
+  },
+});
 
 const validFirewallRuleProtocol = ['ALL', 'TCP', 'UDP', 'ICMP', 'IPENCAP'];
 export const FirewallRuleTypeSchema = object().shape({