diff --git a/eslint.config-md.mjs b/eslint.config-md.mjs
index 9fcc90a813d..da009687858 100644
--- a/eslint.config-md.mjs
+++ b/eslint.config-md.mjs
@@ -30,7 +30,19 @@ export default [
       'react/jsx-uses-react': 'error',
       'react/jsx-uses-vars': 'error',
       'react/no-unknown-property': 'error',
-      'react/jsx-no-undef': 'error'
+      'react/jsx-no-undef': 'error',
+      'no-restricted-imports': [
+        'error',
+        {
+          paths: [
+            {
+              name: 'react',
+              importNames: ['default'],
+              message: 'Please use named imports when importing from React.'
+            }
+          ]
+        }
+      ]
     }
   }
 ];
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 49dea9f6ac1..ecf67b4e756 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -101,7 +101,7 @@ export default [
       'no-new-wrappers': 'error',
       'no-prototype-builtins': 'off',
       'no-restricted-imports': [
-        'warn',
+        'error',
         {
           paths: [
             {
diff --git a/packages/react-charts/src/victory/components/Chart/Chart.test.tsx b/packages/react-charts/src/victory/components/Chart/Chart.test.tsx
index 160c3bfb7c7..e7ec1c59d35 100644
--- a/packages/react-charts/src/victory/components/Chart/Chart.test.tsx
+++ b/packages/react-charts/src/victory/components/Chart/Chart.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { Chart } from './Chart';
 import { ChartGroup } from '../ChartGroup/ChartGroup';
diff --git a/packages/react-charts/src/victory/components/Chart/Chart.tsx b/packages/react-charts/src/victory/components/Chart/Chart.tsx
index ef10fcd2d87..d6d2094ac79 100644
--- a/packages/react-charts/src/victory/components/Chart/Chart.tsx
+++ b/packages/react-charts/src/victory/components/Chart/Chart.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Children, cloneElement, isValidElement, useEffect } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 
 /* eslint-disable camelcase */
@@ -30,7 +30,6 @@ import { getComputedLegend, getLegendItemsExtraHeight, getLegendMaxTextWidth } f
 import { getPaddingForSide } from '../ChartUtils/chart-padding';
 import { getPatternDefs, mergePatternData, useDefaultPatternProps } from '../ChartUtils/chart-patterns';
 import { getChartTheme } from '../ChartUtils/chart-theme-types';
-import { useEffect } from 'react';
 import { ChartLabel } from '../ChartLabel/ChartLabel';
 import { ChartPoint } from '../ChartPoint/ChartPoint';
 import { ChartThemeColor } from '../ChartTheme/ChartThemeColor';
@@ -69,7 +68,7 @@ export interface ChartProps extends VictoryChartProps {
    * The backgroundComponent prop takes a component instance which will be responsible for rendering a background if the
    * Chart's style component includes background styles. The new element created from the passed backgroundComponent
    * will be provided with the following properties calculated by Chart: height, polar, scale, style, x, y, width.
-   * All of these props on Background should take prececence over what VictoryChart is trying to set.
+   * All of these props on Background should take precedence over what VictoryChart is trying to set.
    */
   backgroundComponent?: React.ReactElement<any>;
   /**
@@ -152,7 +151,7 @@ export interface ChartProps extends VictoryChartProps {
    * events. The eventKey may optionally be used to select a single element by index rather than
    * an entire set. The eventHandlers object should be given as an object whose keys are standard
    * event names (i.e. onClick) and whose values are event callbacks. The return value
-   * of an event handler is used to modify elemnts. The return value should be given
+   * of an event handler is used to modify elements. The return value should be given
    * as an object or an array of objects with optional target and eventKey keys,
    * and a mutation key whose value is a function. The target and eventKey keys
    * will default to those corresponding to the element the event handler was attached to.
@@ -513,7 +512,7 @@ export const Chart: React.FunctionComponent<ChartProps> = ({
     containerComponent.props.labelComponent &&
     containerComponent.props.labelComponent.type.displayName === 'ChartLegendTooltip'
   ) {
-    labelComponent = React.cloneElement(containerComponent.props.labelComponent, {
+    labelComponent = cloneElement(containerComponent.props.labelComponent, {
       theme,
       ...(defaultPatternScale && { patternScale: defaultPatternScale }),
       ...containerComponent.props.labelComponent.props
@@ -521,7 +520,7 @@ export const Chart: React.FunctionComponent<ChartProps> = ({
   }
 
   // Clone so users can override container props
-  const container = React.cloneElement(containerComponent, {
+  const container = cloneElement(containerComponent, {
     desc: ariaDesc,
     title: ariaTitle,
     theme,
@@ -536,7 +535,7 @@ export const Chart: React.FunctionComponent<ChartProps> = ({
     legendXOffset = getLegendMaxTextWidth(legendData, theme);
   }
 
-  const legend = React.cloneElement(legendComponent, {
+  const legend = cloneElement(legendComponent, {
     data: legendData,
     ...(name && { name: `${name}-${(legendComponent as any).type.displayName}` }),
     orientation: legendOrientation,
@@ -544,14 +543,14 @@ export const Chart: React.FunctionComponent<ChartProps> = ({
     themeColor,
     ...(legendDirection === 'rtl' && {
       dataComponent: legendComponent.props.dataComponent ? (
-        React.cloneElement(legendComponent.props.dataComponent, { transform: `translate(${legendXOffset})` })
+        cloneElement(legendComponent.props.dataComponent, { transform: `translate(${legendXOffset})` })
       ) : (
         <ChartPoint transform={`translate(${legendXOffset})`} />
       )
     }),
     ...(legendDirection === 'rtl' && {
       labelComponent: legendComponent.props.labelComponent ? (
-        React.cloneElement(legendComponent.props.labelComponent, { direction: 'rtl', dx: legendXOffset - 30 })
+        cloneElement(legendComponent.props.labelComponent, { direction: 'rtl', dx: legendXOffset - 30 })
       ) : (
         <ChartLabel direction="rtl" dx={legendXOffset - 30} />
       )
@@ -570,7 +569,7 @@ export const Chart: React.FunctionComponent<ChartProps> = ({
     let legendTitleHeight = legend.props.title ? 10 : 0;
 
     // Adjust for axis label
-    React.Children.toArray(children).map((child: any) => {
+    Children.toArray(children).map((child: any) => {
       if (child.type.role === 'axis' && child.props.label && child.props.fixAxisLabelHeight) {
         xAxisLabelHeight = getLabelTextSize({ text: child.props.label, theme }).height + 10;
         legendTitleHeight = 0;
@@ -608,10 +607,10 @@ export const Chart: React.FunctionComponent<ChartProps> = ({
 
   // Render children
   const renderChildren = () =>
-    React.Children.toArray(children).map((child, index) => {
-      if (React.isValidElement(child)) {
+    Children.toArray(children).map((child, index) => {
+      if (isValidElement(child)) {
         const { ...childProps } = child.props;
-        return React.cloneElement(child, {
+        return cloneElement(child, {
           colorScale,
           ...(defaultPatternScale && { patternScale: defaultPatternScale }),
           ...(name &&
diff --git a/packages/react-charts/src/victory/components/ChartArea/ChartArea.test.tsx b/packages/react-charts/src/victory/components/ChartArea/ChartArea.test.tsx
index ee1cc9fc1a6..cec3c0c45ef 100644
--- a/packages/react-charts/src/victory/components/ChartArea/ChartArea.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartArea/ChartArea.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartArea } from '../ChartArea/ChartArea';
 
diff --git a/packages/react-charts/src/victory/components/ChartArea/ChartArea.tsx b/packages/react-charts/src/victory/components/ChartArea/ChartArea.tsx
index b093f358cff..2c431291f89 100644
--- a/packages/react-charts/src/victory/components/ChartArea/ChartArea.tsx
+++ b/packages/react-charts/src/victory/components/ChartArea/ChartArea.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import {
   AnimatePropTypeInterface,
@@ -129,7 +129,7 @@ export interface ChartAreaProps extends VictoryAreaProps {
    * Since ChartArea only renders a single element, the eventKey property is not used.
    * The eventHandlers object should be given as an object whose keys are standard
    * event names (i.e. onClick) and whose values are event callbacks. The return value
-   * of an event handler is used to modify elemnts. The return value should be given
+   * of an event handler is used to modify elements. The return value should be given
    * as an object or an array of objects with optional target and eventKey keys,
    * and a mutation key whose value is a function. The target and eventKey keys
    * will default to those corresponding to the element the event handler was attached to.
@@ -433,7 +433,7 @@ export const ChartArea: React.FunctionComponent<ChartAreaProps> = ({
   ...rest
 }: ChartAreaProps) => {
   // Clone so users can override container props
-  const container = React.cloneElement(containerComponent, {
+  const container = cloneElement(containerComponent, {
     theme,
     ...containerComponent.props
   });
diff --git a/packages/react-charts/src/victory/components/ChartArea/examples/ChartArea.md b/packages/react-charts/src/victory/components/ChartArea/examples/ChartArea.md
index ca653b02301..375bd825d49 100644
--- a/packages/react-charts/src/victory/components/ChartArea/examples/ChartArea.md
+++ b/packages/react-charts/src/victory/components/ChartArea/examples/ChartArea.md
@@ -11,7 +11,7 @@ propComponents: [
 ]
 hideDarkMode: true
 ---
-
+import { createRef } from 'react';
 import { Chart, ChartArea, ChartAxis, ChartGroup, ChartThreshold, ChartThemeColor, ChartLegendTooltip, ChartVoronoiContainer, createContainer } from '@patternfly/react-charts/victory';
 import { getResizeObserver } from '@patternfly/react-core';
 
@@ -23,7 +23,6 @@ PatternFly React charts are based on the [Victory](https://formidable.com/open-s
 ## Examples
 ### Basic with right aligned legend
 ```js
-import React from 'react';
 import { Chart, ChartArea, ChartAxis, ChartGroup, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 // import '@patternfly/patternfly/patternfly-charts.css'; // Required for mix-blend-mode CSS property
 
@@ -88,7 +87,6 @@ import { Chart, ChartArea, ChartAxis, ChartGroup, ChartVoronoiContainer } from '
 This demonstrates how to combine cursor and voronoi containers to display tooltips along with a cursor.
 
 ```js
-import React from 'react';
 import { Chart, ChartArea, ChartAxis, ChartGroup, ChartThemeColor, ChartLegendTooltip, createContainer } from '@patternfly/react-charts/victory';
 // import '@patternfly/patternfly/patternfly-charts.css'; // Required for mix-blend-mode CSS property
 
@@ -172,7 +170,6 @@ class BottomAlignedLegend extends React.Component {
 
 ### Multi-color (unordered) bottom-left aligned legend and responsive container
 ```js
-import React from 'react';
 import { Chart, ChartArea, ChartAxis, ChartGroup, ChartThemeColor, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 import { getResizeObserver } from '@patternfly/react-core';
 // import '@patternfly/patternfly/patternfly-charts.css'; // Required for mix-blend-mode CSS property
@@ -180,7 +177,7 @@ import { getResizeObserver } from '@patternfly/react-core';
 class MultiColorChart extends React.Component {
   constructor(props) {
     super(props);
-    this.containerRef = React.createRef();
+    this.containerRef = createRef();
     this.observer = () => {};
     this.state = {
       width: 0
diff --git a/packages/react-charts/src/victory/components/ChartAxis/ChartAxis.test.tsx b/packages/react-charts/src/victory/components/ChartAxis/ChartAxis.test.tsx
index dc4eae0592f..1e85ca81f32 100644
--- a/packages/react-charts/src/victory/components/ChartAxis/ChartAxis.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartAxis/ChartAxis.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { Chart } from '../Chart/Chart';
 import { ChartGroup } from '../ChartGroup/ChartGroup';
diff --git a/packages/react-charts/src/victory/components/ChartAxis/ChartAxis.tsx b/packages/react-charts/src/victory/components/ChartAxis/ChartAxis.tsx
index 8fa73d3996f..4a35625036a 100644
--- a/packages/react-charts/src/victory/components/ChartAxis/ChartAxis.tsx
+++ b/packages/react-charts/src/victory/components/ChartAxis/ChartAxis.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import {
   AnimatePropTypeInterface,
@@ -117,7 +117,7 @@ export interface ChartAxisProps extends VictoryAxisProps {
    * single element by index rather than an entire set. The eventHandlers object
    * should be given as an object whose keys are standard event names (i.e. onClick)
    * and whose values are event callbacks. The return value of an event handler
-   * be used to modify other elemnts. The return value should be given as an object or
+   * be used to modify other elements. The return value should be given as an object or
    * an array of objects with optional target and eventKey keys, and a mutation
    * key whose value is a function. The target and eventKey keys will default to those
    * corresponding to the element the event handler was attached to. The mutation
@@ -458,13 +458,13 @@ export const ChartAxis: React.FunctionComponent<ChartAxisProps> = ({
   const componentTheme = getComponentTheme(themeColor);
 
   // Clone so users can override container props
-  const container = React.cloneElement(containerComponent, {
+  const container = cloneElement(containerComponent, {
     theme,
     ...containerComponent.props
   });
 
   const getAxisLabelComponent = () =>
-    React.cloneElement(axisLabelComponent, {
+    cloneElement(axisLabelComponent, {
       ...(name && {
         id: () => `${name}-${(axisLabelComponent as any).type.displayName}`
       }),
@@ -473,7 +473,7 @@ export const ChartAxis: React.FunctionComponent<ChartAxisProps> = ({
     });
 
   const getTickLabelComponent = () =>
-    React.cloneElement(tickLabelComponent, {
+    cloneElement(tickLabelComponent, {
       ...(name && {
         id: (props: any) => `${name}-${(tickLabelComponent as any).type.displayName}-${props.index}`
       }),
diff --git a/packages/react-charts/src/victory/components/ChartBar/ChartBar.test.tsx b/packages/react-charts/src/victory/components/ChartBar/ChartBar.test.tsx
index 99b54355d0c..3a1fee8d1b3 100644
--- a/packages/react-charts/src/victory/components/ChartBar/ChartBar.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartBar/ChartBar.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { Chart } from '../Chart/Chart';
 import { ChartGroup } from '../ChartGroup/ChartGroup';
diff --git a/packages/react-charts/src/victory/components/ChartBar/ChartBar.tsx b/packages/react-charts/src/victory/components/ChartBar/ChartBar.tsx
index 6285b0d4052..f6b79b1efca 100644
--- a/packages/react-charts/src/victory/components/ChartBar/ChartBar.tsx
+++ b/packages/react-charts/src/victory/components/ChartBar/ChartBar.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import {
   AnimatePropTypeInterface,
@@ -169,7 +169,7 @@ export interface ChartBarProps extends VictoryBarProps {
    * The eventKey may optionally be used to select a single element by index rather than an entire
    * set. The eventHandlers object should be given as an object whose keys are standard
    * event names (i.e. onClick) and whose values are event callbacks. The return value
-   * of an event handler is used to modify elemnts. The return value should be given
+   * of an event handler is used to modify elements. The return value should be given
    * as an object or an array of objects with optional target and eventKey keys,
    * and a mutation key whose value is a function. The target and eventKey keys
    * will default to those corresponding to the element the event handler was attached to.
@@ -471,7 +471,7 @@ export const ChartBar: React.FunctionComponent<ChartBarProps> = ({
   ...rest
 }: ChartBarProps) => {
   // Clone so users can override container props
-  const container = React.cloneElement(containerComponent, {
+  const container = cloneElement(containerComponent, {
     theme,
     ...containerComponent.props
   });
diff --git a/packages/react-charts/src/victory/components/ChartBar/examples/ChartBar.md b/packages/react-charts/src/victory/components/ChartBar/examples/ChartBar.md
index 6466d22dbc7..2d4b0a9385a 100644
--- a/packages/react-charts/src/victory/components/ChartBar/examples/ChartBar.md
+++ b/packages/react-charts/src/victory/components/ChartBar/examples/ChartBar.md
@@ -22,7 +22,6 @@ PatternFly React charts are based on the [Victory](https://formidable.com/open-s
 ### Basic with right aligned legend
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartBar, ChartGroup, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '250px', width: '600px' }}>
@@ -92,7 +91,6 @@ import { Chart, ChartAxis, ChartBar, ChartGroup, ChartVoronoiContainer } from '@
 This demonstrates an alternate way of applying tooltips using data labels.
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartBar, ChartGroup, ChartThemeColor, ChartTooltip } from '@patternfly/react-charts/victory';
 
 class EmbeddedLegend extends React.Component {
@@ -170,7 +168,6 @@ class EmbeddedLegend extends React.Component {
 This demonstrates zoom for both the x and y axis.
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartBar, ChartGroup, ChartThemeColor } from '@patternfly/react-charts/victory';
 import { VictoryZoomContainer } from 'victory-zoom-container';
 
@@ -236,7 +233,6 @@ import { VictoryZoomContainer } from 'victory-zoom-container';
 ### Single with right aligned legend
 
 ```js
-import React from 'react';
 import { Chart, ChartBar, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '250px', width: '600px' }}>
@@ -278,7 +274,6 @@ import { Chart, ChartBar, ChartVoronoiContainer } from '@patternfly/react-charts
 A gnatt-like chart using `y` and `y0` data properties for alert start/end dates
 
 ```js
-import React from 'react';
 import {
   Chart,
   ChartAxis,
diff --git a/packages/react-charts/src/victory/components/ChartBoxPlot/ChartBoxPlot.test.tsx b/packages/react-charts/src/victory/components/ChartBoxPlot/ChartBoxPlot.test.tsx
index 9a478999000..72a7b5c80d6 100644
--- a/packages/react-charts/src/victory/components/ChartBoxPlot/ChartBoxPlot.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartBoxPlot/ChartBoxPlot.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { Chart } from '../Chart/Chart';
 import { ChartBoxPlot } from './ChartBoxPlot';
diff --git a/packages/react-charts/src/victory/components/ChartBoxPlot/ChartBoxPlot.tsx b/packages/react-charts/src/victory/components/ChartBoxPlot/ChartBoxPlot.tsx
index a27aeb2c0e6..49660a60e25 100644
--- a/packages/react-charts/src/victory/components/ChartBoxPlot/ChartBoxPlot.tsx
+++ b/packages/react-charts/src/victory/components/ChartBoxPlot/ChartBoxPlot.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import {
   AnimatePropTypeInterface,
@@ -157,7 +157,7 @@ export interface ChartBoxPlotProps extends VictoryBoxPlotProps {
    * The eventKey may optionally be used to select a single element by index rather than an entire
    * set. The eventHandlers object should be given as an object whose keys are standard
    * event names (i.e. onClick) and whose values are event callbacks. The return value
-   * of an event handler is used to modify elemnts. The return value should be given
+   * of an event handler is used to modify elements. The return value should be given
    * as an object or an array of objects with optional target and eventKey keys,
    * and a mutation key whose value is a function. The target and eventKey keys
    * will default to those corresponding to the element the event handler was attached to.
@@ -685,7 +685,7 @@ export const ChartBoxPlot: React.FunctionComponent<ChartBoxPlotProps> = ({
   ...rest
 }: ChartBoxPlotProps) => {
   // Clone so users can override container props
-  const container = React.cloneElement(containerComponent, {
+  const container = cloneElement(containerComponent, {
     theme,
     ...containerComponent.props
   });
diff --git a/packages/react-charts/src/victory/components/ChartBoxPlot/examples/ChartBoxPlot.md b/packages/react-charts/src/victory/components/ChartBoxPlot/examples/ChartBoxPlot.md
index ee8e3822fca..cac766f7b20 100644
--- a/packages/react-charts/src/victory/components/ChartBoxPlot/examples/ChartBoxPlot.md
+++ b/packages/react-charts/src/victory/components/ChartBoxPlot/examples/ChartBoxPlot.md
@@ -25,7 +25,6 @@ PatternFly React charts are based on the [Victory](https://formidable.com/open-s
 ## Examples
 ### Basic with right aligned legend
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartBoxPlot, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '300px', width: '750px' }}>
@@ -67,7 +66,6 @@ import { Chart, ChartAxis, ChartBoxPlot, ChartThemeColor } from '@patternfly/rea
 This demonstrates how to display labels.
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartBoxPlot, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '300px', width: '600px' }}>
@@ -114,7 +112,6 @@ import { Chart, ChartAxis, ChartBoxPlot, ChartThemeColor } from '@patternfly/rea
 This demonstrates how to embed a legend within a tooltip. Combining cursor and voronoi containers is required to display tooltips with a vertical cursor.
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartBoxPlot, ChartLegendTooltip, ChartThemeColor, ChartThreshold, createContainer } from '@patternfly/react-charts/victory';
 import chart_color_orange_300 from '@patternfly/react-tokens/dist/esm/chart_color_orange_300';
 
@@ -216,7 +213,6 @@ class EmbeddedLegend extends React.Component {
 This demonstrates how to embed HTML within a tooltip. Combining cursor and voronoi containers is required to display tooltips with a vertical cursor.
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartBoxPlot, ChartCursorTooltip, ChartThemeColor, createContainer } from '@patternfly/react-charts/victory';
 
 class EmbeddedHtml extends React.Component {
diff --git a/packages/react-charts/src/victory/components/ChartBullet/ChartBullet.test.tsx b/packages/react-charts/src/victory/components/ChartBullet/ChartBullet.test.tsx
index c7986881558..d46d659c501 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/ChartBullet.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartBullet/ChartBullet.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartAxis } from '../ChartAxis/ChartAxis';
 import { ChartLabel } from '../ChartLabel/ChartLabel';
diff --git a/packages/react-charts/src/victory/components/ChartBullet/ChartBullet.tsx b/packages/react-charts/src/victory/components/ChartBullet/ChartBullet.tsx
index fd79bc04547..dc146b522b9 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/ChartBullet.tsx
+++ b/packages/react-charts/src/victory/components/ChartBullet/ChartBullet.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement, Fragment, useEffect } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import { DataGetterPropType, DomainPropType, PaddingProps } from 'victory-core';
 import { VictoryChart } from 'victory-chart';
@@ -28,7 +28,6 @@ import { ChartBulletQualitativeRange } from './ChartBulletQualitativeRange';
 import { getBulletDomain } from './utils/chart-bullet-domain';
 import { getBulletThemeWithLegendColorScale } from './utils/chart-bullet-theme';
 import { getPaddingForSide } from '../ChartUtils/chart-padding';
-import { useEffect } from 'react';
 import { ChartPoint } from '../ChartPoint/ChartPoint';
 import { ChartLabel } from '../ChartLabel/ChartLabel';
 
@@ -588,7 +587,7 @@ export const ChartBullet: React.FunctionComponent<ChartBulletProps> = ({
   };
 
   // Bullet group title
-  const bulletGroupTitle = React.cloneElement(groupTitleComponent, {
+  const bulletGroupTitle = cloneElement(groupTitleComponent, {
     height,
     ...(name && { name: `${name}-${(groupTitleComponent as any).type.displayName}` }),
     standalone: false,
@@ -600,7 +599,7 @@ export const ChartBullet: React.FunctionComponent<ChartBulletProps> = ({
   });
 
   // Bullet title
-  const bulletTitle = React.cloneElement(titleComponent, {
+  const bulletTitle = cloneElement(titleComponent, {
     height,
     horizontal,
     legendPosition,
@@ -617,7 +616,7 @@ export const ChartBullet: React.FunctionComponent<ChartBulletProps> = ({
   });
 
   // Comparative error measure
-  const comparativeErrorMeasure = React.cloneElement(comparativeErrorMeasureComponent, {
+  const comparativeErrorMeasure = cloneElement(comparativeErrorMeasureComponent, {
     allowTooltip,
     barWidth: getComparativeMeasureErrorWidth({
       height: chartSize.height,
@@ -641,7 +640,7 @@ export const ChartBullet: React.FunctionComponent<ChartBulletProps> = ({
   });
 
   // Comparative warning measure
-  const comparativeWarningMeasure = React.cloneElement(comparativeWarningMeasureComponent, {
+  const comparativeWarningMeasure = cloneElement(comparativeWarningMeasureComponent, {
     allowTooltip,
     barWidth: getComparativeMeasureWarningWidth({
       height: chartSize.height,
@@ -665,7 +664,7 @@ export const ChartBullet: React.FunctionComponent<ChartBulletProps> = ({
   });
 
   // Comparative zero measure
-  const comparativeZeroMeasure = React.cloneElement(comparativeZeroMeasureComponent, {
+  const comparativeZeroMeasure = cloneElement(comparativeZeroMeasureComponent, {
     barWidth: getComparativeMeasureWidth({ height: chartSize.height, horizontal, themeColor, width: chartSize.width }),
     data: [{ y: 0 }],
     domain,
@@ -693,7 +692,7 @@ export const ChartBullet: React.FunctionComponent<ChartBulletProps> = ({
   }
 
   // Legend
-  const legend = React.cloneElement(legendComponent, {
+  const legend = cloneElement(legendComponent, {
     data: [
       ...(primaryDotMeasureLegendData ? primaryDotMeasureLegendData : []),
       ...(primarySegmentedMeasureLegendData ? primarySegmentedMeasureLegendData : []),
@@ -709,14 +708,14 @@ export const ChartBullet: React.FunctionComponent<ChartBulletProps> = ({
     themeColor,
     ...(legendDirection === 'rtl' && {
       dataComponent: legendComponent.props.dataComponent ? (
-        React.cloneElement(legendComponent.props.dataComponent, { transform: `translate(${legendXOffset})` })
+        cloneElement(legendComponent.props.dataComponent, { transform: `translate(${legendXOffset})` })
       ) : (
         <ChartPoint transform={`translate(${legendXOffset})`} />
       )
     }),
     ...(legendDirection === 'rtl' && {
       labelComponent: legendComponent.props.labelComponent ? (
-        React.cloneElement(legendComponent.props.labelComponent, {
+        cloneElement(legendComponent.props.labelComponent, {
           direction: 'rtl',
           dx: legendXOffset - 30
         })
@@ -728,7 +727,7 @@ export const ChartBullet: React.FunctionComponent<ChartBulletProps> = ({
   });
 
   // Primary dot measure
-  const primaryDotMeasure = React.cloneElement(primaryDotMeasureComponent, {
+  const primaryDotMeasure = cloneElement(primaryDotMeasureComponent, {
     allowTooltip,
     constrainToVisibleArea,
     data: primaryDotMeasureData,
@@ -748,7 +747,7 @@ export const ChartBullet: React.FunctionComponent<ChartBulletProps> = ({
   });
 
   // Primary segmented measure
-  const primarySegmentedMeasure = React.cloneElement(primarySegmentedMeasureComponent, {
+  const primarySegmentedMeasure = cloneElement(primarySegmentedMeasureComponent, {
     allowTooltip,
     constrainToVisibleArea,
     barWidth: getPrimarySegmentedMeasureWidth({
@@ -773,7 +772,7 @@ export const ChartBullet: React.FunctionComponent<ChartBulletProps> = ({
   });
 
   // Qualitative range
-  const qualitativeRange = React.cloneElement(qualitativeRangeComponent, {
+  const qualitativeRange = cloneElement(qualitativeRangeComponent, {
     allowTooltip,
     constrainToVisibleArea,
     barWidth: getQualitativeRangeBarWidth({ height: chartSize.height, horizontal, themeColor, width: chartSize.width }),
@@ -878,7 +877,7 @@ export const ChartBullet: React.FunctionComponent<ChartBulletProps> = ({
   };
 
   // Axis component for custom tick values
-  const axis = React.cloneElement(axisComponent, {
+  const axis = cloneElement(axisComponent, {
     dependentAxis: horizontal ? false : true,
     domain: !horizontal
       ? domain
@@ -902,7 +901,7 @@ export const ChartBullet: React.FunctionComponent<ChartBulletProps> = ({
 
   const computedLegend = getLegend();
   const bulletChart = (
-    <React.Fragment>
+    <Fragment>
       {axis}
       {bulletGroupTitle}
       {bulletTitle}
@@ -913,7 +912,7 @@ export const ChartBullet: React.FunctionComponent<ChartBulletProps> = ({
       {comparativeWarningMeasure}
       {getComparativeZeroMeasure()}
       {computedLegend}
-    </React.Fragment>
+    </Fragment>
   );
 
   // Callback to compliment legendAllowWrap
@@ -934,7 +933,7 @@ export const ChartBullet: React.FunctionComponent<ChartBulletProps> = ({
       {bulletChart}
     </ChartContainer>
   ) : (
-    <React.Fragment>{bulletChart}</React.Fragment>
+    <Fragment>{bulletChart}</Fragment>
   );
 };
 ChartBullet.displayName = 'ChartBullet';
diff --git a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeErrorMeasure.test.tsx b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeErrorMeasure.test.tsx
index ee2e3468e30..0888ac5c552 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeErrorMeasure.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeErrorMeasure.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartBulletComparativeErrorMeasure } from './ChartBulletComparativeErrorMeasure';
 
diff --git a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeErrorMeasure.tsx b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeErrorMeasure.tsx
index 9e90749308b..60ad1770418 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeErrorMeasure.tsx
+++ b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeErrorMeasure.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement, Fragment } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import { DataGetterPropType, DomainPropType, NumberOrCallback, PaddingProps } from 'victory-core';
 import { VictoryBar } from 'victory-bar';
@@ -186,7 +186,7 @@ export const ChartBulletComparativeErrorMeasure: React.FunctionComponent<ChartBu
   width = theme.bar.width
 }: ChartBulletComparativeErrorMeasureProps) => {
   // Comparative measure component
-  const measure = React.cloneElement(measureComponent, {
+  const measure = cloneElement(measureComponent, {
     allowTooltip,
     ariaDesc,
     ariaTitle,
@@ -212,7 +212,7 @@ export const ChartBulletComparativeErrorMeasure: React.FunctionComponent<ChartBu
       {measure}
     </ChartContainer>
   ) : (
-    <React.Fragment>{measure}</React.Fragment>
+    <Fragment>{measure}</Fragment>
   );
 };
 ChartBulletComparativeErrorMeasure.displayName = 'ChartBulletComparativeErrorMeasure';
diff --git a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeMeasure.test.tsx b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeMeasure.test.tsx
index 065596c6bb9..e26dfffb9da 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeMeasure.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeMeasure.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartBulletComparativeMeasure } from './ChartBulletComparativeMeasure';
 
diff --git a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeMeasure.tsx b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeMeasure.tsx
index 40b45a68f59..0ef3a57b904 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeMeasure.tsx
+++ b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeMeasure.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement, Fragment } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import { DataGetterPropType, DomainPropType, NumberOrCallback, PaddingProps } from 'victory-core';
 import { VictoryBar } from 'victory-bar';
@@ -197,7 +197,7 @@ export const ChartBulletComparativeMeasure: React.FunctionComponent<ChartBulletC
   // Label component
   //
   // Note: SVG height and width are provided by ChartBullet as a workaround to support constrainToVisibleArea
-  const tooltip = React.cloneElement(labelComponent, {
+  const tooltip = cloneElement(labelComponent, {
     constrainToVisibleArea,
     dx: () => {
       if (horizontal) {
@@ -218,7 +218,7 @@ export const ChartBulletComparativeMeasure: React.FunctionComponent<ChartBulletC
   });
 
   const measure = computedData.map((dataPoint: any, index: number) =>
-    React.cloneElement(measureComponent, {
+    cloneElement(measureComponent, {
       barWidth,
       data: [{ ...dataPoint }],
       domain,
@@ -241,7 +241,7 @@ export const ChartBulletComparativeMeasure: React.FunctionComponent<ChartBulletC
       {measure}
     </ChartContainer>
   ) : (
-    <React.Fragment>{measure}</React.Fragment>
+    <Fragment>{measure}</Fragment>
   );
 };
 ChartBulletComparativeMeasure.displayName = 'ChartBulletComparativeMeasure';
diff --git a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeWarningMeasure.test.tsx b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeWarningMeasure.test.tsx
index b1bb81c26f4..83b8fbfde6a 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeWarningMeasure.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeWarningMeasure.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartBulletComparativeWarningMeasure } from './ChartBulletComparativeWarningMeasure';
 
diff --git a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeWarningMeasure.tsx b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeWarningMeasure.tsx
index 8ddf308cc92..3dc5b08329c 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeWarningMeasure.tsx
+++ b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletComparativeWarningMeasure.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement, Fragment } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import { DataGetterPropType, DomainPropType, NumberOrCallback, PaddingProps } from 'victory-core';
 import { VictoryBar } from 'victory-bar';
@@ -188,7 +188,7 @@ export const ChartBulletComparativeWarningMeasure: React.FunctionComponent<
   width = theme.bar.width
 }: ChartBulletComparativeWarningMeasureProps) => {
   // Comparative measure component
-  const measure = React.cloneElement(measureComponent, {
+  const measure = cloneElement(measureComponent, {
     allowTooltip,
     ariaDesc,
     ariaTitle,
@@ -214,7 +214,7 @@ export const ChartBulletComparativeWarningMeasure: React.FunctionComponent<
       {measure}
     </ChartContainer>
   ) : (
-    <React.Fragment>{measure}</React.Fragment>
+    <Fragment>{measure}</Fragment>
   );
 };
 ChartBulletComparativeWarningMeasure.displayName = 'ChartBulletComparativeWarningMeasure';
diff --git a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletGroupTitle.test.tsx b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletGroupTitle.test.tsx
index 68e7213ac81..6894adecf04 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletGroupTitle.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletGroupTitle.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartBulletGroupTitle } from './ChartBulletGroupTitle';
 import { ChartLabel } from '../ChartLabel/ChartLabel';
diff --git a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletGroupTitle.tsx b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletGroupTitle.tsx
index 82d622c5b7b..17a9b1db978 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletGroupTitle.tsx
+++ b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletGroupTitle.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement, Fragment } from 'react';
 import { PaddingProps, Line, StringOrNumberOrCallback } from 'victory-core';
 import { ChartContainer } from '../ChartContainer/ChartContainer';
 import { ChartLabel } from '../ChartLabel/ChartLabel';
@@ -154,7 +154,7 @@ export const ChartBulletGroupTitle: React.FunctionComponent<ChartBulletGroupTitl
         ? titleSize.height + subTitleSize.height + labelPadding.top + labelPadding.bottom
         : titleSize.height + labelPadding.top + labelPadding.bottom;
 
-    return React.cloneElement(dividerComponent, {
+    return cloneElement(dividerComponent, {
       x1: defaultPadding.left,
       x2: width - defaultPadding.right,
       y1: defaultPadding.top + dy,
@@ -169,7 +169,7 @@ export const ChartBulletGroupTitle: React.FunctionComponent<ChartBulletGroupTitl
     const componentTheme = getComponentTheme(themeColor);
     const titleProps = titleComponent ? titleComponent.props : {};
     const showBoth = title && subTitle;
-    return React.cloneElement(titleComponent, {
+    return cloneElement(titleComponent, {
       ...(showBoth && { capHeight }),
       ...(name && { id: () => `${name}-${(titleComponent as any).type.displayName}` }),
       style: [ChartBulletStyles.label.groupTitle, ChartBulletStyles.label.subTitle],
@@ -191,10 +191,10 @@ export const ChartBulletGroupTitle: React.FunctionComponent<ChartBulletGroupTitl
   };
 
   const groupTitle = Boolean(title) && (
-    <React.Fragment>
+    <Fragment>
       {getTitle()}
       {getDivider()}
-    </React.Fragment>
+    </Fragment>
   );
 
   return standalone ? (
@@ -202,7 +202,7 @@ export const ChartBulletGroupTitle: React.FunctionComponent<ChartBulletGroupTitl
       {groupTitle}
     </ChartContainer>
   ) : (
-    <React.Fragment>{groupTitle}</React.Fragment>
+    <Fragment>{groupTitle}</Fragment>
   );
 };
 ChartBulletGroupTitle.displayName = 'ChartBulletGroupTitle';
diff --git a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletPrimaryDotMeasure.test.tsx b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletPrimaryDotMeasure.test.tsx
index c795926f137..42e88fe96a4 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletPrimaryDotMeasure.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletPrimaryDotMeasure.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartBulletPrimaryDotMeasure } from './ChartBulletPrimaryDotMeasure';
 
diff --git a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletPrimaryDotMeasure.tsx b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletPrimaryDotMeasure.tsx
index 2c105d600ee..9ee7e48a6d0 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletPrimaryDotMeasure.tsx
+++ b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletPrimaryDotMeasure.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement, Fragment } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import { DataGetterPropType, DomainPropType, PaddingProps } from 'victory-core';
 import { VictoryScatter } from 'victory-scatter';
@@ -208,7 +208,7 @@ export const ChartBulletPrimaryDotMeasure: React.FunctionComponent<ChartBulletPr
   // Label component
   //
   // Note: SVG height and width are provided by ChartBullet as a workaround to support constrainToVisibleArea
-  const tooltip = React.cloneElement(labelComponent, {
+  const tooltip = cloneElement(labelComponent, {
     constrainToVisibleArea,
     dx: 0,
     dy: horizontal ? -size : 0,
@@ -217,7 +217,7 @@ export const ChartBulletPrimaryDotMeasure: React.FunctionComponent<ChartBulletPr
   });
 
   const measure = computedData.map((dataPoint: any, index) =>
-    React.cloneElement(measureComponent, {
+    cloneElement(measureComponent, {
       data: [{ ...dataPoint }],
       domain,
       height,
@@ -245,7 +245,7 @@ export const ChartBulletPrimaryDotMeasure: React.FunctionComponent<ChartBulletPr
       {measure}
     </ChartContainer>
   ) : (
-    <React.Fragment>{measure}</React.Fragment>
+    <Fragment>{measure}</Fragment>
   );
 };
 ChartBulletPrimaryDotMeasure.displayName = 'ChartBulletPrimaryDotMeasure';
diff --git a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletPrimarySegmentedMeasure.test.tsx b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletPrimarySegmentedMeasure.test.tsx
index 80b09370953..f5cef6f4737 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletPrimarySegmentedMeasure.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletPrimarySegmentedMeasure.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartBulletPrimarySegmentedMeasure } from './ChartBulletPrimarySegmentedMeasure';
 
diff --git a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletPrimarySegmentedMeasure.tsx b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletPrimarySegmentedMeasure.tsx
index f640058ebc7..14372952dc8 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletPrimarySegmentedMeasure.tsx
+++ b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletPrimarySegmentedMeasure.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement, Fragment } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import { DataGetterPropType, DomainPropType, NumberOrCallback, PaddingProps } from 'victory-core';
 import { VictoryBar } from 'victory-bar';
@@ -229,7 +229,7 @@ export const ChartBulletPrimarySegmentedMeasure: React.FunctionComponent<ChartBu
   // Label component
   //
   // Note: SVG height and width are provided by ChartBullet as a workaround to support constrainToVisibleArea
-  const tooltip = React.cloneElement(labelComponent, {
+  const tooltip = cloneElement(labelComponent, {
     constrainToVisibleArea,
     dx: () => {
       if (horizontal) {
@@ -250,7 +250,7 @@ export const ChartBulletPrimarySegmentedMeasure: React.FunctionComponent<ChartBu
   });
 
   const measure = computedData.map((dataPoint: any, index) =>
-    React.cloneElement(measureComponent, {
+    cloneElement(measureComponent, {
       barWidth,
       data: [{ ...dataPoint }],
       domain,
@@ -278,7 +278,7 @@ export const ChartBulletPrimarySegmentedMeasure: React.FunctionComponent<ChartBu
       {measure}
     </ChartContainer>
   ) : (
-    <React.Fragment>{measure}</React.Fragment>
+    <Fragment>{measure}</Fragment>
   );
 };
 ChartBulletPrimarySegmentedMeasure.displayName = 'ChartBulletPrimarySegmentedMeasure';
diff --git a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletQualitativeRange.test.tsx b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletQualitativeRange.test.tsx
index 7eba951db01..eb895307124 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletQualitativeRange.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletQualitativeRange.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartBulletQualitativeRange } from './ChartBulletQualitativeRange';
 
diff --git a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletQualitativeRange.tsx b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletQualitativeRange.tsx
index 03568b89ef4..857e847226b 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletQualitativeRange.tsx
+++ b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletQualitativeRange.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement, Fragment } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import { DataGetterPropType, DomainPropType, NumberOrCallback, PaddingProps } from 'victory-core';
 import { VictoryBar } from 'victory-bar';
@@ -217,7 +217,7 @@ export const ChartBulletQualitativeRange: React.FunctionComponent<ChartBulletQua
   // Having the tooltip vertically centered is visually confusing with comparative measures.
   //
   // Note: SVG height and width are provided by ChartBullet as a workaround to support constrainToVisibleArea
-  const tooltip = React.cloneElement(labelComponent, {
+  const tooltip = cloneElement(labelComponent, {
     constrainToVisibleArea,
     dx: () => {
       if (horizontal) {
@@ -238,7 +238,7 @@ export const ChartBulletQualitativeRange: React.FunctionComponent<ChartBulletQua
   });
 
   const measure = computedData.map((dataPoint: any, index) =>
-    React.cloneElement(measureComponent, {
+    cloneElement(measureComponent, {
       barWidth,
       data: [{ ...dataPoint }],
       domain,
@@ -266,7 +266,7 @@ export const ChartBulletQualitativeRange: React.FunctionComponent<ChartBulletQua
       {measure}
     </ChartContainer>
   ) : (
-    <React.Fragment>{measure}</React.Fragment>
+    <Fragment>{measure}</Fragment>
   );
 };
 ChartBulletQualitativeRange.displayName = 'ChartBulletQualitativeRange';
diff --git a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletTitle.test.tsx b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletTitle.test.tsx
index a7574058146..884f20e163c 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletTitle.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletTitle.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartBulletTitle } from './ChartBulletTitle';
 import { ChartLabel } from '../ChartLabel/ChartLabel';
diff --git a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletTitle.tsx b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletTitle.tsx
index d2d6f595a68..aeb0635c2b7 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/ChartBulletTitle.tsx
+++ b/packages/react-charts/src/victory/components/ChartBullet/ChartBulletTitle.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement, Fragment } from 'react';
 import { PaddingProps, StringOrNumberOrCallback } from 'victory-core';
 import { ChartContainer } from '../ChartContainer/ChartContainer';
 import { ChartLabel } from '../ChartLabel/ChartLabel';
@@ -190,7 +190,7 @@ export const ChartBulletTitle: React.FunctionComponent<ChartBulletTitleProps> =
 
     // The x and y calculations below are used to adjust the position of the title, based on padding and scale.
     // This ensures that when padding is adjusted, the title moves along with the chart's position.
-    return React.cloneElement(titleComponent, {
+    return cloneElement(titleComponent, {
       ...(showBoth && { capHeight }),
       ...(name && { id: () => `${name}-${(titleComponent as any).type.displayName}` }),
       style: [ChartBulletStyles.label.title, ChartBulletStyles.label.subTitle],
@@ -227,7 +227,7 @@ export const ChartBulletTitle: React.FunctionComponent<ChartBulletTitleProps> =
       {getTitle()}
     </ChartContainer>
   ) : (
-    <React.Fragment>{getTitle()}</React.Fragment>
+    <Fragment>{getTitle()}</Fragment>
   );
 };
 ChartBulletTitle.displayName = 'ChartBulletTitle';
diff --git a/packages/react-charts/src/victory/components/ChartBullet/examples/ChartBullet.md b/packages/react-charts/src/victory/components/ChartBullet/examples/ChartBullet.md
index 821add11443..f3c0a03ca8c 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/examples/ChartBullet.md
+++ b/packages/react-charts/src/victory/components/ChartBullet/examples/ChartBullet.md
@@ -9,6 +9,7 @@ propComponents: [
 hideDarkMode: true
 ---
 
+import { createRef } from 'react';
 import { ChartAxis, ChartBullet, ChartContainer, ChartThemeColor } from '@patternfly/react-charts/victory';
 import { getResizeObserver } from '@patternfly/react-core';
 
@@ -20,7 +21,6 @@ PatternFly React charts are based on the [Victory](https://formidable.com/open-s
 ## Examples
 ### Basic
 ```js
-import React from 'react';
 import { ChartBullet } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '150px', width: '600px' }}>
@@ -42,7 +42,6 @@ import { ChartBullet } from '@patternfly/react-charts/victory';
 
 ### Segmented primary measure
 ```js
-import React from 'react';
 import { ChartBullet } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '200px', width: '600px' }}>
@@ -78,14 +77,13 @@ import { ChartBullet } from '@patternfly/react-charts/victory';
 This demonstrates a responsive legend which wraps when items are wider than its container.
 
 ```js
-import React from 'react';
 import { ChartBullet } from '@patternfly/react-charts/victory';
 import { getResizeObserver } from '@patternfly/react-core';
 
 class BulletChart extends React.Component {
   constructor(props) {
     super(props);
-    this.containerRef = React.createRef();
+    this.containerRef = createRef();
     this.observer = () => {};
     this.state = {
       extraHeight: 0,
@@ -156,7 +154,6 @@ class BulletChart extends React.Component {
 
 ### Primary measure dot
 ```js
-import React from 'react';
 import { ChartBullet } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '200px', width: '600px' }}>
@@ -192,7 +189,6 @@ import { ChartBullet } from '@patternfly/react-charts/victory';
 This is a green bullet chart with error measure and custom axis ticks with 3 legend items per row.
 
 ```js
-import React from 'react';
 import { ChartAxis, ChartBullet, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '200px', width: '600px' }}>
@@ -232,7 +228,6 @@ import { ChartAxis, ChartBullet, ChartThemeColor } from '@patternfly/react-chart
 This is a yellow bullet chart with primary measure greater than max range.
 
 ```js
-import React from 'react';
 import { ChartBullet, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '200px', width: '600px' }}>
@@ -270,7 +265,6 @@ import { ChartBullet, ChartThemeColor } from '@patternfly/react-charts/victory';
 This bullet chart with negative primary measure is for measures considered to be bad when they are low.
 
 ```js
-import React from 'react';
 import { ChartBullet } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '200px', width: '600px' }}>
@@ -307,7 +301,6 @@ import { ChartBullet } from '@patternfly/react-charts/victory';
 This reversed bullet chart with right aligned legend is for measures considered to be good when they are low.
 
 ```js
-import React from 'react';
 import { ChartBullet } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '200px', width: '700px' }}>
@@ -347,7 +340,6 @@ import { ChartBullet } from '@patternfly/react-charts/victory';
 This bullet chart with negative and positive primary measures has 4 legend items per row.
 
 ```js
-import React from 'react';
 import { ChartBullet } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '200px', width: '600px' }}>
@@ -382,7 +374,6 @@ import { ChartBullet } from '@patternfly/react-charts/victory';
 
 ### Vertical with segmented primary measure
 ```js
-import React from 'react';
 import { ChartBullet } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '500px', width: '500px' }}>
@@ -416,7 +407,6 @@ import { ChartBullet } from '@patternfly/react-charts/victory';
 
 ### Vertical primary measure outside max range
 ```js
-import React from 'react';
 import { ChartBullet, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '500px', width: '500px' }}>
@@ -452,7 +442,6 @@ import { ChartBullet, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 ### Custom labels
 ```js
-import React from 'react';
 import { ChartAxis, ChartBullet } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '150px', width: '600px' }}>
@@ -493,7 +482,6 @@ import { ChartAxis, ChartBullet } from '@patternfly/react-charts/victory';
 
 ### Custom size
 ```js
-import React from 'react';
 import { ChartBullet } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '200px', width: '600px' }}>
@@ -509,7 +497,7 @@ import { ChartBullet } from '@patternfly/react-charts/victory';
     name="chart13"
     padding={{
       bottom: 50,
-      left: 150, // Adjusted to accomodate labels
+      left: 150, // Adjusted to accommodate labels
       right: 50,
       top: 50
     }}
@@ -526,7 +514,6 @@ import { ChartBullet } from '@patternfly/react-charts/victory';
 
 ### Horizontal group
 ```js
-import React from 'react';
 import { ChartBullet, ChartContainer } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '500px', width: '600px' }}>
@@ -624,7 +611,6 @@ import { ChartBullet, ChartContainer } from '@patternfly/react-charts/victory';
 
 ### Vertical group
 ```js
-import React from 'react';
 import { ChartBullet, ChartContainer } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '600px', width: '500px' }}>
@@ -726,7 +712,6 @@ import { ChartBullet, ChartContainer } from '@patternfly/react-charts/victory';
 
 ### Horizontal group with title
 ```js
-import React from 'react';
 import { ChartBullet, ChartContainer } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '600px', width: '600px' }}>
@@ -826,7 +811,6 @@ import { ChartBullet, ChartContainer } from '@patternfly/react-charts/victory';
 
 ### Vertical group with title
 ```js
-import React from 'react';
 import { ChartBullet, ChartContainer } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '600px', width: '500px' }}>
diff --git a/packages/react-charts/src/victory/components/ChartBullet/utils/chart-bullet-domain.ts b/packages/react-charts/src/victory/components/ChartBullet/utils/chart-bullet-domain.ts
index a7e42a72de1..45aaedc0337 100644
--- a/packages/react-charts/src/victory/components/ChartBullet/utils/chart-bullet-domain.ts
+++ b/packages/react-charts/src/victory/components/ChartBullet/utils/chart-bullet-domain.ts
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { ChartDomain, getDomains } from '../../ChartUtils/chart-domain';
 
 interface ChartBulletDomainInterface {
diff --git a/packages/react-charts/src/victory/components/ChartContainer/ChartContainer.test.tsx b/packages/react-charts/src/victory/components/ChartContainer/ChartContainer.test.tsx
index 6cf8caa96ac..ddc3ab1ad9c 100644
--- a/packages/react-charts/src/victory/components/ChartContainer/ChartContainer.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartContainer/ChartContainer.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartLegend } from '../ChartLegend/ChartLegend';
 import { ChartLabel } from '../ChartLabel/ChartLabel';
diff --git a/packages/react-charts/src/victory/components/ChartContainer/ChartContainer.tsx b/packages/react-charts/src/victory/components/ChartContainer/ChartContainer.tsx
index 39de6c243a1..f4d9054e2f7 100644
--- a/packages/react-charts/src/victory/components/ChartContainer/ChartContainer.tsx
+++ b/packages/react-charts/src/victory/components/ChartContainer/ChartContainer.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import { OriginType, VictoryContainer, VictoryContainerProps } from 'victory-core';
 import { ChartThemeDefinition } from '../ChartTheme/ChartTheme';
@@ -38,7 +37,7 @@ export interface ChartContainerProps extends VictoryContainerProps {
    * the description, the more usable it will be for people using screen readers.
    * This prop defaults to an empty string.
    *
-   * @example "Golden retreivers make up 30%, Labs make up 25%, and other dog breeds are
+   * @example "Golden retrievers make up 30%, Labs make up 25%, and other dog breeds are
    * not represented above 5% each."
    */
   desc?: string;
diff --git a/packages/react-charts/src/victory/components/ChartCursorContainer/ChartCursorContainer.test.tsx b/packages/react-charts/src/victory/components/ChartCursorContainer/ChartCursorContainer.test.tsx
index d85e03bda7d..09896c2eb72 100644
--- a/packages/react-charts/src/victory/components/ChartCursorContainer/ChartCursorContainer.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartCursorContainer/ChartCursorContainer.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartArea } from '../ChartArea/ChartArea';
 import { ChartGroup } from '../ChartGroup/ChartGroup';
diff --git a/packages/react-charts/src/victory/components/ChartCursorContainer/ChartCursorContainer.tsx b/packages/react-charts/src/victory/components/ChartCursorContainer/ChartCursorContainer.tsx
index f25bffb868e..4c459828991 100644
--- a/packages/react-charts/src/victory/components/ChartCursorContainer/ChartCursorContainer.tsx
+++ b/packages/react-charts/src/victory/components/ChartCursorContainer/ChartCursorContainer.tsx
@@ -1,7 +1,6 @@
 /* eslint-disable camelcase */
+import { cloneElement } from 'react';
 import chart_global_label_Fill from '@patternfly/react-tokens/dist/esm/chart_global_label_Fill';
-
-import * as React from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import { LineSegment, OriginType, ValueOrAccessor, VictoryLabelProps } from 'victory-core';
 import {
@@ -89,7 +88,7 @@ export interface ChartCursorContainerProps extends VictoryCursorContainerProps {
    * the description, the more usable it will be for people using screen readers.
    * This prop defaults to an empty string.
    *
-   * @example "Golden retreivers make up 30%, Labs make up 25%, and other dog breeds are
+   * @example "Golden retrievers make up 30%, Labs make up 25%, and other dog breeds are
    * not represented above 5% each."
    */
   desc?: string;
@@ -212,14 +211,14 @@ export const ChartCursorContainer: React.FunctionComponent<ChartCursorContainerP
 }: ChartCursorContainerProps) => {
   const componentTheme = getComponentTheme(themeColor);
   const chartClassName = getClassName({ className });
-  const chartCursorLabelComponent = React.cloneElement(cursorLabelComponent, {
+  const chartCursorLabelComponent = cloneElement(cursorLabelComponent, {
     theme,
     ...cursorLabelComponent.props,
     ...(componentTheme?.label && componentTheme.label) // override backgroundStyle
   });
 
   // Clone so users can override cursor container props
-  const cursor = React.cloneElement(cursorComponent, {
+  const cursor = cloneElement(cursorComponent, {
     style: {
       strokeColor: chart_global_label_Fill.var
     },
diff --git a/packages/react-charts/src/victory/components/ChartCursorTooltip/ChartCursorFlyout.test.tsx b/packages/react-charts/src/victory/components/ChartCursorTooltip/ChartCursorFlyout.test.tsx
index 0e182fab261..0891b5eb8a6 100644
--- a/packages/react-charts/src/victory/components/ChartCursorTooltip/ChartCursorFlyout.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartCursorTooltip/ChartCursorFlyout.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartArea } from '../ChartArea/ChartArea';
 import { ChartGroup } from '../ChartGroup/ChartGroup';
diff --git a/packages/react-charts/src/victory/components/ChartCursorTooltip/ChartCursorFlyout.tsx b/packages/react-charts/src/victory/components/ChartCursorTooltip/ChartCursorFlyout.tsx
index 75356069836..a4af55aa015 100644
--- a/packages/react-charts/src/victory/components/ChartCursorTooltip/ChartCursorFlyout.tsx
+++ b/packages/react-charts/src/victory/components/ChartCursorTooltip/ChartCursorFlyout.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement } from 'react';
 import { Helpers, OrientationTypes, Path, VictoryCommonPrimitiveProps } from 'victory-core';
 import isPlainObject from 'lodash/isPlainObject';
 
@@ -118,7 +118,7 @@ const ChartCursorFlyout = (props: ChartCursorFlyoutProps) => {
     ...props
   });
 
-  return React.cloneElement(props.pathComponent, {
+  return cloneElement(props.pathComponent, {
     ...props.events,
     style: props.style,
     d: getFlyoutPath(props),
diff --git a/packages/react-charts/src/victory/components/ChartCursorTooltip/ChartCursorTooltip.test.tsx b/packages/react-charts/src/victory/components/ChartCursorTooltip/ChartCursorTooltip.test.tsx
index 840690fa7cc..45c1fcfe6c9 100644
--- a/packages/react-charts/src/victory/components/ChartCursorTooltip/ChartCursorTooltip.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartCursorTooltip/ChartCursorTooltip.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartArea } from '../ChartArea/ChartArea';
 import { ChartGroup } from '../ChartGroup/ChartGroup';
diff --git a/packages/react-charts/src/victory/components/ChartCursorTooltip/ChartCursorTooltip.tsx b/packages/react-charts/src/victory/components/ChartCursorTooltip/ChartCursorTooltip.tsx
index 83e600ad0a5..f1456fba3d9 100644
--- a/packages/react-charts/src/victory/components/ChartCursorTooltip/ChartCursorTooltip.tsx
+++ b/packages/react-charts/src/victory/components/ChartCursorTooltip/ChartCursorTooltip.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import {
   Helpers,
@@ -291,7 +291,7 @@ export const ChartCursorTooltip: React.FunctionComponent<ChartCursorTooltipProps
     if (showPointer && _pointerLength === 0) {
       _pointerLength = theme && theme.tooltip ? Helpers.evaluateProp(theme.tooltip.pointerLength, undefined) : 10;
     }
-    return React.cloneElement(flyoutComponent, {
+    return cloneElement(flyoutComponent, {
       pointerLength: _pointerLength,
       pointerWidth,
       ...flyoutComponent.props
diff --git a/packages/react-charts/src/victory/components/ChartDonut/ChartDonut.test.tsx b/packages/react-charts/src/victory/components/ChartDonut/ChartDonut.test.tsx
index 03f4b6cbe4c..7b917f77cdc 100644
--- a/packages/react-charts/src/victory/components/ChartDonut/ChartDonut.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartDonut/ChartDonut.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartDonut } from './ChartDonut';
 
diff --git a/packages/react-charts/src/victory/components/ChartDonut/ChartDonut.tsx b/packages/react-charts/src/victory/components/ChartDonut/ChartDonut.tsx
index 3fb5974533b..69b73966bfa 100644
--- a/packages/react-charts/src/victory/components/ChartDonut/ChartDonut.tsx
+++ b/packages/react-charts/src/victory/components/ChartDonut/ChartDonut.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement, Fragment } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import {
   AnimatePropTypeInterface,
@@ -172,7 +172,7 @@ export interface ChartDonutProps extends ChartPieProps {
    * events. The eventKey may optionally be used to select a single element by index rather than
    * an entire set. The eventHandlers object should be given as an object whose keys are standard
    * event names (i.e. onClick) and whose values are event callbacks. The return value
-   * of an event handler is used to modify elemnts. The return value should be given
+   * of an event handler is used to modify elements. The return value should be given
    * as an object or an array of objects with optional target and eventKey keys,
    * and a mutation key whose value is a function. The target and eventKey keys
    * will default to those corresponding to the element the event handler was attached to.
@@ -624,10 +624,10 @@ export const ChartDonut: React.FunctionComponent<ChartDonutProps> = ({
       });
     }
     return (
-      <React.Fragment key="pf-chart-donut-titles">
+      <Fragment key="pf-chart-donut-titles">
         {getTitle({ titles: title, dy: centerSubTitle ? -8 : 0 })}
         {getSubTitle({ textComponent: subTitleComponent, dy: centerSubTitle ? 15 : 0 })}
-      </React.Fragment>
+      </Fragment>
     );
   };
 
@@ -641,7 +641,7 @@ export const ChartDonut: React.FunctionComponent<ChartDonutProps> = ({
     }
     const subTitleProps = textComponent.props ? textComponent.props : {};
 
-    return React.cloneElement(textComponent, {
+    return cloneElement(textComponent, {
       ...(name && { id: `${name}-${(textComponent as any).type.displayName}-subTitle` }),
       key: 'pf-chart-donut-subtitle',
       style: ChartDonutStyles.label.subTitle,
@@ -674,7 +674,7 @@ export const ChartDonut: React.FunctionComponent<ChartDonutProps> = ({
     }
     const titleProps = titleComponent ? titleComponent.props : {};
 
-    return React.cloneElement(titleComponent, {
+    return cloneElement(titleComponent, {
       ...(Array.isArray(titles) && { capHeight }), // Use capHeight with multiple labels
       ...(name && { id: `${name}-${(titleComponent as any).type.displayName}-title` }),
       key: 'pf-chart-donut-title',
@@ -722,7 +722,7 @@ export const ChartDonut: React.FunctionComponent<ChartDonutProps> = ({
   );
 
   // Clone so users can override container props
-  const container = React.cloneElement(
+  const container = cloneElement(
     containerComponent,
     {
       desc: ariaDesc,
@@ -736,12 +736,12 @@ export const ChartDonut: React.FunctionComponent<ChartDonutProps> = ({
   );
 
   return standalone ? (
-    <React.Fragment>{container}</React.Fragment>
+    <Fragment>{container}</Fragment>
   ) : (
-    <React.Fragment>
+    <Fragment>
       {chart}
       {getAllTitles()}
-    </React.Fragment>
+    </Fragment>
   );
 };
 ChartDonut.displayName = 'ChartDonut';
diff --git a/packages/react-charts/src/victory/components/ChartDonut/examples/ChartDonut.md b/packages/react-charts/src/victory/components/ChartDonut/examples/ChartDonut.md
index 63e2917cad9..5d488eb093f 100644
--- a/packages/react-charts/src/victory/components/ChartDonut/examples/ChartDonut.md
+++ b/packages/react-charts/src/victory/components/ChartDonut/examples/ChartDonut.md
@@ -17,7 +17,6 @@ PatternFly React charts are based on the [Victory](https://formidable.com/open-s
 ## Examples
 ### Basic
 ```js
-import React from 'react';
 import { ChartDonut } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '230px', width: '230px' }}>
@@ -36,7 +35,6 @@ import { ChartDonut } from '@patternfly/react-charts/victory';
 
 ### Right aligned legend
 ```js
-import React from 'react';
 import { ChartDonut } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '230px', width: '350px' }}>
@@ -65,7 +63,6 @@ import { ChartDonut } from '@patternfly/react-charts/victory';
 
 ### Multi-color (ordered) with right aligned legend
 ```js
-import React from 'react';
 import { ChartDonut, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '230px', width: '350px' }}>
@@ -95,7 +92,6 @@ import { ChartDonut, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 ### Bottom aligned legend
 ```js
-import React from 'react';
 import { ChartDonut } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '275px', width: '300px' }}>
@@ -126,7 +122,6 @@ import { ChartDonut } from '@patternfly/react-charts/victory';
 
 ### Small
 ```js
-import React from 'react';
 import { ChartDonut } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '150px', width: '150px' }}>
@@ -147,7 +142,6 @@ import { ChartDonut } from '@patternfly/react-charts/victory';
 
 ### Small with right aligned legend
 ```js
-import React from 'react';
 import { ChartDonut } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '150px', width: '275px' }}>
@@ -177,7 +171,6 @@ import { ChartDonut } from '@patternfly/react-charts/victory';
 
 ### Small with bottom aligned subtitle
 ```js
-import React from 'react';
 import { ChartDonut } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '165px', width: '275px' }}>
@@ -208,7 +201,6 @@ import { ChartDonut } from '@patternfly/react-charts/victory';
 
 ### Small with right aligned subtitle
 ```js
-import React from 'react';
 import { ChartDonut } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '200px', width: '300px' }}>
diff --git a/packages/react-charts/src/victory/components/ChartDonutUtilization/ChartDonutThreshold.test.tsx b/packages/react-charts/src/victory/components/ChartDonutUtilization/ChartDonutThreshold.test.tsx
index 913f69b374e..44642d5fd7f 100644
--- a/packages/react-charts/src/victory/components/ChartDonutUtilization/ChartDonutThreshold.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartDonutUtilization/ChartDonutThreshold.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartDonutThreshold } from './ChartDonutThreshold';
 
diff --git a/packages/react-charts/src/victory/components/ChartDonutUtilization/ChartDonutThreshold.tsx b/packages/react-charts/src/victory/components/ChartDonutUtilization/ChartDonutThreshold.tsx
index 0f890ca31c6..62c16641768 100644
--- a/packages/react-charts/src/victory/components/ChartDonutUtilization/ChartDonutThreshold.tsx
+++ b/packages/react-charts/src/victory/components/ChartDonutUtilization/ChartDonutThreshold.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Children, cloneElement, Fragment, isValidElement } from 'react';
 import {
   AnimatePropTypeInterface,
   CategoryPropType,
@@ -147,7 +147,7 @@ export interface ChartDonutThresholdProps extends ChartDonutProps {
    *
    * Note: Overridden by containerComponent
    *
-   * @example "Golden retreivers make up 30%, Labs make up 25%, and other dog breeds are
+   * @example "Golden retrievers make up 30%, Labs make up 25%, and other dog breeds are
    * not represented above 5% each."
    */
   desc?: string;
@@ -170,7 +170,7 @@ export interface ChartDonutThresholdProps extends ChartDonutProps {
    * events. The eventKey may optionally be used to select a single element by index rather than
    * an entire set. The eventHandlers object should be given as an object whose keys are standard
    * event names (i.e. onClick) and whose values are event callbacks. The return value
-   * of an event handler is used to modify elemnts. The return value should be given
+   * of an event handler is used to modify elements. The return value should be given
    * as an object or an array of objects with optional target and eventKey keys,
    * and a mutation key whose value is a function. The target and eventKey keys
    * will default to those corresponding to the element the event handler was attached to.
@@ -500,12 +500,12 @@ export const ChartDonutThreshold: React.FunctionComponent<ChartDonutThresholdPro
   // Render dynamic utilization donut cart
   const computedData = getComputedData();
   const renderChildren = () =>
-    React.Children.toArray(children).map((child, index) => {
-      if (React.isValidElement(child)) {
+    Children.toArray(children).map((child, index) => {
+      if (isValidElement(child)) {
         const { data: childData, ...childProps } = child.props;
         const datum = Data.formatData([childData], childProps, ['x', 'y']); // Format child data independently of this component's props
         const dynamicTheme = childProps.theme || getDonutThresholdDynamicTheme(childProps.themeColor || themeColor);
-        return React.cloneElement(child, {
+        return cloneElement(child, {
           ...(hasPatterns && { hasPatterns: true }), // Enable ChartDonutUtilization patterns
           constrainToVisibleArea,
           data: childData,
@@ -554,7 +554,7 @@ export const ChartDonutThreshold: React.FunctionComponent<ChartDonutThresholdPro
   );
 
   // Clone so users can override container props
-  const container = React.cloneElement(
+  const container = cloneElement(
     containerComponent,
     {
       desc: ariaDesc,
@@ -568,12 +568,12 @@ export const ChartDonutThreshold: React.FunctionComponent<ChartDonutThresholdPro
   );
 
   return standalone ? (
-    <React.Fragment>{container}</React.Fragment>
+    <Fragment>{container}</Fragment>
   ) : (
-    <React.Fragment>
+    <Fragment>
       {chart}
       {renderChildren()}
-    </React.Fragment>
+    </Fragment>
   );
 };
 ChartDonutThreshold.displayName = 'ChartDonutThreshold';
diff --git a/packages/react-charts/src/victory/components/ChartDonutUtilization/ChartDonutUtilization.test.tsx b/packages/react-charts/src/victory/components/ChartDonutUtilization/ChartDonutUtilization.test.tsx
index 82e564ed53c..5cb9efefbfe 100644
--- a/packages/react-charts/src/victory/components/ChartDonutUtilization/ChartDonutUtilization.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartDonutUtilization/ChartDonutUtilization.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartDonutUtilization } from './ChartDonutUtilization';
 
diff --git a/packages/react-charts/src/victory/components/ChartDonutUtilization/ChartDonutUtilization.tsx b/packages/react-charts/src/victory/components/ChartDonutUtilization/ChartDonutUtilization.tsx
index 66ffc28dccb..655783fa874 100644
--- a/packages/react-charts/src/victory/components/ChartDonutUtilization/ChartDonutUtilization.tsx
+++ b/packages/react-charts/src/victory/components/ChartDonutUtilization/ChartDonutUtilization.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement, Fragment } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import orderBy from 'lodash/orderBy';
 import {
@@ -146,7 +146,7 @@ export interface ChartDonutUtilizationProps extends ChartDonutProps {
    *
    * Note: Overridden by containerComponent
    *
-   * @example "Golden retreivers make up 30%, Labs make up 25%, and other dog breeds are
+   * @example "Golden retrievers make up 30%, Labs make up 25%, and other dog breeds are
    * not represented above 5% each."
    */
   desc?: string;
@@ -169,7 +169,7 @@ export interface ChartDonutUtilizationProps extends ChartDonutProps {
    * events. The eventKey may optionally be used to select a single element by index rather than
    * an entire set. The eventHandlers object should be given as an object whose keys are standard
    * event names (i.e. onClick) and whose values are event callbacks. The return value
-   * of an event handler is used to modify elemnts. The return value should be given
+   * of an event handler is used to modify elements. The return value should be given
    * as an object or an array of objects with optional target and eventKey keys,
    * and a mutation key whose value is a function. The target and eventKey keys
    * will default to those corresponding to the element the event handler was attached to.
@@ -695,7 +695,7 @@ export const ChartDonutUtilization: React.FunctionComponent<ChartDonutUtilizatio
   );
 
   // Clone so users can override container props
-  const container = React.cloneElement(
+  const container = cloneElement(
     containerComponent,
     {
       desc: ariaDesc,
@@ -708,7 +708,7 @@ export const ChartDonutUtilization: React.FunctionComponent<ChartDonutUtilizatio
     [chart]
   );
 
-  return standalone ? <React.Fragment>{container}</React.Fragment> : <React.Fragment>{chart}</React.Fragment>;
+  return standalone ? <Fragment>{container}</Fragment> : <Fragment>{chart}</Fragment>;
 };
 ChartDonutUtilization.displayName = 'ChartDonutUtilization';
 
diff --git a/packages/react-charts/src/victory/components/ChartDonutUtilization/examples/ChartDonutUtilization.md b/packages/react-charts/src/victory/components/ChartDonutUtilization/examples/ChartDonutUtilization.md
index c92e0521a57..408c0e23e27 100644
--- a/packages/react-charts/src/victory/components/ChartDonutUtilization/examples/ChartDonutUtilization.md
+++ b/packages/react-charts/src/victory/components/ChartDonutUtilization/examples/ChartDonutUtilization.md
@@ -18,7 +18,6 @@ PatternFly React charts are based on the [Victory](https://formidable.com/open-s
 ## Donut utilization examples
 ### Basic
 ```js
-import React from 'react';
 import { ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '230px', width: '230px' }}>
@@ -37,7 +36,6 @@ import { ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 ### Right aligned legend
 ```js
-import React from 'react';
 import { ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 class DonutUtilizationChart extends React.Component {
@@ -96,7 +94,6 @@ class DonutUtilizationChart extends React.Component {
 
 ### Inverted with right aligned legend
 ```js
-import React from 'react';
 import { ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 class InvertedDonutUtilizationChart extends React.Component {
@@ -156,7 +153,6 @@ class InvertedDonutUtilizationChart extends React.Component {
 
 ### Right aligned vertical legend
 ```js
-import React from 'react';
 import { ChartDonutUtilization, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 class VerticalLegendUtilizationChart extends React.Component {
@@ -218,7 +214,6 @@ class VerticalLegendUtilizationChart extends React.Component {
 
 ### Bottom aligned legend
 ```js
-import React from 'react';
 import { ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '275px', width: '300px' }}>
@@ -248,7 +243,6 @@ import { ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 ### Small
 ```js
-import React from 'react';
 import { ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '175px', width: '175px' }}>
@@ -269,7 +263,6 @@ import { ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 ### Small with right aligned legend
 ```js
-import React from 'react';
 import { ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 class UtilizationChart extends React.Component {
@@ -332,7 +325,6 @@ class UtilizationChart extends React.Component {
 This is a small donut utilization chart with bottom aligned legend and right aligned subtitle.
 
 ```js
-import React from 'react';
 import { ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '185px', width: '350px' }}>
@@ -363,7 +355,6 @@ import { ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 ### Small with right aligned subtitle
 ```js
-import React from 'react';
 import { ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '200px', width: '350px' }}>
@@ -395,7 +386,6 @@ import { ChartDonutUtilization } from '@patternfly/react-charts/victory';
 ## Donut utilization threshold examples
 ### Static thresholds
 ```js
-import React from 'react';
 import { ChartDonutThreshold, ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '230px', width: '230px' }}>
@@ -419,7 +409,6 @@ import { ChartDonutThreshold, ChartDonutUtilization } from '@patternfly/react-ch
 
 ### Static thresholds with right aligned legend
 ```js
-import React from 'react';
 import { ChartDonutThreshold, ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 class ThresholdChart extends React.Component {
@@ -478,7 +467,6 @@ class ThresholdChart extends React.Component {
 
 ### Inverted static thresholds with right aligned legend
 ```js
-import React from 'react';
 import { ChartDonutThreshold, ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 class InvertedThresholdChart extends React.Component {
@@ -543,7 +531,6 @@ class InvertedThresholdChart extends React.Component {
 
 ### Static thresholds with custom legend
 ```js
-import React from 'react';
 import { ChartDonutThreshold, ChartDonutUtilization, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 class CustomLegendThresholdChart extends React.Component {
@@ -605,7 +592,6 @@ class CustomLegendThresholdChart extends React.Component {
 
 ### Static thresholds with bottom aligned legend
 ```js
-import React from 'react';
 import { ChartDonutThreshold, ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '275px', width: '675px' }}>
@@ -639,7 +625,6 @@ import { ChartDonutThreshold, ChartDonutUtilization } from '@patternfly/react-ch
 
 ### Small with static thresholds
 ```js
-import React from 'react';
 import { ChartDonutThreshold, ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '185px', width: '185px' }}>
@@ -665,7 +650,6 @@ import { ChartDonutThreshold, ChartDonutUtilization } from '@patternfly/react-ch
 
 ### Small with static thresholds and right aligned legend
 ```js
-import React from 'react';
 import { ChartDonutThreshold, ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 class ThresholdChart extends React.Component {
@@ -728,7 +712,6 @@ class ThresholdChart extends React.Component {
 This is a small donut utilization chart with static thresholds with right aligned legend and bottom aligned subtitle.
 
 ```js
-import React from 'react';
 import { ChartDonutThreshold, ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '200px', width: '425px' }}>
@@ -764,7 +747,6 @@ import { ChartDonutThreshold, ChartDonutUtilization } from '@patternfly/react-ch
 
 ### Small with thresholds and right aligned subtitle
 ```js
-import React from 'react';
 import { ChartDonutThreshold, ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '225px', width: '675px' }}>
diff --git a/packages/react-charts/src/victory/components/ChartGroup/ChartGroup.test.tsx b/packages/react-charts/src/victory/components/ChartGroup/ChartGroup.test.tsx
index 7b800771eba..5d3c972ff67 100644
--- a/packages/react-charts/src/victory/components/ChartGroup/ChartGroup.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartGroup/ChartGroup.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartArea } from '../ChartArea/ChartArea';
 import { ChartGroup } from './ChartGroup';
diff --git a/packages/react-charts/src/victory/components/ChartGroup/ChartGroup.tsx b/packages/react-charts/src/victory/components/ChartGroup/ChartGroup.tsx
index 6bb01abb496..35aa3975936 100644
--- a/packages/react-charts/src/victory/components/ChartGroup/ChartGroup.tsx
+++ b/packages/react-charts/src/victory/components/ChartGroup/ChartGroup.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import {
   AnimatePropTypeInterface,
@@ -152,7 +152,7 @@ export interface ChartGroupProps extends VictoryGroupProps {
    * Since ChartGroup only renders a single element, the eventKey property is not used.
    * The eventHandlers object should be given as an object whose keys are standard
    * event names (i.e. onClick) and whose values are event callbacks. The return value
-   * of an event handler is used to modify elemnts. The return value should be given
+   * of an event handler is used to modify elements. The return value should be given
    * as an object or an array of objects with optional target and eventKey keys,
    * and a mutation key whose value is a function. The target and eventKey keys
    * will default to those corresponding to the element the event handler was attached to.
@@ -479,7 +479,7 @@ export const ChartGroup: React.FunctionComponent<ChartGroupProps> = ({
   ...rest
 }: ChartGroupProps) => {
   // Clone so users can override container props
-  const container = React.cloneElement(containerComponent, {
+  const container = cloneElement(containerComponent, {
     desc: ariaDesc,
     title: ariaTitle,
     theme,
diff --git a/packages/react-charts/src/victory/components/ChartLabel/ChartLabel.test.tsx b/packages/react-charts/src/victory/components/ChartLabel/ChartLabel.test.tsx
index 6915a7cbf69..1f9e3f3b461 100644
--- a/packages/react-charts/src/victory/components/ChartLabel/ChartLabel.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartLabel/ChartLabel.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartLabel } from './ChartLabel';
 
diff --git a/packages/react-charts/src/victory/components/ChartLabel/ChartLabel.tsx b/packages/react-charts/src/victory/components/ChartLabel/ChartLabel.tsx
index 00359976b9c..58c283ff22c 100644
--- a/packages/react-charts/src/victory/components/ChartLabel/ChartLabel.tsx
+++ b/packages/react-charts/src/victory/components/ChartLabel/ChartLabel.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import defaults from 'lodash/defaults';
 import {
@@ -54,7 +53,7 @@ export interface ChartLabelProps extends VictoryLabelProps {
    */
   className?: string;
   /**
-   * Labels that apply to an entire data series will recieve the entire series as `data` instead of an individual datum
+   * Labels that apply to an entire data series will receive the entire series as `data` instead of an individual datum
    * prop.
    */
   data?: any[];
@@ -111,7 +110,7 @@ export interface ChartLabelProps extends VictoryLabelProps {
   /**
    * The labelPlacement prop is used to specify the placement of labels relative to the data point they represent.
    * This prop may be given as “vertical”, “parallel” or “perpendicular”. This props is particularly useful in polar
-   * charts, where it may be desireable to position a label either parallel or perpendicular to its corresponding angle.
+   * charts, where it may be desirable to position a label either parallel or perpendicular to its corresponding angle.
    * When this prop is not set, perpendicular label placement will be used for polar charts, and vertical label
    * placement will be used for cartesian charts.
    *
diff --git a/packages/react-charts/src/victory/components/ChartLegend/ChartLegend.test.tsx b/packages/react-charts/src/victory/components/ChartLegend/ChartLegend.test.tsx
index fa40554fc4f..9f42835b0c6 100644
--- a/packages/react-charts/src/victory/components/ChartLegend/ChartLegend.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartLegend/ChartLegend.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartLegend } from './ChartLegend';
 import { ChartLabel } from '../ChartLabel/ChartLabel';
diff --git a/packages/react-charts/src/victory/components/ChartLegend/ChartLegend.tsx b/packages/react-charts/src/victory/components/ChartLegend/ChartLegend.tsx
index c2af1359289..d6c76c3a24f 100644
--- a/packages/react-charts/src/victory/components/ChartLegend/ChartLegend.tsx
+++ b/packages/react-charts/src/victory/components/ChartLegend/ChartLegend.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import {
   BlockProps,
@@ -45,7 +45,7 @@ export interface ChartLegendProps extends VictoryLegendProps {
   /**
    * The borderPadding specifies the amount of padding that should
    * be added between the legend items and the border. This prop may be given as
-   * a number, or asanobject with values specified for top, bottom, left, and right.
+   * a number, or as an object with values specified for top, bottom, left, and right.
    * Please note that the default width and height calculated for the border
    * component is based on approximated text measurements, so padding may need to be adjusted.
    *
@@ -343,21 +343,21 @@ export const ChartLegend: React.FunctionComponent<ChartLegendProps> = ({
   };
 
   // Clone so users can override container props
-  const container = React.cloneElement(containerComponent, {
+  const container = cloneElement(containerComponent, {
     responsive,
     theme,
     ...containerComponent.props
   });
 
   const getLabelComponent = () =>
-    React.cloneElement(labelComponent, {
+    cloneElement(labelComponent, {
       ...(name && { id: (props: any) => `${name}-${(labelComponent as any).type.displayName}-${props.index}` }),
       ...labelComponent.props,
       ...(componentTheme?.label && componentTheme.label) // override backgroundStyle
     });
 
   const getTitleComponent = () =>
-    React.cloneElement(titleComponent, {
+    cloneElement(titleComponent, {
       // Victory doesn't appear to call the id function here, but it's valid for label components
       ...(name && { id: () => `${name}-${(titleComponent as any).type.displayName}` }),
       ...titleComponent.props,
diff --git a/packages/react-charts/src/victory/components/ChartLegend/examples/ChartLegend.md b/packages/react-charts/src/victory/components/ChartLegend/examples/ChartLegend.md
index 4db4cccb351..d75660d145a 100644
--- a/packages/react-charts/src/victory/components/ChartLegend/examples/ChartLegend.md
+++ b/packages/react-charts/src/victory/components/ChartLegend/examples/ChartLegend.md
@@ -20,6 +20,7 @@ propComponents: [
 hideDarkMode: true
 ---
 
+import { cloneElement, createRef, useEffect, useRef, useState } from 'react';
 import { 
   Chart,
   ChartArea,
@@ -53,7 +54,6 @@ PatternFly React charts are based on the [Victory](https://formidable.com/open-s
 ## Examples
 ### Basic with right aligned legend
 ```js
-import React from 'react';
 import { ChartDonut } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '230px', width: '350px' }}>
@@ -82,7 +82,6 @@ import { ChartDonut } from '@patternfly/react-charts/victory';
 
 ### Bottom aligned legend
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartBar, ChartGroup, ChartThemeColor, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '275px', width: '450px' }}>
@@ -121,14 +120,13 @@ import { Chart, ChartAxis, ChartBar, ChartGroup, ChartThemeColor, ChartVoronoiCo
 This demonstrates a responsive legend which wraps when items are wider than its container.
 
 ```js
-import React from 'react';
 import { ChartBullet } from '@patternfly/react-charts/victory';
 import { getResizeObserver } from '@patternfly/react-core';
 
 class BulletChart extends React.Component {
   constructor(props) {
     super(props);
-    this.containerRef = React.createRef();
+    this.containerRef = createRef();
     this.observer = () => {};
     this.state = {
       extraHeight: 0,
@@ -202,7 +200,6 @@ class BulletChart extends React.Component {
 This demonstrates a standalone legend vs. using the `legendData` property.
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartGroup, ChartLegend, ChartLine, ChartThemeColor, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '275px', width: '450px' }}>
@@ -278,7 +275,6 @@ import { Chart, ChartAxis, ChartGroup, ChartLegend, ChartLine, ChartThemeColor,
 This demonstrates how to add an interactive legend using events such as `onMouseOver`, `onMouseOut`, and `onClick`.
 
 ```js
-import React from 'react';
 import { 
   Chart, 
   ChartArea, 
@@ -296,9 +292,9 @@ import { getResizeObserver } from '@patternfly/react-core';
 // import '@patternfly/patternfly/patternfly-charts.css'; // For mixed blend mode
 
 const InteractiveLegendChart = () => {
-  const containerRef = React.useRef(null);
-  const [hiddenSeries, setHiddenSeries] = React.useState(new Set());
-  const [width, setWidth] = React.useState(0);
+  const containerRef = useRef(null);
+  const [hiddenSeries, setHiddenSeries] = useState(new Set());
+  const [width, setWidth] = useState(0);
 
   const series = [
     {
@@ -361,7 +357,7 @@ const InteractiveLegendChart = () => {
   const isDataAvailable = () => hiddenSeries.size !== series.length;
 
   // Set chart width per current window size
-  React.useEffect(() => {
+  useEffect(() => {
     const observer = getResizeObserver(containerRef.current, () => {
       if (containerRef.current?.clientWidth) {
         setWidth(containerRef.current.clientWidth);
@@ -440,7 +436,6 @@ const InteractiveLegendChart = () => {
 This demonstrates how to add an interactive legend to a pie chart using events such as `onMouseOver`, `onMouseOut`, and `onClick`.
 
 ```js
-import React from 'react';
 import { 
   Chart,
   ChartLegend,
@@ -558,7 +553,6 @@ class InteractivePieLegendChart extends React.Component {
 This demonstrates an approach for applying tooltips to a legend using a custom label component. These tooltips are keyboard navigable.
 
 ```js
-import React from 'react';
 import { ChartLabel, ChartLegend, ChartPie, ChartThemeColor } from '@patternfly/react-charts/victory';
 import { Tooltip } from '@patternfly/react-core';
 
@@ -569,7 +563,7 @@ class TooltipPieChart extends React.Component {
     // Custom legend label component
     // Note: Tooltip wraps children with a div tag, so we use a reference to ChartLabel instead
     this.LegendLabel = ({datum, ...rest}) => {
-      const ref = React.createRef();
+      const ref = createRef();
       return (
         <g ref={ref}>
           <ChartLabel {...rest} />
@@ -624,14 +618,13 @@ class TooltipPieChart extends React.Component {
 This demonstrates an approach for applying links to a legend using a custom label component. These links are keyboard navigable.
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartGroup, ChartLabel, ChartLegend, ChartLine, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 
 class LegendLinkPieChart extends React.Component {
   constructor(props) {
     super(props);
 
-    // Custom legend label compoenent
+    // Custom legend label component
     this.LegendLabel = ({datum, ...rest}) => (
       <a href="#" aria-label={`Learn more about ${rest.text}`}>
         <ChartLabel {...rest} />
@@ -727,7 +720,6 @@ class LegendLinkPieChart extends React.Component {
 This demonstrates an approach for applying a different legend layout and styles using a custom label component.
 
 ```js
-import React from 'react';
 import { ChartLabel, ChartLegend, ChartDonut, ChartThemeColor } from '@patternfly/react-charts/victory';
 import { Tooltip } from '@patternfly/react-core';
 
@@ -735,7 +727,7 @@ class LegendLayoutPieChart extends React.Component {
   constructor(props) {
     super(props);
 
-    // Custom legend label compoenent
+    // Custom legend label component
     this.LegendLabel = ({values, ...rest}) => (
       <ChartLabel
         {...rest}
diff --git a/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltip.test.tsx b/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltip.test.tsx
index 46928fe7a51..02671cfcf0d 100644
--- a/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltip.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltip.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { Chart } from '../Chart/Chart';
 import { ChartAxis } from '../ChartAxis/ChartAxis';
diff --git a/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltip.tsx b/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltip.tsx
index 167a7e4244a..dfd8070ebea 100644
--- a/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltip.tsx
+++ b/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltip.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import {
   Helpers,
@@ -367,7 +367,7 @@ export const ChartLegendTooltip: React.FunctionComponent<ChartLegendTooltipProps
 
   // Returns the tooltip content component
   const getTooltipContentComponent = (props: FlyoutProps) =>
-    React.cloneElement(labelComponent, {
+    cloneElement(labelComponent, {
       center,
       flyoutHeight: flyoutHeight || getFlyoutHeight(props),
       flyoutWidth: flyoutWidth || getFlyoutWidth(props),
@@ -388,7 +388,7 @@ export const ChartLegendTooltip: React.FunctionComponent<ChartLegendTooltipProps
     }
     const _flyoutWidth = getFlyoutWidth(legendSize);
     const tooltipComponent = isCursorTooltip ? <ChartCursorTooltip /> : <ChartTooltip />;
-    return React.cloneElement(tooltipComponent, {
+    return cloneElement(tooltipComponent, {
       activePoints,
       center,
       datum,
diff --git a/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltipContent.test.tsx b/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltipContent.test.tsx
index 480a43e19b0..b1ed7c10a4b 100644
--- a/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltipContent.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltipContent.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartLegendTooltipContent } from './ChartLegendTooltipContent';
 
diff --git a/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltipContent.tsx b/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltipContent.tsx
index d0e75a72afc..624f05d0f59 100644
--- a/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltipContent.tsx
+++ b/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltipContent.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement, Fragment } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import { Helpers, NumberOrCallback, StringOrNumberOrCallback } from 'victory-core';
 import { VictoryLegend } from 'victory-legend';
@@ -272,7 +272,7 @@ export const ChartLegendTooltipContent: React.FunctionComponent<ChartLegendToolt
 
   // Returns the label component
   const getLabelComponent = () =>
-    React.cloneElement(labelComponent, {
+    cloneElement(labelComponent, {
       datum,
       dx: maxLegendDimensions.width - minLegendDimensions.width,
       legendData: visibleLegendData,
@@ -283,7 +283,7 @@ export const ChartLegendTooltipContent: React.FunctionComponent<ChartLegendToolt
   const getTitleComponent = () => {
     const _title = title instanceof Function ? title(datum) : title;
 
-    return React.cloneElement(titleComponent, {
+    return cloneElement(titleComponent, {
       style: {
         fill: ChartLegendTooltipStyles.label.fill,
         fontWeight: ChartLegendTooltipStyles.label.fontWeight
@@ -298,7 +298,7 @@ export const ChartLegendTooltipContent: React.FunctionComponent<ChartLegendToolt
 
   // Returns the legend component
   const getLegendComponent = () =>
-    React.cloneElement(legendComponent, {
+    cloneElement(legendComponent, {
       data: getLegendTooltipVisibleData({
         activePoints,
         colorScale: legendProps.colorScale,
@@ -319,10 +319,10 @@ export const ChartLegendTooltipContent: React.FunctionComponent<ChartLegendToolt
     });
 
   return (
-    <React.Fragment>
+    <Fragment>
       {getTitleComponent()}
       {getLegendComponent()}
-    </React.Fragment>
+    </Fragment>
   );
 };
 ChartLegendTooltipContent.displayName = 'ChartLegendTooltipContent';
diff --git a/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltipLabel.test.tsx b/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltipLabel.test.tsx
index 3fec86c52fa..6b6733b9b4e 100644
--- a/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltipLabel.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltipLabel.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartLegendTooltipLabel } from './ChartLegendTooltipLabel';
 import { ChartLabel } from '../ChartLabel/ChartLabel';
diff --git a/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltipLabel.tsx b/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltipLabel.tsx
index 5fb9c4bd58b..f5969fb2d1c 100644
--- a/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltipLabel.tsx
+++ b/packages/react-charts/src/victory/components/ChartLegendTooltip/ChartLegendTooltipLabel.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement, Fragment } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import defaults from 'lodash/defaults';
 import {
@@ -56,7 +56,7 @@ export interface ChartLegendTooltipLabelProps extends VictoryLabelProps {
    */
   className?: string;
   /**
-   * Labels that apply to an entire data series will recieve the entire series as `data` instead of an individual datum
+   * Labels that apply to an entire data series will receive the entire series as `data` instead of an individual datum
    * prop.
    */
   data?: any[];
@@ -109,7 +109,7 @@ export interface ChartLegendTooltipLabelProps extends VictoryLabelProps {
   /**
    * The labelPlacement prop is used to specify the placement of labels relative to the data point they represent.
    * This prop may be given as “vertical”, “parallel” or “perpendicular”. This props is particularly useful in polar
-   * charts, where it may be desireable to position a label either parallel or perpendicular to its corresponding angle.
+   * charts, where it may be desirable to position a label either parallel or perpendicular to its corresponding angle.
    * When this prop is not set, perpendicular label placement will be used for polar charts, and vertical label
    * placement will be used for cartesian charts.
    *
@@ -263,7 +263,7 @@ export const ChartLegendTooltipLabel: React.FunctionComponent<ChartLegendTooltip
   const getLegendLabelComponent = () => {
     const label = legendData && legendData.length ? legendData[index as any].name : undefined;
 
-    return React.cloneElement(legendLabelComponent, {
+    return cloneElement(legendLabelComponent, {
       style: getStyle({}),
       text: label,
       textAnchor: 'start',
@@ -275,7 +275,7 @@ export const ChartLegendTooltipLabel: React.FunctionComponent<ChartLegendTooltip
   const getValueLabelComponent = () => {
     const _x = x + (Helpers.evaluateProp(dx, undefined) as number);
 
-    return React.cloneElement(valueLabelComponent, {
+    return cloneElement(valueLabelComponent, {
       style: getStyle(style),
       text,
       textAnchor,
@@ -288,10 +288,10 @@ export const ChartLegendTooltipLabel: React.FunctionComponent<ChartLegendTooltip
   const legendLabel = getLegendLabelComponent();
   const valueLabel = getValueLabelComponent();
   return (
-    <React.Fragment>
+    <Fragment>
       {legendLabel}
       {valueLabel}
-    </React.Fragment>
+    </Fragment>
   );
 };
 ChartLegendTooltipLabel.displayName = 'ChartLegendTooltipLabel';
diff --git a/packages/react-charts/src/victory/components/ChartLine/ChartLine.test.tsx b/packages/react-charts/src/victory/components/ChartLine/ChartLine.test.tsx
index 2ac5f0cc718..aabebe15844 100644
--- a/packages/react-charts/src/victory/components/ChartLine/ChartLine.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartLine/ChartLine.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { Chart } from '../Chart/Chart';
 import { ChartGroup } from '../ChartGroup/ChartGroup';
diff --git a/packages/react-charts/src/victory/components/ChartLine/ChartLine.tsx b/packages/react-charts/src/victory/components/ChartLine/ChartLine.tsx
index 993e682ea48..091ee3b9c5a 100644
--- a/packages/react-charts/src/victory/components/ChartLine/ChartLine.tsx
+++ b/packages/react-charts/src/victory/components/ChartLine/ChartLine.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import {
   AnimatePropTypeInterface,
@@ -128,7 +128,7 @@ export interface ChartLineProps extends VictoryLineProps {
    * Since ChartLine only renders a single element, the eventKey property is not used.
    * The eventHandlers object should be given as an object whose keys are standard
    * event names (i.e. onClick) and whose values are event callbacks. The return value
-   * of an event handler is used to modify elemnts. The return value should be given
+   * of an event handler is used to modify elements. The return value should be given
    * as an object or an array of objects with optional target and eventKey keys,
    * and a mutation key whose value is a function. The target and eventKey keys
    * will default to those corresponding to the element the event handler was attached to.
@@ -434,7 +434,7 @@ export const ChartLine: React.FunctionComponent<ChartLineProps> = ({
   ...rest
 }: ChartLineProps) => {
   // Clone so users can override container props
-  const container = React.cloneElement(containerComponent, {
+  const container = cloneElement(containerComponent, {
     theme,
     ...containerComponent.props
   });
diff --git a/packages/react-charts/src/victory/components/ChartLine/examples/ChartLine.md b/packages/react-charts/src/victory/components/ChartLine/examples/ChartLine.md
index c4f4294940d..83e8fd3e6b3 100644
--- a/packages/react-charts/src/victory/components/ChartLine/examples/ChartLine.md
+++ b/packages/react-charts/src/victory/components/ChartLine/examples/ChartLine.md
@@ -11,6 +11,7 @@ propComponents: [
 hideDarkMode: true
 ---
 
+import { createRef } from 'react';
 import { Chart, ChartAxis, ChartGroup, ChartLine, ChartThemeColor, ChartLegendTooltip, ChartVoronoiContainer, createContainer } from '@patternfly/react-charts/victory';
 import { getResizeObserver } from '@patternfly/react-core';
 import { VictoryZoomContainer } from 'victory-zoom-container';
@@ -23,7 +24,6 @@ PatternFly React charts are based on the [Victory](https://formidable.com/open-s
 ## Examples
 ### Basic with right aligned legend
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartGroup, ChartLine, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '250px', width: '600px' }}>
@@ -96,7 +96,6 @@ import { Chart, ChartAxis, ChartGroup, ChartLine, ChartVoronoiContainer } from '
 This demonstrates how to combine cursor and voronoi containers to display tooltips along with a cursor.
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartGroup, ChartLine, ChartThemeColor, ChartLegendTooltip, createContainer } from '@patternfly/react-charts/victory';
 
 class BottomAlignedLegend extends React.Component {
@@ -192,7 +191,6 @@ class BottomAlignedLegend extends React.Component {
 This demonstrates zoom for the x axis only.
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartGroup, ChartLine, ChartThemeColor } from '@patternfly/react-charts/victory';
 import { getResizeObserver } from '@patternfly/react-core';
 import { VictoryZoomContainer } from 'victory-zoom-container';
@@ -200,7 +198,7 @@ import { VictoryZoomContainer } from 'victory-zoom-container';
 class MultiColorChart extends React.Component {
   constructor(props) {
     super(props);
-    this.containerRef = React.createRef();
+    this.containerRef = createRef();
     this.observer = () => {};
     this.state = {
       width: 0
diff --git a/packages/react-charts/src/victory/components/ChartPie/ChartPie.test.tsx b/packages/react-charts/src/victory/components/ChartPie/ChartPie.test.tsx
index 03406cfeb54..0a56a343fb7 100644
--- a/packages/react-charts/src/victory/components/ChartPie/ChartPie.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartPie/ChartPie.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartPie } from './ChartPie';
 
diff --git a/packages/react-charts/src/victory/components/ChartPie/ChartPie.tsx b/packages/react-charts/src/victory/components/ChartPie/ChartPie.tsx
index bcf31af1be3..6f11821009a 100644
--- a/packages/react-charts/src/victory/components/ChartPie/ChartPie.tsx
+++ b/packages/react-charts/src/victory/components/ChartPie/ChartPie.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement, Fragment, useEffect } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import {
   AnimatePropTypeInterface,
@@ -32,7 +32,6 @@ import { getComputedLegend, getLegendItemsExtraHeight, getLegendMaxTextWidth } f
 import { getPaddingForSide } from '../ChartUtils/chart-padding';
 import { getPatternDefs, useDefaultPatternProps } from '../ChartUtils/chart-patterns';
 import { getTheme } from '../ChartUtils/chart-theme';
-import { useEffect } from 'react';
 import { ChartPoint } from '../ChartPoint/ChartPoint';
 import { ChartLabel } from '../ChartLabel/ChartLabel';
 
@@ -159,7 +158,7 @@ export interface ChartPieProps extends VictoryPieProps {
    * events. The eventKey may optionally be used to select a single element by index rather than
    * an entire set. The eventHandlers object should be given as an object whose keys are standard
    * event names (i.e. onClick) and whose values are event callbacks. The return value
-   * of an event handler is used to modify elemnts. The return value should be given
+   * of an event handler is used to modify elements. The return value should be given
    * as an object or an array of objects with optional target and eventKey keys,
    * and a mutation key whose value is a function. The target and eventKey keys
    * will default to those corresponding to the element the event handler was attached to.
@@ -586,7 +585,7 @@ export const ChartPie: React.FunctionComponent<ChartPieProps> = ({
     legendXOffset = getLegendMaxTextWidth(legendData, theme);
   }
 
-  const legend = React.cloneElement(legendComponent, {
+  const legend = cloneElement(legendComponent, {
     colorScale,
     data: legendData,
     ...(name && { name: `${name}-${(legendComponent as any).type.displayName}` }),
@@ -596,14 +595,14 @@ export const ChartPie: React.FunctionComponent<ChartPieProps> = ({
     themeColor,
     ...(legendDirection === 'rtl' && {
       dataComponent: legendComponent.props.dataComponent ? (
-        React.cloneElement(legendComponent.props.dataComponent, { transform: `translate(${legendXOffset})` })
+        cloneElement(legendComponent.props.dataComponent, { transform: `translate(${legendXOffset})` })
       ) : (
         <ChartPoint transform={`translate(${legendXOffset})`} />
       )
     }),
     ...(legendDirection === 'rtl' && {
       labelComponent: legendComponent.props.labelComponent ? (
-        React.cloneElement(legendComponent.props.labelComponent, { direction: 'rtl', dx: legendXOffset - 30 })
+        cloneElement(legendComponent.props.labelComponent, { direction: 'rtl', dx: legendXOffset - 30 })
       ) : (
         <ChartLabel direction="rtl" dx={legendXOffset - 30} />
       )
@@ -631,7 +630,7 @@ export const ChartPie: React.FunctionComponent<ChartPieProps> = ({
 
   // Clone so users can override container props
   const container = standalone
-    ? React.cloneElement(
+    ? cloneElement(
         containerComponent,
         {
           desc: ariaDesc,
@@ -664,13 +663,13 @@ export const ChartPie: React.FunctionComponent<ChartPieProps> = ({
   }, [computedLegend, legendAllowWrap, theme, width]);
 
   return standalone ? (
-    <React.Fragment>{container}</React.Fragment>
+    <Fragment>{container}</Fragment>
   ) : (
-    <React.Fragment>
+    <Fragment>
       {chart}
       {computedLegend}
       {isPatternDefs && getPatternDefs({ patternId, colorScale: defaultColorScale, patternUnshiftIndex })}
-    </React.Fragment>
+    </Fragment>
   );
 };
 ChartPie.displayName = 'ChartPie';
diff --git a/packages/react-charts/src/victory/components/ChartPie/examples/ChartPie.md b/packages/react-charts/src/victory/components/ChartPie/examples/ChartPie.md
index 41fb26fd255..8fb03c3ea8f 100644
--- a/packages/react-charts/src/victory/components/ChartPie/examples/ChartPie.md
+++ b/packages/react-charts/src/victory/components/ChartPie/examples/ChartPie.md
@@ -18,7 +18,6 @@ PatternFly React charts are based on the [Victory](https://formidable.com/open-s
 ## Examples
 ### Basic with right aligned legend
 ```js
-import React from 'react';
 import { ChartPie } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '230px', width: '350px' }}>
@@ -46,7 +45,6 @@ import { ChartPie } from '@patternfly/react-charts/victory';
 
 ### Multi-color (ordered) with bottom aligned legend
 ```js
-import React from 'react';
 import { ChartPie, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '275px', width: '300px' }}>
@@ -77,7 +75,6 @@ import { ChartPie, ChartThemeColor } from '@patternfly/react-charts/victory';
 This demonstrates how to apply a custom color scale.
 
 ```js
-import React from 'react';
 import { ChartPie, ChartThemeColor } from '@patternfly/react-charts/victory';
 import chart_theme_blue_ColorScale_100 from '@patternfly/react-tokens/dist/esm/chart_theme_blue_ColorScale_100';
 import chart_theme_yellow_ColorScale_100 from '@patternfly/react-tokens/dist/esm/chart_theme_yellow_ColorScale_100';
diff --git a/packages/react-charts/src/victory/components/ChartPoint/ChartPoint.test.tsx b/packages/react-charts/src/victory/components/ChartPoint/ChartPoint.test.tsx
index 7ffa84bef7a..a478e918757 100644
--- a/packages/react-charts/src/victory/components/ChartPoint/ChartPoint.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartPoint/ChartPoint.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartLabel } from '../ChartLabel/ChartLabel';
 import { ChartLegend } from '../ChartLegend/ChartLegend';
diff --git a/packages/react-charts/src/victory/components/ChartPoint/ChartPoint.tsx b/packages/react-charts/src/victory/components/ChartPoint/ChartPoint.tsx
index 8768f990c66..5bbe892c1cb 100644
--- a/packages/react-charts/src/victory/components/ChartPoint/ChartPoint.tsx
+++ b/packages/react-charts/src/victory/components/ChartPoint/ChartPoint.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement } from 'react';
 import { Helpers, Path } from 'victory-core';
 import { PathHelpers, PathHelpersInterface } from './path-helpers';
 
@@ -166,7 +166,7 @@ export const ChartPoint: React.FunctionComponent<ChartPointProps> = ({
     ...rest
   };
 
-  return React.cloneElement(pathComponent, {
+  return cloneElement(pathComponent, {
     className,
     clipPath,
     d: getPath(props),
diff --git a/packages/react-charts/src/victory/components/ChartScatter/ChartScatter.test.tsx b/packages/react-charts/src/victory/components/ChartScatter/ChartScatter.test.tsx
index 841d25a4c67..765735b6623 100644
--- a/packages/react-charts/src/victory/components/ChartScatter/ChartScatter.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartScatter/ChartScatter.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { Chart } from '../Chart/Chart';
 import { ChartGroup } from '../ChartGroup/ChartGroup';
diff --git a/packages/react-charts/src/victory/components/ChartScatter/ChartScatter.tsx b/packages/react-charts/src/victory/components/ChartScatter/ChartScatter.tsx
index 0727ccb175c..c746aae3576 100644
--- a/packages/react-charts/src/victory/components/ChartScatter/ChartScatter.tsx
+++ b/packages/react-charts/src/victory/components/ChartScatter/ChartScatter.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import {
   AnimatePropTypeInterface,
@@ -131,7 +131,7 @@ export interface ChartScatterProps extends VictoryScatterProps {
    * Since ChartScatter only renders a single element, the eventKey property is not used.
    * The eventHandlers object should be given as an object whose keys are standard
    * event names (i.e. onClick) and whose values are event callbacks. The return value
-   * of an event handler is used to modify elemnts. The return value should be given
+   * of an event handler is used to modify elements. The return value should be given
    * as an object or an array of objects with optional target and eventKey keys,
    * and a mutation key whose value is a function. The target and eventKey keys
    * will default to those corresponding to the element the event handler was attached to.
@@ -449,7 +449,7 @@ export const ChartScatter: React.FunctionComponent<ChartScatterProps> = ({
   ...rest
 }: ChartScatterProps) => {
   // Clone so users can override container props
-  const container = React.cloneElement(containerComponent, {
+  const container = cloneElement(containerComponent, {
     theme,
     ...containerComponent.props
   });
diff --git a/packages/react-charts/src/victory/components/ChartScatter/examples/ChartScatter.md b/packages/react-charts/src/victory/components/ChartScatter/examples/ChartScatter.md
index 6feb3210e7c..3c8f4d304d1 100644
--- a/packages/react-charts/src/victory/components/ChartScatter/examples/ChartScatter.md
+++ b/packages/react-charts/src/victory/components/ChartScatter/examples/ChartScatter.md
@@ -13,6 +13,7 @@ propComponents: [
 hideDarkMode: true
 ---
 
+import { createRef } from 'react';
 import {
 Chart,
 ChartArea,
@@ -33,7 +34,6 @@ PatternFly React charts are based on the [Victory](https://formidable.com/open-s
 ## Examples
 ### Basic
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartGroup, ChartScatter, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '275px', width: '450px' }}>
@@ -73,14 +73,13 @@ import { Chart, ChartAxis, ChartGroup, ChartScatter, ChartVoronoiContainer } fro
 This demonstrates how to add interactive data points to a line chart.
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartGroup, ChartLine, ChartScatter, ChartThemeColor, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 import { getResizeObserver } from '@patternfly/react-core';
 
 class ScatterLineChart extends React.Component {
   constructor(props) {
     super(props);
-    this.containerRef = React.createRef();
+    this.containerRef = createRef();
     this.observer = () => {};
     this.state = {
       width: 0
@@ -211,7 +210,6 @@ class ScatterLineChart extends React.Component {
 This demonstrates how to add interactive data points to an area chart.
 
 ```js
-import React from 'react';
 import { Chart, ChartArea, ChartAxis, ChartGroup, ChartScatter, ChartThemeColor, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 import { getResizeObserver } from '@patternfly/react-core';
 // import '@patternfly/patternfly/patternfly-charts.css'; // For mixed blend mode
@@ -219,7 +217,7 @@ import { getResizeObserver } from '@patternfly/react-core';
 class ScatterAreaChart extends React.Component {
   constructor(props) {
     super(props);
-    this.containerRef = React.createRef();
+    this.containerRef = createRef();
     this.observer = () => {};
     this.state = {
       width: 0
diff --git a/packages/react-charts/src/victory/components/ChartStack/ChartStack.test.tsx b/packages/react-charts/src/victory/components/ChartStack/ChartStack.test.tsx
index 4f546e8900b..0b36c2836f1 100644
--- a/packages/react-charts/src/victory/components/ChartStack/ChartStack.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartStack/ChartStack.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { Chart } from '../Chart/Chart';
 import { ChartBar } from '../ChartBar/ChartBar';
diff --git a/packages/react-charts/src/victory/components/ChartStack/ChartStack.tsx b/packages/react-charts/src/victory/components/ChartStack/ChartStack.tsx
index c22c9dec967..02beb0ae97b 100644
--- a/packages/react-charts/src/victory/components/ChartStack/ChartStack.tsx
+++ b/packages/react-charts/src/victory/components/ChartStack/ChartStack.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import {
   AnimatePropTypeInterface,
@@ -61,7 +61,7 @@ export interface ChartStackProps extends VictoryStackProps {
    * these values for x and y. When categories are not given as an object
    * When this prop is set on a wrapper component, it will dictate the categories of
    * its the children. If this prop is not set, any categories on child component
-   * or catigorical data, will be merged to create a shared set of categories.
+   * or categorical data, will be merged to create a shared set of categories.
    *
    * @propType string[] | { x: string[], y: string[] }
    * @example ["dogs", "cats", "mice"]
@@ -138,7 +138,7 @@ export interface ChartStackProps extends VictoryStackProps {
    * may optionally be used to select a single element by index or eventKey rather than
    * an entire set. The eventHandlers object should be given as an object whose keys are standard
    * event names (i.e. onClick) and whose values are event callbacks. The return value
-   * of an event handler is used to modify elemnts. The return value should be given
+   * of an event handler is used to modify elements. The return value should be given
    * as an object or an array of objects with optional target and eventKey and childName keys,
    * and a mutation key whose value is a function. The target and eventKey and childName keys
    * will default to those corresponding to the element the event handler was attached to.
@@ -417,7 +417,7 @@ export const ChartStack: React.FunctionComponent<ChartStackProps> = ({
   ...rest
 }: ChartStackProps) => {
   // Clone so users can override container props
-  const container = React.cloneElement(containerComponent, {
+  const container = cloneElement(containerComponent, {
     desc: ariaDesc,
     title: ariaTitle,
     theme,
diff --git a/packages/react-charts/src/victory/components/ChartStack/examples/ChartStack.md b/packages/react-charts/src/victory/components/ChartStack/examples/ChartStack.md
index 20340f2ef4d..dc0a428cbe8 100644
--- a/packages/react-charts/src/victory/components/ChartStack/examples/ChartStack.md
+++ b/packages/react-charts/src/victory/components/ChartStack/examples/ChartStack.md
@@ -11,6 +11,7 @@ propComponents: [
 hideDarkMode: true
 ---
 
+import { createRef } from 'react';
 import {
   Chart,
   ChartArea,
@@ -33,7 +34,6 @@ PatternFly React charts are based on the [Victory](https://formidable.com/open-s
 ## Examples
 ### Basic with right aligned legend
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartBar, ChartStack, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '250px', width: '600px' }}>
@@ -69,7 +69,6 @@ import { Chart, ChartAxis, ChartBar, ChartStack, ChartVoronoiContainer } from '@
 
 ### Horizontal with bottom aligned legend
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartBar, ChartStack, ChartThemeColor, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '275px', width: '450px' }}>
@@ -108,7 +107,6 @@ import { Chart, ChartAxis, ChartBar, ChartStack, ChartThemeColor, ChartVoronoiCo
 This demonstrates an alternate way of applying tooltips using data labels.
 
 ```js
-import React from 'react';
 import { Chart, ChartBar, ChartAxis, ChartStack, ChartThemeColor, ChartTooltip } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '275px', width: '450px' }}>
@@ -175,14 +173,13 @@ import { Chart, ChartBar, ChartAxis, ChartStack, ChartThemeColor, ChartTooltip }
 
 ### Monthly data with responsive container
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartBar, ChartStack, ChartTooltip } from '@patternfly/react-charts/victory';
 import { getResizeObserver } from '@patternfly/react-core';
 
 class MonthlyResponsiveStack extends React.Component {
   constructor(props) {
     super(props);
-    this.containerRef = React.createRef();
+    this.containerRef = createRef();
     this.observer = () => {};
     this.state = {
       width: 0
@@ -297,14 +294,13 @@ class MonthlyResponsiveStack extends React.Component {
 This demonstrates monthly data with a bottom aligned legend and responsiveness for mobile.
 
 ```js
-import React from 'react';
 import { Chart, ChartArea, ChartAxis, ChartStack, ChartLegendTooltip, ChartThemeColor, createContainer } from '@patternfly/react-charts/victory';
 import { getResizeObserver } from '@patternfly/react-core';
 
 class MultiColorChart extends React.Component {
   constructor(props) {
     super(props);
-    this.containerRef = React.createRef();
+    this.containerRef = createRef();
     this.observer = () => {};
     this.state = {
       width: 0
diff --git a/packages/react-charts/src/victory/components/ChartTheme/examples/ChartTheme.md b/packages/react-charts/src/victory/components/ChartTheme/examples/ChartTheme.md
index 9d7458c9f6f..ace17ecb49d 100644
--- a/packages/react-charts/src/victory/components/ChartTheme/examples/ChartTheme.md
+++ b/packages/react-charts/src/victory/components/ChartTheme/examples/ChartTheme.md
@@ -37,7 +37,6 @@ PatternFly React charts are based on the [Victory](https://formidable.com/open-s
 This demonstrates how to apply basic theme colors.
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartGroup, ChartLine, ChartThemeColor, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '275px', width: '450px' }}>
@@ -110,7 +109,6 @@ import { Chart, ChartAxis, ChartGroup, ChartLine, ChartThemeColor, ChartVoronoiC
 This demonstrates how to apply theme colors for ordered charts like bar, donut, pie, and stack.
 
 ```js
-import React from 'react';
 import { ChartDonut, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '230px', width: '350px' }}>
@@ -143,7 +141,6 @@ import { ChartDonut, ChartThemeColor } from '@patternfly/react-charts/victory';
 This demonstrates how to apply theme colors for unordered charts like area, line, and sparkline.
 
 ```js
-import React from 'react';
 import { Chart, ChartArea, ChartAxis, ChartGroup, ChartThemeColor, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '200px', width: '800px' }}>
@@ -208,7 +205,6 @@ import { Chart, ChartArea, ChartAxis, ChartGroup, ChartThemeColor, ChartVoronoiC
 This demonstrates an alternate way of applying a custom color scale and fill colors to individual charts.
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartBar, ChartLegend, ChartStack, ChartThemeColor, ChartTooltip } from '@patternfly/react-charts/victory';
 import chart_color_blue_300 from '@patternfly/react-tokens/dist/esm/chart_color_blue_300';
 import chart_color_green_300 from '@patternfly/react-tokens/dist/esm/chart_color_green_300';
@@ -311,7 +307,6 @@ import chart_color_purple_300 from '@patternfly/react-tokens/dist/esm/chart_colo
 This demonstrates an alternate way of applying custom stroke and fill colors to a threshold chart.
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartGroup, ChartLine, ChartThemeColor, ChartThreshold, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 import chart_color_blue_300 from '@patternfly/react-tokens/dist/esm/chart_color_blue_300';
 
@@ -391,7 +386,6 @@ import chart_color_blue_300 from '@patternfly/react-tokens/dist/esm/chart_color_
 This demonstrates custom theme properties, which may be applied across multiple charts.
 
 ```js
-import React from 'react';
 import { Chart, ChartBar, ChartAxis, ChartGroup, ChartThemeColor, ChartVoronoiContainer, getCustomTheme } from '@patternfly/react-charts/victory';
 import chart_color_blue_300 from '@patternfly/react-tokens/dist/esm/chart_color_blue_300';
 import chart_color_green_300 from '@patternfly/react-tokens/dist/esm/chart_color_green_300';
diff --git a/packages/react-charts/src/victory/components/ChartThreshold/ChartThreshold.test.tsx b/packages/react-charts/src/victory/components/ChartThreshold/ChartThreshold.test.tsx
index d1f90945439..314240ba9e0 100644
--- a/packages/react-charts/src/victory/components/ChartThreshold/ChartThreshold.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartThreshold/ChartThreshold.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { Chart } from '../Chart/Chart';
 import { ChartGroup } from '../ChartGroup/ChartGroup';
diff --git a/packages/react-charts/src/victory/components/ChartThreshold/ChartThreshold.tsx b/packages/react-charts/src/victory/components/ChartThreshold/ChartThreshold.tsx
index 9d6566d8a3d..2eb9541cf76 100644
--- a/packages/react-charts/src/victory/components/ChartThreshold/ChartThreshold.tsx
+++ b/packages/react-charts/src/victory/components/ChartThreshold/ChartThreshold.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import cloneDeep from 'lodash/cloneDeep';
 import {
@@ -126,7 +125,7 @@ export interface ChartThresholdProps extends VictoryLineProps {
    * Since ChartLine only renders a single element, the eventKey property is not used.
    * The eventHandlers object should be given as an object whose keys are standard
    * event names (i.e. onClick) and whose values are event callbacks. The return value
-   * of an event handler is used to modify elemnts. The return value should be given
+   * of an event handler is used to modify elements. The return value should be given
    * as an object or an array of objects with optional target and eventKey keys,
    * and a mutation key whose value is a function. The target and eventKey keys
    * will default to those corresponding to the element the event handler was attached to.
diff --git a/packages/react-charts/src/victory/components/ChartThreshold/examples/ChartThreshold.md b/packages/react-charts/src/victory/components/ChartThreshold/examples/ChartThreshold.md
index b76b8781ca7..4459735062b 100644
--- a/packages/react-charts/src/victory/components/ChartThreshold/examples/ChartThreshold.md
+++ b/packages/react-charts/src/victory/components/ChartThreshold/examples/ChartThreshold.md
@@ -11,6 +11,7 @@ propComponents: [
 hideDarkMode: true
 ---
 
+import { createRef } from 'react';
 import {
   Chart,
   ChartArea,
@@ -35,7 +36,6 @@ PatternFly React charts are based on the [Victory](https://formidable.com/open-s
 ## Examples
 ### Multi-color (unordered) with responsive container
 ```js
-import React from 'react';
 import {
   Chart,
   ChartArea,
@@ -53,7 +53,7 @@ import chart_color_orange_300 from '@patternfly/react-tokens/dist/esm/chart_colo
 class MultiColorChart extends React.Component {
   constructor(props) {
     super(props);
-    this.containerRef = React.createRef();
+    this.containerRef = createRef();
     this.observer = () => {};
     this.state = {
       width: 0
diff --git a/packages/react-charts/src/victory/components/ChartTooltip/ChartTooltip.test.tsx b/packages/react-charts/src/victory/components/ChartTooltip/ChartTooltip.test.tsx
index 26a9fdc80ef..136b898918c 100644
--- a/packages/react-charts/src/victory/components/ChartTooltip/ChartTooltip.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartTooltip/ChartTooltip.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartArea } from '../ChartArea/ChartArea';
 import { ChartGroup } from '../ChartGroup/ChartGroup';
diff --git a/packages/react-charts/src/victory/components/ChartTooltip/ChartTooltip.tsx b/packages/react-charts/src/victory/components/ChartTooltip/ChartTooltip.tsx
index 05a890bea57..eb8b6de4df6 100644
--- a/packages/react-charts/src/victory/components/ChartTooltip/ChartTooltip.tsx
+++ b/packages/react-charts/src/victory/components/ChartTooltip/ChartTooltip.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import {
   NumberOrCallback,
@@ -272,7 +272,7 @@ export const ChartTooltip: React.FunctionComponent<ChartTooltipProps> = ({
   theme = getTheme(themeColor),
   ...rest
 }: ChartTooltipProps) => {
-  const chartLabelComponent = React.cloneElement(labelComponent, {
+  const chartLabelComponent = cloneElement(labelComponent, {
     textAnchor: labelTextAnchor,
     theme,
     ...labelComponent.props
diff --git a/packages/react-charts/src/victory/components/ChartTooltip/examples/ChartTooltip.md b/packages/react-charts/src/victory/components/ChartTooltip/examples/ChartTooltip.md
index 9e82556c344..b798f2e6498 100644
--- a/packages/react-charts/src/victory/components/ChartTooltip/examples/ChartTooltip.md
+++ b/packages/react-charts/src/victory/components/ChartTooltip/examples/ChartTooltip.md
@@ -5,6 +5,7 @@ propComponents: ['ChartTooltip']
 hideDarkMode: true
 ---
 
+import { createRef } from 'react';
 import {
   Chart,
   ChartArea,
@@ -48,7 +49,6 @@ PatternFly React charts are based on the [Victory](https://formidable.com/open-s
 This demonstrates how to use a voronoi container to display tooltips.
 
 ```js
-import React from 'react';
 import { Chart, ChartArea, ChartAxis, ChartGroup, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '200px', width: '800px' }}>
@@ -112,7 +112,6 @@ import { Chart, ChartArea, ChartAxis, ChartGroup, ChartVoronoiContainer } from '
 This demonstrates how to combine cursor and voronoi containers to display tooltips along with a vertical cursor.
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartGroup, ChartLine, ChartThemeColor, createContainer } from '@patternfly/react-charts/victory';
 
 class CombinedCursorVoronoiContainer extends React.Component {
@@ -202,7 +201,6 @@ class CombinedCursorVoronoiContainer extends React.Component {
 This demonstrates how to embed a legend within a tooltip. Combining cursor and voronoi containers is required to display tooltips with a vertical cursor.
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartGroup, ChartLegendTooltip, ChartLine, ChartThemeColor, createContainer } from '@patternfly/react-charts/victory';
 
 class EmbeddedLegend extends React.Component {
@@ -298,7 +296,6 @@ class EmbeddedLegend extends React.Component {
 This demonstrates how to embed HTML within a tooltip. Combining cursor and voronoi containers is required to display tooltips with a vertical cursor.
 
 ```js
-import React from 'react';
 import { Chart, ChartArea, ChartAxis, ChartCursorTooltip, ChartGroup, ChartPoint, ChartThemeColor, createContainer } from '@patternfly/react-charts/victory';
 
 class EmbeddedHtml extends React.Component {
@@ -445,7 +442,6 @@ class EmbeddedHtml extends React.Component {
 This demonstrates how to embed a legend within a tooltip, but with a custom font size. Combining cursor and voronoi containers is required to display tooltips with a vertical cursor.
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartGroup, ChartLegendTooltip, ChartLegend, ChartLine, ChartLegendTooltipContent, ChartLegendTooltipLabel, ChartThemeColor, createContainer } from '@patternfly/react-charts/victory';
 
 class EmbeddedLegendAlt extends React.Component {
@@ -545,7 +541,6 @@ class EmbeddedLegendAlt extends React.Component {
 This demonstrates an alternate way of applying tooltips using data labels.
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartBar, ChartStack, ChartThemeColor, ChartTooltip } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '275px', width: '450px' }}>
@@ -613,7 +608,6 @@ import { Chart, ChartAxis, ChartBar, ChartStack, ChartThemeColor, ChartTooltip }
 ### Fixed tooltip
 This demonstrates how to adjust the tooltip position and label radius
 ```js
-import React from 'react';
 import { ChartDonut, ChartThemeColor, ChartTooltip } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '150px', width: '150px' }}>
@@ -640,7 +634,6 @@ import { ChartDonut, ChartThemeColor, ChartTooltip } from '@patternfly/react-cha
 This demonstrates an approach for applying tooltips to a legend using a custom legend label component.
 
 ```js
-import React from 'react';
 import { ChartLabel, ChartLegend, ChartPie, ChartThemeColor } from '@patternfly/react-charts/victory';
 import { Tooltip } from '@patternfly/react-core';
 
@@ -651,7 +644,7 @@ class TooltipPieChart extends React.Component {
     // Custom legend label component
     // Note: Tooltip wraps children with a div tag, so we add a reference to ChartLabel instead
     this.LegendLabel = ({datum, ...rest}) => {
-      const ref = React.createRef();
+      const ref = createRef();
       return (
         <g ref={ref}>
           <ChartLabel {...rest} />
@@ -706,7 +699,6 @@ class TooltipPieChart extends React.Component {
 This demonstrates how to customize tooltip label alignment using theme properties.
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartGroup, ChartLine, ChartThemeColor, ChartVoronoiContainer, getCustomTheme } from '@patternfly/react-charts/victory';
 
 class TooltipThemeChart extends React.Component {
@@ -807,7 +799,6 @@ class TooltipThemeChart extends React.Component {
 This demonstrates an alternate way of applying tooltips using CSS overflow instead of <code>constrainToVisibleArea</code>.
 
 ```js
-import React from 'react';
 import { ChartArea, ChartGroup, ChartLabel, ChartThemeColor, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 
 // Workaround for documentation-framework issue https://github.com/patternfly/patternfly-react/issues/11455
@@ -852,7 +843,6 @@ sheet.insertRule(".ws-react-charts-tooltip-overflow svg { overflow: visible; }",
 This demonstrates an alternate way of applying tooltips by wrapping charts with the Tooltip component.
 
 ```js
-import React from 'react';
 import { ChartDonutThreshold, ChartDonutUtilization } from '@patternfly/react-charts/victory';
 import { Button, Tooltip, TooltipPosition } from '@patternfly/react-core';
 
diff --git a/packages/react-charts/src/victory/components/ChartUtils/chart-domain.ts b/packages/react-charts/src/victory/components/ChartUtils/chart-domain.ts
index d180d3e3c8d..23a4a186a2c 100644
--- a/packages/react-charts/src/victory/components/ChartUtils/chart-domain.ts
+++ b/packages/react-charts/src/victory/components/ChartUtils/chart-domain.ts
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Data, DataGetterPropType } from 'victory-core';
 
 interface DomainInterface {
diff --git a/packages/react-charts/src/victory/components/ChartUtils/chart-legend.ts b/packages/react-charts/src/victory/components/ChartUtils/chart-legend.ts
index b241eddd89b..d195cfa3ff4 100644
--- a/packages/react-charts/src/victory/components/ChartUtils/chart-legend.ts
+++ b/packages/react-charts/src/victory/components/ChartUtils/chart-legend.ts
@@ -1,3 +1,4 @@
+import { cloneElement } from 'react';
 import defaults from 'lodash/defaults';
 import { Helpers, TextSize } from 'victory-core';
 import { ElementPadding } from 'victory-core/src/victory-util/helpers';
@@ -7,8 +8,6 @@ import { ChartCommonStyles } from '../ChartTheme/ChartStyles';
 import { ChartThemeDefinition } from '../ChartTheme/ChartTheme';
 import { getLabelTextSize } from '../ChartUtils/chart-label';
 import { getPieOrigin } from './chart-origin';
-import * as React from 'react';
-
 interface ChartLegendInterface {
   allowWrap?: boolean; // Allow legend items to wrap to the next line
   chartType?: string; // The type of chart (e.g., pie) to lookup for props
@@ -149,7 +148,7 @@ export const getComputedLegend = ({
     x: legendX > 0 ? legendX : 0,
     y: legendY > 0 ? legendY : 0
   });
-  return React.cloneElement(legendComponent, legendProps);
+  return cloneElement(legendComponent, legendProps);
 };
 
 /**
diff --git a/packages/react-charts/src/victory/components/ChartUtils/chart-patterns.tsx b/packages/react-charts/src/victory/components/ChartUtils/chart-patterns.tsx
index 4eb229483b1..8e95fd8ae0f 100644
--- a/packages/react-charts/src/victory/components/ChartUtils/chart-patterns.tsx
+++ b/packages/react-charts/src/victory/components/ChartUtils/chart-patterns.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Children, cloneElement, Fragment, isValidElement, useMemo } from 'react';
 import uniqueId from 'lodash/uniqueId';
 
 interface PatternPropsInterface {
@@ -248,7 +248,7 @@ export const getPatternDefs = ({
 
   // This is wrapped in an empty tag so Victory does not apply child props to defs
   const defs = (
-    <React.Fragment key={`defs`}>
+    <Fragment key={`defs`}>
       <defs>
         {colorScale.map((color: string, index: number) => {
           const {
@@ -266,7 +266,7 @@ export const getPatternDefs = ({
           );
         })}
       </defs>
-    </React.Fragment>
+    </Fragment>
   );
   return defs;
 };
@@ -332,7 +332,7 @@ export const useDefaultPatternProps = ({
   const defaultColorScale = getDefaultColorScale(colorScale, themeColorScale);
   let defaultPatternScale = patternScale;
   let isPatternDefs = !patternScale && hasPatterns !== undefined;
-  const patternId = React.useMemo(() => (isPatternDefs ? getPatternId() : undefined), [isPatternDefs]);
+  const patternId = useMemo(() => (isPatternDefs ? getPatternId() : undefined), [isPatternDefs]);
 
   if (isPatternDefs) {
     defaultPatternScale = getDefaultPatternScale({
@@ -361,8 +361,8 @@ export const useDefaultPatternProps = ({
  * @private
  */
 export const renderChildrenWithPatterns = ({ children, patternScale, themeColor }: PatternPropsInterface) =>
-  React.Children.toArray(children).map((child, index) => {
-    if (React.isValidElement(child)) {
+  Children.toArray(children).map((child, index) => {
+    if (isValidElement(child)) {
       const { ...childProps } = child.props;
       const style = childProps.style ? { ...childProps.style } : {};
 
@@ -374,7 +374,7 @@ export const renderChildrenWithPatterns = ({ children, patternScale, themeColor
           ...style.data
         };
       }
-      const _child = React.cloneElement(child, {
+      const _child = cloneElement(child, {
         ...(patternScale && { patternScale }),
         ...(themeColor && { themeColor }),
         ...childProps,
diff --git a/packages/react-charts/src/victory/components/ChartVoronoiContainer/ChartVoronoContainer.test.tsx b/packages/react-charts/src/victory/components/ChartVoronoiContainer/ChartVoronoContainer.test.tsx
index 0938c334dee..33bd35b5ad4 100644
--- a/packages/react-charts/src/victory/components/ChartVoronoiContainer/ChartVoronoContainer.test.tsx
+++ b/packages/react-charts/src/victory/components/ChartVoronoiContainer/ChartVoronoContainer.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ChartArea } from '../ChartArea/ChartArea';
 import { ChartGroup } from '../ChartGroup/ChartGroup';
diff --git a/packages/react-charts/src/victory/components/ChartVoronoiContainer/ChartVoronoiContainer.tsx b/packages/react-charts/src/victory/components/ChartVoronoiContainer/ChartVoronoiContainer.tsx
index deb4629f477..ae94991e722 100644
--- a/packages/react-charts/src/victory/components/ChartVoronoiContainer/ChartVoronoiContainer.tsx
+++ b/packages/react-charts/src/victory/components/ChartVoronoiContainer/ChartVoronoiContainer.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement } from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import { OriginType } from 'victory-core';
 import { VictoryVoronoiContainer, VictoryVoronoiContainerProps } from 'victory-voronoi-container';
@@ -63,7 +63,7 @@ export interface ChartVoronoiContainerProps extends VictoryVoronoiContainerProps
    * the description, the more usable it will be for people using screen readers.
    * This prop defaults to an empty string.
    *
-   * @example "Golden retreivers make up 30%, Labs make up 25%, and other dog breeds are
+   * @example "Golden retrievers make up 30%, Labs make up 25%, and other dog breeds are
    * not represented above 5% each."
    */
   desc?: string;
@@ -236,7 +236,7 @@ export const ChartVoronoiContainer: React.FunctionComponent<ChartVoronoiContaine
   ...rest
 }: ChartVoronoiContainerProps) => {
   const chartClassName = getClassName({ className });
-  const chartLabelComponent = React.cloneElement(labelComponent, {
+  const chartLabelComponent = cloneElement(labelComponent, {
     constrainToVisibleArea,
     theme,
     ...labelComponent.props
diff --git a/packages/react-charts/src/victory/components/Patterns/examples/patterns.md b/packages/react-charts/src/victory/components/Patterns/examples/patterns.md
index 22b8200dd75..28c29d55fe5 100644
--- a/packages/react-charts/src/victory/components/Patterns/examples/patterns.md
+++ b/packages/react-charts/src/victory/components/Patterns/examples/patterns.md
@@ -20,6 +20,7 @@ propComponents: [
 hideDarkMode: true
 ---
 
+import { cloneElement, createRef } from 'react';
 import { 
   Chart,
   ChartArea,
@@ -56,7 +57,6 @@ PatternFly React charts are based on the [Victory](https://formidable.com/open-s
 ## Examples
 ### Basic pie chart
 ```js
-import React from 'react';
 import { ChartPie } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '230px', width: '350px' }}>
@@ -85,7 +85,6 @@ import { ChartPie } from '@patternfly/react-charts/victory';
 
 ### Bar chart
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartBar, ChartGroup, ChartThemeColor, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '275px', width: '450px' }}>
@@ -122,7 +121,6 @@ import { Chart, ChartAxis, ChartBar, ChartGroup, ChartThemeColor, ChartVoronoiCo
 
 ### Stack chart
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartBar, ChartStack, ChartThemeColor, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '250px', width: '600px' }}>
@@ -160,7 +158,6 @@ import { Chart, ChartAxis, ChartBar, ChartStack, ChartThemeColor, ChartVoronoiCo
 
 ### Donut chart
 ```js
-import React from 'react';
 import { ChartDonut, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '230px', width: '350px' }}>
@@ -194,7 +191,6 @@ import { ChartDonut, ChartThemeColor } from '@patternfly/react-charts/victory';
 This demonstrates how to hide a pattern for the static, unused portion of the donut utilization chart.
 
 ```js
-import React from 'react';
 import { ChartDonutUtilization, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '275px', width: '300px' }}>
@@ -229,7 +225,6 @@ import { ChartDonutUtilization, ChartThemeColor } from '@patternfly/react-charts
 This demonstrates how to apply patterns to thresholds.
 
 ```js
-import React from 'react';
 import { ChartDonutThreshold, ChartDonutUtilization, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '275px', width: '675px' }}>
@@ -268,7 +263,6 @@ import { ChartDonutThreshold, ChartDonutUtilization, ChartThemeColor } from '@pa
 This demonstrates how to add an interactive legend to a pie chart using events such as `onMouseOver`, `onMouseOut`, and `onClick`.
 
 ```js
-import React from 'react';
 import { 
   Chart,
   ChartLegend,
@@ -387,7 +381,6 @@ class InteractivePieLegendChart extends React.Component {
 This demonstrates how to add an interactive legend using events such as `onMouseOver`, `onMouseOut`, and `onClick`.
 
 ```js
-import React from 'react';
 import { 
   Chart, 
   ChartArea, 
@@ -407,7 +400,7 @@ import { getResizeObserver } from '@patternfly/react-core';
 class InteractiveLegendChart extends React.Component {
   constructor(props) {
     super(props);
-    this.containerRef = React.createRef();
+    this.containerRef = createRef();
     this.observer = () => {};
     this.state = {
       hiddenSeries: new Set(),
@@ -530,7 +523,7 @@ class InteractiveLegendChart extends React.Component {
   render() {
     const { hiddenSeries, width } = this.state;
 
-    const container = React.cloneElement(
+    const container = cloneElement(
       this.cursorVoronoiContainer, 
       {
         disable: !this.isDataAvailable()
@@ -599,7 +592,6 @@ class InteractiveLegendChart extends React.Component {
 This demonstrates how to omit patterns from pie chart segments.
 
 ```js
-import React from 'react';
 import { ChartPie, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 <div style={{ height: '230px', width: '350px' }}>
@@ -632,7 +624,6 @@ import { ChartPie, ChartThemeColor } from '@patternfly/react-charts/victory';
 This demonstrates how to apply a custom color scale to patterns.
 
 ```js
-import React from 'react';
 import { ChartPie } from '@patternfly/react-charts/victory';
 import chart_color_blue_300 from '@patternfly/react-tokens/dist/esm/chart_color_blue_300';
 import chart_color_yellow_300 from '@patternfly/react-tokens/dist/esm/chart_color_yellow_300';
@@ -668,7 +659,6 @@ import chart_color_green_300 from '@patternfly/react-tokens/dist/esm/chart_color
 This demonstrates how to create custom patterns.
 
 ```js
-import React from 'react';
 import { ChartPie, ChartThemeColor } from '@patternfly/react-charts/victory';
 import chart_color_blue_300 from '@patternfly/react-tokens/dist/esm/chart_color_blue_300';
 import chart_color_green_300 from '@patternfly/react-tokens/dist/esm/chart_color_green_300';
@@ -710,14 +700,13 @@ import chart_color_green_300 from '@patternfly/react-tokens/dist/esm/chart_color
 
 ### All patterns
 ```js
-import React from 'react';
 import { ChartPie, ChartThemeColor } from '@patternfly/react-charts/victory';
 import { getResizeObserver } from '@patternfly/react-core';
 
 class PatternsPie extends React.Component {
   constructor(props) {
     super(props);
-    this.containerRef = React.createRef();
+    this.containerRef = createRef();
     this.observer = () => {};
     this.state = {
       extraHeight: 0,
diff --git a/packages/react-charts/src/victory/components/ResizeObserver/examples/resizeObserver.md b/packages/react-charts/src/victory/components/ResizeObserver/examples/resizeObserver.md
index 2c260a5b053..af0649bf7d8 100644
--- a/packages/react-charts/src/victory/components/ResizeObserver/examples/resizeObserver.md
+++ b/packages/react-charts/src/victory/components/ResizeObserver/examples/resizeObserver.md
@@ -17,6 +17,7 @@ propComponents: [
 hideDarkMode: true
 ---
 
+import { createRef } from 'react';
 import { 
   Chart,
   ChartArea,
@@ -52,14 +53,13 @@ the parent container may be set to the same height and/or width.
 This demonstrates how to use a `ResizeObserver` to update the chart's width, while its height remains fixed. The `legendAllowWrap` prop is used to automatically wrap legend items.
 
 ```js
-import React from 'react';
 import { ChartBullet } from '@patternfly/react-charts/victory';
 import { getResizeObserver } from '@patternfly/react-core';
 
 class BulletChart extends React.Component {
   constructor(props) {
     super(props);
-    this.containerRef = React.createRef();
+    this.containerRef = createRef();
     this.observer = () => {};
     this.state = {
       extraHeight: 0,
@@ -133,7 +133,6 @@ class BulletChart extends React.Component {
 This demonstrates how to use a `ResizeObserver` to update the chart's width, while its height remains fixed. In this example, `itemsPerRow` is used to wrap legend items manually.
 
 ```js
-import React from 'react';
 import {
   Chart,
   ChartArea,
@@ -151,7 +150,7 @@ import chart_color_orange_300 from '@patternfly/react-tokens/dist/esm/chart_colo
 class MultiColorChart extends React.Component {
   constructor(props) {
     super(props);
-    this.containerRef = React.createRef();
+    this.containerRef = createRef();
     this.observer = () => {};
     this.state = {
       extraHeight: 0,
@@ -294,14 +293,13 @@ class MultiColorChart extends React.Component {
 This demonstrates how to use a `ResizeObserver` to update the chart's width, while its height remains fixed. In this example, `fixLabelOverlap` is used to dynamically adjust the number of axis tick labels.
 
 ```js
-import React from 'react';
 import { Chart, ChartAxis, ChartBar, ChartStack, ChartTooltip } from '@patternfly/react-charts/victory';
 import { getResizeObserver } from '@patternfly/react-core';
 
 class MonthlyResponsiveStack extends React.Component {
   constructor(props) {
     super(props);
-    this.containerRef = React.createRef();
+    this.containerRef = createRef();
     this.observer = () => {};
     this.state = {
       width: 0
diff --git a/packages/react-charts/src/victory/components/Skeletons/examples/skeletons.md b/packages/react-charts/src/victory/components/Skeletons/examples/skeletons.md
index f76f1c9f409..a96990356b2 100644
--- a/packages/react-charts/src/victory/components/Skeletons/examples/skeletons.md
+++ b/packages/react-charts/src/victory/components/Skeletons/examples/skeletons.md
@@ -24,6 +24,7 @@ hideDarkMode: true
 beta: true
 ---
 
+import { useState } from 'react';
 import { Chart, ChartArea, ChartAxis, ChartBar, ChartBoxPlot, ChartBullet, ChartDonut, ChartDonutThreshold, ChartDonutUtilization, ChartLegend, ChartLine, ChartGroup, ChartPie, ChartScatter, ChartStack, ChartThemeColor, ChartThreshold, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 import { getResizeObserver } from '@patternfly/react-core';
 import chart_color_blue_300 from '@patternfly/react-tokens/dist/esm/chart_color_blue_300';
@@ -36,12 +37,11 @@ PatternFly React charts are based on the [Victory](https://formidable.com/open-s
 ## Examples
 ### Area chart
 ```js
-import React from 'react';
 import { Chart, ChartArea, ChartAxis, ChartGroup, ChartThemeColor, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 import { Switch } from '@patternfly/react-core';
 
 export const ChartAreaSkeleton: React.FunctionComponent = () => {
-  const [isChecked, setIsChecked] = React.useState<boolean>(true);
+  const [isChecked, setIsChecked] = useState<boolean>(true);
 
   const handleChange = (_event: React.FormEvent<HTMLInputElement>, checked: boolean) => {
     setIsChecked(checked);
@@ -117,12 +117,11 @@ export const ChartAreaSkeleton: React.FunctionComponent = () => {
 
 ### Bar chart
 ```js
-import React from 'react';
 import { Switch } from '@patternfly/react-core';
 import { Chart, ChartBar, ChartAxis, ChartGroup, ChartThemeColor, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 
 export const ChartBarSkeleton: React.FunctionComponent = () => {
-  const [isChecked, setIsChecked] = React.useState<boolean>(true);
+  const [isChecked, setIsChecked] = useState<boolean>(true);
 
   const handleChange = (_event: React.FormEvent<HTMLInputElement>, checked: boolean) => {
     setIsChecked(checked);
@@ -174,12 +173,11 @@ export const ChartBarSkeleton: React.FunctionComponent = () => {
 
 ### Box plot chart
 ```js
-import React from 'react';
 import { Switch } from '@patternfly/react-core'
 import { Chart, ChartAxis, ChartBoxPlot, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 export const ChartBoxPlotSkeleton: React.FunctionComponent = () => {
-  const [isChecked, setIsChecked] = React.useState<boolean>(true);
+  const [isChecked, setIsChecked] = useState<boolean>(true);
 
   const handleChange = (_event: React.FormEvent<HTMLInputElement>, checked: boolean) => {
     setIsChecked(checked);
@@ -232,12 +230,11 @@ export const ChartBoxPlotSkeleton: React.FunctionComponent = () => {
 
 ### Bullet chart
 ```js
-import React from 'react';
 import { Switch } from '@patternfly/react-core';
 import { Chart, ChartAxis, ChartBullet, ChartLegend, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 export const ChartBulletSkeleton: React.FunctionComponent = () => {
-  const [isChecked, setIsChecked] = React.useState<boolean>(true);
+  const [isChecked, setIsChecked] = useState<boolean>(true);
 
   const handleChange = (_event: React.FormEvent<HTMLInputElement>, checked: boolean) => {
     setIsChecked(checked);
@@ -286,12 +283,11 @@ export const ChartBulletSkeleton: React.FunctionComponent = () => {
 
 ### Donut chart
 ```js
-import React from 'react';
 import { Switch } from '@patternfly/react-core';
 import { Chart, ChartAxis, ChartDonut, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 export const ChartDonutSkeleton: React.FunctionComponent = () => {
-  const [isChecked, setIsChecked] = React.useState<boolean>(true);
+  const [isChecked, setIsChecked] = useState<boolean>(true);
 
   const handleChange = (_event: React.FormEvent<HTMLInputElement>, checked: boolean) => {
     setIsChecked(checked);
@@ -325,12 +321,11 @@ export const ChartDonutSkeleton: React.FunctionComponent = () => {
 
 ### Donut utilization chart
 ```js
-import React from 'react';
 import { Switch } from '@patternfly/react-core';
 import { Chart, ChartAxis, ChartDonutUtilization, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 export const ChartDonutUtilizationSkeleton: React.FunctionComponent = () => {
-  const [isChecked, setIsChecked] = React.useState<boolean>(true);
+  const [isChecked, setIsChecked] = useState<boolean>(true);
 
   const handleChange = (_event: React.FormEvent<HTMLInputElement>, checked: boolean) => {
     setIsChecked(checked);
@@ -374,12 +369,11 @@ export const ChartDonutUtilizationSkeleton: React.FunctionComponent = () => {
 
 ### Donut utilization threshold
 ```js
-import React from 'react';
 import { Switch } from '@patternfly/react-core';
 import { Chart, ChartAxis, ChartDonutThreshold, ChartDonutUtilization, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 export const ChartDonutUtilizationSkeleton: React.FunctionComponent = () => {
-  const [isChecked, setIsChecked] = React.useState<boolean>(true);
+  const [isChecked, setIsChecked] = useState<boolean>(true);
 
   const handleChange = (_event: React.FormEvent<HTMLInputElement>, checked: boolean) => {
     setIsChecked(checked);
@@ -418,12 +412,11 @@ export const ChartDonutUtilizationSkeleton: React.FunctionComponent = () => {
 
 ### Line chart
 ```js
-import React from 'react';
 import { Switch } from '@patternfly/react-core';
 import { Chart, ChartVoronoiContainer, ChartGroup, ChartAxis, ChartLine, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 export const ChartLineSkeleton: React.FunctionComponent = () => {
-  const [isChecked, setIsChecked] = React.useState<boolean>(true);
+  const [isChecked, setIsChecked] = useState<boolean>(true);
 
   const handleChange = (_event: React.FormEvent<HTMLInputElement>, checked: boolean) => {
     setIsChecked(checked);
@@ -508,12 +501,11 @@ export const ChartLineSkeleton: React.FunctionComponent = () => {
 
 ### Pie chart
 ```js
-import React from 'react';
 import { Switch } from '@patternfly/react-core';
 import { Chart, ChartAxis, ChartPie, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 export const ChartPieSkeleton: React.FunctionComponent = () => {
-  const [isChecked, setIsChecked] = React.useState<boolean>(true);
+  const [isChecked, setIsChecked] = useState<boolean>(true);
 
   const handleChange = (_event: React.FormEvent<HTMLInputElement>, checked: boolean) => {
     setIsChecked(checked);
@@ -556,12 +548,11 @@ export const ChartPieSkeleton: React.FunctionComponent = () => {
 
 ### Scatter chart
 ```js
-import React from 'react';
 import { Switch } from '@patternfly/react-core';
 import { Chart, ChartVoronoiContainer, ChartGroup, ChartAxis, ChartScatter, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 export const ChartScatterSkeleton: React.FunctionComponent = () => {
-  const [isChecked, setIsChecked] = React.useState<boolean>(true);
+  const [isChecked, setIsChecked] = useState<boolean>(true);
 
   const handleChange = (_event: React.FormEvent<HTMLInputElement>, checked: boolean) => {
     setIsChecked(checked);
@@ -613,12 +604,11 @@ export const ChartScatterSkeleton: React.FunctionComponent = () => {
 
 ### Stack chart
 ```js
-import React from 'react';
 import { Switch } from '@patternfly/react-core';
 import { Chart, ChartVoronoiContainer, ChartAxis, ChartStack, ChartBar, ChartThemeColor } from '@patternfly/react-charts/victory';
 
 export const ChartStackSkeleton: React.FunctionComponent = () => {
-  const [isChecked, setIsChecked] = React.useState<boolean>(true);
+  const [isChecked, setIsChecked] = useState<boolean>(true);
 
   const handleChange = (_event: React.FormEvent<HTMLInputElement>, checked: boolean) => {
     setIsChecked(checked);
@@ -669,13 +659,12 @@ export const ChartStackSkeleton: React.FunctionComponent = () => {
 
 ### Threshold chart
 ```js
-import React from 'react';
 import { Switch } from '@patternfly/react-core';
 import { Chart, ChartArea, ChartAxis, ChartGroup, ChartLegend, ChartThemeColor, ChartThreshold, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 import chart_color_blue_300 from '@patternfly/react-tokens/dist/esm/chart_color_blue_300';
 
 export const ChartThresholdSkeleton: React.FunctionComponent = () => {
-  const [isChecked, setIsChecked] = React.useState<boolean>(true);
+  const [isChecked, setIsChecked] = useState<boolean>(true);
 
   const handleChange = (_event: React.FormEvent<HTMLInputElement>, checked: boolean) => {
     setIsChecked(checked);
@@ -715,7 +704,7 @@ export const ChartThresholdSkeleton: React.FunctionComponent = () => {
           }
           height={250}
           padding={{
-            bottom: 100, // Adjusted to accomodate legend
+            bottom: 100, // Adjusted to accommodate legend
             left: 50,
             right: 50,
             top: 50
diff --git a/packages/react-charts/src/victory/components/Sparkline/examples/sparkline.md b/packages/react-charts/src/victory/components/Sparkline/examples/sparkline.md
index a80b59b68c5..ec28ab0d7fd 100644
--- a/packages/react-charts/src/victory/components/Sparkline/examples/sparkline.md
+++ b/packages/react-charts/src/victory/components/Sparkline/examples/sparkline.md
@@ -25,7 +25,6 @@ PatternFly React charts are based on the [Victory](https://formidable.com/open-s
 ## Examples
 ### Basic
 ```js
-import React from 'react';
 import { ChartArea, ChartContainer, ChartGroup, ChartLabel, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 
 <div style={{ marginLeft: '50px', marginTop: '50px', height: '135px' }}>
@@ -61,7 +60,6 @@ import { ChartArea, ChartContainer, ChartGroup, ChartLabel, ChartVoronoiContaine
 This demonstrates an alternate way of applying tooltips using CSS overflow
 
 ```js
-import React from 'react';
 import { ChartArea, ChartContainer, ChartGroup, ChartLabel, ChartThemeColor, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 
 // Workaround for documentation-framework issue https://github.com/patternfly/patternfly-react/issues/11455
diff --git a/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx b/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx
index 00567f95cca..cb514436578 100644
--- a/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, createRef, Fragment } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/CodeEditor/code-editor';
 import fileUploadStyles from '@patternfly/react-styles/css/components/FileUpload/file-upload';
@@ -236,11 +236,11 @@ interface CodeEditorState {
   copied: boolean;
 }
 
-class CodeEditor extends React.Component<CodeEditorProps, CodeEditorState> {
+class CodeEditor extends Component<CodeEditorProps, CodeEditorState> {
   static displayName = 'CodeEditor';
   private editor: editor.IStandaloneCodeEditor | null = null;
-  private wrapperRef = React.createRef<HTMLDivElement>();
-  private ref = React.createRef<HTMLDivElement>();
+  private wrapperRef = createRef<HTMLDivElement>();
+  private ref = createRef<HTMLDivElement>();
   private timer: number | null = null;
   private observer = () => {};
 
@@ -576,7 +576,7 @@ class CodeEditor extends React.Component<CodeEditorProps, CodeEditorState> {
             !!shortcutsPopoverProps.bodyContent;
 
           const editorHeaderContent = (
-            <React.Fragment>
+            <Fragment>
               <div className={css(styles.codeEditorControls)}>
                 <CodeEditorContext.Provider value={{ code: value }}>
                   {isCopyEnabled && (!showEmptyState || !!value) && (
@@ -622,7 +622,7 @@ class CodeEditor extends React.Component<CodeEditorProps, CodeEditorState> {
                   </Popover>
                 </div>
               )}
-            </React.Fragment>
+            </Fragment>
           );
 
           const editorHeader = (
diff --git a/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx b/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx
index d6fff968d92..aa9f716d0b3 100644
--- a/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useContext } from 'react';
 import { Button, ButtonProps } from '@patternfly/react-core/dist/esm/components/Button';
 import { Tooltip } from '@patternfly/react-core/dist/esm/components/Tooltip';
 import { CodeEditorContext } from './CodeEditorUtils';
@@ -31,7 +31,7 @@ export const CodeEditorControl: React.FunctionComponent<CodeEditorControlProps>
   tooltipProps = {},
   ...props
 }: CodeEditorControlProps) => {
-  const context = React.useContext(CodeEditorContext);
+  const context = useContext(CodeEditorContext);
 
   const onCustomClick = (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
     onClick(context.code, event);
diff --git a/packages/react-code-editor/src/components/CodeEditor/CodeEditorUtils.ts b/packages/react-code-editor/src/components/CodeEditor/CodeEditorUtils.ts
index cfcf938eef6..e1eb224db79 100644
--- a/packages/react-code-editor/src/components/CodeEditor/CodeEditorUtils.ts
+++ b/packages/react-code-editor/src/components/CodeEditor/CodeEditorUtils.ts
@@ -1,7 +1,7 @@
-import * as React from 'react';
+import { createContext } from 'react';
 
 interface CodeEditorContext {
   code: string;
 }
 
-export const CodeEditorContext = React.createContext<CodeEditorContext>(null);
+export const CodeEditorContext = createContext<CodeEditorContext>(null);
diff --git a/packages/react-code-editor/src/components/CodeEditor/__test__/CodeEditor.test.tsx b/packages/react-code-editor/src/components/CodeEditor/__test__/CodeEditor.test.tsx
index ebdfe4c053c..7ceb91c02d5 100644
--- a/packages/react-code-editor/src/components/CodeEditor/__test__/CodeEditor.test.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/__test__/CodeEditor.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen, act } from '@testing-library/react';
 import { CodeEditor, Language } from '../CodeEditor';
 import styles from '@patternfly/react-styles/css/components/CodeEditor/code-editor';
diff --git a/packages/react-code-editor/src/components/CodeEditor/__test__/CodeEditorControl.test.tsx b/packages/react-code-editor/src/components/CodeEditor/__test__/CodeEditorControl.test.tsx
index 754d0bb296d..1534638dfb4 100644
--- a/packages/react-code-editor/src/components/CodeEditor/__test__/CodeEditorControl.test.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/__test__/CodeEditorControl.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { CodeEditorControl } from '../CodeEditorControl';
 
diff --git a/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditor.md b/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditor.md
index 0b5aea6d89a..a6c980ab71a 100644
--- a/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditor.md
+++ b/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditor.md
@@ -7,6 +7,7 @@ propComponents: ['CodeEditor', 'CodeEditorControl', 'Popover']
 
 Note: Code editor lives in its own package at [@patternfly/react-code-editor](https://www.npmjs.com/package/@patternfly/react-code-editor) and has [**required peer deps**](https://github.com/patternfly/patternfly-react/blob/main/packages/react-code-editor/package.json).
 
+import { Fragment, useState } from 'react';
 import { CodeEditor, CodeEditorControl, Language } from '@patternfly/react-code-editor';
 import PlayIcon from '@patternfly/react-icons/dist/esm/icons/play-icon';
 
diff --git a/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorBasic.tsx b/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorBasic.tsx
index 8dd7f5a9730..b31bc694360 100644
--- a/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorBasic.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorBasic.tsx
@@ -1,12 +1,12 @@
-import React from 'react';
+import { useState } from 'react';
 import { CodeEditor, Language } from '@patternfly/react-code-editor';
 import { Checkbox } from '@patternfly/react-core';
 
 export const CodeEditorBasic: React.FunctionComponent = () => {
-  const [isDarkTheme, setIsDarkTheme] = React.useState(false);
-  const [isLineNumbersVisible, setIsLineNumbersVisible] = React.useState(true);
-  const [isReadOnly, setIsReadOnly] = React.useState(false);
-  const [isMinimapVisible, setIsMinimapVisible] = React.useState(false);
+  const [isDarkTheme, setIsDarkTheme] = useState(false);
+  const [isLineNumbersVisible, setIsLineNumbersVisible] = useState(true);
+  const [isReadOnly, setIsReadOnly] = useState(false);
+  const [isMinimapVisible, setIsMinimapVisible] = useState(false);
 
   const toggleDarkTheme = (checked) => {
     setIsDarkTheme(checked);
diff --git a/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorCustomControl.tsx b/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorCustomControl.tsx
index e72a7c19668..fe470c3f3da 100644
--- a/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorCustomControl.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorCustomControl.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { useState } from 'react';
 import { CodeEditor, CodeEditorControl } from '@patternfly/react-code-editor';
 import PlayIcon from '@patternfly/react-icons/dist/esm/icons/play-icon';
 
 export const CodeEditorCustomControl: React.FunctionComponent = () => {
-  const [code, setCode] = React.useState('Some example content');
+  const [code, setCode] = useState('Some example content');
 
   const onChange = (code) => {
     setCode(code);
diff --git a/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorFullHeight.tsx b/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorFullHeight.tsx
index 7326455f40f..760fa00ea84 100644
--- a/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorFullHeight.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorFullHeight.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { CodeEditor, Language } from '@patternfly/react-code-editor';
 
 export const CodeEditorFullHeight: React.FunctionComponent = () => {
diff --git a/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorShortcutMainHeader.tsx b/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorShortcutMainHeader.tsx
index 9abfe68e0cc..5d996e38385 100644
--- a/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorShortcutMainHeader.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorShortcutMainHeader.tsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { CodeEditor, Language } from '@patternfly/react-code-editor';
 import { Grid, GridItem, Label, Radio } from '@patternfly/react-core';
 
 export const CodeEditorShortcutMainHeader: React.FunctionComponent = () => {
   type ShortcutMode = 'PC' | 'Mac';
 
-  const [currentShortcutMode, setCurrentShortcutMode] = React.useState<ShortcutMode>('PC');
+  const [currentShortcutMode, setCurrentShortcutMode] = useState<ShortcutMode>('PC');
 
   const onEditorDidMount = (editor, monaco) => {
     editor.layout();
@@ -51,7 +51,7 @@ export const CodeEditorShortcutMainHeader: React.FunctionComponent = () => {
     bodyContent: (
       <Grid span={6} hasGutter key="grid">
         {shortcuts.map((shortcut, index) => (
-          <React.Fragment key={index}>
+          <Fragment key={index}>
             <GridItem style={{ textAlign: 'right', marginRight: '1em' }}>
               {shortcut[currentShortcutMode]
                 .map((key) => (
@@ -64,7 +64,7 @@ export const CodeEditorShortcutMainHeader: React.FunctionComponent = () => {
                 ))}
             </GridItem>
             <GridItem>{shortcut.description}</GridItem>
-          </React.Fragment>
+          </Fragment>
         ))}
       </Grid>
     ),
diff --git a/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorSizeToFit.tsx b/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorSizeToFit.tsx
index 330ff275219..cc1ba11ccd7 100644
--- a/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorSizeToFit.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorSizeToFit.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { CodeEditor, Language } from '@patternfly/react-code-editor';
 
 export const CodeEditorSizeToFit: React.FunctionComponent = () => {
diff --git a/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorWithActions.tsx b/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorWithActions.tsx
index bc0b4a4ecd2..3b530303cde 100644
--- a/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorWithActions.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/examples/CodeEditorWithActions.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { CodeEditor } from '@patternfly/react-code-editor';
 
 export const CodeEditorWithActions: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/AboutModal/AboutModal.tsx b/packages/react-core/src/components/AboutModal/AboutModal.tsx
index 8b077697215..62c4c617a4f 100644
--- a/packages/react-core/src/components/AboutModal/AboutModal.tsx
+++ b/packages/react-core/src/components/AboutModal/AboutModal.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import backgroundImage from '@patternfly/react-tokens/dist/esm/c_about_modal_box_BackgroundImage';
 import { AboutModalBoxContent } from './AboutModalBoxContent';
diff --git a/packages/react-core/src/components/AboutModal/AboutModalBox.tsx b/packages/react-core/src/components/AboutModal/AboutModalBox.tsx
index 18810ca5184..d9ad123f792 100644
--- a/packages/react-core/src/components/AboutModal/AboutModalBox.tsx
+++ b/packages/react-core/src/components/AboutModal/AboutModalBox.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/AboutModalBox/about-modal-box';
 
diff --git a/packages/react-core/src/components/AboutModal/AboutModalBoxBrand.tsx b/packages/react-core/src/components/AboutModal/AboutModalBoxBrand.tsx
index b39299dfd49..a948f7d9ab5 100644
--- a/packages/react-core/src/components/AboutModal/AboutModalBoxBrand.tsx
+++ b/packages/react-core/src/components/AboutModal/AboutModalBoxBrand.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/AboutModalBox/about-modal-box';
 
diff --git a/packages/react-core/src/components/AboutModal/AboutModalBoxCloseButton.tsx b/packages/react-core/src/components/AboutModal/AboutModalBoxCloseButton.tsx
index 68612db3851..49de0ae2b10 100644
--- a/packages/react-core/src/components/AboutModal/AboutModalBoxCloseButton.tsx
+++ b/packages/react-core/src/components/AboutModal/AboutModalBoxCloseButton.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/AboutModalBox/about-modal-box';
 import { Button } from '../Button';
diff --git a/packages/react-core/src/components/AboutModal/AboutModalBoxContent.tsx b/packages/react-core/src/components/AboutModal/AboutModalBoxContent.tsx
index e5b029e006b..5c0dd191e74 100644
--- a/packages/react-core/src/components/AboutModal/AboutModalBoxContent.tsx
+++ b/packages/react-core/src/components/AboutModal/AboutModalBoxContent.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/AboutModalBox/about-modal-box';
 import contentStyles from '@patternfly/react-styles/css/components/Content/content';
diff --git a/packages/react-core/src/components/AboutModal/AboutModalBoxHeader.tsx b/packages/react-core/src/components/AboutModal/AboutModalBoxHeader.tsx
index 7634e34c136..4fe01e51cee 100644
--- a/packages/react-core/src/components/AboutModal/AboutModalBoxHeader.tsx
+++ b/packages/react-core/src/components/AboutModal/AboutModalBoxHeader.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/AboutModalBox/about-modal-box';
 import { Title } from '../Title';
diff --git a/packages/react-core/src/components/AboutModal/__tests__/AboutModal.test.tsx b/packages/react-core/src/components/AboutModal/__tests__/AboutModal.test.tsx
index e3804acdb91..5d1b01522b5 100644
--- a/packages/react-core/src/components/AboutModal/__tests__/AboutModal.test.tsx
+++ b/packages/react-core/src/components/AboutModal/__tests__/AboutModal.test.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-core/src/components/AboutModal/__tests__/AboutModalBox.test.tsx b/packages/react-core/src/components/AboutModal/__tests__/AboutModalBox.test.tsx
index 9587eb1a531..89a6245289b 100644
--- a/packages/react-core/src/components/AboutModal/__tests__/AboutModalBox.test.tsx
+++ b/packages/react-core/src/components/AboutModal/__tests__/AboutModalBox.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { AboutModalBox } from '../AboutModalBox';
 
diff --git a/packages/react-core/src/components/AboutModal/__tests__/AboutModalBoxBrand.test.tsx b/packages/react-core/src/components/AboutModal/__tests__/AboutModalBoxBrand.test.tsx
index a764474aaab..2e6ac73621f 100644
--- a/packages/react-core/src/components/AboutModal/__tests__/AboutModalBoxBrand.test.tsx
+++ b/packages/react-core/src/components/AboutModal/__tests__/AboutModalBoxBrand.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { AboutModalBoxBrand } from '../AboutModalBoxBrand';
 
diff --git a/packages/react-core/src/components/AboutModal/__tests__/AboutModalBoxCloseButton.test.tsx b/packages/react-core/src/components/AboutModal/__tests__/AboutModalBoxCloseButton.test.tsx
index 817b526a15b..75c84237b15 100644
--- a/packages/react-core/src/components/AboutModal/__tests__/AboutModalBoxCloseButton.test.tsx
+++ b/packages/react-core/src/components/AboutModal/__tests__/AboutModalBoxCloseButton.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { AboutModalBoxCloseButton } from '../AboutModalBoxCloseButton';
 
diff --git a/packages/react-core/src/components/AboutModal/__tests__/AboutModalBoxContent.test.tsx b/packages/react-core/src/components/AboutModal/__tests__/AboutModalBoxContent.test.tsx
index 62bf982fae7..e1a8d24b687 100644
--- a/packages/react-core/src/components/AboutModal/__tests__/AboutModalBoxContent.test.tsx
+++ b/packages/react-core/src/components/AboutModal/__tests__/AboutModalBoxContent.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { AboutModalBoxContent } from '../AboutModalBoxContent';
 
diff --git a/packages/react-core/src/components/AboutModal/__tests__/AboutModalBoxHeader.test.tsx b/packages/react-core/src/components/AboutModal/__tests__/AboutModalBoxHeader.test.tsx
index 5e12a89f70f..a3650189a94 100644
--- a/packages/react-core/src/components/AboutModal/__tests__/AboutModalBoxHeader.test.tsx
+++ b/packages/react-core/src/components/AboutModal/__tests__/AboutModalBoxHeader.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { AboutModalBoxHeader } from '../AboutModalBoxHeader';
 
diff --git a/packages/react-core/src/components/AboutModal/examples/AboutModal.md b/packages/react-core/src/components/AboutModal/examples/AboutModal.md
index a4ff40d4f69..b6f8635336a 100644
--- a/packages/react-core/src/components/AboutModal/examples/AboutModal.md
+++ b/packages/react-core/src/components/AboutModal/examples/AboutModal.md
@@ -4,6 +4,7 @@ section: components
 cssPrefix: pf-v6-c-about-modal-box
 propComponents: ['AboutModal']
 ---
+import { Fragment, useState } from 'react';
 import brandImg from '../../assets/PF-IconLogo.svg';
 import bgImg from '../../assets/pf-background.svg';
 import spacing from '@patternfly/react-styles/css/utilities/Spacing/spacing';
diff --git a/packages/react-core/src/components/AboutModal/examples/AboutModalBasic.tsx b/packages/react-core/src/components/AboutModal/examples/AboutModalBasic.tsx
index fd3fee9073c..a8b5754f452 100644
--- a/packages/react-core/src/components/AboutModal/examples/AboutModalBasic.tsx
+++ b/packages/react-core/src/components/AboutModal/examples/AboutModalBasic.tsx
@@ -1,16 +1,16 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { AboutModal, Button, Content } from '@patternfly/react-core';
 import brandImg from '../../assets/PF-IconLogo.svg';
 
 export const AboutModalBasic: React.FunctionComponent = () => {
-  const [isModalOpen, setIsModalOpen] = React.useState(false);
+  const [isModalOpen, setIsModalOpen] = useState(false);
 
   const toggleModal = (_event: React.MouseEvent<Element, MouseEvent> | KeyboardEvent | MouseEvent) => {
     setIsModalOpen(!isModalOpen);
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={toggleModal}>
         Show about modal
       </Button>
@@ -42,6 +42,6 @@ export const AboutModalBasic: React.FunctionComponent = () => {
           </dl>
         </Content>
       </AboutModal>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/AboutModal/examples/AboutModalComplexUserPositionedContent.tsx b/packages/react-core/src/components/AboutModal/examples/AboutModalComplexUserPositionedContent.tsx
index 70a6fee69a7..45e0d9ce159 100644
--- a/packages/react-core/src/components/AboutModal/examples/AboutModalComplexUserPositionedContent.tsx
+++ b/packages/react-core/src/components/AboutModal/examples/AboutModalComplexUserPositionedContent.tsx
@@ -1,17 +1,17 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { AboutModal, Alert, Button, Content } from '@patternfly/react-core';
 import brandImg from '../../assets/PF-IconLogo.svg';
 import spacing from '@patternfly/react-styles/css/utilities/Spacing/spacing';
 
 export const AboutModalComplexUserPositionedContent: React.FunctionComponent = () => {
-  const [isModalOpen, setIsModalOpen] = React.useState(false);
+  const [isModalOpen, setIsModalOpen] = useState(false);
 
   const toggleModal = (_event: React.MouseEvent<Element, MouseEvent> | KeyboardEvent | MouseEvent) => {
     setIsModalOpen(!isModalOpen);
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={toggleModal}>
         Show about modal
       </Button>
@@ -49,6 +49,6 @@ export const AboutModalComplexUserPositionedContent: React.FunctionComponent = (
           </dl>
         </Content>
       </AboutModal>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/AboutModal/examples/AboutModalWithoutProductName.tsx b/packages/react-core/src/components/AboutModal/examples/AboutModalWithoutProductName.tsx
index 0835aa257b2..c9073da724c 100644
--- a/packages/react-core/src/components/AboutModal/examples/AboutModalWithoutProductName.tsx
+++ b/packages/react-core/src/components/AboutModal/examples/AboutModalWithoutProductName.tsx
@@ -1,16 +1,16 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { AboutModal, Button, Content } from '@patternfly/react-core';
 import brandImg from '../../assets/PF-IconLogo.svg';
 
 export const AboutModalWithoutProductName: React.FunctionComponent = () => {
-  const [isModalOpen, setIsModalOpen] = React.useState(false);
+  const [isModalOpen, setIsModalOpen] = useState(false);
 
   const toggleModal = (_event: React.MouseEvent<Element, MouseEvent> | KeyboardEvent | MouseEvent) => {
     setIsModalOpen(!isModalOpen);
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={toggleModal}>
         Show about modal
       </Button>
@@ -42,6 +42,6 @@ export const AboutModalWithoutProductName: React.FunctionComponent = () => {
           </dl>
         </Content>
       </AboutModal>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Accordion/Accordion.tsx b/packages/react-core/src/components/Accordion/Accordion.tsx
index fedc1e21ee0..53096f97c2e 100644
--- a/packages/react-core/src/components/Accordion/Accordion.tsx
+++ b/packages/react-core/src/components/Accordion/Accordion.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Accordion/accordion';
 import { AccordionContext } from './AccordionContext';
diff --git a/packages/react-core/src/components/Accordion/AccordionContent.tsx b/packages/react-core/src/components/Accordion/AccordionContent.tsx
index f7f5b052f0a..afb495f5988 100644
--- a/packages/react-core/src/components/Accordion/AccordionContent.tsx
+++ b/packages/react-core/src/components/Accordion/AccordionContent.tsx
@@ -1,4 +1,5 @@
-import * as React from 'react';
+import { useContext, useEffect, useRef, useState } from 'react';
+
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Accordion/accordion';
 import { AccordionContext, AccordionItemContext } from './AccordionContext';
@@ -37,11 +38,11 @@ export const AccordionContent: React.FunctionComponent<AccordionContentProps> =
   contentBodyProps,
   ...props
 }: AccordionContentProps) => {
-  const [hasScrollbar, setHasScrollbar] = React.useState(false);
-  const containerRef = React.useRef(null);
-  const { isExpanded } = React.useContext(AccordionItemContext);
+  const [hasScrollbar, setHasScrollbar] = useState(false);
+  const containerRef = useRef(null);
+  const { isExpanded } = useContext(AccordionItemContext);
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (containerRef?.current && isFixed && isExpanded) {
       const { offsetHeight, scrollHeight } = containerRef.current;
 
diff --git a/packages/react-core/src/components/Accordion/AccordionContext.ts b/packages/react-core/src/components/Accordion/AccordionContext.ts
index e92abd418b1..c476f15898e 100644
--- a/packages/react-core/src/components/Accordion/AccordionContext.ts
+++ b/packages/react-core/src/components/Accordion/AccordionContext.ts
@@ -1,5 +1,4 @@
-import * as React from 'react';
-
+import { createContext } from 'react';
 interface AccordionContextProps {
   ContentContainer: React.ElementType;
   ToggleContainer: React.ElementType;
@@ -10,5 +9,5 @@ interface AccordionItemContextProps {
   isExpanded?: boolean;
 }
 
-export const AccordionContext = React.createContext<Partial<AccordionContextProps>>({});
-export const AccordionItemContext = React.createContext({} as AccordionItemContextProps);
+export const AccordionContext = createContext<Partial<AccordionContextProps>>({});
+export const AccordionItemContext = createContext({} as AccordionItemContextProps);
diff --git a/packages/react-core/src/components/Accordion/AccordionExpandableContentBody.tsx b/packages/react-core/src/components/Accordion/AccordionExpandableContentBody.tsx
index 386c837bf36..ad04610d16a 100644
--- a/packages/react-core/src/components/Accordion/AccordionExpandableContentBody.tsx
+++ b/packages/react-core/src/components/Accordion/AccordionExpandableContentBody.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Accordion/accordion';
 
diff --git a/packages/react-core/src/components/Accordion/AccordionItem.tsx b/packages/react-core/src/components/Accordion/AccordionItem.tsx
index d4ca465ed9e..07c1d7ab16e 100644
--- a/packages/react-core/src/components/Accordion/AccordionItem.tsx
+++ b/packages/react-core/src/components/Accordion/AccordionItem.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Accordion/accordion';
 import { AccordionItemContext } from './AccordionContext';
diff --git a/packages/react-core/src/components/Accordion/AccordionToggle.tsx b/packages/react-core/src/components/Accordion/AccordionToggle.tsx
index 1cb178e640d..64bdc846455 100644
--- a/packages/react-core/src/components/Accordion/AccordionToggle.tsx
+++ b/packages/react-core/src/components/Accordion/AccordionToggle.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useContext } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Accordion/accordion';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
@@ -29,7 +29,7 @@ export const AccordionToggle: React.FunctionComponent<AccordionToggleProps> = ({
     </span>
   );
 
-  const { isExpanded } = React.useContext(AccordionItemContext);
+  const { isExpanded } = useContext(AccordionItemContext);
 
   return (
     <AccordionContext.Consumer>
diff --git a/packages/react-core/src/components/Accordion/__tests__/Accordion.test.tsx b/packages/react-core/src/components/Accordion/__tests__/Accordion.test.tsx
index 4d347f5d0eb..c6260e3f8cd 100644
--- a/packages/react-core/src/components/Accordion/__tests__/Accordion.test.tsx
+++ b/packages/react-core/src/components/Accordion/__tests__/Accordion.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 
 import { Accordion } from '../Accordion';
diff --git a/packages/react-core/src/components/Accordion/__tests__/AccordionContent.test.tsx b/packages/react-core/src/components/Accordion/__tests__/AccordionContent.test.tsx
index 2008005acf8..84f5ef02d43 100644
--- a/packages/react-core/src/components/Accordion/__tests__/AccordionContent.test.tsx
+++ b/packages/react-core/src/components/Accordion/__tests__/AccordionContent.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 
 import { AccordionContent } from '../AccordionContent';
diff --git a/packages/react-core/src/components/Accordion/__tests__/AccordionExpandedContentBody.test.tsx b/packages/react-core/src/components/Accordion/__tests__/AccordionExpandedContentBody.test.tsx
index 1257a00d99c..3070148b556 100644
--- a/packages/react-core/src/components/Accordion/__tests__/AccordionExpandedContentBody.test.tsx
+++ b/packages/react-core/src/components/Accordion/__tests__/AccordionExpandedContentBody.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 
 import { AccordionExpandableContentBody } from '../AccordionExpandableContentBody';
diff --git a/packages/react-core/src/components/Accordion/__tests__/AccordionItem.test.tsx b/packages/react-core/src/components/Accordion/__tests__/AccordionItem.test.tsx
index ec3f94b4019..f48a5cfedbe 100644
--- a/packages/react-core/src/components/Accordion/__tests__/AccordionItem.test.tsx
+++ b/packages/react-core/src/components/Accordion/__tests__/AccordionItem.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import { AccordionItem } from '../AccordionItem';
 import styles from '@patternfly/react-styles/css/components/Accordion/accordion';
diff --git a/packages/react-core/src/components/Accordion/__tests__/AccordionToggle.test.tsx b/packages/react-core/src/components/Accordion/__tests__/AccordionToggle.test.tsx
index ca45a0b2c0d..ff59083ec4f 100644
--- a/packages/react-core/src/components/Accordion/__tests__/AccordionToggle.test.tsx
+++ b/packages/react-core/src/components/Accordion/__tests__/AccordionToggle.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 
 import { AccordionToggle } from '../AccordionToggle';
diff --git a/packages/react-core/src/components/Accordion/examples/AccordionBordered.tsx b/packages/react-core/src/components/Accordion/examples/AccordionBordered.tsx
index 448b124eccd..7cd0a01ba40 100644
--- a/packages/react-core/src/components/Accordion/examples/AccordionBordered.tsx
+++ b/packages/react-core/src/components/Accordion/examples/AccordionBordered.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Accordion,
   AccordionItem,
diff --git a/packages/react-core/src/components/Accordion/examples/AccordionDefinitionList.tsx b/packages/react-core/src/components/Accordion/examples/AccordionDefinitionList.tsx
index d91573f53ce..938877aa888 100644
--- a/packages/react-core/src/components/Accordion/examples/AccordionDefinitionList.tsx
+++ b/packages/react-core/src/components/Accordion/examples/AccordionDefinitionList.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Accordion, AccordionItem, AccordionContent, AccordionToggle } from '@patternfly/react-core';
 
 export const AccordionDefinitionList: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Accordion/examples/AccordionFixedWithMultipleExpandBehavior.tsx b/packages/react-core/src/components/Accordion/examples/AccordionFixedWithMultipleExpandBehavior.tsx
index e0375c1056d..b4f68eba239 100644
--- a/packages/react-core/src/components/Accordion/examples/AccordionFixedWithMultipleExpandBehavior.tsx
+++ b/packages/react-core/src/components/Accordion/examples/AccordionFixedWithMultipleExpandBehavior.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Accordion, AccordionItem, AccordionContent, AccordionToggle } from '@patternfly/react-core';
 
 export const AccordionFixedWithMultipleExpandBehavior: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Accordion/examples/AccordionSingleExpandBehavior.tsx b/packages/react-core/src/components/Accordion/examples/AccordionSingleExpandBehavior.tsx
index 17359cc4c0d..a39ebad4578 100644
--- a/packages/react-core/src/components/Accordion/examples/AccordionSingleExpandBehavior.tsx
+++ b/packages/react-core/src/components/Accordion/examples/AccordionSingleExpandBehavior.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Accordion, AccordionItem, AccordionContent, AccordionToggle } from '@patternfly/react-core';
 
 export const AccordionSingleExpandBehavior: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Accordion/examples/AccordionToggleIconAtStart.tsx b/packages/react-core/src/components/Accordion/examples/AccordionToggleIconAtStart.tsx
index c347feade96..4da46e0f1d2 100644
--- a/packages/react-core/src/components/Accordion/examples/AccordionToggleIconAtStart.tsx
+++ b/packages/react-core/src/components/Accordion/examples/AccordionToggleIconAtStart.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Accordion, AccordionItem, AccordionContent, AccordionToggle } from '@patternfly/react-core';
 
 export const AccordionToggleIconAtStart: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/ActionList/ActionList.tsx b/packages/react-core/src/components/ActionList/ActionList.tsx
index 8dd82ea57eb..08f0b57ed5c 100644
--- a/packages/react-core/src/components/ActionList/ActionList.tsx
+++ b/packages/react-core/src/components/ActionList/ActionList.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/ActionList/action-list';
 
diff --git a/packages/react-core/src/components/ActionList/ActionListGroup.tsx b/packages/react-core/src/components/ActionList/ActionListGroup.tsx
index 1e36985b9f7..8e5a22cb3b0 100644
--- a/packages/react-core/src/components/ActionList/ActionListGroup.tsx
+++ b/packages/react-core/src/components/ActionList/ActionListGroup.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/ActionList/action-list';
 
diff --git a/packages/react-core/src/components/ActionList/ActionListItem.tsx b/packages/react-core/src/components/ActionList/ActionListItem.tsx
index 2cc829848a3..d6827ff3801 100644
--- a/packages/react-core/src/components/ActionList/ActionListItem.tsx
+++ b/packages/react-core/src/components/ActionList/ActionListItem.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/ActionList/action-list';
 
diff --git a/packages/react-core/src/components/ActionList/__tests__/ActionList.test.tsx b/packages/react-core/src/components/ActionList/__tests__/ActionList.test.tsx
index 6512ebdb138..c1ed3bb8d47 100644
--- a/packages/react-core/src/components/ActionList/__tests__/ActionList.test.tsx
+++ b/packages/react-core/src/components/ActionList/__tests__/ActionList.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { ActionList } from '../ActionList';
 import styles from '@patternfly/react-styles/css/components/ActionList/action-list';
diff --git a/packages/react-core/src/components/ActionList/__tests__/ActionListGroup.test.tsx b/packages/react-core/src/components/ActionList/__tests__/ActionListGroup.test.tsx
index baf4d2a4515..66a2c8fcb25 100644
--- a/packages/react-core/src/components/ActionList/__tests__/ActionListGroup.test.tsx
+++ b/packages/react-core/src/components/ActionList/__tests__/ActionListGroup.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { ActionListGroup } from '../ActionListGroup';
 import styles from '@patternfly/react-styles/css/components/ActionList/action-list';
diff --git a/packages/react-core/src/components/ActionList/__tests__/ActionListItem.test.tsx b/packages/react-core/src/components/ActionList/__tests__/ActionListItem.test.tsx
index 18b1949d80a..6c14466d16c 100644
--- a/packages/react-core/src/components/ActionList/__tests__/ActionListItem.test.tsx
+++ b/packages/react-core/src/components/ActionList/__tests__/ActionListItem.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { ActionListItem } from '../ActionListItem';
 import styles from '@patternfly/react-styles/css/components/ActionList/action-list';
diff --git a/packages/react-core/src/components/ActionList/examples/ActionList.md b/packages/react-core/src/components/ActionList/examples/ActionList.md
index 34f1cc9e18d..ff1e7fb698e 100644
--- a/packages/react-core/src/components/ActionList/examples/ActionList.md
+++ b/packages/react-core/src/components/ActionList/examples/ActionList.md
@@ -5,6 +5,7 @@ cssPrefix: pf-v6-c-action-list
 propComponents: ['ActionList', 'ActionListGroup', 'ActionListItem']
 ---
 
+import { Fragment } from 'react';
 import TimesIcon from '@patternfly/react-icons/dist/js/icons/times-icon';
 import CheckIcon from '@patternfly/react-icons/dist/js/icons/check-icon';
 import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
diff --git a/packages/react-core/src/components/ActionList/examples/ActionListMultipleGroups.tsx b/packages/react-core/src/components/ActionList/examples/ActionListMultipleGroups.tsx
index 1ea62325003..b9f3ecec657 100644
--- a/packages/react-core/src/components/ActionList/examples/ActionListMultipleGroups.tsx
+++ b/packages/react-core/src/components/ActionList/examples/ActionListMultipleGroups.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ActionList, ActionListGroup, ActionListItem, Button } from '@patternfly/react-core';
 
 export const ActionListMultipleGroups: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/ActionList/examples/ActionListSingleGroup.tsx b/packages/react-core/src/components/ActionList/examples/ActionListSingleGroup.tsx
index 8b9e42d6edc..9d4ca00a6dc 100644
--- a/packages/react-core/src/components/ActionList/examples/ActionListSingleGroup.tsx
+++ b/packages/react-core/src/components/ActionList/examples/ActionListSingleGroup.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   ActionList,
   ActionListGroup,
@@ -45,7 +45,7 @@ export const ActionListSingleGroup: React.FunctionComponent = () => {
     </>
   );
   return (
-    <React.Fragment>
+    <Fragment>
       <ActionList>
         <ActionListGroup>
           <ActionListItem>
@@ -95,6 +95,6 @@ export const ActionListSingleGroup: React.FunctionComponent = () => {
           </ActionListItem>
         </ActionListGroup>
       </ActionList>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/ActionList/examples/ActionListWithCancelButton.tsx b/packages/react-core/src/components/ActionList/examples/ActionListWithCancelButton.tsx
index e8cc63d8763..cbcec892798 100644
--- a/packages/react-core/src/components/ActionList/examples/ActionListWithCancelButton.tsx
+++ b/packages/react-core/src/components/ActionList/examples/ActionListWithCancelButton.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { ActionList, ActionListGroup, ActionListItem, Button } from '@patternfly/react-core';
 
 export const ActionListWithCancelButton: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     In modals, forms, data lists
     <ActionList>
       <ActionListGroup>
@@ -41,5 +41,5 @@ export const ActionListWithCancelButton: React.FunctionComponent = () => (
         </ActionListItem>
       </ActionListGroup>
     </ActionList>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/ActionList/examples/ActionListWithIcons.tsx b/packages/react-core/src/components/ActionList/examples/ActionListWithIcons.tsx
index e2de3ea44b7..362a7e5b680 100644
--- a/packages/react-core/src/components/ActionList/examples/ActionListWithIcons.tsx
+++ b/packages/react-core/src/components/ActionList/examples/ActionListWithIcons.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ActionList, ActionListGroup, ActionListItem, Button } from '@patternfly/react-core';
 import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
 import CheckIcon from '@patternfly/react-icons/dist/esm/icons/check-icon';
diff --git a/packages/react-core/src/components/Alert/Alert.tsx b/packages/react-core/src/components/Alert/Alert.tsx
index 4ac3057fc12..f14cdee9e51 100644
--- a/packages/react-core/src/components/Alert/Alert.tsx
+++ b/packages/react-core/src/components/Alert/Alert.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-import { useState, type JSX } from 'react';
+import { Fragment, useEffect, useRef, useState, type JSX } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Alert/alert';
 import { AlertIcon } from './AlertIcon';
@@ -115,18 +114,18 @@ export const Alert: React.FunctionComponent<AlertProps> = ({
 }: AlertProps) => {
   const ouiaProps = useOUIAProps(Alert.displayName, ouiaId, ouiaSafe, variant);
   const getHeadingContent = (
-    <React.Fragment>
+    <Fragment>
       <span className="pf-v6-screen-reader">{variantLabel}</span>
       {title}
-    </React.Fragment>
+    </Fragment>
   );
 
-  const titleRef = React.useRef(null);
+  const titleRef = useRef(null);
   const TitleComponent = component as any;
 
-  const divRef = React.useRef<HTMLDivElement>(undefined);
+  const divRef = useRef<HTMLDivElement>(undefined);
   const [isTooltipVisible, setIsTooltipVisible] = useState(false);
-  React.useEffect(() => {
+  useEffect(() => {
     if (!titleRef.current || !truncateTitle) {
       return;
     }
@@ -142,14 +141,14 @@ export const Alert: React.FunctionComponent<AlertProps> = ({
   const [isMouseOver, setIsMouseOver] = useState<boolean | undefined>();
   const [containsFocus, setContainsFocus] = useState<boolean | undefined>();
   const dismissed = timedOut && timedOutAnimation && !isMouseOver && !containsFocus;
-  React.useEffect(() => {
+  useEffect(() => {
     const calculatedTimeout = timeout === true ? 8000 : Number(timeout);
     if (calculatedTimeout > 0) {
       const timer = setTimeout(() => setTimedOut(true), calculatedTimeout);
       return () => clearTimeout(timer);
     }
   }, [timeout]);
-  React.useEffect(() => {
+  useEffect(() => {
     const onDocumentFocus = () => {
       if (divRef.current) {
         if (divRef.current.contains(document.activeElement)) {
@@ -165,13 +164,13 @@ export const Alert: React.FunctionComponent<AlertProps> = ({
 
     return () => document.removeEventListener('focus', onDocumentFocus, true);
   }, [containsFocus]);
-  React.useEffect(() => {
+  useEffect(() => {
     if (containsFocus === false || isMouseOver === false) {
       const timer = setTimeout(() => setTimedOutAnimation(true), timeoutAnimation);
       return () => clearTimeout(timer);
     }
   }, [containsFocus, isMouseOver, timeoutAnimation]);
-  React.useEffect(() => {
+  useEffect(() => {
     dismissed && onTimeout();
   }, [dismissed, onTimeout]);
 
diff --git a/packages/react-core/src/components/Alert/AlertActionCloseButton.tsx b/packages/react-core/src/components/Alert/AlertActionCloseButton.tsx
index a42090f8918..bc9e6c81d45 100644
--- a/packages/react-core/src/components/Alert/AlertActionCloseButton.tsx
+++ b/packages/react-core/src/components/Alert/AlertActionCloseButton.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Button, ButtonVariant, ButtonProps } from '../Button';
 import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
 import { AlertContext } from './AlertContext';
diff --git a/packages/react-core/src/components/Alert/AlertActionLink.tsx b/packages/react-core/src/components/Alert/AlertActionLink.tsx
index b881e861fd9..14ee1169d39 100644
--- a/packages/react-core/src/components/Alert/AlertActionLink.tsx
+++ b/packages/react-core/src/components/Alert/AlertActionLink.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Button, ButtonVariant, ButtonProps } from '../Button';
 
 /** Renders buttons styled as links beneath the alert title and description when this sub-component
diff --git a/packages/react-core/src/components/Alert/AlertContext.ts b/packages/react-core/src/components/Alert/AlertContext.ts
index cbda82bb4a0..8dcb84c14a0 100644
--- a/packages/react-core/src/components/Alert/AlertContext.ts
+++ b/packages/react-core/src/components/Alert/AlertContext.ts
@@ -1,8 +1,7 @@
-import * as React from 'react';
-
+import { createContext } from 'react';
 interface AlertContext {
   title: React.ReactNode;
   variantLabel?: string;
 }
 
-export const AlertContext = React.createContext<AlertContext>(null);
+export const AlertContext = createContext<AlertContext>(null);
diff --git a/packages/react-core/src/components/Alert/AlertGroup.tsx b/packages/react-core/src/components/Alert/AlertGroup.tsx
index 12c99aa8daf..798e0313aa4 100644
--- a/packages/react-core/src/components/Alert/AlertGroup.tsx
+++ b/packages/react-core/src/components/Alert/AlertGroup.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 import * as ReactDOM from 'react-dom';
 import { canUseDOM } from '../../helpers';
 import { AlertGroupInline } from './AlertGroupInline';
@@ -26,7 +26,7 @@ interface AlertGroupState {
   container: HTMLElement;
 }
 
-class AlertGroup extends React.Component<AlertGroupProps, AlertGroupState> {
+class AlertGroup extends Component<AlertGroupProps, AlertGroupState> {
   static displayName = 'AlertGroup';
   state = {
     container: undefined
@@ -64,7 +64,7 @@ class AlertGroup extends React.Component<AlertGroupProps, AlertGroupState> {
       overflowMessage,
       'aria-label': ariaLabel,
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      appendTo, // dont pass down to ul
+      appendTo, // do not pass down to ul
       ...props
     } = this.props;
     const alertGroup = (
diff --git a/packages/react-core/src/components/Alert/AlertGroupInline.tsx b/packages/react-core/src/components/Alert/AlertGroupInline.tsx
index 3d1ab2e058d..b8c2084d992 100644
--- a/packages/react-core/src/components/Alert/AlertGroupInline.tsx
+++ b/packages/react-core/src/components/Alert/AlertGroupInline.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Children } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Alert/alert-group';
 import { AlertGroupProps } from './AlertGroup';
@@ -20,7 +20,7 @@ export const AlertGroupInline: React.FunctionComponent<AlertGroupProps> = ({
     className={css(styles.alertGroup, className, isToast ? styles.modifiers.toast : '')}
     {...rest}
   >
-    {React.Children.toArray(children).map((alert, index) => (
+    {Children.toArray(children).map((alert, index) => (
       <li key={(alert as React.ReactElement<AlertProps>).props?.id || index}>{alert}</li>
     ))}
     {overflowMessage && (
diff --git a/packages/react-core/src/components/Alert/AlertIcon.tsx b/packages/react-core/src/components/Alert/AlertIcon.tsx
index 04539a9c84c..e907f573fe9 100644
--- a/packages/react-core/src/components/Alert/AlertIcon.tsx
+++ b/packages/react-core/src/components/Alert/AlertIcon.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Alert/alert';
 import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
diff --git a/packages/react-core/src/components/Alert/AlertToggleExpandButton.tsx b/packages/react-core/src/components/Alert/AlertToggleExpandButton.tsx
index 44cc37d9c37..e43692e77f1 100644
--- a/packages/react-core/src/components/Alert/AlertToggleExpandButton.tsx
+++ b/packages/react-core/src/components/Alert/AlertToggleExpandButton.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useContext } from 'react';
 import { Button, ButtonProps, ButtonVariant } from '../Button';
 import { AlertContext } from './AlertContext';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
@@ -23,7 +23,7 @@ export const AlertToggleExpandButton: React.FunctionComponent<AlertToggleExpandB
   isExpanded = false,
   ...props
 }: AlertToggleExpandButtonProps) => {
-  const { title, variantLabel: alertVariantLabel } = React.useContext(AlertContext);
+  const { title, variantLabel: alertVariantLabel } = useContext(AlertContext);
   return (
     <Button
       variant={ButtonVariant.plain}
diff --git a/packages/react-core/src/components/Alert/__tests__/Alert.test.tsx b/packages/react-core/src/components/Alert/__tests__/Alert.test.tsx
index 74461bed196..19b394af444 100644
--- a/packages/react-core/src/components/Alert/__tests__/Alert.test.tsx
+++ b/packages/react-core/src/components/Alert/__tests__/Alert.test.tsx
@@ -1,7 +1,6 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { act } from 'react';
+import { act, useContext } from 'react';
 
 import { Alert, AlertVariant } from '../Alert';
 import { AlertContext } from '../AlertContext';
@@ -109,7 +108,7 @@ test('Renders with Custom hidden text of "Custom alert:"', () => {
 
   test(`Provides a variantLabel of '${capitalize(variant)} alert:' in a context when variant = ${variant}`, () => {
     const TestComponent: React.FunctionComponent = () => {
-      const context = React.useContext(AlertContext);
+      const context = useContext(AlertContext);
 
       return (
         <p data-testid="Test-component" aria-label={context.variantLabel}>
@@ -213,7 +212,7 @@ test(`Renders the actionClose element inside ${styles.alertAction}`, () => {
 
 test('Provides the actionClose element access to the title via a context', () => {
   const TestComponent: React.FunctionComponent = () => {
-    const context = React.useContext(AlertContext);
+    const context = useContext(AlertContext);
 
     return (
       <p data-testid="Test-component" aria-label={context.variantLabel}>
@@ -275,7 +274,7 @@ test('Renders with the aria label passed via prop', () => {
 
 test('Renders with the variantLabel passed via prop', () => {
   const TestComponent: React.FunctionComponent = () => {
-    const context = React.useContext(AlertContext);
+    const context = useContext(AlertContext);
 
     return (
       <p data-testid="Test-component" aria-label={context.variantLabel}>
diff --git a/packages/react-core/src/components/Alert/__tests__/AlertActionCloseButton.test.tsx b/packages/react-core/src/components/Alert/__tests__/AlertActionCloseButton.test.tsx
index 0116fe2ac09..d0f553730ac 100644
--- a/packages/react-core/src/components/Alert/__tests__/AlertActionCloseButton.test.tsx
+++ b/packages/react-core/src/components/Alert/__tests__/AlertActionCloseButton.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-core/src/components/Alert/__tests__/AlertActionLink.test.tsx b/packages/react-core/src/components/Alert/__tests__/AlertActionLink.test.tsx
index 3e22ee03c5e..b70ae2d4aea 100644
--- a/packages/react-core/src/components/Alert/__tests__/AlertActionLink.test.tsx
+++ b/packages/react-core/src/components/Alert/__tests__/AlertActionLink.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { AlertActionLink } from '../AlertActionLink';
 
diff --git a/packages/react-core/src/components/Alert/__tests__/AlertGroup.test.tsx b/packages/react-core/src/components/Alert/__tests__/AlertGroup.test.tsx
index 09f37026d10..77f8e698c07 100644
--- a/packages/react-core/src/components/Alert/__tests__/AlertGroup.test.tsx
+++ b/packages/react-core/src/components/Alert/__tests__/AlertGroup.test.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-core/src/components/Alert/__tests__/AlertIcon.test.tsx b/packages/react-core/src/components/Alert/__tests__/AlertIcon.test.tsx
index 0798486d119..9dd0782cb66 100644
--- a/packages/react-core/src/components/Alert/__tests__/AlertIcon.test.tsx
+++ b/packages/react-core/src/components/Alert/__tests__/AlertIcon.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 
 import { AlertIcon } from '../AlertIcon';
diff --git a/packages/react-core/src/components/Alert/__tests__/AlertToggleExpandButton.test.tsx b/packages/react-core/src/components/Alert/__tests__/AlertToggleExpandButton.test.tsx
index 188fd49d33b..1d896dd624d 100644
--- a/packages/react-core/src/components/Alert/__tests__/AlertToggleExpandButton.test.tsx
+++ b/packages/react-core/src/components/Alert/__tests__/AlertToggleExpandButton.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-core/src/components/Alert/__tests__/Generated/AlertActionCloseButton.test.tsx b/packages/react-core/src/components/Alert/__tests__/Generated/AlertActionCloseButton.test.tsx
index 5bbd710608a..fb3bad4ad4f 100644
--- a/packages/react-core/src/components/Alert/__tests__/Generated/AlertActionCloseButton.test.tsx
+++ b/packages/react-core/src/components/Alert/__tests__/Generated/AlertActionCloseButton.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render } from '@testing-library/react';
 
 import { AlertActionCloseButton } from '../../AlertActionCloseButton';
diff --git a/packages/react-core/src/components/Alert/__tests__/Generated/AlertActionLink.test.tsx b/packages/react-core/src/components/Alert/__tests__/Generated/AlertActionLink.test.tsx
index 21600743628..e54b8bb1ecd 100644
--- a/packages/react-core/src/components/Alert/__tests__/Generated/AlertActionLink.test.tsx
+++ b/packages/react-core/src/components/Alert/__tests__/Generated/AlertActionLink.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { AlertActionLink } from '../../AlertActionLink';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Alert/__tests__/Generated/AlertGroup.test.tsx b/packages/react-core/src/components/Alert/__tests__/Generated/AlertGroup.test.tsx
index b88c41d42bf..8f29f8a65fd 100644
--- a/packages/react-core/src/components/Alert/__tests__/Generated/AlertGroup.test.tsx
+++ b/packages/react-core/src/components/Alert/__tests__/Generated/AlertGroup.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { AlertGroup } from '../../AlertGroup';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Alert/__tests__/Generated/AlertGroupInline.test.tsx b/packages/react-core/src/components/Alert/__tests__/Generated/AlertGroupInline.test.tsx
index 4cdec220359..8301f3bcdaa 100644
--- a/packages/react-core/src/components/Alert/__tests__/Generated/AlertGroupInline.test.tsx
+++ b/packages/react-core/src/components/Alert/__tests__/Generated/AlertGroupInline.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { AlertGroupInline } from '../../AlertGroupInline';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Alert/__tests__/Generated/AlertIcon.test.tsx b/packages/react-core/src/components/Alert/__tests__/Generated/AlertIcon.test.tsx
index fd0fb6005b3..06ecd8a01f3 100644
--- a/packages/react-core/src/components/Alert/__tests__/Generated/AlertIcon.test.tsx
+++ b/packages/react-core/src/components/Alert/__tests__/Generated/AlertIcon.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { AlertIcon } from '../../AlertIcon';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Alert/examples/Alert.md b/packages/react-core/src/components/Alert/examples/Alert.md
index da300a169cc..2a7b436bac9 100644
--- a/packages/react-core/src/components/Alert/examples/Alert.md
+++ b/packages/react-core/src/components/Alert/examples/Alert.md
@@ -7,6 +7,7 @@ ouia: true
 ---
 
 import './alert.css';
+import { Fragment, useState } from 'react';
 import UsersIcon from '@patternfly/react-icons/dist/esm/icons/users-icon';
 import BoxIcon from '@patternfly/react-icons/dist/esm/icons/box-icon';
 import DatabaseIcon from '@patternfly/react-icons/dist/esm/icons/database-icon';
@@ -29,7 +30,6 @@ PatternFly supports several alert variants for different scenarios. Each variant
 | Danger | Use to indicate that a critical or blocking error has occurred |
 
 ```ts
-import React from 'react';
 import { Alert } from '@patternfly/react-core';
 
 <React.Fragment>
@@ -56,7 +56,6 @@ PatternFly supports several properties and variations that can be used to add ex
   - If there is a description passed via `children` prop, then the `component` prop should be a heading element. Headings should be ordered by their level and heading levels should not be skipped. For example, a heading of an `h2` level should not be followed directly by an `h4`.
 
 ```ts
-import React from 'react';
 import { Alert, AlertActionCloseButton, AlertActionLink } from '@patternfly/react-core';
 
 <React.Fragment>
@@ -104,7 +103,6 @@ import { Alert, AlertActionCloseButton, AlertActionLink } from '@patternfly/reac
 Use the `timeout` property to automatically dismiss an alert after a period of time. If set to `true`, the `timeout` will be 8000 milliseconds. Provide a specific value to dismiss the alert after a different number of milliseconds.
 
 ```ts
-import React from 'react';
 import { Alert, AlertActionLink, AlertGroup, Button } from '@patternfly/react-core';
 
 const AlertTimeout: React.FunctionComponent = () => {
@@ -163,7 +161,6 @@ It is not recommended to use an expandable alert with a `timeout` in a [toast al
 See the [toast alert considerations](/components/alert/accessibility#toast-alerts) section of the alert accessibility documentation to understand the accessibility risks associated with using toast alerts.
 
 ```ts
-import React from 'react';
 import { Alert, AlertActionCloseButton, AlertActionLink } from '@patternfly/react-core';
 
 <React.Fragment>
@@ -204,7 +201,6 @@ import { Alert, AlertActionCloseButton, AlertActionLink } from '@patternfly/reac
 Use the `truncateTitle` property to shorten a long `title`. Set `truncateTitle` equal to a number (passed in as `{n}`) to reduce the number of lines of text in the alert's `title`. Users may hover over or tab to a truncated `title` to see the full message in a tooltip.
 
 ```ts
-import React from 'react';
 import { Alert } from '@patternfly/react-core';
 
 <React.Fragment>
@@ -237,7 +233,6 @@ import { Alert } from '@patternfly/react-core';
 Use the `customIcon` property to replace a default alert icon with a custom icon.
 
 ```ts
-import React from 'react';
 import { Alert } from '@patternfly/react-core';
 import UsersIcon from '@patternfly/react-icons/dist/esm/icons/users-icon';
 import BoxIcon from '@patternfly/react-icons/dist/esm/icons/box-icon';
@@ -259,7 +254,6 @@ import LaptopIcon from '@patternfly/react-icons/dist/esm/icons/laptop-icon';
 Use inline alerts to display an alert inline with content. All alert variants may use the `isInline` property to position alerts in content-heavy areas, such as within forms, wizards, or drawers.
 
 ```ts
-import React from 'react';
 import { Alert } from '@patternfly/react-core';
 <React.Fragment>
   <Alert variant="custom" isInline title="Custom inline alert title" />
@@ -275,7 +269,6 @@ import { Alert } from '@patternfly/react-core';
 All general alert variations can use the `isInline` property to apply inline styling.
 
 ```ts
-import React from 'react';
 import { Alert, AlertActionCloseButton, AlertActionLink } from '@patternfly/react-core';
 <React.Fragment>
   <Alert
@@ -324,7 +317,6 @@ import { Alert, AlertActionCloseButton, AlertActionLink } from '@patternfly/reac
 Use the `isPlain` property to make any inline alert plain. Plain styling removes the colored background but keeps colored text and icons.
 
 ```ts
-import React from 'react';
 import { Alert } from '@patternfly/react-core';
 <React.Fragment>
   <Alert variant="custom" isInline isPlain title="Custom inline alert title" />
@@ -340,7 +332,6 @@ import { Alert } from '@patternfly/react-core';
 It is not recommended to use a plain inline alert with `actionClose` nor `actionLinks` because these alerts are non-dismissible and should persist until the error or action related to the alert is resolved.
 
 ```ts
-import React from 'react';
 import { Alert } from '@patternfly/react-core';
 <Alert isInline isPlain variant="success" title="Success alert title">
   <p>Success alert description. This should tell the user more information about the alert.</p>
@@ -354,7 +345,6 @@ Live region alerts allow you to expose dynamic content changes in a way that can
 By default, `isLiveRegion`alerts are static.
 
 ```ts
-import React from 'react';
 import { Alert, AlertActionCloseButton } from '@patternfly/react-core';
 
 <React.Fragment>
diff --git a/packages/react-core/src/components/Alert/examples/AlertAsyncLiveRegion.tsx b/packages/react-core/src/components/Alert/examples/AlertAsyncLiveRegion.tsx
index d4b7d34c32f..d80bdaa8c7d 100644
--- a/packages/react-core/src/components/Alert/examples/AlertAsyncLiveRegion.tsx
+++ b/packages/react-core/src/components/Alert/examples/AlertAsyncLiveRegion.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Alert, AlertGroup, AlertVariant, ToggleGroup, ToggleGroupItem } from '@patternfly/react-core';
 
 interface AlertInfo {
@@ -36,7 +36,7 @@ export const AsyncLiveRegionAlert: React.FunctionComponent = () => {
   }, [isActive, alerts]);
 
   return (
-    <React.Fragment>
+    <Fragment>
       <ToggleGroup aria-label="Toggle asynchronous alerts">
         <ToggleGroupItem
           text="Async alerts on"
@@ -56,6 +56,6 @@ export const AsyncLiveRegionAlert: React.FunctionComponent = () => {
           <Alert variant={variant} title={title} key={key} />
         ))}
       </AlertGroup>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Alert/examples/AlertDynamicLiveRegion.tsx b/packages/react-core/src/components/Alert/examples/AlertDynamicLiveRegion.tsx
index 4a4bcfb74c8..e20aabcb3a1 100644
--- a/packages/react-core/src/components/Alert/examples/AlertDynamicLiveRegion.tsx
+++ b/packages/react-core/src/components/Alert/examples/AlertDynamicLiveRegion.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { Alert, AlertGroup, AlertVariant, InputGroup } from '@patternfly/react-core';
 import buttonStyles from '@patternfly/react-styles/css/components/Button/button';
 
@@ -9,7 +9,7 @@ interface AlertInfo {
 }
 
 export const DynamicLiveRegionAlert: React.FunctionComponent = () => {
-  const [alerts, setAlerts] = React.useState<AlertInfo[]>([]);
+  const [alerts, setAlerts] = useState<AlertInfo[]>([]);
   const getUniqueId: () => number = () => new Date().getTime();
   const btnClasses = [buttonStyles.button, buttonStyles.modifiers.secondary].join(' ');
 
@@ -40,7 +40,7 @@ export const DynamicLiveRegionAlert: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <InputGroup style={{ marginBottom: '16px' }}>
         <button onClick={addSuccessAlert} type="button" className={btnClasses}>
           Add single success alert
@@ -57,6 +57,6 @@ export const DynamicLiveRegionAlert: React.FunctionComponent = () => {
           <Alert variant={variant} title={title} key={key} />
         ))}
       </AlertGroup>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Alert/examples/AlertGroupAsync.tsx b/packages/react-core/src/components/Alert/examples/AlertGroupAsync.tsx
index 2a2e894ec15..b608134f040 100644
--- a/packages/react-core/src/components/Alert/examples/AlertGroupAsync.tsx
+++ b/packages/react-core/src/components/Alert/examples/AlertGroupAsync.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Alert,
   AlertProps,
@@ -45,7 +45,7 @@ export const AlertGroupAsync: React.FunctionComponent = () => {
   useInterval(addAlert, isRunning ? 4500 : null);
 
   return (
-    <React.Fragment>
+    <Fragment>
       <InputGroup style={{ marginBottom: '16px' }}>
         <InputGroupItem>
           <button onClick={startAsyncAlerts} type="button" className={btnClasses}>
@@ -74,6 +74,6 @@ export const AlertGroupAsync: React.FunctionComponent = () => {
           />
         ))}
       </AlertGroup>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Alert/examples/AlertGroupMultipleDynamic.tsx b/packages/react-core/src/components/Alert/examples/AlertGroupMultipleDynamic.tsx
index bc638abb4f2..9d98bd923e6 100644
--- a/packages/react-core/src/components/Alert/examples/AlertGroupMultipleDynamic.tsx
+++ b/packages/react-core/src/components/Alert/examples/AlertGroupMultipleDynamic.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Alert,
   AlertProps,
@@ -34,7 +34,7 @@ export const AlertGroupMultipleDynamic: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <InputGroup style={{ marginBottom: '16px' }}>
         <InputGroupItem>
           <button onClick={addAlertCollection} type="button" className={btnClasses}>
@@ -58,6 +58,6 @@ export const AlertGroupMultipleDynamic: React.FunctionComponent = () => {
           />
         ))}
       </AlertGroup>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Alert/examples/AlertGroupSingularDynamic.tsx b/packages/react-core/src/components/Alert/examples/AlertGroupSingularDynamic.tsx
index d70d1584e8b..1df8dc6296c 100644
--- a/packages/react-core/src/components/Alert/examples/AlertGroupSingularDynamic.tsx
+++ b/packages/react-core/src/components/Alert/examples/AlertGroupSingularDynamic.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Alert,
   AlertProps,
@@ -38,7 +38,7 @@ export const AlertGroupSingularDynamic: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <InputGroup style={{ marginBottom: '16px' }}>
         <InputGroupItem>
           <button onClick={addSuccessAlert} type="button" className={btnClasses}>
@@ -73,6 +73,6 @@ export const AlertGroupSingularDynamic: React.FunctionComponent = () => {
           />
         ))}
       </AlertGroup>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Alert/examples/AlertGroupSingularDynamicOverflow.tsx b/packages/react-core/src/components/Alert/examples/AlertGroupSingularDynamicOverflow.tsx
index f827dbe5048..f7736ad4d42 100644
--- a/packages/react-core/src/components/Alert/examples/AlertGroupSingularDynamicOverflow.tsx
+++ b/packages/react-core/src/components/Alert/examples/AlertGroupSingularDynamicOverflow.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Alert,
   AlertProps,
@@ -57,7 +57,7 @@ export const AlertGroupSingularDynamicOverflow: React.FunctionComponent = () =>
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <InputGroup style={{ marginBottom: '16px' }}>
         <InputGroupItem>
           <button onClick={addSuccessAlert} type="button" className={btnClasses}>
@@ -92,6 +92,6 @@ export const AlertGroupSingularDynamicOverflow: React.FunctionComponent = () =>
           />
         ))}
       </AlertGroup>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Alert/examples/AlertGroupStatic.tsx b/packages/react-core/src/components/Alert/examples/AlertGroupStatic.tsx
index c0afd20e980..1477cefc811 100644
--- a/packages/react-core/src/components/Alert/examples/AlertGroupStatic.tsx
+++ b/packages/react-core/src/components/Alert/examples/AlertGroupStatic.tsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Alert, AlertGroup } from '@patternfly/react-core';
 
 export const AlertGroupStatic: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <AlertGroup>
       <Alert title="Success alert" variant="success" isInline />
       <Alert title="Info alert" variant="info" isInline />
     </AlertGroup>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Alert/examples/AlertGroupToast.tsx b/packages/react-core/src/components/Alert/examples/AlertGroupToast.tsx
index 1bb01c58f83..1d38f86308b 100644
--- a/packages/react-core/src/components/Alert/examples/AlertGroupToast.tsx
+++ b/packages/react-core/src/components/Alert/examples/AlertGroupToast.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Alert,
   AlertProps,
@@ -38,7 +38,7 @@ export const AlertGroupToast: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <InputGroup style={{ marginBottom: '16px' }}>
         <InputGroupItem>
           <button onClick={addSuccessAlert} type="button" className={btnClasses}>
@@ -72,6 +72,6 @@ export const AlertGroupToast: React.FunctionComponent = () => {
           />
         ))}
       </AlertGroup>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Alert/examples/AlertGroupToastOverflowCapture.tsx b/packages/react-core/src/components/Alert/examples/AlertGroupToastOverflowCapture.tsx
index 88c94e7b4ba..b8ddd9cd611 100644
--- a/packages/react-core/src/components/Alert/examples/AlertGroupToastOverflowCapture.tsx
+++ b/packages/react-core/src/components/Alert/examples/AlertGroupToastOverflowCapture.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Alert,
   AlertProps,
@@ -57,7 +57,7 @@ export const AlertGroupToastOverflowCapture: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <InputGroup style={{ marginBottom: '16px' }}>
         <InputGroupItem>
           <button onClick={addSuccessAlert} type="button" className={btnClasses}>
@@ -91,6 +91,6 @@ export const AlertGroupToastOverflowCapture: React.FunctionComponent = () => {
           />
         ))}
       </AlertGroup>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Avatar/Avatar.tsx b/packages/react-core/src/components/Avatar/Avatar.tsx
index 8aba318f43d..f7108e8c33e 100644
--- a/packages/react-core/src/components/Avatar/Avatar.tsx
+++ b/packages/react-core/src/components/Avatar/Avatar.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Avatar/avatar';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Avatar/__tests__/Avatar.test.tsx b/packages/react-core/src/components/Avatar/__tests__/Avatar.test.tsx
index 79326b1896e..8f3b066e074 100644
--- a/packages/react-core/src/components/Avatar/__tests__/Avatar.test.tsx
+++ b/packages/react-core/src/components/Avatar/__tests__/Avatar.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Avatar } from '../Avatar';
 import styles from '@patternfly/react-styles/css/components/Avatar/avatar';
diff --git a/packages/react-core/src/components/Avatar/examples/Avatar.md b/packages/react-core/src/components/Avatar/examples/Avatar.md
index ecc6efe11a8..75417fde012 100644
--- a/packages/react-core/src/components/Avatar/examples/Avatar.md
+++ b/packages/react-core/src/components/Avatar/examples/Avatar.md
@@ -5,6 +5,7 @@ cssPrefix: pf-v6-c-avatar
 propComponents: ['Avatar']
 ---
 
+import { Fragment } from 'react';
 import avatarImg from '../../assets/avatarImg.svg';
 
 ## Examples
diff --git a/packages/react-core/src/components/Avatar/examples/AvatarSizeVariations.tsx b/packages/react-core/src/components/Avatar/examples/AvatarSizeVariations.tsx
index 0d8964830f8..05ae1781ecd 100644
--- a/packages/react-core/src/components/Avatar/examples/AvatarSizeVariations.tsx
+++ b/packages/react-core/src/components/Avatar/examples/AvatarSizeVariations.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Avatar } from '@patternfly/react-core';
 import avatarImg from '../../assets/avatarImg.svg';
 
-<React.Fragment>
+<Fragment>
   Small
   <br />
   <Avatar src={avatarImg} alt="avatar" size="sm" />
@@ -18,4 +18,4 @@ import avatarImg from '../../assets/avatarImg.svg';
   Extra Large
   <br />
   <Avatar src={avatarImg} alt="avatar" size="xl" />
-</React.Fragment>;
+</Fragment>;
diff --git a/packages/react-core/src/components/BackToTop/BackToTop.tsx b/packages/react-core/src/components/BackToTop/BackToTop.tsx
index b57973816c4..df12c9f2a8e 100644
--- a/packages/react-core/src/components/BackToTop/BackToTop.tsx
+++ b/packages/react-core/src/components/BackToTop/BackToTop.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef, useEffect, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/BackToTop/back-to-top';
 import { css } from '@patternfly/react-styles';
 import AngleUpIcon from '@patternfly/react-icons/dist/esm/icons/angle-up-icon';
@@ -26,12 +26,12 @@ const BackToTopBase: React.FunctionComponent<BackToTopProps> = ({
   isAlwaysVisible = false,
   ...props
 }: BackToTopProps) => {
-  const [visible, setVisible] = React.useState(isAlwaysVisible);
-  React.useEffect(() => {
+  const [visible, setVisible] = useState(isAlwaysVisible);
+  useEffect(() => {
     setVisible(isAlwaysVisible);
   }, [isAlwaysVisible]);
 
-  const [scrollElement, setScrollElement] = React.useState(null);
+  const [scrollElement, setScrollElement] = useState(null);
 
   const toggleVisible = () => {
     if (scrollElement) {
@@ -46,7 +46,7 @@ const BackToTopBase: React.FunctionComponent<BackToTopProps> = ({
     }
   };
 
-  React.useEffect(() => {
+  useEffect(() => {
     const hasScrollSpy = Boolean(scrollableSelector);
     if (hasScrollSpy) {
       const scrollEl = document.querySelector(scrollableSelector) as HTMLElement;
@@ -91,7 +91,7 @@ const BackToTopBase: React.FunctionComponent<BackToTopProps> = ({
   );
 };
 
-export const BackToTop = React.forwardRef((props: BackToTopProps, ref: React.Ref<any>) => (
+export const BackToTop = forwardRef((props: BackToTopProps, ref: React.Ref<any>) => (
   <BackToTopBase innerRef={ref} {...props} />
 ));
 BackToTop.displayName = 'BackToTop';
diff --git a/packages/react-core/src/components/BackToTop/__tests__/BackToTop.test.tsx b/packages/react-core/src/components/BackToTop/__tests__/BackToTop.test.tsx
index 26c34aa4af8..958e73e1785 100644
--- a/packages/react-core/src/components/BackToTop/__tests__/BackToTop.test.tsx
+++ b/packages/react-core/src/components/BackToTop/__tests__/BackToTop.test.tsx
@@ -1,4 +1,4 @@
-import React, { RefObject } from 'react';
+import { createRef, RefObject } from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import { BackToTop } from '../BackToTop';
 import userEvent from '@testing-library/user-event';
@@ -76,7 +76,7 @@ test('Renders with passed aria-label', () => {
 });
 
 test('BackToTop can be accessed via passed innerRef', () => {
-  const testRef: RefObject<HTMLElement | null> = React.createRef();
+  const testRef: RefObject<HTMLElement | null> = createRef();
   render(<BackToTop innerRef={testRef} isAlwaysVisible />);
   global.scrollTo = jest.fn();
   testRef.current?.click();
diff --git a/packages/react-core/src/components/BackToTop/examples/BackToTopBasic.tsx b/packages/react-core/src/components/BackToTop/examples/BackToTopBasic.tsx
index 3ff05cc5c52..31190319b2d 100644
--- a/packages/react-core/src/components/BackToTop/examples/BackToTopBasic.tsx
+++ b/packages/react-core/src/components/BackToTop/examples/BackToTopBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { BackToTop } from '@patternfly/react-core';
 
 export const BackToTopBasic: React.FunctionComponent = () => <BackToTop isAlwaysVisible />;
diff --git a/packages/react-core/src/components/Backdrop/Backdrop.tsx b/packages/react-core/src/components/Backdrop/Backdrop.tsx
index 853bb8de57e..c564a8b7f53 100644
--- a/packages/react-core/src/components/Backdrop/Backdrop.tsx
+++ b/packages/react-core/src/components/Backdrop/Backdrop.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Backdrop/backdrop';
 
diff --git a/packages/react-core/src/components/Backdrop/__tests__/Backdrop.test.tsx b/packages/react-core/src/components/Backdrop/__tests__/Backdrop.test.tsx
index b49797cc25b..927bf1a4c44 100644
--- a/packages/react-core/src/components/Backdrop/__tests__/Backdrop.test.tsx
+++ b/packages/react-core/src/components/Backdrop/__tests__/Backdrop.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Backdrop } from '../Backdrop';
 import styles from '@patternfly/react-styles/css/components/Backdrop/backdrop';
diff --git a/packages/react-core/src/components/Backdrop/examples/BackdropBasic.tsx b/packages/react-core/src/components/Backdrop/examples/BackdropBasic.tsx
index 642e27428f7..6a56cbacb1d 100644
--- a/packages/react-core/src/components/Backdrop/examples/BackdropBasic.tsx
+++ b/packages/react-core/src/components/Backdrop/examples/BackdropBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Backdrop } from '@patternfly/react-core';
 
 export const BackdropBasic: React.FunctionComponent = () => <Backdrop />;
diff --git a/packages/react-core/src/components/BackgroundImage/BackgroundImage.tsx b/packages/react-core/src/components/BackgroundImage/BackgroundImage.tsx
index 9586f2b5d96..ed7fb875985 100644
--- a/packages/react-core/src/components/BackgroundImage/BackgroundImage.tsx
+++ b/packages/react-core/src/components/BackgroundImage/BackgroundImage.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/BackgroundImage/background-image';
 import cssBackgroundImage from '@patternfly/react-tokens/dist/esm/c_background_image_BackgroundImage';
diff --git a/packages/react-core/src/components/BackgroundImage/__tests__/BackgroundImage.test.tsx b/packages/react-core/src/components/BackgroundImage/__tests__/BackgroundImage.test.tsx
index ecd1cb47a6a..870c96469f1 100644
--- a/packages/react-core/src/components/BackgroundImage/__tests__/BackgroundImage.test.tsx
+++ b/packages/react-core/src/components/BackgroundImage/__tests__/BackgroundImage.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { BackgroundImage } from '../BackgroundImage';
 import styles from '@patternfly/react-styles/css/components/BackgroundImage/background-image';
diff --git a/packages/react-core/src/components/BackgroundImage/examples/BackgroundImageBasic.tsx b/packages/react-core/src/components/BackgroundImage/examples/BackgroundImageBasic.tsx
index 063de040fd1..52b2e7d3c0a 100644
--- a/packages/react-core/src/components/BackgroundImage/examples/BackgroundImageBasic.tsx
+++ b/packages/react-core/src/components/BackgroundImage/examples/BackgroundImageBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { BackgroundImage } from '@patternfly/react-core';
 
 export const BackgroundImageBasic: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Badge/Badge.tsx b/packages/react-core/src/components/Badge/Badge.tsx
index 11ed2e84c57..8a625be02d3 100644
--- a/packages/react-core/src/components/Badge/Badge.tsx
+++ b/packages/react-core/src/components/Badge/Badge.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Badge/badge';
 
diff --git a/packages/react-core/src/components/Badge/__tests__/Badge.test.tsx b/packages/react-core/src/components/Badge/__tests__/Badge.test.tsx
index eda05188aa5..12654efc25b 100644
--- a/packages/react-core/src/components/Badge/__tests__/Badge.test.tsx
+++ b/packages/react-core/src/components/Badge/__tests__/Badge.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Badge } from '../Badge';
 import styles from '@patternfly/react-styles/css/components/Badge/badge';
diff --git a/packages/react-core/src/components/Badge/examples/Badge.md b/packages/react-core/src/components/Badge/examples/Badge.md
index 89fa574b2ee..75667fa6d6a 100644
--- a/packages/react-core/src/components/Badge/examples/Badge.md
+++ b/packages/react-core/src/components/Badge/examples/Badge.md
@@ -5,6 +5,7 @@ cssPrefix: pf-v6-c-badge
 propComponents: ['Badge']
 ---
 
+import { Fragment } from 'react';
 import './Badge.css';
 
 ## Examples
diff --git a/packages/react-core/src/components/Badge/examples/BadgeDisabled.tsx b/packages/react-core/src/components/Badge/examples/BadgeDisabled.tsx
index c7d4bdad2f9..decc3995e63 100644
--- a/packages/react-core/src/components/Badge/examples/BadgeDisabled.tsx
+++ b/packages/react-core/src/components/Badge/examples/BadgeDisabled.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Badge } from '@patternfly/react-core';
 
 export const BadgeRead: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Badge key={1} isDisabled isRead>
       7
     </Badge>
@@ -15,5 +15,5 @@ export const BadgeRead: React.FunctionComponent = () => (
     <Badge key={4} isDisabled>
       999+
     </Badge>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Badge/examples/BadgeRead.tsx b/packages/react-core/src/components/Badge/examples/BadgeRead.tsx
index d4ed336b545..fd0ea5fc6ff 100644
--- a/packages/react-core/src/components/Badge/examples/BadgeRead.tsx
+++ b/packages/react-core/src/components/Badge/examples/BadgeRead.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Badge } from '@patternfly/react-core';
 
 export const BadgeRead: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Badge key={1} isRead>
       7
     </Badge>
@@ -15,5 +15,5 @@ export const BadgeRead: React.FunctionComponent = () => (
     <Badge key={4} isRead>
       999+
     </Badge>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Badge/examples/BadgeUnread.tsx b/packages/react-core/src/components/Badge/examples/BadgeUnread.tsx
index b5bd85255a9..d327227d19d 100644
--- a/packages/react-core/src/components/Badge/examples/BadgeUnread.tsx
+++ b/packages/react-core/src/components/Badge/examples/BadgeUnread.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Badge } from '@patternfly/react-core';
 
 export const BadgeUnread: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Badge key={1} screenReaderText="Unread Messages">
       7
     </Badge>
@@ -15,5 +15,5 @@ export const BadgeUnread: React.FunctionComponent = () => (
     <Badge key={4} screenReaderText="Unread Messages">
       999+
     </Badge>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Banner/Banner.tsx b/packages/react-core/src/components/Banner/Banner.tsx
index 5b579f54586..3acce9ab700 100644
--- a/packages/react-core/src/components/Banner/Banner.tsx
+++ b/packages/react-core/src/components/Banner/Banner.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Banner/banner';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Banner/__tests__/Banner.test.tsx b/packages/react-core/src/components/Banner/__tests__/Banner.test.tsx
index 37213a605ca..83a5ee4b41f 100644
--- a/packages/react-core/src/components/Banner/__tests__/Banner.test.tsx
+++ b/packages/react-core/src/components/Banner/__tests__/Banner.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Banner } from '../Banner';
 import styles from '@patternfly/react-styles/css/components/Banner/banner';
diff --git a/packages/react-core/src/components/Banner/examples/BannerBasic.tsx b/packages/react-core/src/components/Banner/examples/BannerBasic.tsx
index c9509d7ca35..dae3a5c5af0 100644
--- a/packages/react-core/src/components/Banner/examples/BannerBasic.tsx
+++ b/packages/react-core/src/components/Banner/examples/BannerBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Banner } from '@patternfly/react-core';
 
 export const BannerBasic: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Banner/examples/BannerStatus.tsx b/packages/react-core/src/components/Banner/examples/BannerStatus.tsx
index 56f60c8de7c..2da01b084be 100644
--- a/packages/react-core/src/components/Banner/examples/BannerStatus.tsx
+++ b/packages/react-core/src/components/Banner/examples/BannerStatus.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Banner, Flex, FlexItem } from '@patternfly/react-core';
 import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
 import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
diff --git a/packages/react-core/src/components/Brand/Brand.tsx b/packages/react-core/src/components/Brand/Brand.tsx
index 328bf61fa64..89186f369c6 100644
--- a/packages/react-core/src/components/Brand/Brand.tsx
+++ b/packages/react-core/src/components/Brand/Brand.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Brand/brand';
 import { setBreakpointCssVars } from '../../helpers';
diff --git a/packages/react-core/src/components/Brand/__tests__/Brand.test.tsx b/packages/react-core/src/components/Brand/__tests__/Brand.test.tsx
index 9465121f30f..859e858bd25 100644
--- a/packages/react-core/src/components/Brand/__tests__/Brand.test.tsx
+++ b/packages/react-core/src/components/Brand/__tests__/Brand.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Brand } from '../Brand';
 import '@testing-library/jest-dom';
diff --git a/packages/react-core/src/components/Brand/examples/BrandBasic.tsx b/packages/react-core/src/components/Brand/examples/BrandBasic.tsx
index 9e4de1fd4b9..8a4cf455bb0 100644
--- a/packages/react-core/src/components/Brand/examples/BrandBasic.tsx
+++ b/packages/react-core/src/components/Brand/examples/BrandBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Brand } from '@patternfly/react-core';
 import pfLogo from '../../assets/PF-HorizontalLogo-Color.svg';
 import pfLogoDark from '../../assets/PF-HorizontalLogo-Reverse.svg';
diff --git a/packages/react-core/src/components/Brand/examples/BrandResponsive.tsx b/packages/react-core/src/components/Brand/examples/BrandResponsive.tsx
index b8cdffad8c0..fef2a7bba7a 100644
--- a/packages/react-core/src/components/Brand/examples/BrandResponsive.tsx
+++ b/packages/react-core/src/components/Brand/examples/BrandResponsive.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Brand } from '@patternfly/react-core';
 
 import pfLogo from '../../assets/PF-HorizontalLogo-Color.svg';
diff --git a/packages/react-core/src/components/Breadcrumb/Breadcrumb.tsx b/packages/react-core/src/components/Breadcrumb/Breadcrumb.tsx
index fea9df52ad8..2787047cefd 100644
--- a/packages/react-core/src/components/Breadcrumb/Breadcrumb.tsx
+++ b/packages/react-core/src/components/Breadcrumb/Breadcrumb.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Children, isValidElement, cloneElement } from 'react';
 import styles from '@patternfly/react-styles/css/components/Breadcrumb/breadcrumb';
 import { css } from '@patternfly/react-styles';
 import { useOUIAProps, OUIAProps } from '../../helpers';
@@ -28,10 +28,10 @@ export const Breadcrumb: React.FunctionComponent<BreadcrumbProps> = ({
   return (
     <nav {...props} aria-label={ariaLabel} className={css(styles.breadcrumb, className)} {...ouiaProps}>
       <ol className={styles.breadcrumbList} role="list">
-        {React.Children.map(children, (child, index) => {
+        {Children.map(children, (child, index) => {
           const showDivider = index > 0;
-          if (React.isValidElement(child)) {
-            return React.cloneElement(child as React.ReactElement<any>, { showDivider });
+          if (isValidElement(child)) {
+            return cloneElement(child as React.ReactElement<any>, { showDivider });
           }
 
           return child;
diff --git a/packages/react-core/src/components/Breadcrumb/BreadcrumbHeading.tsx b/packages/react-core/src/components/Breadcrumb/BreadcrumbHeading.tsx
index f5c06328ef2..7a20639716b 100644
--- a/packages/react-core/src/components/Breadcrumb/BreadcrumbHeading.tsx
+++ b/packages/react-core/src/components/Breadcrumb/BreadcrumbHeading.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Fragment } from 'react';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
 import styles from '@patternfly/react-styles/css/components/Breadcrumb/breadcrumb';
 import { css } from '@patternfly/react-styles';
@@ -51,7 +51,7 @@ export const BreadcrumbHeading: React.FunctionComponent<BreadcrumbHeadingProps>
             {children}
           </Component>
         )}
-        {!to && component !== 'button' && <React.Fragment>{children}</React.Fragment>}
+        {!to && component !== 'button' && <Fragment>{children}</Fragment>}
       </h1>
     </li>
   );
diff --git a/packages/react-core/src/components/Breadcrumb/BreadcrumbItem.tsx b/packages/react-core/src/components/Breadcrumb/BreadcrumbItem.tsx
index 8a15f486665..7d0d1b81f7d 100644
--- a/packages/react-core/src/components/Breadcrumb/BreadcrumbItem.tsx
+++ b/packages/react-core/src/components/Breadcrumb/BreadcrumbItem.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
 import styles from '@patternfly/react-styles/css/components/Breadcrumb/breadcrumb';
 import { css } from '@patternfly/react-styles';
diff --git a/packages/react-core/src/components/Breadcrumb/__tests__/Breadcrumb.test.tsx b/packages/react-core/src/components/Breadcrumb/__tests__/Breadcrumb.test.tsx
index bc793f7313f..72a264022e5 100644
--- a/packages/react-core/src/components/Breadcrumb/__tests__/Breadcrumb.test.tsx
+++ b/packages/react-core/src/components/Breadcrumb/__tests__/Breadcrumb.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Breadcrumb } from '../Breadcrumb';
 import { BreadcrumbItem } from '../BreadcrumbItem';
 import { render } from '@testing-library/react';
diff --git a/packages/react-core/src/components/Breadcrumb/__tests__/BreadcrumbHeading.test.tsx b/packages/react-core/src/components/Breadcrumb/__tests__/BreadcrumbHeading.test.tsx
index a1c1f89c778..f3b98b5b3af 100644
--- a/packages/react-core/src/components/Breadcrumb/__tests__/BreadcrumbHeading.test.tsx
+++ b/packages/react-core/src/components/Breadcrumb/__tests__/BreadcrumbHeading.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { BreadcrumbHeading } from '../BreadcrumbHeading';
 import { render } from '@testing-library/react';
 
diff --git a/packages/react-core/src/components/Breadcrumb/__tests__/BreadcrumbItem.test.tsx b/packages/react-core/src/components/Breadcrumb/__tests__/BreadcrumbItem.test.tsx
index d333bfda427..b6018ade261 100644
--- a/packages/react-core/src/components/Breadcrumb/__tests__/BreadcrumbItem.test.tsx
+++ b/packages/react-core/src/components/Breadcrumb/__tests__/BreadcrumbItem.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { BreadcrumbItem } from '../BreadcrumbItem';
 import { render } from '@testing-library/react';
 
diff --git a/packages/react-core/src/components/Breadcrumb/examples/BreadcrumbBasic.tsx b/packages/react-core/src/components/Breadcrumb/examples/BreadcrumbBasic.tsx
index d7cdc3c9593..74b21f00379 100644
--- a/packages/react-core/src/components/Breadcrumb/examples/BreadcrumbBasic.tsx
+++ b/packages/react-core/src/components/Breadcrumb/examples/BreadcrumbBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Breadcrumb, BreadcrumbItem } from '@patternfly/react-core';
 
 export const BreadcrumbBasic: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Breadcrumb/examples/BreadcrumbDropdown.tsx b/packages/react-core/src/components/Breadcrumb/examples/BreadcrumbDropdown.tsx
index a85d40363ba..6d1fc2266a6 100644
--- a/packages/react-core/src/components/Breadcrumb/examples/BreadcrumbDropdown.tsx
+++ b/packages/react-core/src/components/Breadcrumb/examples/BreadcrumbDropdown.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Breadcrumb,
   BreadcrumbItem,
diff --git a/packages/react-core/src/components/Breadcrumb/examples/BreadcrumbWithHeading.tsx b/packages/react-core/src/components/Breadcrumb/examples/BreadcrumbWithHeading.tsx
index bf811d1bbe9..a497eeea097 100644
--- a/packages/react-core/src/components/Breadcrumb/examples/BreadcrumbWithHeading.tsx
+++ b/packages/react-core/src/components/Breadcrumb/examples/BreadcrumbWithHeading.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Breadcrumb, BreadcrumbItem, BreadcrumbHeading } from '@patternfly/react-core';
 
 export const BreadcrumbWithHeading: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Breadcrumb/examples/BreadcrumbWithoutHomeLink.tsx b/packages/react-core/src/components/Breadcrumb/examples/BreadcrumbWithoutHomeLink.tsx
index 74777e99b13..cc66b22eac1 100644
--- a/packages/react-core/src/components/Breadcrumb/examples/BreadcrumbWithoutHomeLink.tsx
+++ b/packages/react-core/src/components/Breadcrumb/examples/BreadcrumbWithoutHomeLink.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Breadcrumb, BreadcrumbItem } from '@patternfly/react-core';
 
 export const BreadcrumbHomeLink: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Button/Button.tsx b/packages/react-core/src/components/Button/Button.tsx
index c15aef446c9..cf389b76551 100644
--- a/packages/react-core/src/components/Button/Button.tsx
+++ b/packages/react-core/src/components/Button/Button.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/Button/button';
 import { css } from '@patternfly/react-styles';
 import { Spinner, spinnerSize } from '../Spinner';
@@ -230,8 +230,6 @@ const ButtonBase: React.FunctionComponent<ButtonProps> = ({
   );
 };
 
-export const Button = React.forwardRef((props: ButtonProps, ref: React.Ref<any>) => (
-  <ButtonBase innerRef={ref} {...props} />
-));
+export const Button = forwardRef((props: ButtonProps, ref: React.Ref<any>) => <ButtonBase innerRef={ref} {...props} />);
 
 Button.displayName = 'Button';
diff --git a/packages/react-core/src/components/Button/__tests__/Button.test.tsx b/packages/react-core/src/components/Button/__tests__/Button.test.tsx
index 894ceee4bfb..bdc5a1c0696 100644
--- a/packages/react-core/src/components/Button/__tests__/Button.test.tsx
+++ b/packages/react-core/src/components/Button/__tests__/Button.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Button, ButtonState, ButtonVariant } from '../Button';
 import styles from '@patternfly/react-styles/css/components/Button/button';
diff --git a/packages/react-core/src/components/Button/examples/Button.md b/packages/react-core/src/components/Button/examples/Button.md
index 5e57787c919..a082ee23279 100644
--- a/packages/react-core/src/components/Button/examples/Button.md
+++ b/packages/react-core/src/components/Button/examples/Button.md
@@ -6,6 +6,7 @@ propComponents: ['Button', 'BadgeCountObject']
 ouia: true
 ---
 
+import { Fragment } from 'react';
 import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
 import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
 import ExternalLinkSquareAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-square-alt-icon';
diff --git a/packages/react-core/src/components/Button/examples/ButtonAriaDisabled.tsx b/packages/react-core/src/components/Button/examples/ButtonAriaDisabled.tsx
index 0becd377cff..9e9d0fa1ef5 100644
--- a/packages/react-core/src/components/Button/examples/ButtonAriaDisabled.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonAriaDisabled.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button, Flex, Tooltip } from '@patternfly/react-core';
 import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
 
diff --git a/packages/react-core/src/components/Button/examples/ButtonBlock.tsx b/packages/react-core/src/components/Button/examples/ButtonBlock.tsx
index 69d484378df..0481e2657eb 100644
--- a/packages/react-core/src/components/Button/examples/ButtonBlock.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonBlock.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button } from '@patternfly/react-core';
 
 export const ButtonBlock: React.FunctionComponent = () => <Button isBlock>Block level button</Button>;
diff --git a/packages/react-core/src/components/Button/examples/ButtonCallToAction.tsx b/packages/react-core/src/components/Button/examples/ButtonCallToAction.tsx
index 3c3887a478e..c46056cbafc 100644
--- a/packages/react-core/src/components/Button/examples/ButtonCallToAction.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonCallToAction.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button, Flex } from '@patternfly/react-core';
 import ArrowRightIcon from '@patternfly/react-icons/dist/esm/icons/arrow-right-icon';
 
diff --git a/packages/react-core/src/components/Button/examples/ButtonCustomComponent.tsx b/packages/react-core/src/components/Button/examples/ButtonCustomComponent.tsx
index b99e659df41..c7b5fa9ebb9 100644
--- a/packages/react-core/src/components/Button/examples/ButtonCustomComponent.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonCustomComponent.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button } from '@patternfly/react-core';
 
 export const ButtonCustomComponent: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Button/examples/ButtonDisabled.tsx b/packages/react-core/src/components/Button/examples/ButtonDisabled.tsx
index e04c6158958..3483b7074d4 100644
--- a/packages/react-core/src/components/Button/examples/ButtonDisabled.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonDisabled.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button, Flex } from '@patternfly/react-core';
 import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
 import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
diff --git a/packages/react-core/src/components/Button/examples/ButtonInlineSpanLink.tsx b/packages/react-core/src/components/Button/examples/ButtonInlineSpanLink.tsx
index 131607eb0c8..cd0a38d490d 100644
--- a/packages/react-core/src/components/Button/examples/ButtonInlineSpanLink.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonInlineSpanLink.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button, KeyTypes } from '@patternfly/react-core';
 
 const handleKeydown = (event: React.KeyboardEvent<HTMLButtonElement>) => {
@@ -13,7 +13,7 @@ const handleKeydown = (event: React.KeyboardEvent<HTMLButtonElement>) => {
 };
 
 export const ButtonInlineSpanLink: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <p>
       Lorem ipsum dolor sit amet, consectetur adipiscing elit.
       <Button variant="link" isInline component="span">
@@ -32,5 +32,5 @@ export const ButtonInlineSpanLink: React.FunctionComponent = () => (
       </Button>
       Pressing the Enter or Space keys on the inline link as span above demonstrates this by triggering an alert.
     </p>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Button/examples/ButtonLinks.tsx b/packages/react-core/src/components/Button/examples/ButtonLinks.tsx
index 5a6ec5a1ead..1bd930e6b61 100644
--- a/packages/react-core/src/components/Button/examples/ButtonLinks.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonLinks.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button, Flex } from '@patternfly/react-core';
 
 export const ButtonLinks: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Button/examples/ButtonPlainHasNoPadding.tsx b/packages/react-core/src/components/Button/examples/ButtonPlainHasNoPadding.tsx
index 4d46c396d14..c806c367e7c 100644
--- a/packages/react-core/src/components/Button/examples/ButtonPlainHasNoPadding.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonPlainHasNoPadding.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button } from '@patternfly/react-core';
 import QuestionCircleIcon from '@patternfly/react-icons/dist/esm/icons/question-circle-icon';
 
diff --git a/packages/react-core/src/components/Button/examples/ButtonProgress.tsx b/packages/react-core/src/components/Button/examples/ButtonProgress.tsx
index 39fb0ca3f47..44b07f44e3b 100644
--- a/packages/react-core/src/components/Button/examples/ButtonProgress.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonProgress.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button, Flex } from '@patternfly/react-core';
 import UploadIcon from '@patternfly/react-icons/dist/esm/icons/upload-icon';
 
diff --git a/packages/react-core/src/components/Button/examples/ButtonSmall.tsx b/packages/react-core/src/components/Button/examples/ButtonSmall.tsx
index 2fea0b9be89..e031f4ffaed 100644
--- a/packages/react-core/src/components/Button/examples/ButtonSmall.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonSmall.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button, Flex } from '@patternfly/react-core';
 
 export const ButtonSmall: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Button/examples/ButtonStateful.tsx b/packages/react-core/src/components/Button/examples/ButtonStateful.tsx
index cb26da9b8f1..b6e3094f883 100644
--- a/packages/react-core/src/components/Button/examples/ButtonStateful.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonStateful.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button, Flex } from '@patternfly/react-core';
 import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
 
diff --git a/packages/react-core/src/components/Button/examples/ButtonTypes.tsx b/packages/react-core/src/components/Button/examples/ButtonTypes.tsx
index fb2fd288835..c07934d7918 100644
--- a/packages/react-core/src/components/Button/examples/ButtonTypes.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonTypes.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button, Flex } from '@patternfly/react-core';
 
 export const ButtonTypes: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Button/examples/ButtonVariations.tsx b/packages/react-core/src/components/Button/examples/ButtonVariations.tsx
index 5f2e69de722..e765e4d302e 100644
--- a/packages/react-core/src/components/Button/examples/ButtonVariations.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonVariations.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button, Flex } from '@patternfly/react-core';
 import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
 import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
diff --git a/packages/react-core/src/components/Button/examples/ButtonWithCount.tsx b/packages/react-core/src/components/Button/examples/ButtonWithCount.tsx
index 644ef31dfd2..e56340ffb5f 100644
--- a/packages/react-core/src/components/Button/examples/ButtonWithCount.tsx
+++ b/packages/react-core/src/components/Button/examples/ButtonWithCount.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { BadgeCountObject, Button, Flex } from '@patternfly/react-core';
 
 export const ButtonWithCount: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx b/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx
index 0d672d87021..08f75672704 100644
--- a/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx
+++ b/packages/react-core/src/components/CalendarMonth/CalendarMonth.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, type JSX } from 'react';
+import { useEffect, useMemo, useRef, useState, type JSX } from 'react';
 import { TextInput } from '../TextInput';
 import { Button } from '../Button';
 import { Select, SelectList, SelectOption } from '../Select';
@@ -148,7 +148,7 @@ export const CalendarMonth = ({
   const longMonths = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
     .map((monthNum) => new Date(1990, monthNum))
     .map(monthFormat);
-  const [isSelectOpen, setIsSelectOpen] = React.useState(false);
+  const [isSelectOpen, setIsSelectOpen] = useState(false);
 
   const getInitialDate = () => {
     if (isValidDate(dateProp)) {
@@ -160,18 +160,18 @@ export const CalendarMonth = ({
     return today;
   };
   const initialDate = getInitialDate();
-  const [focusedDate, setFocusedDate] = React.useState(initialDate);
+  const [focusedDate, setFocusedDate] = useState(initialDate);
 
   // Must be numeric given current header design
   const yearFormat = (date: Date) => date.getFullYear();
   //
   const yearFormatted = yearFormat(focusedDate);
-  const [yearInput, setYearInput] = React.useState(yearFormatted.toString());
+  const [yearInput, setYearInput] = useState(yearFormatted.toString());
 
-  const [hoveredDate, setHoveredDate] = React.useState<Date>(undefined);
-  const focusRef = React.useRef<HTMLButtonElement>(undefined);
-  const [hiddenMonthId] = React.useState(getUniqueId('hidden-month-span'));
-  const [shouldFocus, setShouldFocus] = React.useState(false);
+  const [hoveredDate, setHoveredDate] = useState<Date>(undefined);
+  const focusRef = useRef<HTMLButtonElement>(undefined);
+  const [hiddenMonthId] = useState(getUniqueId('hidden-month-span'));
+  const [shouldFocus, setShouldFocus] = useState(false);
 
   const isValidated = (date: Date) => validators.every((validator) => validator(date));
   const focusedDateValidated = isValidated(focusedDate);
@@ -266,7 +266,7 @@ export const CalendarMonth = ({
   const nextMonth = addMonth(1);
   const focusedYear = focusedDate.getFullYear();
   const focusedMonth = focusedDate.getMonth();
-  const calendar = React.useMemo(
+  const calendar = useMemo(
     () => buildCalendar(focusedYear, focusedMonth, weekStart, validators),
     [focusedYear, focusedMonth, weekStart, validators]
   );
diff --git a/packages/react-core/src/components/CalendarMonth/__tests__/CalendarMonth.test.tsx b/packages/react-core/src/components/CalendarMonth/__tests__/CalendarMonth.test.tsx
index f94e4af16a0..28afa2b5c62 100644
--- a/packages/react-core/src/components/CalendarMonth/__tests__/CalendarMonth.test.tsx
+++ b/packages/react-core/src/components/CalendarMonth/__tests__/CalendarMonth.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 
 import { CalendarMonth } from '../CalendarMonth';
diff --git a/packages/react-core/src/components/CalendarMonth/examples/CalendarMonthDateRange.tsx b/packages/react-core/src/components/CalendarMonth/examples/CalendarMonthDateRange.tsx
index 1bdfd79ea46..a2654d98e11 100644
--- a/packages/react-core/src/components/CalendarMonth/examples/CalendarMonthDateRange.tsx
+++ b/packages/react-core/src/components/CalendarMonth/examples/CalendarMonthDateRange.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { CalendarMonth, Title, CalendarMonthInlineProps } from '@patternfly/react-core';
 
 export const CalendarMonthDateRange: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/CalendarMonth/examples/CalendarMonthSelectableDate.tsx b/packages/react-core/src/components/CalendarMonth/examples/CalendarMonthSelectableDate.tsx
index cde7097ffa5..0e9d49a1065 100644
--- a/packages/react-core/src/components/CalendarMonth/examples/CalendarMonthSelectableDate.tsx
+++ b/packages/react-core/src/components/CalendarMonth/examples/CalendarMonthSelectableDate.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { CalendarMonth, Title, CalendarMonthInlineProps } from '@patternfly/react-core';
 
 export const CalendarMonthSelectableDate: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Card/Card.tsx b/packages/react-core/src/components/Card/Card.tsx
index 7dcd6e79d90..d78c9b40544 100644
--- a/packages/react-core/src/components/Card/Card.tsx
+++ b/packages/react-core/src/components/Card/Card.tsx
@@ -1,10 +1,8 @@
-import * as React from 'react';
+import { createContext, type JSX } from 'react';
 import styles from '@patternfly/react-styles/css/components/Card/card';
 import { css } from '@patternfly/react-styles';
 import { useOUIAProps, OUIAProps } from '../../helpers';
 
-import type { JSX } from 'react';
-
 export interface CardProps extends React.HTMLProps<HTMLElement>, OUIAProps {
   /** Content rendered inside the Card */
   children?: React.ReactNode;
@@ -56,7 +54,7 @@ interface CardContextProps {
   isDisabled: boolean;
 }
 
-export const CardContext = React.createContext<Partial<CardContextProps>>({
+export const CardContext = createContext<Partial<CardContextProps>>({
   cardId: '',
   isExpanded: false,
   isClickable: false,
diff --git a/packages/react-core/src/components/Card/CardActions.tsx b/packages/react-core/src/components/Card/CardActions.tsx
index 2fbe418dc6b..5732439ea0d 100644
--- a/packages/react-core/src/components/Card/CardActions.tsx
+++ b/packages/react-core/src/components/Card/CardActions.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Card/card';
 
diff --git a/packages/react-core/src/components/Card/CardBody.tsx b/packages/react-core/src/components/Card/CardBody.tsx
index 67397e61e9f..da14d0fe16c 100644
--- a/packages/react-core/src/components/Card/CardBody.tsx
+++ b/packages/react-core/src/components/Card/CardBody.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Card/card';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Card/CardExpandableContent.tsx b/packages/react-core/src/components/Card/CardExpandableContent.tsx
index 9f9c538ebc9..9def7cebfba 100644
--- a/packages/react-core/src/components/Card/CardExpandableContent.tsx
+++ b/packages/react-core/src/components/Card/CardExpandableContent.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Card/card';
 import { css } from '@patternfly/react-styles';
 import { CardContext } from './Card';
diff --git a/packages/react-core/src/components/Card/CardFooter.tsx b/packages/react-core/src/components/Card/CardFooter.tsx
index 4bf7559bc2a..09078bd8931 100644
--- a/packages/react-core/src/components/Card/CardFooter.tsx
+++ b/packages/react-core/src/components/Card/CardFooter.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Card/card';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Card/CardHeader.tsx b/packages/react-core/src/components/Card/CardHeader.tsx
index 18e61f0ae25..06df4a1f045 100644
--- a/packages/react-core/src/components/Card/CardHeader.tsx
+++ b/packages/react-core/src/components/Card/CardHeader.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Card/card';
 import { CardContext } from './Card';
diff --git a/packages/react-core/src/components/Card/CardHeaderMain.tsx b/packages/react-core/src/components/Card/CardHeaderMain.tsx
index 759bb18d47b..e7f4b6d25d8 100644
--- a/packages/react-core/src/components/Card/CardHeaderMain.tsx
+++ b/packages/react-core/src/components/Card/CardHeaderMain.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Card/card';
 
diff --git a/packages/react-core/src/components/Card/CardSelectableActions.tsx b/packages/react-core/src/components/Card/CardSelectableActions.tsx
index 3b86314bdc9..5a2d2d0e8f2 100644
--- a/packages/react-core/src/components/Card/CardSelectableActions.tsx
+++ b/packages/react-core/src/components/Card/CardSelectableActions.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Card/card';
 
diff --git a/packages/react-core/src/components/Card/CardTitle.tsx b/packages/react-core/src/components/Card/CardTitle.tsx
index 1d2f5448593..f5b48e82953 100644
--- a/packages/react-core/src/components/Card/CardTitle.tsx
+++ b/packages/react-core/src/components/Card/CardTitle.tsx
@@ -1,10 +1,8 @@
-import * as React from 'react';
+import { useContext, type JSX } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Card/card';
 import { CardContext } from './Card';
 
-import type { JSX } from 'react';
-
 export interface CardTitleProps extends React.HTMLProps<HTMLDivElement> {
   /** Content rendered inside the CardTitle */
   children?: React.ReactNode;
@@ -20,7 +18,7 @@ export const CardTitle: React.FunctionComponent<CardTitleProps> = ({
   component = 'div',
   ...props
 }: CardTitleProps) => {
-  const { cardId } = React.useContext(CardContext);
+  const { cardId } = useContext(CardContext);
   const Component = component as any;
   const titleId = cardId ? `${cardId}-title` : '';
 
diff --git a/packages/react-core/src/components/Card/__tests__/Card.test.tsx b/packages/react-core/src/components/Card/__tests__/Card.test.tsx
index 6cb6196dc3a..fa73fbbed70 100644
--- a/packages/react-core/src/components/Card/__tests__/Card.test.tsx
+++ b/packages/react-core/src/components/Card/__tests__/Card.test.tsx
@@ -1,4 +1,4 @@
-import React, { type JSX } from 'react';
+import { type JSX } from 'react';
 
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
diff --git a/packages/react-core/src/components/Card/__tests__/CardBody.test.tsx b/packages/react-core/src/components/Card/__tests__/CardBody.test.tsx
index f60d6b46128..41e176eef5a 100644
--- a/packages/react-core/src/components/Card/__tests__/CardBody.test.tsx
+++ b/packages/react-core/src/components/Card/__tests__/CardBody.test.tsx
@@ -1,4 +1,4 @@
-import React, { type JSX } from 'react';
+import { type JSX } from 'react';
 import { render, screen } from '@testing-library/react';
 import { CardBody } from '../CardBody';
 
diff --git a/packages/react-core/src/components/Card/__tests__/CardExpandableContent.test.tsx b/packages/react-core/src/components/Card/__tests__/CardExpandableContent.test.tsx
index 72316947730..77b27e573a0 100644
--- a/packages/react-core/src/components/Card/__tests__/CardExpandableContent.test.tsx
+++ b/packages/react-core/src/components/Card/__tests__/CardExpandableContent.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { CardContext } from '../Card';
 import { CardExpandableContent } from '../CardExpandableContent';
 import { render } from '@testing-library/react';
diff --git a/packages/react-core/src/components/Card/__tests__/CardFooter.test.tsx b/packages/react-core/src/components/Card/__tests__/CardFooter.test.tsx
index 8d81add62c6..1b2c44ed4a7 100644
--- a/packages/react-core/src/components/Card/__tests__/CardFooter.test.tsx
+++ b/packages/react-core/src/components/Card/__tests__/CardFooter.test.tsx
@@ -1,4 +1,4 @@
-import React, { type JSX } from 'react';
+import { type JSX } from 'react';
 import { render, screen } from '@testing-library/react';
 import { CardFooter } from '../CardFooter';
 
diff --git a/packages/react-core/src/components/Card/__tests__/CardHeader.test.tsx b/packages/react-core/src/components/Card/__tests__/CardHeader.test.tsx
index 996f024b0ec..7c7d2643629 100644
--- a/packages/react-core/src/components/Card/__tests__/CardHeader.test.tsx
+++ b/packages/react-core/src/components/Card/__tests__/CardHeader.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { CardHeader } from '../CardHeader';
diff --git a/packages/react-core/src/components/Card/__tests__/CardHeaderMain.test.tsx b/packages/react-core/src/components/Card/__tests__/CardHeaderMain.test.tsx
index e72ed722d70..dd393d0d845 100644
--- a/packages/react-core/src/components/Card/__tests__/CardHeaderMain.test.tsx
+++ b/packages/react-core/src/components/Card/__tests__/CardHeaderMain.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { CardHeaderMain } from '../CardHeaderMain';
 
diff --git a/packages/react-core/src/components/Card/__tests__/CardSelectableActions.test.tsx b/packages/react-core/src/components/Card/__tests__/CardSelectableActions.test.tsx
index 7d591ac5ddf..3f9798629cf 100644
--- a/packages/react-core/src/components/Card/__tests__/CardSelectableActions.test.tsx
+++ b/packages/react-core/src/components/Card/__tests__/CardSelectableActions.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { CardSelectableActions } from '../CardSelectableActions';
 
diff --git a/packages/react-core/src/components/Card/__tests__/CardTitle.test.tsx b/packages/react-core/src/components/Card/__tests__/CardTitle.test.tsx
index 0aa55985b51..b198310d73f 100644
--- a/packages/react-core/src/components/Card/__tests__/CardTitle.test.tsx
+++ b/packages/react-core/src/components/Card/__tests__/CardTitle.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { CardTitle } from '../CardTitle';
 
diff --git a/packages/react-core/src/components/Card/__tests__/Generated/CardActions.test.tsx b/packages/react-core/src/components/Card/__tests__/Generated/CardActions.test.tsx
index 9bd416885cc..5275d6e1a45 100644
--- a/packages/react-core/src/components/Card/__tests__/Generated/CardActions.test.tsx
+++ b/packages/react-core/src/components/Card/__tests__/Generated/CardActions.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { CardActions } from '../../CardActions';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Card/examples/Card.md b/packages/react-core/src/components/Card/examples/Card.md
index ef2946b0a30..11928543aee 100644
--- a/packages/react-core/src/components/Card/examples/Card.md
+++ b/packages/react-core/src/components/Card/examples/Card.md
@@ -16,6 +16,7 @@ propComponents:
 ouia: true
 ---
 
+import { Fragment } from 'react';
 import pfLogo from '../../assets/PF-HorizontalLogo-Color.svg';
 import pfLogoSmall from '../../assets/PF-IconLogo.svg';
 import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
diff --git a/packages/react-core/src/components/Card/examples/CardBasic.tsx b/packages/react-core/src/components/Card/examples/CardBasic.tsx
index f56f572ed66..142d7e9bbb2 100644
--- a/packages/react-core/src/components/Card/examples/CardBasic.tsx
+++ b/packages/react-core/src/components/Card/examples/CardBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Card, CardTitle, CardBody, CardFooter } from '@patternfly/react-core';
 
 export const CardBasic: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Card/examples/CardClickable.tsx b/packages/react-core/src/components/Card/examples/CardClickable.tsx
index 3c0ef1c1bfd..654d8736202 100644
--- a/packages/react-core/src/components/Card/examples/CardClickable.tsx
+++ b/packages/react-core/src/components/Card/examples/CardClickable.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Card, CardHeader, CardTitle, CardBody, Checkbox, Gallery } from '@patternfly/react-core';
 
 export const CardClickable: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Card/examples/CardClickableSelectable.tsx b/packages/react-core/src/components/Card/examples/CardClickableSelectable.tsx
index c72516ff21f..0e2c57537ae 100644
--- a/packages/react-core/src/components/Card/examples/CardClickableSelectable.tsx
+++ b/packages/react-core/src/components/Card/examples/CardClickableSelectable.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Card, CardHeader, CardTitle, CardBody, Button, Checkbox, Gallery } from '@patternfly/react-core';
 
 export const CardClickable: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Card/examples/CardExpandable.tsx b/packages/react-core/src/components/Card/examples/CardExpandable.tsx
index 7ddbd946ed3..39378dfe660 100644
--- a/packages/react-core/src/components/Card/examples/CardExpandable.tsx
+++ b/packages/react-core/src/components/Card/examples/CardExpandable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Card,
   CardHeader,
@@ -90,7 +90,7 @@ export const CardExpandable: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <div style={{ marginBottom: '12px' }}>
         <Checkbox
           id={'isToggleRightAligned-1'}
@@ -119,6 +119,6 @@ export const CardExpandable: React.FunctionComponent = () => {
           <CardFooter>Footer</CardFooter>
         </CardExpandableContent>
       </Card>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Card/examples/CardExpandableWithIcon.tsx b/packages/react-core/src/components/Card/examples/CardExpandableWithIcon.tsx
index 7dc038535c2..fb3a227622a 100644
--- a/packages/react-core/src/components/Card/examples/CardExpandableWithIcon.tsx
+++ b/packages/react-core/src/components/Card/examples/CardExpandableWithIcon.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Card,
   CardHeader,
diff --git a/packages/react-core/src/components/Card/examples/CardHeaderInCardHead.tsx b/packages/react-core/src/components/Card/examples/CardHeaderInCardHead.tsx
index ac2e7f4c062..59ce8254bcc 100644
--- a/packages/react-core/src/components/Card/examples/CardHeaderInCardHead.tsx
+++ b/packages/react-core/src/components/Card/examples/CardHeaderInCardHead.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Card,
   CardHeader,
diff --git a/packages/react-core/src/components/Card/examples/CardOnlyActionsInCardHead.tsx b/packages/react-core/src/components/Card/examples/CardOnlyActionsInCardHead.tsx
index 3e97f2561e4..e955f1c5c18 100644
--- a/packages/react-core/src/components/Card/examples/CardOnlyActionsInCardHead.tsx
+++ b/packages/react-core/src/components/Card/examples/CardOnlyActionsInCardHead.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Checkbox,
   Card,
diff --git a/packages/react-core/src/components/Card/examples/CardSecondary.tsx b/packages/react-core/src/components/Card/examples/CardSecondary.tsx
index 7efa4fd9c2e..451bd36ce56 100644
--- a/packages/react-core/src/components/Card/examples/CardSecondary.tsx
+++ b/packages/react-core/src/components/Card/examples/CardSecondary.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Card, CardTitle, CardBody, CardFooter } from '@patternfly/react-core';
 
 export const CardSecondary: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Card/examples/CardSelectable.tsx b/packages/react-core/src/components/Card/examples/CardSelectable.tsx
index 83aac5c128f..26c3aca9393 100644
--- a/packages/react-core/src/components/Card/examples/CardSelectable.tsx
+++ b/packages/react-core/src/components/Card/examples/CardSelectable.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Card, CardHeader, CardTitle, CardBody, Checkbox, Gallery } from '@patternfly/react-core';
 
 export const SelectableCard: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Card/examples/CardSingleSelectable.tsx b/packages/react-core/src/components/Card/examples/CardSingleSelectable.tsx
index 63db53153e8..f6073dd47de 100644
--- a/packages/react-core/src/components/Card/examples/CardSingleSelectable.tsx
+++ b/packages/react-core/src/components/Card/examples/CardSingleSelectable.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Card, CardHeader, CardTitle, CardBody, Gallery } from '@patternfly/react-core';
 
 export const SingleSelectableCard: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Card/examples/CardTile.tsx b/packages/react-core/src/components/Card/examples/CardTile.tsx
index 9fdbadaacea..24f0f41c0ec 100644
--- a/packages/react-core/src/components/Card/examples/CardTile.tsx
+++ b/packages/react-core/src/components/Card/examples/CardTile.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Card, CardHeader, CardBody, Gallery, Flex } from '@patternfly/react-core';
 import PlusIcon from '@patternfly/react-icons/dist/esm/icons/plus-icon';
 
diff --git a/packages/react-core/src/components/Card/examples/CardTileMulti.tsx b/packages/react-core/src/components/Card/examples/CardTileMulti.tsx
index 87a453ad1d5..310e037dd1e 100644
--- a/packages/react-core/src/components/Card/examples/CardTileMulti.tsx
+++ b/packages/react-core/src/components/Card/examples/CardTileMulti.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Card, CardHeader, CardBody, Gallery, Flex } from '@patternfly/react-core';
 import PlusIcon from '@patternfly/react-icons/dist/esm/icons/plus-icon';
 
diff --git a/packages/react-core/src/components/Card/examples/CardWithBodySectionFills.tsx b/packages/react-core/src/components/Card/examples/CardWithBodySectionFills.tsx
index 646df9fd57f..2706d01ef60 100644
--- a/packages/react-core/src/components/Card/examples/CardWithBodySectionFills.tsx
+++ b/packages/react-core/src/components/Card/examples/CardWithBodySectionFills.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Card, CardTitle, CardBody, CardFooter } from '@patternfly/react-core';
 
 export const CardWithBodySectionFills: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Card/examples/CardWithDividers.tsx b/packages/react-core/src/components/Card/examples/CardWithDividers.tsx
index 4d15e87dd44..376196a6c90 100644
--- a/packages/react-core/src/components/Card/examples/CardWithDividers.tsx
+++ b/packages/react-core/src/components/Card/examples/CardWithDividers.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Card, CardTitle, CardBody, CardFooter, Divider } from '@patternfly/react-core';
 
 export const CardWithDividers: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Card/examples/CardWithHeadingElement.tsx b/packages/react-core/src/components/Card/examples/CardWithHeadingElement.tsx
index ef4154376e3..2ff37314632 100644
--- a/packages/react-core/src/components/Card/examples/CardWithHeadingElement.tsx
+++ b/packages/react-core/src/components/Card/examples/CardWithHeadingElement.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Card, CardTitle, CardBody, CardFooter } from '@patternfly/react-core';
 
 export const CardWithHeadingElement: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Card/examples/CardWithImageAndActions.tsx b/packages/react-core/src/components/Card/examples/CardWithImageAndActions.tsx
index 66a265be827..de361622506 100644
--- a/packages/react-core/src/components/Card/examples/CardWithImageAndActions.tsx
+++ b/packages/react-core/src/components/Card/examples/CardWithImageAndActions.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Brand,
   Card,
diff --git a/packages/react-core/src/components/Card/examples/CardWithModifiers.tsx b/packages/react-core/src/components/Card/examples/CardWithModifiers.tsx
index 7332ace1036..9b18185f07d 100644
--- a/packages/react-core/src/components/Card/examples/CardWithModifiers.tsx
+++ b/packages/react-core/src/components/Card/examples/CardWithModifiers.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Card, CardTitle, CardBody, CardFooter, Checkbox } from '@patternfly/react-core';
 
 export const CardWithModifiers: React.FunctionComponent = () => {
@@ -6,7 +6,7 @@ export const CardWithModifiers: React.FunctionComponent = () => {
   const [modifiers, setModifiers] = React.useState({});
 
   return (
-    <React.Fragment>
+    <Fragment>
       <div style={{ marginBottom: '12px' }}>
         {mods.map((mod) => (
           <Checkbox
@@ -28,6 +28,6 @@ export const CardWithModifiers: React.FunctionComponent = () => {
           <CardFooter>Footer</CardFooter>
         </Card>
       </div>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Card/examples/CardWithMultipleBodySections.tsx b/packages/react-core/src/components/Card/examples/CardWithMultipleBodySections.tsx
index 96781013019..3986a2aeb26 100644
--- a/packages/react-core/src/components/Card/examples/CardWithMultipleBodySections.tsx
+++ b/packages/react-core/src/components/Card/examples/CardWithMultipleBodySections.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Card, CardTitle, CardBody, CardFooter } from '@patternfly/react-core';
 
 export const CardWithMultipleBodySections: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Card/examples/CardWithNoFooter.tsx b/packages/react-core/src/components/Card/examples/CardWithNoFooter.tsx
index 08fb95bc5fe..f5ee1a6634b 100644
--- a/packages/react-core/src/components/Card/examples/CardWithNoFooter.tsx
+++ b/packages/react-core/src/components/Card/examples/CardWithNoFooter.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Card, CardTitle, CardBody } from '@patternfly/react-core';
 
 export const CardWithNoFooter: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Card/examples/CardWithNoHeader.tsx b/packages/react-core/src/components/Card/examples/CardWithNoHeader.tsx
index d817259f10d..fa99eb0902f 100644
--- a/packages/react-core/src/components/Card/examples/CardWithNoHeader.tsx
+++ b/packages/react-core/src/components/Card/examples/CardWithNoHeader.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Card, CardBody, CardFooter } from '@patternfly/react-core';
 
 export const CardWithNoHeader: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Card/examples/CardWithOnlyBodySection.tsx b/packages/react-core/src/components/Card/examples/CardWithOnlyBodySection.tsx
index 85a412e1c09..622cf9d24b7 100644
--- a/packages/react-core/src/components/Card/examples/CardWithOnlyBodySection.tsx
+++ b/packages/react-core/src/components/Card/examples/CardWithOnlyBodySection.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Card, CardBody } from '@patternfly/react-core';
 
 export const CardWithOnlyBodySection: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Checkbox/Checkbox.tsx b/packages/react-core/src/components/Checkbox/Checkbox.tsx
index ee301a73c22..cbd488ce62d 100644
--- a/packages/react-core/src/components/Checkbox/Checkbox.tsx
+++ b/packages/react-core/src/components/Checkbox/Checkbox.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 import styles from '@patternfly/react-styles/css/components/Check/check';
 import { css } from '@patternfly/react-styles';
 import { PickOptional } from '../../helpers/typeUtils';
@@ -54,7 +54,7 @@ interface CheckboxState {
   ouiaStateId: string;
 }
 
-class Checkbox extends React.Component<CheckboxProps, CheckboxState> {
+class Checkbox extends Component<CheckboxProps, CheckboxState> {
   static displayName = 'Checkbox';
   static defaultProps: PickOptional<CheckboxProps> = {
     className: '',
diff --git a/packages/react-core/src/components/Checkbox/__tests__/Checkbox.test.tsx b/packages/react-core/src/components/Checkbox/__tests__/Checkbox.test.tsx
index f2136c936e3..cdd5f3ab289 100644
--- a/packages/react-core/src/components/Checkbox/__tests__/Checkbox.test.tsx
+++ b/packages/react-core/src/components/Checkbox/__tests__/Checkbox.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-core/src/components/Checkbox/examples/Checkbox.md b/packages/react-core/src/components/Checkbox/examples/Checkbox.md
index 58854597a55..c7a87545404 100644
--- a/packages/react-core/src/components/Checkbox/examples/Checkbox.md
+++ b/packages/react-core/src/components/Checkbox/examples/Checkbox.md
@@ -6,6 +6,8 @@ cssPrefix: pf-v6-c-check
 propComponents: ['Checkbox']
 ---
 
+import { Fragment } from 'react';
+
 ## Examples
 
 ### Controlled
diff --git a/packages/react-core/src/components/Checkbox/examples/CheckboxControlled.tsx b/packages/react-core/src/components/Checkbox/examples/CheckboxControlled.tsx
index 3881eaf0700..d91da501c2a 100644
--- a/packages/react-core/src/components/Checkbox/examples/CheckboxControlled.tsx
+++ b/packages/react-core/src/components/Checkbox/examples/CheckboxControlled.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Checkbox } from '@patternfly/react-core';
 
 export const CheckboxControlled: React.FunctionComponent = () => {
@@ -42,7 +42,7 @@ export const CheckboxControlled: React.FunctionComponent = () => {
   }, [isChecked2, isChecked3]);
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Checkbox
         label="Parent CheckBox"
         isChecked={isChecked1}
@@ -75,6 +75,6 @@ export const CheckboxControlled: React.FunctionComponent = () => {
         id="controlled-check-4"
         name="check4"
       />
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Checkbox/examples/CheckboxDisabled.tsx b/packages/react-core/src/components/Checkbox/examples/CheckboxDisabled.tsx
index 79e388cfc27..55c22ac1f33 100644
--- a/packages/react-core/src/components/Checkbox/examples/CheckboxDisabled.tsx
+++ b/packages/react-core/src/components/Checkbox/examples/CheckboxDisabled.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Checkbox } from '@patternfly/react-core';
 
 export const CheckboxDisabled: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Checkbox id="disabled-check-1" label="Disabled CheckBox 1" defaultChecked isDisabled />
     <Checkbox id="disabled-check-2" label="Disabled CheckBox 2" isDisabled />
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Checkbox/examples/CheckboxLabelWraps.tsx b/packages/react-core/src/components/Checkbox/examples/CheckboxLabelWraps.tsx
index 256d9de82b7..0560cbe48f8 100644
--- a/packages/react-core/src/components/Checkbox/examples/CheckboxLabelWraps.tsx
+++ b/packages/react-core/src/components/Checkbox/examples/CheckboxLabelWraps.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Checkbox } from '@patternfly/react-core';
 
 export const CheckboxLabelWraps: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Checkbox/examples/CheckboxRequired.tsx b/packages/react-core/src/components/Checkbox/examples/CheckboxRequired.tsx
index 48cf9afd72a..44c7cd6f0f0 100644
--- a/packages/react-core/src/components/Checkbox/examples/CheckboxRequired.tsx
+++ b/packages/react-core/src/components/Checkbox/examples/CheckboxRequired.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Checkbox } from '@patternfly/react-core';
 
 export const CheckboxRequired: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Checkbox/examples/CheckboxReversed.tsx b/packages/react-core/src/components/Checkbox/examples/CheckboxReversed.tsx
index e6d16ed5c85..6f72e13c6fe 100644
--- a/packages/react-core/src/components/Checkbox/examples/CheckboxReversed.tsx
+++ b/packages/react-core/src/components/Checkbox/examples/CheckboxReversed.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Checkbox } from '@patternfly/react-core';
 
 export const CheckboxReversed: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Checkbox/examples/CheckboxStandaloneInput.tsx b/packages/react-core/src/components/Checkbox/examples/CheckboxStandaloneInput.tsx
index c594162b8a4..7aaef07f619 100644
--- a/packages/react-core/src/components/Checkbox/examples/CheckboxStandaloneInput.tsx
+++ b/packages/react-core/src/components/Checkbox/examples/CheckboxStandaloneInput.tsx
@@ -1,6 +1,5 @@
-import React from 'react';
 import { Checkbox } from '@patternfly/react-core';
 
 export const CheckboxStandaloneInput: React.FunctionComponent = () => (
-  <Checkbox id="standalone-check" name="standlone-check" aria-label="Standalone input" />
+  <Checkbox id="standalone-check" name="standalone-check" aria-label="Standalone input" />
 );
diff --git a/packages/react-core/src/components/Checkbox/examples/CheckboxUncontrolled.tsx b/packages/react-core/src/components/Checkbox/examples/CheckboxUncontrolled.tsx
index fbc92cd5623..618edc5d80a 100644
--- a/packages/react-core/src/components/Checkbox/examples/CheckboxUncontrolled.tsx
+++ b/packages/react-core/src/components/Checkbox/examples/CheckboxUncontrolled.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Checkbox } from '@patternfly/react-core';
 
 export const CheckboxUncontrolled: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Checkbox label="Uncontrolled CheckBox 1" id="uncontrolled-check-1" />
     <Checkbox label="Uncontrolled CheckBox 2" id="uncontrolled-check-2" />
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Checkbox/examples/CheckboxWithBody.tsx b/packages/react-core/src/components/Checkbox/examples/CheckboxWithBody.tsx
index c660431cae7..680103124a8 100644
--- a/packages/react-core/src/components/Checkbox/examples/CheckboxWithBody.tsx
+++ b/packages/react-core/src/components/Checkbox/examples/CheckboxWithBody.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Checkbox } from '@patternfly/react-core';
 
 export const CheckboxWithBody: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Checkbox/examples/CheckboxWithDescription.tsx b/packages/react-core/src/components/Checkbox/examples/CheckboxWithDescription.tsx
index 2b7b7517357..6100ee03638 100644
--- a/packages/react-core/src/components/Checkbox/examples/CheckboxWithDescription.tsx
+++ b/packages/react-core/src/components/Checkbox/examples/CheckboxWithDescription.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Checkbox } from '@patternfly/react-core';
 
 export const CheckboxWithDescription: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Checkbox/examples/CheckboxWithDescriptionBody.tsx b/packages/react-core/src/components/Checkbox/examples/CheckboxWithDescriptionBody.tsx
index faa13944140..47a276c7d62 100644
--- a/packages/react-core/src/components/Checkbox/examples/CheckboxWithDescriptionBody.tsx
+++ b/packages/react-core/src/components/Checkbox/examples/CheckboxWithDescriptionBody.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Checkbox } from '@patternfly/react-core';
 
 export const CheckboxWithDescriptionBody: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx b/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx
index b4d973f5d06..99a0cca901e 100644
--- a/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/ClipboardCopy.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, Fragment } from 'react';
 import styles from '@patternfly/react-styles/css/components/ClipboardCopy/clipboard-copy';
 import { css } from '@patternfly/react-styles';
 import { PickOptional } from '../../helpers/typeUtils';
@@ -98,7 +98,7 @@ export interface ClipboardCopyProps extends Omit<React.HTMLProps<HTMLDivElement>
   ouiaSafe?: boolean;
 }
 
-class ClipboardCopy extends React.Component<ClipboardCopyProps, ClipboardCopyState> {
+class ClipboardCopy extends Component<ClipboardCopyProps, ClipboardCopyState> {
   static displayName = 'ClipboardCopy';
   timer = null as number;
   constructor(props: ClipboardCopyProps) {
@@ -206,7 +206,7 @@ class ClipboardCopy extends React.Component<ClipboardCopyProps, ClipboardCopySta
         {variant === 'inline-compact' && (
           <GenerateId prefix="">
             {(id) => (
-              <React.Fragment>
+              <Fragment>
                 {!isCode && (
                   <span className={css(styles.clipboardCopyText)} id={`${textIdPrefix}${id}`}>
                     {this.state.text}
@@ -240,14 +240,14 @@ class ClipboardCopy extends React.Component<ClipboardCopyProps, ClipboardCopySta
                   </span>
                   {additionalActions && additionalActions}
                 </span>
-              </React.Fragment>
+              </Fragment>
             )}
           </GenerateId>
         )}
         {variant !== 'inline-compact' && (
           <GenerateId prefix="">
             {(id) => (
-              <React.Fragment>
+              <Fragment>
                 <div className={css(styles.clipboardCopyGroup)}>
                   {variant === 'expansion' && (
                     <ClipboardCopyToggle
@@ -301,7 +301,7 @@ class ClipboardCopy extends React.Component<ClipboardCopyProps, ClipboardCopySta
                     {this.state.text}
                   </ClipboardCopyExpanded>
                 )}
-              </React.Fragment>
+              </Fragment>
             )}
           </GenerateId>
         )}
diff --git a/packages/react-core/src/components/ClipboardCopy/ClipboardCopyAction.tsx b/packages/react-core/src/components/ClipboardCopy/ClipboardCopyAction.tsx
index 231c1713052..8128bb2c220 100644
--- a/packages/react-core/src/components/ClipboardCopy/ClipboardCopyAction.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/ClipboardCopyAction.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/ClipboardCopy/clipboard-copy';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/ClipboardCopy/ClipboardCopyButton.tsx b/packages/react-core/src/components/ClipboardCopy/ClipboardCopyButton.tsx
index 5400b45049b..d5d0e83385e 100644
--- a/packages/react-core/src/components/ClipboardCopy/ClipboardCopyButton.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/ClipboardCopyButton.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { createRef } from 'react';
 import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon';
 import { Button } from '../Button';
 import { Tooltip, TooltipPosition } from '../Tooltip';
@@ -63,7 +63,7 @@ export const ClipboardCopyButton: React.FunctionComponent<ClipboardCopyButtonPro
   hasNoPadding = false,
   ...props
 }: ClipboardCopyButtonProps) => {
-  const triggerRef = React.createRef<HTMLButtonElement>();
+  const triggerRef = createRef<HTMLButtonElement>();
 
   return (
     <Tooltip
diff --git a/packages/react-core/src/components/ClipboardCopy/ClipboardCopyExpanded.tsx b/packages/react-core/src/components/ClipboardCopy/ClipboardCopyExpanded.tsx
index 0c805495078..0185c01b7b2 100644
--- a/packages/react-core/src/components/ClipboardCopy/ClipboardCopyExpanded.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/ClipboardCopyExpanded.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 import styles from '@patternfly/react-styles/css/components/ClipboardCopy/clipboard-copy';
 import { css } from '@patternfly/react-styles';
 import { ClipboardCopyProps } from './ClipboardCopy';
@@ -11,7 +11,7 @@ export interface ClipboardCopyExpandedProps extends Omit<ClipboardCopyProps, 'on
   isCode?: boolean;
 }
 
-class ClipboardCopyExpanded extends React.Component<ClipboardCopyExpandedProps> {
+class ClipboardCopyExpanded extends Component<ClipboardCopyExpandedProps> {
   static displayName = 'ClipboardCopyExpanded';
   constructor(props: any) {
     super(props);
diff --git a/packages/react-core/src/components/ClipboardCopy/ClipboardCopyToggle.tsx b/packages/react-core/src/components/ClipboardCopy/ClipboardCopyToggle.tsx
index de8bbff13d8..481d9f28f23 100644
--- a/packages/react-core/src/components/ClipboardCopy/ClipboardCopyToggle.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/ClipboardCopyToggle.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/ClipboardCopy/clipboard-copy';
 import { css } from '@patternfly/react-styles';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
diff --git a/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopy.test.tsx b/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopy.test.tsx
index e7441dd2c03..b30d81937fb 100644
--- a/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopy.test.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopy.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { screen, render } from '@testing-library/react';
 import { ClipboardCopy } from '../ClipboardCopy';
 import styles from '@patternfly/react-styles/css/components/ClipboardCopy/clipboard-copy';
diff --git a/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyAction.test.tsx b/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyAction.test.tsx
index 0419477b26b..d1ba3895f57 100644
--- a/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyAction.test.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyAction.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { screen, render } from '@testing-library/react';
 import { ClipboardCopyAction } from '../ClipboardCopyAction';
 import styles from '@patternfly/react-styles/css/components/ClipboardCopy/clipboard-copy';
diff --git a/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyButton.test.tsx b/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyButton.test.tsx
index 1c071cc4d2b..18b3eeebcbe 100644
--- a/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyButton.test.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyButton.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { ClipboardCopyButton } from '../ClipboardCopyButton';
diff --git a/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyExpanded.test.tsx b/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyExpanded.test.tsx
index d91426d6e17..d47a84ef276 100644
--- a/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyExpanded.test.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyExpanded.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { screen, render } from '@testing-library/react';
 import { ClipboardCopyExpanded } from '../ClipboardCopyExpanded';
 import styles from '@patternfly/react-styles/css/components/ClipboardCopy/clipboard-copy';
diff --git a/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyToggle.test.tsx b/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyToggle.test.tsx
index 49bc2b64c1b..a810ca6ee4e 100644
--- a/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyToggle.test.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/__tests__/ClipboardCopyToggle.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { screen, render } from '@testing-library/react';
 import { ClipboardCopyToggle } from '../ClipboardCopyToggle';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopy.md b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopy.md
index 4b2fef0638c..e50d928bb8f 100644
--- a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopy.md
+++ b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopy.md
@@ -6,6 +6,7 @@ propComponents: ['ClipboardCopy', 'ClipboardCopyButton']
 ouia: true
 ---
 
+import { Fragment, useEffect, useState } from 'react';
 import PlayIcon from '@patternfly/react-icons/dist/esm/icons/play-icon';
 
 ## Examples
diff --git a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyBasic.tsx b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyBasic.tsx
index b1a7d29316e..39dd099f746 100644
--- a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyBasic.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ClipboardCopy } from '@patternfly/react-core';
 
 export const ClipboardCopyBasic: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyExpanded.tsx b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyExpanded.tsx
index c81d494cb5d..7d3555589c3 100644
--- a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyExpanded.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyExpanded.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ClipboardCopy, ClipboardCopyVariant } from '@patternfly/react-core';
 
 export const ClipboardCopyExpanded: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyExpandedWithArray.tsx b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyExpandedWithArray.tsx
index 8eb3c1e6f58..88dc48ee5cf 100644
--- a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyExpandedWithArray.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyExpandedWithArray.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ClipboardCopy, ClipboardCopyVariant } from '@patternfly/react-core';
 
 const text = [
diff --git a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyInlineCompact.tsx b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyInlineCompact.tsx
index bdb80f67c1e..66ddba33b16 100644
--- a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyInlineCompact.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyInlineCompact.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ClipboardCopy } from '@patternfly/react-core';
 export const ClipboardCopyInlineCompact: React.FunctionComponent = () => (
   <ClipboardCopy hoverTip="Copy" clickTip="Copied" variant="inline-compact">
diff --git a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyInlineCompactCode.tsx b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyInlineCompactCode.tsx
index fa1ff0423ae..a8877535fba 100644
--- a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyInlineCompactCode.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyInlineCompactCode.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ClipboardCopy } from '@patternfly/react-core';
 
 export const ClipboardCopyInlineCompactCode: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyInlineCompactInSentence.tsx b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyInlineCompactInSentence.tsx
index 2adab4eafd5..a6e39fb042f 100644
--- a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyInlineCompactInSentence.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyInlineCompactInSentence.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { ClipboardCopy } from '@patternfly/react-core';
 
 export const ClipboardCopyInlineCompactInSentence: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <b>Basic</b>
     <br />
     Lorem ipsum{' '}
@@ -32,5 +32,5 @@ export const ClipboardCopyInlineCompactInSentence: React.FunctionComponent = ()
       </ClipboardCopy>
     }{' '}
     Mauris luctus, libero nec dapibus ultricies, urna purus pretium mauris, ullamcorper pharetra lacus nibh vitae enim.
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyInlineCompactWithAdditionalAction.tsx b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyInlineCompactWithAdditionalAction.tsx
index 9714cfc9cf4..1e5fad49a2d 100644
--- a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyInlineCompactWithAdditionalAction.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyInlineCompactWithAdditionalAction.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { useState } from 'react';
 import { ClipboardCopy, ClipboardCopyAction, Button, Tooltip } from '@patternfly/react-core';
 import PlayIcon from '@patternfly/react-icons/dist/esm/icons/play-icon';
 
 export const ClipboardCopyInlineCompactWithAdditionalAction: React.FunctionComponent = () => {
-  const [isRunning, setisRunning] = React.useState(false);
+  const [isRunning, setisRunning] = useState(false);
   const runText: string = 'Run in web terminal';
   const doneRunText: string = 'Running in web terminal';
   return (
diff --git a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyJSONObject.tsx b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyJSONObject.tsx
index 92a85a4c8f9..351537d8c90 100644
--- a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyJSONObject.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyJSONObject.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ClipboardCopy, ClipboardCopyVariant } from '@patternfly/react-core';
 
 export const ClipboardCopyJSONObject: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyReadOnly.tsx b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyReadOnly.tsx
index 1d133b97364..b2f9d4dd1ef 100644
--- a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyReadOnly.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyReadOnly.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ClipboardCopy } from '@patternfly/react-core';
 
 export const ClipboardCopyReadOnly: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyReadOnlyExpanded.tsx b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyReadOnlyExpanded.tsx
index 985919999dd..082f46cbf0a 100644
--- a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyReadOnlyExpanded.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyReadOnlyExpanded.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ClipboardCopy, ClipboardCopyVariant } from '@patternfly/react-core';
 
 export const ClipboardCopyReadOnlyExpanded: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyReadOnlyExpandedByDefault.tsx b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyReadOnlyExpandedByDefault.tsx
index b7963fbb3c9..ac62d4776f8 100644
--- a/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyReadOnlyExpandedByDefault.tsx
+++ b/packages/react-core/src/components/ClipboardCopy/examples/ClipboardCopyReadOnlyExpandedByDefault.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ClipboardCopy, ClipboardCopyVariant } from '@patternfly/react-core';
 
 export const ClipboardCopyReadOnlyExpandedByDefault: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/CodeBlock/CodeBlock.tsx b/packages/react-core/src/components/CodeBlock/CodeBlock.tsx
index f125a9c123c..114467cdfb4 100644
--- a/packages/react-core/src/components/CodeBlock/CodeBlock.tsx
+++ b/packages/react-core/src/components/CodeBlock/CodeBlock.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/CodeBlock/code-block';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/CodeBlock/CodeBlockAction.tsx b/packages/react-core/src/components/CodeBlock/CodeBlockAction.tsx
index 408f0aa5f00..133a19fae78 100644
--- a/packages/react-core/src/components/CodeBlock/CodeBlockAction.tsx
+++ b/packages/react-core/src/components/CodeBlock/CodeBlockAction.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/CodeBlock/code-block';
 
diff --git a/packages/react-core/src/components/CodeBlock/CodeBlockCode.tsx b/packages/react-core/src/components/CodeBlock/CodeBlockCode.tsx
index 274b23c6851..3ad683324a9 100644
--- a/packages/react-core/src/components/CodeBlock/CodeBlockCode.tsx
+++ b/packages/react-core/src/components/CodeBlock/CodeBlockCode.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/CodeBlock/code-block';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/CodeBlock/__tests__/CodeBlock.test.tsx b/packages/react-core/src/components/CodeBlock/__tests__/CodeBlock.test.tsx
index 9125aed8f4e..20ed69747f4 100644
--- a/packages/react-core/src/components/CodeBlock/__tests__/CodeBlock.test.tsx
+++ b/packages/react-core/src/components/CodeBlock/__tests__/CodeBlock.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { CodeBlock } from '../CodeBlock';
 import styles from '@patternfly/react-styles/css/components/CodeBlock/code-block';
diff --git a/packages/react-core/src/components/CodeBlock/__tests__/CodeBlockAction.test.tsx b/packages/react-core/src/components/CodeBlock/__tests__/CodeBlockAction.test.tsx
index b51934acf9e..01ee459ef71 100644
--- a/packages/react-core/src/components/CodeBlock/__tests__/CodeBlockAction.test.tsx
+++ b/packages/react-core/src/components/CodeBlock/__tests__/CodeBlockAction.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { CodeBlockAction } from '../CodeBlockAction';
 import styles from '@patternfly/react-styles/css/components/CodeBlock/code-block';
diff --git a/packages/react-core/src/components/CodeBlock/__tests__/CodeBlockCode.test.tsx b/packages/react-core/src/components/CodeBlock/__tests__/CodeBlockCode.test.tsx
index fce3584eb35..91a9573271c 100644
--- a/packages/react-core/src/components/CodeBlock/__tests__/CodeBlockCode.test.tsx
+++ b/packages/react-core/src/components/CodeBlock/__tests__/CodeBlockCode.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { CodeBlockCode } from '../CodeBlockCode';
 import styles from '@patternfly/react-styles/css/components/CodeBlock/code-block';
diff --git a/packages/react-core/src/components/CodeBlock/examples/CodeBlock.md b/packages/react-core/src/components/CodeBlock/examples/CodeBlock.md
index e14359a210e..da8e7bb5b1c 100644
--- a/packages/react-core/src/components/CodeBlock/examples/CodeBlock.md
+++ b/packages/react-core/src/components/CodeBlock/examples/CodeBlock.md
@@ -5,6 +5,7 @@ cssPrefix: pf-v6-c-code-block
 propComponents: ['CodeBlock', 'CodeBlockAction', 'CodeBlockCode']
 ---
 
+import { Fragment, useState } from 'react';
 import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon';
 import PlayIcon from '@patternfly/react-icons/dist/esm/icons/play-icon';
 
diff --git a/packages/react-core/src/components/CodeBlock/examples/CodeBlockBasic.tsx b/packages/react-core/src/components/CodeBlock/examples/CodeBlockBasic.tsx
index 294cff82969..eb077a1d463 100644
--- a/packages/react-core/src/components/CodeBlock/examples/CodeBlockBasic.tsx
+++ b/packages/react-core/src/components/CodeBlock/examples/CodeBlockBasic.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import {
   CodeBlock,
   CodeBlockAction,
@@ -10,8 +10,8 @@ import {
 import PlayIcon from '@patternfly/react-icons/dist/esm/icons/play-icon';
 
 export const BasicCodeBlock: React.FunctionComponent = () => {
-  const [copied, setCopied] = React.useState(false);
-  const [isRunning, setisRunning] = React.useState(false);
+  const [copied, setCopied] = useState(false);
+  const [isRunning, setisRunning] = useState(false);
   const runText: string = 'Run in web terminal';
   const doneRunText: string = 'Running in web terminal';
 
@@ -33,7 +33,7 @@ connectionConfig:
 url: https://raw.githubusercontent.com/Azure-Samples/helm-charts/master/docs`;
 
   const actions = (
-    <React.Fragment>
+    <Fragment>
       <CodeBlockAction>
         <ClipboardCopyButton
           id="basic-copy-button"
@@ -63,7 +63,7 @@ url: https://raw.githubusercontent.com/Azure-Samples/helm-charts/master/docs`;
           />
         </Tooltip>
       </CodeBlockAction>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
diff --git a/packages/react-core/src/components/CodeBlock/examples/CodeBlockExpandable.tsx b/packages/react-core/src/components/CodeBlock/examples/CodeBlockExpandable.tsx
index d4c9851751a..8e7fde3b03d 100644
--- a/packages/react-core/src/components/CodeBlock/examples/CodeBlockExpandable.tsx
+++ b/packages/react-core/src/components/CodeBlock/examples/CodeBlockExpandable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import {
   CodeBlock,
   CodeBlockAction,
@@ -12,9 +12,9 @@ import {
 import PlayIcon from '@patternfly/react-icons/dist/esm/icons/play-icon';
 
 export const ExpandableCodeBlock: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const [copied, setCopied] = React.useState(false);
-  const [isRunning, setisRunning] = React.useState(false);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const [copied, setCopied] = useState(false);
+  const [isRunning, setisRunning] = useState(false);
   const runText: string = 'Run in web terminal';
   const doneRunText: string = 'Running in web terminal';
 
@@ -48,7 +48,7 @@ connectionConfig:
 url: https://raw.githubusercontent.com/Azure-Samples/helm-charts/master/docs`;
 
   const actions = (
-    <React.Fragment>
+    <Fragment>
       <CodeBlockAction>
         <ClipboardCopyButton
           id="expandable-copy-button"
@@ -78,7 +78,7 @@ url: https://raw.githubusercontent.com/Azure-Samples/helm-charts/master/docs`;
           />
         </Tooltip>
       </CodeBlockAction>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
diff --git a/packages/react-core/src/components/Content/Content.tsx b/packages/react-core/src/components/Content/Content.tsx
index d60d07197b0..896f6a040ed 100644
--- a/packages/react-core/src/components/Content/Content.tsx
+++ b/packages/react-core/src/components/Content/Content.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Content/content';
 import { useOUIAProps, OUIAProps } from '../../helpers';
diff --git a/packages/react-core/src/components/Content/__tests__/Content.test.tsx b/packages/react-core/src/components/Content/__tests__/Content.test.tsx
index b7e6255f4a5..445f7c1b49a 100644
--- a/packages/react-core/src/components/Content/__tests__/Content.test.tsx
+++ b/packages/react-core/src/components/Content/__tests__/Content.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Content } from '../Content';
 import styles from '@patternfly/react-styles/css/components/Content/content';
diff --git a/packages/react-core/src/components/Content/examples/ContentBody.tsx b/packages/react-core/src/components/Content/examples/ContentBody.tsx
index b94e9e2c524..b239985220e 100644
--- a/packages/react-core/src/components/Content/examples/ContentBody.tsx
+++ b/packages/react-core/src/components/Content/examples/ContentBody.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Content, ContentVariants } from '@patternfly/react-core';
 
 export const ContentBody: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Content/examples/ContentDescriptionList.tsx b/packages/react-core/src/components/Content/examples/ContentDescriptionList.tsx
index 7742ca50f94..0199d09df33 100644
--- a/packages/react-core/src/components/Content/examples/ContentDescriptionList.tsx
+++ b/packages/react-core/src/components/Content/examples/ContentDescriptionList.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Content, ContentVariants } from '@patternfly/react-core';
 
 export const ContentDescriptionList: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Content/examples/ContentEditorial.tsx b/packages/react-core/src/components/Content/examples/ContentEditorial.tsx
index 14c4ff825f9..c1690072ca9 100644
--- a/packages/react-core/src/components/Content/examples/ContentEditorial.tsx
+++ b/packages/react-core/src/components/Content/examples/ContentEditorial.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Content, ContentVariants } from '@patternfly/react-core';
 
 export const ContentEditorial: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Content/examples/ContentHeadings.tsx b/packages/react-core/src/components/Content/examples/ContentHeadings.tsx
index f0a6f4b3c0e..4cde33a667e 100644
--- a/packages/react-core/src/components/Content/examples/ContentHeadings.tsx
+++ b/packages/react-core/src/components/Content/examples/ContentHeadings.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Content, ContentVariants } from '@patternfly/react-core';
 
 export const ContentHeadings: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Content/examples/ContentOrderedList.tsx b/packages/react-core/src/components/Content/examples/ContentOrderedList.tsx
index 24dd49c2c5d..bdb4fd73eec 100644
--- a/packages/react-core/src/components/Content/examples/ContentOrderedList.tsx
+++ b/packages/react-core/src/components/Content/examples/ContentOrderedList.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Content, ContentVariants } from '@patternfly/react-core';
 
 export const ContentOrderedList: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Content/examples/ContentPlainList.tsx b/packages/react-core/src/components/Content/examples/ContentPlainList.tsx
index e49e4512868..13433226326 100644
--- a/packages/react-core/src/components/Content/examples/ContentPlainList.tsx
+++ b/packages/react-core/src/components/Content/examples/ContentPlainList.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Content, ContentVariants } from '@patternfly/react-core';
 
 export const ContentPlainList: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Content/examples/ContentUnorderedList.tsx b/packages/react-core/src/components/Content/examples/ContentUnorderedList.tsx
index 356edfe1b0f..d3eade8d88e 100644
--- a/packages/react-core/src/components/Content/examples/ContentUnorderedList.tsx
+++ b/packages/react-core/src/components/Content/examples/ContentUnorderedList.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Content, ContentVariants } from '@patternfly/react-core';
 
 export const ContentUnorderedList: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Content/examples/ContentVisited.tsx b/packages/react-core/src/components/Content/examples/ContentVisited.tsx
index 56fe72aa1b1..82ac85ee812 100644
--- a/packages/react-core/src/components/Content/examples/ContentVisited.tsx
+++ b/packages/react-core/src/components/Content/examples/ContentVisited.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Content, ContentVariants } from '@patternfly/react-core';
 
 export const ContentVisited: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Content/examples/ContentWrapper.tsx b/packages/react-core/src/components/Content/examples/ContentWrapper.tsx
index e8ed09652c2..8e4be41b78a 100644
--- a/packages/react-core/src/components/Content/examples/ContentWrapper.tsx
+++ b/packages/react-core/src/components/Content/examples/ContentWrapper.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Content, ContentVariants } from '@patternfly/react-core';
 
 export const ContentWrapper: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/DataList/DataList.tsx b/packages/react-core/src/components/DataList/DataList.tsx
index 6466e8d3aad..350b7480899 100644
--- a/packages/react-core/src/components/DataList/DataList.tsx
+++ b/packages/react-core/src/components/DataList/DataList.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { createContext, forwardRef } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DataList/data-list';
 
@@ -48,7 +48,7 @@ interface DataListContextProps {
   onSelectableRowChange?: (event: React.FormEvent<HTMLInputElement>, id: string) => void;
 }
 
-export const DataListContext = React.createContext<Partial<DataListContextProps>>({
+export const DataListContext = createContext<Partial<DataListContextProps>>({
   isSelectable: false
 });
 
@@ -102,7 +102,7 @@ export const DataListBase: React.FunctionComponent<DataListProps> = ({
 
 DataListBase.displayName = 'DataListBase';
 
-export const DataList = React.forwardRef((props: DataListProps, ref: React.Ref<HTMLUListElement>) => (
+export const DataList = forwardRef((props: DataListProps, ref: React.Ref<HTMLUListElement>) => (
   <DataListBase innerRef={ref as React.MutableRefObject<any>} {...props} />
 ));
 
diff --git a/packages/react-core/src/components/DataList/DataListAction.tsx b/packages/react-core/src/components/DataList/DataListAction.tsx
index 9ab2c927d73..a511848d248 100644
--- a/packages/react-core/src/components/DataList/DataListAction.tsx
+++ b/packages/react-core/src/components/DataList/DataListAction.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DataList/data-list';
 import { formatBreakpointMods } from '../../helpers/util';
diff --git a/packages/react-core/src/components/DataList/DataListCell.tsx b/packages/react-core/src/components/DataList/DataListCell.tsx
index 287fa91fa5a..b2961729402 100644
--- a/packages/react-core/src/components/DataList/DataListCell.tsx
+++ b/packages/react-core/src/components/DataList/DataListCell.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DataList/data-list';
 import { DataListWrapModifier } from './DataList';
diff --git a/packages/react-core/src/components/DataList/DataListCheck.tsx b/packages/react-core/src/components/DataList/DataListCheck.tsx
index 6a19e058aaf..978521a738c 100644
--- a/packages/react-core/src/components/DataList/DataListCheck.tsx
+++ b/packages/react-core/src/components/DataList/DataListCheck.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Fragment } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DataList/data-list';
 import { Checkbox, CheckboxProps } from '../Checkbox';
@@ -67,10 +67,10 @@ export const DataListCheck: React.FunctionComponent<DataListCheckProps> = ({
     </div>
   );
   return (
-    <React.Fragment>
+    <Fragment>
       {!otherControls && <div className={css(styles.dataListItemControl, className)}>{check}</div>}
       {otherControls && check}
-    </React.Fragment>
+    </Fragment>
   );
 };
 DataListCheck.displayName = 'DataListCheck';
diff --git a/packages/react-core/src/components/DataList/DataListContent.tsx b/packages/react-core/src/components/DataList/DataListContent.tsx
index 28e59ea9c31..e5738d6b686 100644
--- a/packages/react-core/src/components/DataList/DataListContent.tsx
+++ b/packages/react-core/src/components/DataList/DataListContent.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DataList/data-list';
 
diff --git a/packages/react-core/src/components/DataList/DataListControl.tsx b/packages/react-core/src/components/DataList/DataListControl.tsx
index 1a1fa9990fb..b44577d2042 100644
--- a/packages/react-core/src/components/DataList/DataListControl.tsx
+++ b/packages/react-core/src/components/DataList/DataListControl.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DataList/data-list';
 
diff --git a/packages/react-core/src/components/DataList/DataListDragButton.tsx b/packages/react-core/src/components/DataList/DataListDragButton.tsx
index 55000ed0d46..d24c326a334 100644
--- a/packages/react-core/src/components/DataList/DataListDragButton.tsx
+++ b/packages/react-core/src/components/DataList/DataListDragButton.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DataList/data-list';
 import GripVerticalIcon from '@patternfly/react-icons/dist/esm/icons/grip-vertical-icon';
diff --git a/packages/react-core/src/components/DataList/DataListItem.tsx b/packages/react-core/src/components/DataList/DataListItem.tsx
index d5b15b0980c..cc06d019a9d 100644
--- a/packages/react-core/src/components/DataList/DataListItem.tsx
+++ b/packages/react-core/src/components/DataList/DataListItem.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Children, Component, cloneElement, isValidElement } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DataList/data-list';
 import { DataListContext } from './DataList';
@@ -24,7 +24,7 @@ export interface DataListItemChildProps {
   rowid: string;
 }
 
-class DataListItem extends React.Component<DataListItemProps> {
+class DataListItem extends Component<DataListItemProps> {
   static displayName = 'DataListItem';
   static defaultProps: DataListItemProps = {
     isExpanded: false,
@@ -99,11 +99,11 @@ class DataListItem extends React.Component<DataListItemProps> {
                   {...selectableInputAriaProps}
                 />
               )}
-              {React.Children.map(
+              {Children.map(
                 children,
                 (child) =>
-                  React.isValidElement(child) &&
-                  React.cloneElement(child as React.ReactElement<any>, {
+                  isValidElement(child) &&
+                  cloneElement(child as React.ReactElement<any>, {
                     rowid: ariaLabelledBy
                   })
               )}
diff --git a/packages/react-core/src/components/DataList/DataListItemCells.tsx b/packages/react-core/src/components/DataList/DataListItemCells.tsx
index 822eb2a7223..1cbf539de5f 100644
--- a/packages/react-core/src/components/DataList/DataListItemCells.tsx
+++ b/packages/react-core/src/components/DataList/DataListItemCells.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DataList/data-list';
 
diff --git a/packages/react-core/src/components/DataList/DataListItemRow.tsx b/packages/react-core/src/components/DataList/DataListItemRow.tsx
index bc216d07877..39e27829a00 100644
--- a/packages/react-core/src/components/DataList/DataListItemRow.tsx
+++ b/packages/react-core/src/components/DataList/DataListItemRow.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Children, cloneElement, isValidElement } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DataList/data-list';
 import { DataListWrapModifier } from './DataList';
@@ -22,11 +22,11 @@ export const DataListItemRow: React.FunctionComponent<DataListItemRowProps> = ({
   ...props
 }: DataListItemRowProps) => (
   <div className={css(styles.dataListItemRow, className, wrapModifier && styles.modifiers[wrapModifier])} {...props}>
-    {React.Children.map(
+    {Children.map(
       children,
       (child) =>
-        React.isValidElement(child) &&
-        React.cloneElement(child as React.ReactElement<any>, {
+        isValidElement(child) &&
+        cloneElement(child as React.ReactElement<any>, {
           rowid
         })
     )}
diff --git a/packages/react-core/src/components/DataList/DataListText.tsx b/packages/react-core/src/components/DataList/DataListText.tsx
index 69341f792ea..795db78a857 100644
--- a/packages/react-core/src/components/DataList/DataListText.tsx
+++ b/packages/react-core/src/components/DataList/DataListText.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useState } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DataList/data-list';
 import { Tooltip } from '../Tooltip';
@@ -30,7 +30,7 @@ export const DataListText: React.FunctionComponent<DataListTextProps> = ({
 }: DataListTextProps) => {
   const Component = component as any;
 
-  const [tooltip, setTooltip] = React.useState('');
+  const [tooltip, setTooltip] = useState('');
   const onMouseEnter = (event: any) => {
     if (event.target.offsetWidth < event.target.scrollWidth) {
       setTooltip(tooltipProp || event.target.innerHTML);
diff --git a/packages/react-core/src/components/DataList/DataListToggle.tsx b/packages/react-core/src/components/DataList/DataListToggle.tsx
index 71fda10f908..e26b6eb7731 100644
--- a/packages/react-core/src/components/DataList/DataListToggle.tsx
+++ b/packages/react-core/src/components/DataList/DataListToggle.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
 import styles from '@patternfly/react-styles/css/components/DataList/data-list';
diff --git a/packages/react-core/src/components/DataList/__tests__/DataList.test.tsx b/packages/react-core/src/components/DataList/__tests__/DataList.test.tsx
index f28b8cd6f2c..bdb5b8263f4 100644
--- a/packages/react-core/src/components/DataList/__tests__/DataList.test.tsx
+++ b/packages/react-core/src/components/DataList/__tests__/DataList.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
@@ -40,7 +38,7 @@ test(`Renders ${styles.modifiers.compact} when isCompact = true`, () => {
 });
 
 ['nowrap', 'truncate', 'breakWord'].forEach((wrap) => {
-  test(`Renders with class ${styles.modifiers[wrap]} when wrapModifier = ${wrap} is pased`, () => {
+  test(`Renders with class ${styles.modifiers[wrap]} when wrapModifier = ${wrap} is passed`, () => {
     render(<DataList aria-label="list" wrapModifier={wrap as 'nowrap' | 'truncate' | 'breakWord'} />);
     expect(screen.getByLabelText('list')).toHaveClass(styles.modifiers[wrap]);
   });
@@ -57,7 +55,7 @@ const gridBreakpointClasses = {
 };
 
 ['none', 'always', 'sm', 'md', 'lg', 'xl', '2xl'].forEach((oneBreakpoint) => {
-  test(`Has breakpoint - ${oneBreakpoint} when gridBreakpoint is pased`, () => {
+  test(`Has breakpoint - ${oneBreakpoint} when gridBreakpoint is passed`, () => {
     render(<DataList aria-label="list" gridBreakpoint={oneBreakpoint as any} />);
     expect(screen.getByLabelText('list')).toHaveClass(gridBreakpointClasses[oneBreakpoint]);
   });
diff --git a/packages/react-core/src/components/DataList/__tests__/DataListAction.test.tsx b/packages/react-core/src/components/DataList/__tests__/DataListAction.test.tsx
index 9171561fe3c..c6dbaf99c9c 100644
--- a/packages/react-core/src/components/DataList/__tests__/DataListAction.test.tsx
+++ b/packages/react-core/src/components/DataList/__tests__/DataListAction.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 
diff --git a/packages/react-core/src/components/DataList/__tests__/DataListCell.test.tsx b/packages/react-core/src/components/DataList/__tests__/DataListCell.test.tsx
index 6e55ada2648..36a55cbc3e6 100644
--- a/packages/react-core/src/components/DataList/__tests__/DataListCell.test.tsx
+++ b/packages/react-core/src/components/DataList/__tests__/DataListCell.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { DataListCell } from '../DataListCell';
 
diff --git a/packages/react-core/src/components/DataList/__tests__/DataListCheck.test.tsx b/packages/react-core/src/components/DataList/__tests__/DataListCheck.test.tsx
index 6b9833ec3f6..eff217f7f22 100644
--- a/packages/react-core/src/components/DataList/__tests__/DataListCheck.test.tsx
+++ b/packages/react-core/src/components/DataList/__tests__/DataListCheck.test.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useState } from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { DataListCheck } from '../DataListCheck';
@@ -13,7 +13,7 @@ it('does not throw a "A component is changing an uncontrolled input of type chec
   const user = userEvent.setup();
 
   const ControlledDataListCheck = () => {
-    const [checked, setChecked] = React.useState(false);
+    const [checked, setChecked] = useState(false);
 
     return (
       <DataListCheck id="test" isChecked={checked} onChange={() => setChecked(!checked)} aria-labelledby={'string'} />
diff --git a/packages/react-core/src/components/DataList/__tests__/DataListContent.test.tsx b/packages/react-core/src/components/DataList/__tests__/DataListContent.test.tsx
index 912bb48f0de..63506fb6184 100644
--- a/packages/react-core/src/components/DataList/__tests__/DataListContent.test.tsx
+++ b/packages/react-core/src/components/DataList/__tests__/DataListContent.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { DataListContent } from '../DataListContent';
 
diff --git a/packages/react-core/src/components/DataList/__tests__/DataListItem.test.tsx b/packages/react-core/src/components/DataList/__tests__/DataListItem.test.tsx
index 54f358c8e83..19b0fb2d5da 100644
--- a/packages/react-core/src/components/DataList/__tests__/DataListItem.test.tsx
+++ b/packages/react-core/src/components/DataList/__tests__/DataListItem.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { DataListItem } from '../DataListItem';
 
diff --git a/packages/react-core/src/components/DataList/__tests__/DataListItemCells.test.tsx b/packages/react-core/src/components/DataList/__tests__/DataListItemCells.test.tsx
index e8419f2b361..c8d756b1985 100644
--- a/packages/react-core/src/components/DataList/__tests__/DataListItemCells.test.tsx
+++ b/packages/react-core/src/components/DataList/__tests__/DataListItemCells.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { DataListItemCells } from '../DataListItemCells';
 
diff --git a/packages/react-core/src/components/DataList/__tests__/DataListItemRow.test.tsx b/packages/react-core/src/components/DataList/__tests__/DataListItemRow.test.tsx
index 74ec2e6fafc..e86ec190661 100644
--- a/packages/react-core/src/components/DataList/__tests__/DataListItemRow.test.tsx
+++ b/packages/react-core/src/components/DataList/__tests__/DataListItemRow.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { DataListItemRow } from '../DataListItemRow';
 
@@ -33,7 +32,7 @@ test(`Renders with spread props`, () => {
 });
 
 ['nowrap', 'truncate', 'breakWord'].forEach((wrap) => {
-  test(`Renders with class ${styles.modifiers[wrap]} when wrapModifier = ${wrap} is pased`, () => {
+  test(`Renders with class ${styles.modifiers[wrap]} when wrapModifier = ${wrap} is passed`, () => {
     render(
       <DataListItemRow data-testid="test" wrapModifier={wrap as 'nowrap' | 'truncate' | 'breakWord'}>
         test
diff --git a/packages/react-core/src/components/DataList/__tests__/DataListToggle.test.tsx b/packages/react-core/src/components/DataList/__tests__/DataListToggle.test.tsx
index 8f7f8b4cd9b..af677b320b3 100644
--- a/packages/react-core/src/components/DataList/__tests__/DataListToggle.test.tsx
+++ b/packages/react-core/src/components/DataList/__tests__/DataListToggle.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { DataListToggle } from '../DataListToggle';
 
diff --git a/packages/react-core/src/components/DataList/__tests__/Generated/DataListAction.test.tsx b/packages/react-core/src/components/DataList/__tests__/Generated/DataListAction.test.tsx
index 2f07cb48c8d..d6af1889bfe 100644
--- a/packages/react-core/src/components/DataList/__tests__/Generated/DataListAction.test.tsx
+++ b/packages/react-core/src/components/DataList/__tests__/Generated/DataListAction.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { DataListAction } from '../../DataListAction';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/DataList/__tests__/Generated/DataListCell.test.tsx b/packages/react-core/src/components/DataList/__tests__/Generated/DataListCell.test.tsx
index 8ef64961e43..9325da25c76 100644
--- a/packages/react-core/src/components/DataList/__tests__/Generated/DataListCell.test.tsx
+++ b/packages/react-core/src/components/DataList/__tests__/Generated/DataListCell.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { DataListCell } from '../../DataListCell';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/DataList/__tests__/Generated/DataListCheck.test.tsx b/packages/react-core/src/components/DataList/__tests__/Generated/DataListCheck.test.tsx
index 748738dbae0..81c1612e8b3 100644
--- a/packages/react-core/src/components/DataList/__tests__/Generated/DataListCheck.test.tsx
+++ b/packages/react-core/src/components/DataList/__tests__/Generated/DataListCheck.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { DataListCheck } from '../../DataListCheck';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/DataList/__tests__/Generated/DataListContent.test.tsx b/packages/react-core/src/components/DataList/__tests__/Generated/DataListContent.test.tsx
index 96d79ef0645..d56ee15d68e 100644
--- a/packages/react-core/src/components/DataList/__tests__/Generated/DataListContent.test.tsx
+++ b/packages/react-core/src/components/DataList/__tests__/Generated/DataListContent.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { DataListContent } from '../../DataListContent';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/DataList/__tests__/Generated/DataListItem.test.tsx b/packages/react-core/src/components/DataList/__tests__/Generated/DataListItem.test.tsx
index 1e18e943867..8ce3d07a96a 100644
--- a/packages/react-core/src/components/DataList/__tests__/Generated/DataListItem.test.tsx
+++ b/packages/react-core/src/components/DataList/__tests__/Generated/DataListItem.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { DataListItem } from '../../DataListItem';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/DataList/__tests__/Generated/DataListItemCells.test.tsx b/packages/react-core/src/components/DataList/__tests__/Generated/DataListItemCells.test.tsx
index 1f71eed7cc1..67438001e56 100644
--- a/packages/react-core/src/components/DataList/__tests__/Generated/DataListItemCells.test.tsx
+++ b/packages/react-core/src/components/DataList/__tests__/Generated/DataListItemCells.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { DataListItemCells } from '../../DataListItemCells';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/DataList/__tests__/Generated/DataListItemRow.test.tsx b/packages/react-core/src/components/DataList/__tests__/Generated/DataListItemRow.test.tsx
index acd0768a0bb..6179c72efde 100644
--- a/packages/react-core/src/components/DataList/__tests__/Generated/DataListItemRow.test.tsx
+++ b/packages/react-core/src/components/DataList/__tests__/Generated/DataListItemRow.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { DataListItemRow } from '../../DataListItemRow';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/DataList/__tests__/Generated/DataListToggle.test.tsx b/packages/react-core/src/components/DataList/__tests__/Generated/DataListToggle.test.tsx
index 9e1b0e3407a..e6fff7d3fbf 100644
--- a/packages/react-core/src/components/DataList/__tests__/Generated/DataListToggle.test.tsx
+++ b/packages/react-core/src/components/DataList/__tests__/Generated/DataListToggle.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { DataListToggle } from '../../DataListToggle';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/DataList/examples/DataList.md b/packages/react-core/src/components/DataList/examples/DataList.md
index 131ee5943fe..b4e06fa735b 100644
--- a/packages/react-core/src/components/DataList/examples/DataList.md
+++ b/packages/react-core/src/components/DataList/examples/DataList.md
@@ -18,6 +18,7 @@ propComponents:
   ]
 ---
 
+import { Fragment, useState } from 'react';
 import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
 import AngleDownIcon from '@patternfly/react-icons/dist/esm/icons/angle-down-icon';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
diff --git a/packages/react-core/src/components/DataList/examples/DataListActions.tsx b/packages/react-core/src/components/DataList/examples/DataListActions.tsx
index 2606386482e..fe828173a4b 100644
--- a/packages/react-core/src/components/DataList/examples/DataListActions.tsx
+++ b/packages/react-core/src/components/DataList/examples/DataListActions.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import {
   Button,
   DataList,
@@ -16,8 +16,8 @@ import {
 import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
 
 export const DataListActions: React.FunctionComponent = () => {
-  const [isOpen, setIsOpen] = React.useState(false);
-  const [isDeleted, setIsDeleted] = React.useState(false);
+  const [isOpen, setIsOpen] = useState(false);
+  const [isDeleted, setIsDeleted] = useState(false);
 
   const onToggle = () => {
     setIsOpen(!isOpen);
@@ -28,7 +28,7 @@ export const DataListActions: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <DataList aria-label="single action data list example ">
         {!isDeleted && (
           <DataListItem aria-labelledby="single-action-item1">
@@ -111,6 +111,6 @@ export const DataListActions: React.FunctionComponent = () => {
           </DataListItemRow>
         </DataListItem>
       </DataList>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/DataList/examples/DataListBasic.tsx b/packages/react-core/src/components/DataList/examples/DataListBasic.tsx
index 984511aa480..e4af45501e9 100644
--- a/packages/react-core/src/components/DataList/examples/DataListBasic.tsx
+++ b/packages/react-core/src/components/DataList/examples/DataListBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { DataList, DataListItem, DataListItemRow, DataListItemCells, DataListCell } from '@patternfly/react-core';
 
 export const DataListBasic: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/DataList/examples/DataListCheckboxes.tsx b/packages/react-core/src/components/DataList/examples/DataListCheckboxes.tsx
index 54cf46b7e76..5138ce37093 100644
--- a/packages/react-core/src/components/DataList/examples/DataListCheckboxes.tsx
+++ b/packages/react-core/src/components/DataList/examples/DataListCheckboxes.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   Button,
   DataList,
@@ -17,9 +17,9 @@ import {
 import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
 
 export const DataListCheckboxes: React.FunctionComponent = () => {
-  const [isOpen1, setIsOpen1] = React.useState(false);
-  const [isOpen2, setIsOpen2] = React.useState(false);
-  const [isOpen3, setIsOpen3] = React.useState(false);
+  const [isOpen1, setIsOpen1] = useState(false);
+  const [isOpen2, setIsOpen2] = useState(false);
+  const [isOpen3, setIsOpen3] = useState(false);
 
   const onToggle1 = () => {
     setIsOpen1(!isOpen1);
diff --git a/packages/react-core/src/components/DataList/examples/DataListClickableRows.tsx b/packages/react-core/src/components/DataList/examples/DataListClickableRows.tsx
index dcd36f28a01..a23bd1ad94f 100644
--- a/packages/react-core/src/components/DataList/examples/DataListClickableRows.tsx
+++ b/packages/react-core/src/components/DataList/examples/DataListClickableRows.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import {
   DataList,
   DataListItem,
@@ -15,9 +15,9 @@ import {
 import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
 
 export const DataListClickableRows: React.FunctionComponent = () => {
-  const [isOpen1, setIsOpen1] = React.useState(false);
-  const [isOpen2, setIsOpen2] = React.useState(false);
-  const [selectedDataListItemId, setSelectedDataListItemId] = React.useState('');
+  const [isOpen1, setIsOpen1] = useState(false);
+  const [isOpen2, setIsOpen2] = useState(false);
+  const [selectedDataListItemId, setSelectedDataListItemId] = useState('');
 
   const onToggle1 = () => {
     setIsOpen1(!isOpen1);
@@ -44,7 +44,7 @@ export const DataListClickableRows: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <DataList
         aria-label="clickable data list example"
         selectedDataListItemId={selectedDataListItemId}
@@ -150,6 +150,6 @@ export const DataListClickableRows: React.FunctionComponent = () => {
           </DataListItemRow>
         </DataListItem>
       </DataList>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/DataList/examples/DataListCompact.tsx b/packages/react-core/src/components/DataList/examples/DataListCompact.tsx
index 6232f30015b..23644d59371 100644
--- a/packages/react-core/src/components/DataList/examples/DataListCompact.tsx
+++ b/packages/react-core/src/components/DataList/examples/DataListCompact.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { DataList, DataListItem, DataListItemRow, DataListItemCells, DataListCell } from '@patternfly/react-core';
 
 export const DataListCompact: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/DataList/examples/DataListControllingText.tsx b/packages/react-core/src/components/DataList/examples/DataListControllingText.tsx
index c8ced89d5fb..01d5adc3b73 100644
--- a/packages/react-core/src/components/DataList/examples/DataListControllingText.tsx
+++ b/packages/react-core/src/components/DataList/examples/DataListControllingText.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   DataList,
   DataListItem,
diff --git a/packages/react-core/src/components/DataList/examples/DataListExpandable.tsx b/packages/react-core/src/components/DataList/examples/DataListExpandable.tsx
index d483c18b613..7b94d233115 100644
--- a/packages/react-core/src/components/DataList/examples/DataListExpandable.tsx
+++ b/packages/react-core/src/components/DataList/examples/DataListExpandable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import {
   DataList,
   DataListItem,
@@ -18,10 +18,10 @@ import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-ico
 import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
 
 export const DataListExpandable: React.FunctionComponent = () => {
-  const [isOpen1, setIsOpen1] = React.useState(false);
-  const [isOpen2, setIsOpen2] = React.useState(false);
-  const [isOpen3, setIsOpen3] = React.useState(false);
-  const [expanded, setExpanded] = React.useState(['ex-toggle1', 'ex-toggle3']);
+  const [isOpen1, setIsOpen1] = useState(false);
+  const [isOpen2, setIsOpen2] = useState(false);
+  const [isOpen3, setIsOpen3] = useState(false);
+  const [expanded, setExpanded] = useState(['ex-toggle1', 'ex-toggle3']);
 
   const onToggle1 = () => {
     setIsOpen1(!isOpen1);
@@ -53,7 +53,7 @@ export const DataListExpandable: React.FunctionComponent = () => {
     setExpanded(newExpanded);
   };
   return (
-    <React.Fragment>
+    <Fragment>
       <DataList aria-label="Expandable data list example">
         <DataListItem aria-labelledby="ex-item1" isExpanded={expanded.includes('ex-toggle1')}>
           <DataListItemRow>
@@ -265,6 +265,6 @@ export const DataListExpandable: React.FunctionComponent = () => {
           </DataListContent>
         </DataListItem>
       </DataList>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/DataList/examples/DataListMixedExpandable.tsx b/packages/react-core/src/components/DataList/examples/DataListMixedExpandable.tsx
index e3183ffc96a..fd6eac75bfa 100644
--- a/packages/react-core/src/components/DataList/examples/DataListMixedExpandable.tsx
+++ b/packages/react-core/src/components/DataList/examples/DataListMixedExpandable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import {
   DataList,
   DataListItem,
@@ -18,10 +18,10 @@ import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-ico
 import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
 
 export const DataListMixedExpandable: React.FunctionComponent = () => {
-  const [isOpen1, setIsOpen1] = React.useState(false);
-  const [isOpen2, setIsOpen2] = React.useState(false);
-  const [isOpen3, setIsOpen3] = React.useState(false);
-  const [expanded, setExpanded] = React.useState(['m-ex-toggle1', 'm-ex-toggle3']);
+  const [isOpen1, setIsOpen1] = useState(false);
+  const [isOpen2, setIsOpen2] = useState(false);
+  const [isOpen3, setIsOpen3] = useState(false);
+  const [expanded, setExpanded] = useState(['m-ex-toggle1', 'm-ex-toggle3']);
 
   const onToggle1 = () => {
     setIsOpen1(!isOpen1);
@@ -55,7 +55,7 @@ export const DataListMixedExpandable: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <DataList aria-label="Mixed expandable data list example">
         <DataListItem aria-labelledby="m-ex-item1" isExpanded={expanded.includes('m-ex-toggle1')}>
           <DataListItemRow>
@@ -261,6 +261,6 @@ export const DataListMixedExpandable: React.FunctionComponent = () => {
           </DataListContent>
         </DataListItem>
       </DataList>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/DataList/examples/DataListSmGridBreakpoint.tsx b/packages/react-core/src/components/DataList/examples/DataListSmGridBreakpoint.tsx
index 55d0023dd8c..9beb45d5788 100644
--- a/packages/react-core/src/components/DataList/examples/DataListSmGridBreakpoint.tsx
+++ b/packages/react-core/src/components/DataList/examples/DataListSmGridBreakpoint.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { DataList, DataListItem, DataListItemRow, DataListItemCells, DataListCell } from '@patternfly/react-core';
 
 export const DataListSmGridBreakpoint: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/DataList/examples/DataListWidthModifiers.tsx b/packages/react-core/src/components/DataList/examples/DataListWidthModifiers.tsx
index 6d44d45ca2e..f7cde4ca06d 100644
--- a/packages/react-core/src/components/DataList/examples/DataListWidthModifiers.tsx
+++ b/packages/react-core/src/components/DataList/examples/DataListWidthModifiers.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   Content,
   DataList,
@@ -19,9 +19,9 @@ import {
 import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
 
 export const DataListWidthModifiers: React.FunctionComponent = () => {
-  const [show, setShow] = React.useState(true);
-  const [isOpen1, setIsOpen1] = React.useState(false);
-  const [isOpen2, setIsOpen2] = React.useState(false);
+  const [show, setShow] = useState(true);
+  const [isOpen1, setIsOpen1] = useState(false);
+  const [isOpen2, setIsOpen2] = useState(false);
 
   const onToggle1 = () => {
     setIsOpen1(!isOpen1);
diff --git a/packages/react-core/src/components/DatePicker/DatePicker.tsx b/packages/react-core/src/components/DatePicker/DatePicker.tsx
index aa5d5ac62d7..4ae3a994d46 100644
--- a/packages/react-core/src/components/DatePicker/DatePicker.tsx
+++ b/packages/react-core/src/components/DatePicker/DatePicker.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DatePicker/date-picker';
 import calendarMonthStyles from '@patternfly/react-styles/css/components/CalendarMonth/calendar-month';
@@ -8,7 +8,6 @@ import { Popover, PopoverProps } from '../Popover/Popover';
 import { InputGroup, InputGroupItem } from '../InputGroup';
 import OutlinedCalendarAltIcon from '@patternfly/react-icons/dist/esm/icons/outlined-calendar-alt-icon';
 import { CalendarMonth, CalendarFormat } from '../CalendarMonth';
-import { useImperativeHandle } from 'react';
 import { KeyTypes } from '../../helpers';
 import { isValidDate } from '../../helpers/datetimeUtils';
 import { HelperText, HelperTextItem } from '../HelperText';
@@ -124,33 +123,33 @@ const DatePickerBase = (
   }: DatePickerProps,
   ref: React.Ref<DatePickerRef>
 ) => {
-  const [value, setValue] = React.useState(valueProp);
-  const [valueDate, setValueDate] = React.useState(dateParse(value));
-  const [errorText, setErrorText] = React.useState('');
-  const [popoverOpen, setPopoverOpen] = React.useState(false);
-  const [selectOpen, setSelectOpen] = React.useState(false);
-  const [pristine, setPristine] = React.useState(true);
-  const [textInputFocused, setTextInputFocused] = React.useState(false);
-  const widthChars = React.useMemo(() => Math.max(dateFormat(new Date()).length, placeholder.length), [dateFormat]);
+  const [value, setValue] = useState(valueProp);
+  const [valueDate, setValueDate] = useState(dateParse(value));
+  const [errorText, setErrorText] = useState('');
+  const [popoverOpen, setPopoverOpen] = useState(false);
+  const [selectOpen, setSelectOpen] = useState(false);
+  const [pristine, setPristine] = useState(true);
+  const [textInputFocused, setTextInputFocused] = useState(false);
+  const widthChars = useMemo(() => Math.max(dateFormat(new Date()).length, placeholder.length), [dateFormat]);
   const style = { [cssFormControlWidthChars.name]: widthChars, ...styleProps };
-  const buttonRef = React.useRef<HTMLButtonElement>(undefined);
-  const datePickerWrapperRef = React.useRef<HTMLDivElement>(undefined);
-  const triggerRef = React.useRef<HTMLDivElement>(undefined);
+  const buttonRef = useRef<HTMLButtonElement>(undefined);
+  const datePickerWrapperRef = useRef<HTMLDivElement>(undefined);
+  const triggerRef = useRef<HTMLDivElement>(undefined);
   const dateIsRequired = requiredDateOptions?.isRequired || false;
   const emptyDateText = requiredDateOptions?.emptyDateText || 'Date cannot be blank';
 
-  React.useEffect(() => {
+  useEffect(() => {
     setValue(valueProp);
     setValueDate(dateParse(valueProp));
   }, [valueProp]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (isValidDate(valueDate)) {
       applyValidators(valueDate);
     }
   }, [validators]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     setPristine(!value);
     const newValueDate = dateParse(value);
     if (errorText && isValidDate(newValueDate)) {
@@ -353,5 +352,5 @@ const DatePickerBase = (
   );
 };
 
-export const DatePicker = React.forwardRef<DatePickerRef, DatePickerProps>(DatePickerBase);
+export const DatePicker = forwardRef<DatePickerRef, DatePickerProps>(DatePickerBase);
 DatePicker.displayName = 'DatePicker';
diff --git a/packages/react-core/src/components/DatePicker/__tests__/DatePicker.test.tsx b/packages/react-core/src/components/DatePicker/__tests__/DatePicker.test.tsx
index bbb252c064e..9d6030c0eef 100644
--- a/packages/react-core/src/components/DatePicker/__tests__/DatePicker.test.tsx
+++ b/packages/react-core/src/components/DatePicker/__tests__/DatePicker.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { screen, render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-core/src/components/DatePicker/examples/DatePicker.md b/packages/react-core/src/components/DatePicker/examples/DatePicker.md
index 4dd8f28cbfd..84f79c38e3b 100644
--- a/packages/react-core/src/components/DatePicker/examples/DatePicker.md
+++ b/packages/react-core/src/components/DatePicker/examples/DatePicker.md
@@ -6,6 +6,8 @@ cssPrefix: pf-v6-c-date-picker
 propComponents: ['DatePicker', 'CalendarFormat', 'DatePickerRef', 'DatePickerRequiredObject']
 ---
 
+import { Fragment, useState, useRef } from 'react';
+
 ## Examples
 
 ### Basic
diff --git a/packages/react-core/src/components/DatePicker/examples/DatePickerAmerican.tsx b/packages/react-core/src/components/DatePicker/examples/DatePickerAmerican.tsx
index 54dba78291f..b41299b7368 100644
--- a/packages/react-core/src/components/DatePicker/examples/DatePickerAmerican.tsx
+++ b/packages/react-core/src/components/DatePicker/examples/DatePickerAmerican.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { DatePicker } from '@patternfly/react-core';
 
 export const DatePickerAmerican: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/DatePicker/examples/DatePickerBasic.tsx b/packages/react-core/src/components/DatePicker/examples/DatePickerBasic.tsx
index 65e371fcc7b..3008b7dc715 100644
--- a/packages/react-core/src/components/DatePicker/examples/DatePickerBasic.tsx
+++ b/packages/react-core/src/components/DatePicker/examples/DatePickerBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { DatePicker } from '@patternfly/react-core';
 
 export const DatePickerBasic: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/DatePicker/examples/DatePickerControlled.tsx b/packages/react-core/src/components/DatePicker/examples/DatePickerControlled.tsx
index a4297e9265e..980df3fdf0f 100644
--- a/packages/react-core/src/components/DatePicker/examples/DatePickerControlled.tsx
+++ b/packages/react-core/src/components/DatePicker/examples/DatePickerControlled.tsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { Button, DatePicker, Flex, FlexItem } from '@patternfly/react-core';
 
 export const DatePickerControlled: React.FunctionComponent = () => {
   const initialValue = '2020-03-17';
-  const [value, setValue] = React.useState(initialValue);
+  const [value, setValue] = useState(initialValue);
   return (
-    <React.Fragment>
+    <Fragment>
       <DatePicker value={value} onChange={(_event, value) => setValue(value)} />
       <br />
       <br />
@@ -17,6 +17,6 @@ export const DatePickerControlled: React.FunctionComponent = () => {
           <Button onClick={() => setValue('')}>Clear date</Button>
         </FlexItem>
       </Flex>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/DatePicker/examples/DatePickerControlledCalendar.tsx b/packages/react-core/src/components/DatePicker/examples/DatePickerControlledCalendar.tsx
index 89291a358c7..b7f7805fbf3 100644
--- a/packages/react-core/src/components/DatePicker/examples/DatePickerControlledCalendar.tsx
+++ b/packages/react-core/src/components/DatePicker/examples/DatePickerControlledCalendar.tsx
@@ -1,19 +1,19 @@
-import React from 'react';
+import { Fragment, useRef } from 'react';
 import { Button, DatePicker } from '@patternfly/react-core';
 
 export const DatePickerControlledCalendar: React.FunctionComponent = () => {
-  const dateRef = React.useRef(null);
+  const dateRef = useRef(null);
   const onClick = () => {
     if (dateRef.current) {
       dateRef.current.toggleCalendar();
     }
   };
   return (
-    <React.Fragment>
+    <Fragment>
       <DatePicker ref={dateRef} />
       <br />
       <br />
       <Button onClick={onClick}>Toggle calendar</Button>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/DatePicker/examples/DatePickerControlledRequired.tsx b/packages/react-core/src/components/DatePicker/examples/DatePickerControlledRequired.tsx
index 4ba5bf302da..dc66819a833 100644
--- a/packages/react-core/src/components/DatePicker/examples/DatePickerControlledRequired.tsx
+++ b/packages/react-core/src/components/DatePicker/examples/DatePickerControlledRequired.tsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { Button, DatePicker, Flex, FlexItem } from '@patternfly/react-core';
 
 export const DatePickerControlled: React.FunctionComponent = () => {
   const initialValue = '2020-03-17';
-  const [value, setValue] = React.useState(initialValue);
+  const [value, setValue] = useState(initialValue);
   return (
-    <React.Fragment>
+    <Fragment>
       <DatePicker
         requiredDateOptions={{ isRequired: true, emptyDateText: 'Date is required' }}
         value={value}
@@ -21,6 +21,6 @@ export const DatePickerControlled: React.FunctionComponent = () => {
           <Button onClick={() => setValue('')}>Clear date</Button>
         </FlexItem>
       </Flex>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/DatePicker/examples/DatePickerFrench.tsx b/packages/react-core/src/components/DatePicker/examples/DatePickerFrench.tsx
index 1dc033ecb19..3006e3b235a 100644
--- a/packages/react-core/src/components/DatePicker/examples/DatePickerFrench.tsx
+++ b/packages/react-core/src/components/DatePicker/examples/DatePickerFrench.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { DatePicker, Weekday } from '@patternfly/react-core';
 
 export const DatePickerFrench: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/DatePicker/examples/DatePickerHelperText.tsx b/packages/react-core/src/components/DatePicker/examples/DatePickerHelperText.tsx
index 854b922c1e2..55c280074fd 100644
--- a/packages/react-core/src/components/DatePicker/examples/DatePickerHelperText.tsx
+++ b/packages/react-core/src/components/DatePicker/examples/DatePickerHelperText.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { DatePicker, HelperText, HelperTextItem } from '@patternfly/react-core';
 
 export const DatePickerHelperText: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/DatePicker/examples/DatePickerMinMax.tsx b/packages/react-core/src/components/DatePicker/examples/DatePickerMinMax.tsx
index 1253f5bab56..74f565bc37a 100644
--- a/packages/react-core/src/components/DatePicker/examples/DatePickerMinMax.tsx
+++ b/packages/react-core/src/components/DatePicker/examples/DatePickerMinMax.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { DatePicker } from '@patternfly/react-core';
 
 export const DatePickerMinMax: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/DatePicker/examples/DatePickerRequired.tsx b/packages/react-core/src/components/DatePicker/examples/DatePickerRequired.tsx
index fbeb0f1febb..8571cd817d4 100644
--- a/packages/react-core/src/components/DatePicker/examples/DatePickerRequired.tsx
+++ b/packages/react-core/src/components/DatePicker/examples/DatePickerRequired.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { DatePicker } from '@patternfly/react-core';
 
 export const DatePickerRequired: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/DescriptionList/DescriptionList.tsx b/packages/react-core/src/components/DescriptionList/DescriptionList.tsx
index 975e8e9e0d8..4edc1d5adb3 100644
--- a/packages/react-core/src/components/DescriptionList/DescriptionList.tsx
+++ b/packages/react-core/src/components/DescriptionList/DescriptionList.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DescriptionList/description-list';
 import { formatBreakpointMods } from '../../helpers';
diff --git a/packages/react-core/src/components/DescriptionList/DescriptionListDescription.tsx b/packages/react-core/src/components/DescriptionList/DescriptionListDescription.tsx
index 205c0ea3268..cb37fdf71c6 100644
--- a/packages/react-core/src/components/DescriptionList/DescriptionListDescription.tsx
+++ b/packages/react-core/src/components/DescriptionList/DescriptionListDescription.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/DescriptionList/description-list';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/DescriptionList/DescriptionListGroup.tsx b/packages/react-core/src/components/DescriptionList/DescriptionListGroup.tsx
index 3828d225654..1d4b54a3529 100644
--- a/packages/react-core/src/components/DescriptionList/DescriptionListGroup.tsx
+++ b/packages/react-core/src/components/DescriptionList/DescriptionListGroup.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/DescriptionList/description-list';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/DescriptionList/DescriptionListTerm.tsx b/packages/react-core/src/components/DescriptionList/DescriptionListTerm.tsx
index 459edee63ce..3536e485dd8 100644
--- a/packages/react-core/src/components/DescriptionList/DescriptionListTerm.tsx
+++ b/packages/react-core/src/components/DescriptionList/DescriptionListTerm.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/DescriptionList/description-list';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/DescriptionList/DescriptionListTermHelpText.tsx b/packages/react-core/src/components/DescriptionList/DescriptionListTermHelpText.tsx
index cf273a9d504..2a21d37b9a2 100644
--- a/packages/react-core/src/components/DescriptionList/DescriptionListTermHelpText.tsx
+++ b/packages/react-core/src/components/DescriptionList/DescriptionListTermHelpText.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/DescriptionList/description-list';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/DescriptionList/DescriptionListTermHelpTextButton.tsx b/packages/react-core/src/components/DescriptionList/DescriptionListTermHelpTextButton.tsx
index d7c8508a94d..6950498d2e9 100644
--- a/packages/react-core/src/components/DescriptionList/DescriptionListTermHelpTextButton.tsx
+++ b/packages/react-core/src/components/DescriptionList/DescriptionListTermHelpTextButton.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { createRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/DescriptionList/description-list';
 import { css } from '@patternfly/react-styles';
 
@@ -14,7 +14,7 @@ export const DescriptionListTermHelpTextButton: React.FunctionComponent<Descript
   className,
   ...props
 }: DescriptionListTermHelpTextButtonProps) => {
-  const helpTextRef = React.createRef<HTMLSpanElement>();
+  const helpTextRef = createRef<HTMLSpanElement>();
 
   const handleKeys = (event: React.KeyboardEvent<HTMLSpanElement>) => {
     if (!helpTextRef.current || helpTextRef.current !== (event.target as HTMLElement)) {
diff --git a/packages/react-core/src/components/DescriptionList/__tests__/DescriptionList.test.tsx b/packages/react-core/src/components/DescriptionList/__tests__/DescriptionList.test.tsx
index 9240e271c23..1bc061785ab 100644
--- a/packages/react-core/src/components/DescriptionList/__tests__/DescriptionList.test.tsx
+++ b/packages/react-core/src/components/DescriptionList/__tests__/DescriptionList.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { DescriptionList } from '../DescriptionList';
 
diff --git a/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListDescription.test.tsx b/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListDescription.test.tsx
index 65367307167..e18009a2604 100644
--- a/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListDescription.test.tsx
+++ b/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListDescription.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { DescriptionListDescription } from '../DescriptionListDescription';
 
diff --git a/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListGroup.test.tsx b/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListGroup.test.tsx
index 53e84b545ff..18e07ca68b9 100644
--- a/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListGroup.test.tsx
+++ b/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListGroup.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { DescriptionListGroup } from '../DescriptionListGroup';
 
diff --git a/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListHelpTextButton.test.tsx b/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListHelpTextButton.test.tsx
index bb49c585450..120279c6fda 100644
--- a/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListHelpTextButton.test.tsx
+++ b/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListHelpTextButton.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { DescriptionListTermHelpTextButton } from '../DescriptionListTermHelpTextButton';
 
diff --git a/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListTerm.test.tsx b/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListTerm.test.tsx
index 840db5199ea..173ba1bf4c0 100644
--- a/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListTerm.test.tsx
+++ b/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListTerm.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { DescriptionListTerm } from '../DescriptionListTerm';
 
diff --git a/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListTermHelpText.test.tsx b/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListTermHelpText.test.tsx
index 1bd9779d379..27acbaf3d93 100644
--- a/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListTermHelpText.test.tsx
+++ b/packages/react-core/src/components/DescriptionList/__tests__/DescriptionListTermHelpText.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { DescriptionListTermHelpText } from '../DescriptionListTermHelpText';
 
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListAutoFitBasic.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListAutoFitBasic.tsx
index 350ce0c3244..2ee115ea76d 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListAutoFitBasic.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListAutoFitBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListAutoFitMinWidthModified.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListAutoFitMinWidthModified.tsx
index a9a7f930f60..d161edf30fa 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListAutoFitMinWidthModified.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListAutoFitMinWidthModified.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListAutoFitMinWidthResponsive.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListAutoFitMinWidthResponsive.tsx
index c6a6baf0967..e224b8c47af 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListAutoFitMinWidthResponsive.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListAutoFitMinWidthResponsive.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListBasic.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListBasic.tsx
index 2e757d7c134..c7694925afa 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListBasic.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListColumnFill.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListColumnFill.tsx
index 4130504079d..56a14f7c0fe 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListColumnFill.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListColumnFill.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListCompact.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListCompact.tsx
index b88b87a1dce..a549dfc3f81 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListCompact.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListCompact.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListCompactHorizontal.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListCompactHorizontal.tsx
index 9f830d4dc11..9d0861dd10a 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListCompactHorizontal.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListCompactHorizontal.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultAutoColumn.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultAutoColumn.tsx
index faafefab01b..bc1940a8c0d 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultAutoColumn.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultAutoColumn.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultInlineGrid.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultInlineGrid.tsx
index f7efc50cf19..01f5ca593a0 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultInlineGrid.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultInlineGrid.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultResponsiveColumns.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultResponsiveColumns.tsx
index 62831bc0a1b..e88cebefbe2 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultResponsiveColumns.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultResponsiveColumns.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultThreeColLg.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultThreeColLg.tsx
index 06e60b06979..c66e0fce3e2 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultThreeColLg.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultThreeColLg.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultTwoCol.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultTwoCol.tsx
index a06a0d48aac..63c1caf52dd 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultTwoCol.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListDefaultTwoCol.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListDisplaySizeAndCardHorizontalTermWidth.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListDisplaySizeAndCardHorizontalTermWidth.tsx
index 0c9a0ca430b..36b45683b7e 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListDisplaySizeAndCardHorizontalTermWidth.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListDisplaySizeAndCardHorizontalTermWidth.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button, DescriptionList, DescriptionListTerm, DescriptionListDescription, Card } from '@patternfly/react-core';
 import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
 
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListDisplaySizeAndCardThreeColumn.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListDisplaySizeAndCardThreeColumn.tsx
index a54c675e8e0..70947c5e2f8 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListDisplaySizeAndCardThreeColumn.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListDisplaySizeAndCardThreeColumn.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button, DescriptionList, DescriptionListTerm, DescriptionListDescription, Card } from '@patternfly/react-core';
 import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
 
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListFluidHorizontal.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListFluidHorizontal.tsx
index 152d4142490..d2494e5dceb 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListFluidHorizontal.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListFluidHorizontal.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontal.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontal.tsx
index 9ef28e516af..b08312c0523 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontal.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontal.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalAutoColumn.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalAutoColumn.tsx
index 28c76e77467..2c495d4594d 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalAutoColumn.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalAutoColumn.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalCustomTermWidth.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalCustomTermWidth.tsx
index 888cc033939..1974f1b0873 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalCustomTermWidth.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalCustomTermWidth.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalResponsiveColumns.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalResponsiveColumns.tsx
index 22f77d4cabd..da0e109def4 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalResponsiveColumns.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalResponsiveColumns.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalThreeColLg.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalThreeColLg.tsx
index a582b4dfaca..539f68c8608 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalThreeColLg.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalThreeColLg.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalTwoCol.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalTwoCol.tsx
index 3e43bf50592..76a14345afa 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalTwoCol.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListHorizontalTwoCol.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListIconsOnTerms.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListIconsOnTerms.tsx
index 98d896285f9..02010a4685c 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListIconsOnTerms.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListIconsOnTerms.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListResponsiveHoriVertGroup.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListResponsiveHoriVertGroup.tsx
index e60d592fdf9..c97560a6125 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListResponsiveHoriVertGroup.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListResponsiveHoriVertGroup.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListWithCard.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListWithCard.tsx
index 5e7a0c0ba80..63ad0076a42 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListWithCard.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListWithCard.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListWithLargeDisplaySize.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListWithLargeDisplaySize.tsx
index dc673735d57..22e3962bf4f 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListWithLargeDisplaySize.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListWithLargeDisplaySize.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListWithLargeDisplaySizeAndCard.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListWithLargeDisplaySizeAndCard.tsx
index 1d44868ae6e..238990874ea 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListWithLargeDisplaySizeAndCard.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListWithLargeDisplaySizeAndCard.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/DescriptionList/examples/DescriptionListWithTermHelpText.tsx b/packages/react-core/src/components/DescriptionList/examples/DescriptionListWithTermHelpText.tsx
index 297995a4a2d..537e5a34180 100644
--- a/packages/react-core/src/components/DescriptionList/examples/DescriptionListWithTermHelpText.tsx
+++ b/packages/react-core/src/components/DescriptionList/examples/DescriptionListWithTermHelpText.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   DescriptionList,
diff --git a/packages/react-core/src/components/Divider/Divider.tsx b/packages/react-core/src/components/Divider/Divider.tsx
index 35ccaba4555..5b10b5b27af 100644
--- a/packages/react-core/src/components/Divider/Divider.tsx
+++ b/packages/react-core/src/components/Divider/Divider.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Divider/divider';
 import { formatBreakpointMods } from '../../helpers/util';
diff --git a/packages/react-core/src/components/Divider/__tests__/Divider.test.tsx b/packages/react-core/src/components/Divider/__tests__/Divider.test.tsx
index 53192ed63a4..33384c6b455 100644
--- a/packages/react-core/src/components/Divider/__tests__/Divider.test.tsx
+++ b/packages/react-core/src/components/Divider/__tests__/Divider.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Divider } from '../Divider';
 import styles from '@patternfly/react-styles/css/components/Divider/divider';
diff --git a/packages/react-core/src/components/Divider/examples/DividerInsetMedium.tsx b/packages/react-core/src/components/Divider/examples/DividerInsetMedium.tsx
index 281c786b590..23ac7a522fd 100644
--- a/packages/react-core/src/components/Divider/examples/DividerInsetMedium.tsx
+++ b/packages/react-core/src/components/Divider/examples/DividerInsetMedium.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Divider } from '@patternfly/react-core';
 
 export const DividerInsetMedium: React.FunctionComponent = () => <Divider inset={{ default: 'insetMd' }} />;
diff --git a/packages/react-core/src/components/Divider/examples/DividerInsetVariousBreakpoints.tsx b/packages/react-core/src/components/Divider/examples/DividerInsetVariousBreakpoints.tsx
index 20f43d5dedc..32a706ec99b 100644
--- a/packages/react-core/src/components/Divider/examples/DividerInsetVariousBreakpoints.tsx
+++ b/packages/react-core/src/components/Divider/examples/DividerInsetVariousBreakpoints.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Divider } from '@patternfly/react-core';
 
 export const DividerInsetVariousBreakpoints: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Divider/examples/DividerOrientationVariousBreakpoints.tsx b/packages/react-core/src/components/Divider/examples/DividerOrientationVariousBreakpoints.tsx
index b182293baaf..da3b18a8337 100644
--- a/packages/react-core/src/components/Divider/examples/DividerOrientationVariousBreakpoints.tsx
+++ b/packages/react-core/src/components/Divider/examples/DividerOrientationVariousBreakpoints.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Divider, Flex, FlexItem } from '@patternfly/react-core';
 
 export const DividerOrientationVariousBreakpoints: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Divider/examples/DividerUsingDiv.tsx b/packages/react-core/src/components/Divider/examples/DividerUsingDiv.tsx
index fc16716c5f7..2db47de38eb 100644
--- a/packages/react-core/src/components/Divider/examples/DividerUsingDiv.tsx
+++ b/packages/react-core/src/components/Divider/examples/DividerUsingDiv.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Divider } from '@patternfly/react-core';
 
 export const DividerUsingDiv: React.FunctionComponent = () => <Divider component="div" />;
diff --git a/packages/react-core/src/components/Divider/examples/DividerUsingHr.tsx b/packages/react-core/src/components/Divider/examples/DividerUsingHr.tsx
index 8ca86bcdee6..90b2418a27b 100644
--- a/packages/react-core/src/components/Divider/examples/DividerUsingHr.tsx
+++ b/packages/react-core/src/components/Divider/examples/DividerUsingHr.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Divider } from '@patternfly/react-core';
 
 export const DividerUsingHr: React.FunctionComponent = () => <Divider />;
diff --git a/packages/react-core/src/components/Divider/examples/DividerUsingLi.tsx b/packages/react-core/src/components/Divider/examples/DividerUsingLi.tsx
index f8e0c4269ea..0d6e4584f65 100644
--- a/packages/react-core/src/components/Divider/examples/DividerUsingLi.tsx
+++ b/packages/react-core/src/components/Divider/examples/DividerUsingLi.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Divider } from '@patternfly/react-core';
 
 export const DividerUsingLi: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Divider/examples/DividerVerticalFlex.tsx b/packages/react-core/src/components/Divider/examples/DividerVerticalFlex.tsx
index 57054866cde..47a40933628 100644
--- a/packages/react-core/src/components/Divider/examples/DividerVerticalFlex.tsx
+++ b/packages/react-core/src/components/Divider/examples/DividerVerticalFlex.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Divider, Flex, FlexItem } from '@patternfly/react-core';
 
 export const DividerVerticalFlex: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Divider/examples/DividerVerticalFlexInsetSmall.tsx b/packages/react-core/src/components/Divider/examples/DividerVerticalFlexInsetSmall.tsx
index 95e93d151c1..0ad28729feb 100644
--- a/packages/react-core/src/components/Divider/examples/DividerVerticalFlexInsetSmall.tsx
+++ b/packages/react-core/src/components/Divider/examples/DividerVerticalFlexInsetSmall.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Divider, Flex, FlexItem } from '@patternfly/react-core';
 
 export const DividerVerticalFlexInsetSmall: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Divider/examples/DividerVerticalFlexInsetVariousBreakpoints.tsx b/packages/react-core/src/components/Divider/examples/DividerVerticalFlexInsetVariousBreakpoints.tsx
index c47a605b781..7f1c67baca9 100644
--- a/packages/react-core/src/components/Divider/examples/DividerVerticalFlexInsetVariousBreakpoints.tsx
+++ b/packages/react-core/src/components/Divider/examples/DividerVerticalFlexInsetVariousBreakpoints.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Divider, Flex, FlexItem } from '@patternfly/react-core';
 
 export const DividerVerticalFlexInsetVariousBreakpoints: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Drawer/Drawer.tsx b/packages/react-core/src/components/Drawer/Drawer.tsx
index d8151d76780..c38effa6016 100644
--- a/packages/react-core/src/components/Drawer/Drawer.tsx
+++ b/packages/react-core/src/components/Drawer/Drawer.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { createContext, useRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/Drawer/drawer';
 import { css } from '@patternfly/react-styles';
 
@@ -35,7 +35,7 @@ export interface DrawerContextProps {
   isInline: boolean;
 }
 
-export const DrawerContext = React.createContext<Partial<DrawerContextProps>>({
+export const DrawerContext = createContext<Partial<DrawerContextProps>>({
   isExpanded: false,
   isStatic: false,
   onExpand: () => {},
@@ -55,8 +55,8 @@ export const Drawer: React.FunctionComponent<DrawerProps> = ({
   onExpand = () => {},
   ...props
 }: DrawerProps) => {
-  const drawerRef = React.useRef<HTMLDivElement>(undefined);
-  const drawerContentRef = React.useRef<HTMLDivElement>(undefined);
+  const drawerRef = useRef<HTMLDivElement>(undefined);
+  const drawerContentRef = useRef<HTMLDivElement>(undefined);
 
   return (
     <DrawerContext.Provider value={{ isExpanded, isStatic, onExpand, position, drawerRef, drawerContentRef, isInline }}>
diff --git a/packages/react-core/src/components/Drawer/DrawerActions.tsx b/packages/react-core/src/components/Drawer/DrawerActions.tsx
index 85321d7c0ee..97d4367861c 100644
--- a/packages/react-core/src/components/Drawer/DrawerActions.tsx
+++ b/packages/react-core/src/components/Drawer/DrawerActions.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Drawer/drawer';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Drawer/DrawerCloseButton.tsx b/packages/react-core/src/components/Drawer/DrawerCloseButton.tsx
index fc6fff86dc6..14639244ac3 100644
--- a/packages/react-core/src/components/Drawer/DrawerCloseButton.tsx
+++ b/packages/react-core/src/components/Drawer/DrawerCloseButton.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Drawer/drawer';
 import { css } from '@patternfly/react-styles';
 import { Button } from '../Button';
diff --git a/packages/react-core/src/components/Drawer/DrawerContent.tsx b/packages/react-core/src/components/Drawer/DrawerContent.tsx
index 4dda7972892..a489316842d 100644
--- a/packages/react-core/src/components/Drawer/DrawerContent.tsx
+++ b/packages/react-core/src/components/Drawer/DrawerContent.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useContext } from 'react';
 import styles from '@patternfly/react-styles/css/components/Drawer/drawer';
 import { css } from '@patternfly/react-styles';
 import { DrawerMain } from './DrawerMain';
@@ -28,7 +28,7 @@ export const DrawerContent: React.FunctionComponent<DrawerContentProps> = ({
   colorVariant = DrawerContentColorVariant.default,
   ...props
 }: DrawerContentProps) => {
-  const { drawerContentRef } = React.useContext(DrawerContext);
+  const { drawerContentRef } = useContext(DrawerContext);
 
   return (
     <DrawerMain>
diff --git a/packages/react-core/src/components/Drawer/DrawerContentBody.tsx b/packages/react-core/src/components/Drawer/DrawerContentBody.tsx
index b5d32fdba39..a522457b4a2 100644
--- a/packages/react-core/src/components/Drawer/DrawerContentBody.tsx
+++ b/packages/react-core/src/components/Drawer/DrawerContentBody.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Drawer/drawer';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Drawer/DrawerHead.tsx b/packages/react-core/src/components/Drawer/DrawerHead.tsx
index 16b634b0419..703531699ea 100644
--- a/packages/react-core/src/components/Drawer/DrawerHead.tsx
+++ b/packages/react-core/src/components/Drawer/DrawerHead.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Drawer/drawer';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Drawer/DrawerMain.tsx b/packages/react-core/src/components/Drawer/DrawerMain.tsx
index 095046a7302..1cda6baddab 100644
--- a/packages/react-core/src/components/Drawer/DrawerMain.tsx
+++ b/packages/react-core/src/components/Drawer/DrawerMain.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Drawer/drawer';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Drawer/DrawerPanelBody.tsx b/packages/react-core/src/components/Drawer/DrawerPanelBody.tsx
index b23ccca102f..9b6ca99e73e 100644
--- a/packages/react-core/src/components/Drawer/DrawerPanelBody.tsx
+++ b/packages/react-core/src/components/Drawer/DrawerPanelBody.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Drawer/drawer';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Drawer/DrawerPanelContent.tsx b/packages/react-core/src/components/Drawer/DrawerPanelContent.tsx
index 9822585e2a8..83cac16a3aa 100644
--- a/packages/react-core/src/components/Drawer/DrawerPanelContent.tsx
+++ b/packages/react-core/src/components/Drawer/DrawerPanelContent.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Fragment, useCallback, useContext, useEffect, useRef, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/Drawer/drawer';
 import { css } from '@patternfly/react-styles';
 import { DrawerColorVariant, DrawerContext } from './Drawer';
@@ -47,7 +47,7 @@ export interface DrawerPanelContentProps extends Omit<React.HTMLProps<HTMLDivEle
   increment?: number;
   /** Aria label for the resizable drawer splitter. */
   resizeAriaLabel?: string;
-  /** Width for drawer panel at various breakpoints. Overriden by resizable drawer minSize and defaultSize. */
+  /** Width for drawer panel at various breakpoints. Overridden by resizable drawer minSize and defaultSize. */
   widths?: {
     default?: 'width_25' | 'width_33' | 'width_50' | 'width_66' | 'width_75' | 'width_100';
     lg?: 'width_25' | 'width_33' | 'width_50' | 'width_66' | 'width_75' | 'width_100';
@@ -79,15 +79,14 @@ export const DrawerPanelContent: React.FunctionComponent<DrawerPanelContentProps
   focusTrap,
   ...props
 }: DrawerPanelContentProps) => {
-  const panel = React.useRef<HTMLDivElement>(undefined);
-  const splitterRef = React.useRef<HTMLDivElement>(undefined);
-  const [separatorValue, setSeparatorValue] = React.useState(0);
-  const { position, isExpanded, isStatic, onExpand, drawerRef, drawerContentRef, isInline } =
-    React.useContext(DrawerContext);
+  const panel = useRef<HTMLDivElement>(undefined);
+  const splitterRef = useRef<HTMLDivElement>(undefined);
+  const [separatorValue, setSeparatorValue] = useState(0);
+  const { position, isExpanded, isStatic, onExpand, drawerRef, drawerContentRef, isInline } = useContext(DrawerContext);
   const hidden = isStatic ? false : !isExpanded;
-  const [isExpandedInternal, setIsExpandedInternal] = React.useState(!hidden);
-  const [isFocusTrapActive, setIsFocusTrapActive] = React.useState(false);
-  const previouslyFocusedElement = React.useRef(null);
+  const [isExpandedInternal, setIsExpandedInternal] = useState(!hidden);
+  const [isFocusTrapActive, setIsFocusTrapActive] = useState(false);
+  const previouslyFocusedElement = useRef(null);
   let currWidth: number = 0;
   let panelRect: DOMRect;
   let end: number;
@@ -102,7 +101,7 @@ export const DrawerPanelContent: React.FunctionComponent<DrawerPanelContentProps
     );
   }
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (!isStatic && isExpanded) {
       setIsExpandedInternal(isExpanded);
     }
@@ -258,10 +257,10 @@ export const DrawerPanelContent: React.FunctionComponent<DrawerPanelContentProps
     document.removeEventListener('touchend', callbackTouchEnd);
   };
 
-  const callbackMouseMove = React.useCallback(handleMouseMove, []);
-  const callbackTouchEnd = React.useCallback(handleTouchEnd, []);
-  const callbackTouchMove = React.useCallback(handleTouchMove, []);
-  const callbackMouseUp = React.useCallback(handleMouseup, []);
+  const callbackMouseMove = useCallback(handleMouseMove, []);
+  const callbackTouchEnd = useCallback(handleTouchEnd, []);
+  const callbackTouchMove = useCallback(handleTouchMove, []);
+  const callbackMouseUp = useCallback(handleMouseup, []);
 
   const handleKeys = (e: React.KeyboardEvent) => {
     const isRTL = getLanguageDirection(panel.current) === 'rtl';
@@ -389,9 +388,9 @@ export const DrawerPanelContent: React.FunctionComponent<DrawerPanelContentProps
             ref={panel}
           >
             {isExpandedInternal && (
-              <React.Fragment>
+              <Fragment>
                 {isResizable && (
-                  <React.Fragment>
+                  <Fragment>
                     <div
                       className={css(styles.drawerSplitter, position !== 'bottom' && styles.modifiers.vertical)}
                       role="separator"
@@ -410,10 +409,10 @@ export const DrawerPanelContent: React.FunctionComponent<DrawerPanelContentProps
                       <div className={css(styles.drawerSplitterHandle)} aria-hidden></div>
                     </div>
                     <div className={css(styles.drawerPanelMain)}>{children}</div>
-                  </React.Fragment>
+                  </Fragment>
                 )}
                 {!isResizable && children}
-              </React.Fragment>
+              </Fragment>
             )}
           </Component>
         );
diff --git a/packages/react-core/src/components/Drawer/DrawerPanelDescription.tsx b/packages/react-core/src/components/Drawer/DrawerPanelDescription.tsx
index ac066f09b0a..7d044777f8d 100644
--- a/packages/react-core/src/components/Drawer/DrawerPanelDescription.tsx
+++ b/packages/react-core/src/components/Drawer/DrawerPanelDescription.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Drawer/drawer';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Drawer/DrawerSection.tsx b/packages/react-core/src/components/Drawer/DrawerSection.tsx
index 95e0a0662f6..011f2dde0b8 100644
--- a/packages/react-core/src/components/Drawer/DrawerSection.tsx
+++ b/packages/react-core/src/components/Drawer/DrawerSection.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Drawer/drawer';
 import { css } from '@patternfly/react-styles';
 import { DrawerColorVariant } from './Drawer';
diff --git a/packages/react-core/src/components/Drawer/__tests__/Drawer.test.tsx b/packages/react-core/src/components/Drawer/__tests__/Drawer.test.tsx
index c215634bb50..a7b0d8a8708 100644
--- a/packages/react-core/src/components/Drawer/__tests__/Drawer.test.tsx
+++ b/packages/react-core/src/components/Drawer/__tests__/Drawer.test.tsx
@@ -1,3 +1,4 @@
+import { createContext } from 'react';
 import {
   Drawer,
   DrawerActions,
@@ -9,7 +10,6 @@ import {
   DrawerPanelContent,
   DrawerColorVariant
 } from '../';
-import React from 'react';
 import { render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { KeyTypes } from '../../../helpers';
@@ -130,7 +130,7 @@ test(`Drawer has resizable callback and id`, () => {
 });
 
 test('Resizeable DrawerPanelContent can be wrapped in a context without causing an error', async () => {
-  const TestContext = React.createContext({});
+  const TestContext = createContext({});
 
   const consoleError = jest.spyOn(console, 'error').mockImplementation();
 
diff --git a/packages/react-core/src/components/Drawer/__tests__/DrawerPanelContent.test.tsx b/packages/react-core/src/components/Drawer/__tests__/DrawerPanelContent.test.tsx
index b1cd0fe850e..fd277778bf3 100644
--- a/packages/react-core/src/components/Drawer/__tests__/DrawerPanelContent.test.tsx
+++ b/packages/react-core/src/components/Drawer/__tests__/DrawerPanelContent.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { DrawerPanelContent } from '../DrawerPanelContent';
 import { Drawer } from '../Drawer';
diff --git a/packages/react-core/src/components/Drawer/__tests__/Generated/DrawerContent.test.tsx b/packages/react-core/src/components/Drawer/__tests__/Generated/DrawerContent.test.tsx
index a4f332fc05e..3ce691d8284 100644
--- a/packages/react-core/src/components/Drawer/__tests__/Generated/DrawerContent.test.tsx
+++ b/packages/react-core/src/components/Drawer/__tests__/Generated/DrawerContent.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { DrawerContent } from '../../DrawerContent';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Drawer/__tests__/Generated/DrawerPanelContent.test.tsx b/packages/react-core/src/components/Drawer/__tests__/Generated/DrawerPanelContent.test.tsx
index ed8676d0943..34c66959937 100644
--- a/packages/react-core/src/components/Drawer/__tests__/Generated/DrawerPanelContent.test.tsx
+++ b/packages/react-core/src/components/Drawer/__tests__/Generated/DrawerPanelContent.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { DrawerPanelContent } from '../../DrawerPanelContent';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Drawer/examples/Drawer.md b/packages/react-core/src/components/Drawer/examples/Drawer.md
index 448970d8247..e9db8ac9e5b 100644
--- a/packages/react-core/src/components/Drawer/examples/Drawer.md
+++ b/packages/react-core/src/components/Drawer/examples/Drawer.md
@@ -17,7 +17,7 @@ propComponents:
   ]
 section: components
 ---
-
+import { Fragment, useRef, useState } from 'react';
 import accessibility from '@patternfly/react-styles/css/utilities/Accessibility/accessibility';
 
 ## Examples
diff --git a/packages/react-core/src/components/Drawer/examples/DrawerAdditionalSectionAboveContent.tsx b/packages/react-core/src/components/Drawer/examples/DrawerAdditionalSectionAboveContent.tsx
index 1c217b3f986..df64c62bda8 100644
--- a/packages/react-core/src/components/Drawer/examples/DrawerAdditionalSectionAboveContent.tsx
+++ b/packages/react-core/src/components/Drawer/examples/DrawerAdditionalSectionAboveContent.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useRef, useState } from 'react';
 import {
   Drawer,
   DrawerPanelContent,
@@ -12,8 +12,8 @@ import {
 } from '@patternfly/react-core';
 
 export const DrawerAdditionalSectionAboveContent: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const drawerRef = React.useRef<HTMLDivElement>(undefined);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const drawerRef = useRef<HTMLDivElement>(undefined);
 
   const onExpand = () => {
     drawerRef.current && drawerRef.current.focus();
@@ -44,7 +44,7 @@ export const DrawerAdditionalSectionAboveContent: React.FunctionComponent = () =
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button aria-expanded={isExpanded} onClick={onClick}>
         Toggle drawer
       </Button>
@@ -54,6 +54,6 @@ export const DrawerAdditionalSectionAboveContent: React.FunctionComponent = () =
           <DrawerContentBody>{drawerContent}</DrawerContentBody>
         </DrawerContent>
       </Drawer>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Drawer/examples/DrawerBasic.tsx b/packages/react-core/src/components/Drawer/examples/DrawerBasic.tsx
index 134bfdf098d..e792e32a058 100644
--- a/packages/react-core/src/components/Drawer/examples/DrawerBasic.tsx
+++ b/packages/react-core/src/components/Drawer/examples/DrawerBasic.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useRef, useState } from 'react';
 import {
   Drawer,
   DrawerPanelContent,
@@ -13,8 +13,8 @@ import {
 } from '@patternfly/react-core';
 
 export const DrawerBasic: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const drawerRef = React.useRef<HTMLDivElement>(undefined);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const drawerRef = useRef<HTMLDivElement>(undefined);
 
   const onExpand = () => {
     drawerRef.current && drawerRef.current.focus();
@@ -47,7 +47,7 @@ export const DrawerBasic: React.FunctionComponent = () => {
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button aria-expanded={isExpanded} onClick={onClick}>
         Toggle drawer
       </Button>
@@ -56,6 +56,6 @@ export const DrawerBasic: React.FunctionComponent = () => {
           <DrawerContentBody>{drawerContent}</DrawerContentBody>
         </DrawerContent>
       </Drawer>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Drawer/examples/DrawerBasicInline.tsx b/packages/react-core/src/components/Drawer/examples/DrawerBasicInline.tsx
index b948452b7b6..a9ceb86666e 100644
--- a/packages/react-core/src/components/Drawer/examples/DrawerBasicInline.tsx
+++ b/packages/react-core/src/components/Drawer/examples/DrawerBasicInline.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useRef, useState } from 'react';
 import {
   Drawer,
   DrawerPanelContent,
@@ -11,8 +11,8 @@ import {
 } from '@patternfly/react-core';
 
 export const DrawerBasicInline: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const drawerRef = React.useRef<HTMLDivElement>(undefined);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const drawerRef = useRef<HTMLDivElement>(undefined);
 
   const onExpand = () => {
     drawerRef.current && drawerRef.current.focus();
@@ -43,7 +43,7 @@ export const DrawerBasicInline: React.FunctionComponent = () => {
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button aria-expanded={isExpanded} onClick={onClick}>
         Toggle drawer
       </Button>
@@ -52,6 +52,6 @@ export const DrawerBasicInline: React.FunctionComponent = () => {
           <DrawerContentBody>{drawerContent}</DrawerContentBody>
         </DrawerContent>
       </Drawer>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Drawer/examples/DrawerBreakpoint.tsx b/packages/react-core/src/components/Drawer/examples/DrawerBreakpoint.tsx
index 961706d8fda..74eb0eb514f 100644
--- a/packages/react-core/src/components/Drawer/examples/DrawerBreakpoint.tsx
+++ b/packages/react-core/src/components/Drawer/examples/DrawerBreakpoint.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useRef, useState } from 'react';
 import {
   Drawer,
   DrawerPanelContent,
@@ -11,8 +11,8 @@ import {
 } from '@patternfly/react-core';
 
 export const DrawerBreakpoint: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const drawerRef = React.useRef<HTMLDivElement>(undefined);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const drawerRef = useRef<HTMLDivElement>(undefined);
 
   const onExpand = () => {
     drawerRef.current && drawerRef.current.focus();
@@ -43,7 +43,7 @@ export const DrawerBreakpoint: React.FunctionComponent = () => {
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button aria-expanded={isExpanded} onClick={onClick}>
         Toggle drawer
       </Button>
@@ -52,6 +52,6 @@ export const DrawerBreakpoint: React.FunctionComponent = () => {
           <DrawerContentBody>{drawerContent}</DrawerContentBody>
         </DrawerContent>
       </Drawer>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Drawer/examples/DrawerFocusTrap.tsx b/packages/react-core/src/components/Drawer/examples/DrawerFocusTrap.tsx
index e8fde64ed44..5f5f44422e7 100644
--- a/packages/react-core/src/components/Drawer/examples/DrawerFocusTrap.tsx
+++ b/packages/react-core/src/components/Drawer/examples/DrawerFocusTrap.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import {
   Drawer,
   DrawerPanelContent,
@@ -11,7 +11,7 @@ import {
 } from '@patternfly/react-core';
 
 export const DrawerFocusTrap: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
+  const [isExpanded, setIsExpanded] = useState(false);
 
   const onClick = () => {
     setIsExpanded(!isExpanded);
@@ -44,7 +44,7 @@ export const DrawerFocusTrap: React.FunctionComponent = () => {
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button aria-expanded={isExpanded} onClick={onClick}>
         Toggle drawer with focus trap
       </Button>
@@ -53,6 +53,6 @@ export const DrawerFocusTrap: React.FunctionComponent = () => {
           <DrawerContentBody>{drawerContent}</DrawerContentBody>
         </DrawerContent>
       </Drawer>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Drawer/examples/DrawerInlinePanelEnd.tsx b/packages/react-core/src/components/Drawer/examples/DrawerInlinePanelEnd.tsx
index 721ba69ad81..9574c6a5360 100644
--- a/packages/react-core/src/components/Drawer/examples/DrawerInlinePanelEnd.tsx
+++ b/packages/react-core/src/components/Drawer/examples/DrawerInlinePanelEnd.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useRef, useState } from 'react';
 import {
   Drawer,
   DrawerPanelContent,
@@ -11,8 +11,8 @@ import {
 } from '@patternfly/react-core';
 
 export const DrawerInlinePanelEnd: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const drawerRef = React.useRef<HTMLDivElement>(undefined);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const drawerRef = useRef<HTMLDivElement>(undefined);
 
   const onExpand = () => {
     drawerRef.current && drawerRef.current.focus();
@@ -43,7 +43,7 @@ export const DrawerInlinePanelEnd: React.FunctionComponent = () => {
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button aria-expanded={isExpanded} onClick={onClick}>
         Toggle drawer
       </Button>
@@ -52,6 +52,6 @@ export const DrawerInlinePanelEnd: React.FunctionComponent = () => {
           <DrawerContentBody>{drawerContent}</DrawerContentBody>
         </DrawerContent>
       </Drawer>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Drawer/examples/DrawerInlinePanelStart.tsx b/packages/react-core/src/components/Drawer/examples/DrawerInlinePanelStart.tsx
index 0331478d321..c1ed8445748 100644
--- a/packages/react-core/src/components/Drawer/examples/DrawerInlinePanelStart.tsx
+++ b/packages/react-core/src/components/Drawer/examples/DrawerInlinePanelStart.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useRef, useState } from 'react';
 import {
   Drawer,
   DrawerPanelContent,
@@ -11,8 +11,8 @@ import {
 } from '@patternfly/react-core';
 
 export const DrawerInlinePanelStart: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const drawerRef = React.useRef<HTMLDivElement>(undefined);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const drawerRef = useRef<HTMLDivElement>(undefined);
 
   const onExpand = () => {
     drawerRef.current && drawerRef.current.focus();
@@ -43,7 +43,7 @@ export const DrawerInlinePanelStart: React.FunctionComponent = () => {
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button aria-expanded={isExpanded} onClick={onClick}>
         Toggle drawer
       </Button>
@@ -52,6 +52,6 @@ export const DrawerInlinePanelStart: React.FunctionComponent = () => {
           <DrawerContentBody>{drawerContent}</DrawerContentBody>
         </DrawerContent>
       </Drawer>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Drawer/examples/DrawerModifiedContentPadding.tsx b/packages/react-core/src/components/Drawer/examples/DrawerModifiedContentPadding.tsx
index d81a87a8a77..218f7b44889 100644
--- a/packages/react-core/src/components/Drawer/examples/DrawerModifiedContentPadding.tsx
+++ b/packages/react-core/src/components/Drawer/examples/DrawerModifiedContentPadding.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useRef, useState } from 'react';
 import {
   Drawer,
   DrawerPanelContent,
@@ -11,8 +11,8 @@ import {
 } from '@patternfly/react-core';
 
 export const DrawerModifiedContentPadding: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const drawerRef = React.useRef<HTMLDivElement>(undefined);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const drawerRef = useRef<HTMLDivElement>(undefined);
 
   const onExpand = () => {
     drawerRef.current && drawerRef.current.focus();
@@ -43,7 +43,7 @@ export const DrawerModifiedContentPadding: React.FunctionComponent = () => {
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button aria-expanded={isExpanded} onClick={onClick}>
         Toggle drawer
       </Button>
@@ -54,6 +54,6 @@ export const DrawerModifiedContentPadding: React.FunctionComponent = () => {
           </DrawerContentBody>
         </DrawerContent>
       </Drawer>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Drawer/examples/DrawerModifiedPanelPadding.tsx b/packages/react-core/src/components/Drawer/examples/DrawerModifiedPanelPadding.tsx
index 2ee41112dea..5f28bd3e451 100644
--- a/packages/react-core/src/components/Drawer/examples/DrawerModifiedPanelPadding.tsx
+++ b/packages/react-core/src/components/Drawer/examples/DrawerModifiedPanelPadding.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useRef, useState } from 'react';
 import {
   Drawer,
   DrawerPanelContent,
@@ -11,8 +11,8 @@ import {
 } from '@patternfly/react-core';
 
 export const DrawerModifiedPanelPadding: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const drawerRef = React.useRef<HTMLDivElement>(undefined);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const drawerRef = useRef<HTMLDivElement>(undefined);
 
   const onExpand = () => {
     drawerRef.current && drawerRef.current.focus();
@@ -43,7 +43,7 @@ export const DrawerModifiedPanelPadding: React.FunctionComponent = () => {
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button aria-expanded={isExpanded} onClick={onClick}>
         Toggle drawer
       </Button>
@@ -52,6 +52,6 @@ export const DrawerModifiedPanelPadding: React.FunctionComponent = () => {
           <DrawerContentBody>{drawerContent}</DrawerContentBody>
         </DrawerContent>
       </Drawer>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Drawer/examples/DrawerPanelBottom.tsx b/packages/react-core/src/components/Drawer/examples/DrawerPanelBottom.tsx
index f52b0d72acb..c89f7f13e1f 100644
--- a/packages/react-core/src/components/Drawer/examples/DrawerPanelBottom.tsx
+++ b/packages/react-core/src/components/Drawer/examples/DrawerPanelBottom.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useRef, useState } from 'react';
 import {
   Drawer,
   DrawerPanelContent,
@@ -11,8 +11,8 @@ import {
 } from '@patternfly/react-core';
 
 export const DrawerPanelBottom: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const drawerRef = React.useRef<HTMLDivElement>(undefined);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const drawerRef = useRef<HTMLDivElement>(undefined);
 
   const onExpand = () => {
     drawerRef.current && drawerRef.current.focus();
@@ -43,7 +43,7 @@ export const DrawerPanelBottom: React.FunctionComponent = () => {
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button aria-expanded={isExpanded} onClick={onClick}>
         Toggle drawer
       </Button>
@@ -54,6 +54,6 @@ export const DrawerPanelBottom: React.FunctionComponent = () => {
           </DrawerContent>
         </Drawer>
       </div>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Drawer/examples/DrawerPanelEnd.tsx b/packages/react-core/src/components/Drawer/examples/DrawerPanelEnd.tsx
index c763fce6b22..852b9eff4c1 100644
--- a/packages/react-core/src/components/Drawer/examples/DrawerPanelEnd.tsx
+++ b/packages/react-core/src/components/Drawer/examples/DrawerPanelEnd.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useRef, useState } from 'react';
 import {
   Drawer,
   DrawerPanelContent,
@@ -11,8 +11,8 @@ import {
 } from '@patternfly/react-core';
 
 export const DrawerPanelEnd: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const drawerRef = React.useRef<HTMLDivElement>(undefined);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const drawerRef = useRef<HTMLDivElement>(undefined);
 
   const onExpand = () => {
     drawerRef.current && drawerRef.current.focus();
@@ -43,7 +43,7 @@ export const DrawerPanelEnd: React.FunctionComponent = () => {
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button aria-expanded={isExpanded} onClick={onClick}>
         Toggle drawer
       </Button>
@@ -52,6 +52,6 @@ export const DrawerPanelEnd: React.FunctionComponent = () => {
           <DrawerContentBody>{drawerContent}</DrawerContentBody>
         </DrawerContent>
       </Drawer>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Drawer/examples/DrawerPanelStart.tsx b/packages/react-core/src/components/Drawer/examples/DrawerPanelStart.tsx
index 3d9ab12a799..60c8cc515e0 100644
--- a/packages/react-core/src/components/Drawer/examples/DrawerPanelStart.tsx
+++ b/packages/react-core/src/components/Drawer/examples/DrawerPanelStart.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useRef, useState } from 'react';
 import {
   Drawer,
   DrawerPanelContent,
@@ -11,8 +11,8 @@ import {
 } from '@patternfly/react-core';
 
 export const DrawerPanelStart: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const drawerRef = React.useRef<HTMLDivElement>(undefined);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const drawerRef = useRef<HTMLDivElement>(undefined);
 
   const onExpand = () => {
     drawerRef.current && drawerRef.current.focus();
@@ -43,7 +43,7 @@ export const DrawerPanelStart: React.FunctionComponent = () => {
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button aria-expanded={isExpanded} onClick={onClick}>
         Toggle drawer
       </Button>
@@ -52,6 +52,6 @@ export const DrawerPanelStart: React.FunctionComponent = () => {
           <DrawerContentBody>{drawerContent}</DrawerContentBody>
         </DrawerContent>
       </Drawer>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Drawer/examples/DrawerResizableAtEnd.tsx b/packages/react-core/src/components/Drawer/examples/DrawerResizableAtEnd.tsx
index 88dec2ed23e..252c683ce33 100644
--- a/packages/react-core/src/components/Drawer/examples/DrawerResizableAtEnd.tsx
+++ b/packages/react-core/src/components/Drawer/examples/DrawerResizableAtEnd.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useRef, useState } from 'react';
 import {
   Drawer,
   DrawerPanelContent,
@@ -11,8 +11,8 @@ import {
 } from '@patternfly/react-core';
 
 export const DrawerResizableAtEnd: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const drawerRef = React.useRef<HTMLDivElement>(undefined);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const drawerRef = useRef<HTMLDivElement>(undefined);
 
   const onExpand = () => {
     drawerRef.current && drawerRef.current.focus();
@@ -48,7 +48,7 @@ export const DrawerResizableAtEnd: React.FunctionComponent = () => {
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button aria-expanded={isExpanded} onClick={onClick}>
         Toggle drawer
       </Button>
@@ -57,6 +57,6 @@ export const DrawerResizableAtEnd: React.FunctionComponent = () => {
           <DrawerContentBody>{drawerContent}</DrawerContentBody>
         </DrawerContent>
       </Drawer>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Drawer/examples/DrawerResizableAtStart.tsx b/packages/react-core/src/components/Drawer/examples/DrawerResizableAtStart.tsx
index f0b8aae5cf9..b5d2ef2da8f 100644
--- a/packages/react-core/src/components/Drawer/examples/DrawerResizableAtStart.tsx
+++ b/packages/react-core/src/components/Drawer/examples/DrawerResizableAtStart.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useRef, useState } from 'react';
 import {
   Drawer,
   DrawerPanelContent,
@@ -11,8 +11,8 @@ import {
 } from '@patternfly/react-core';
 
 export const DrawerResizableAtStart: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const drawerRef = React.useRef<HTMLDivElement>(undefined);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const drawerRef = useRef<HTMLDivElement>(undefined);
 
   const onExpand = () => {
     drawerRef.current && drawerRef.current.focus();
@@ -43,7 +43,7 @@ export const DrawerResizableAtStart: React.FunctionComponent = () => {
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button aria-expanded={isExpanded} onClick={onClick}>
         Toggle drawer
       </Button>
@@ -52,6 +52,6 @@ export const DrawerResizableAtStart: React.FunctionComponent = () => {
           <DrawerContentBody>{drawerContent}</DrawerContentBody>
         </DrawerContent>
       </Drawer>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Drawer/examples/DrawerResizableOnBottom.tsx b/packages/react-core/src/components/Drawer/examples/DrawerResizableOnBottom.tsx
index 9f033b26924..86da473b620 100644
--- a/packages/react-core/src/components/Drawer/examples/DrawerResizableOnBottom.tsx
+++ b/packages/react-core/src/components/Drawer/examples/DrawerResizableOnBottom.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useRef, useState } from 'react';
 import {
   Drawer,
   DrawerPanelContent,
@@ -11,8 +11,8 @@ import {
 } from '@patternfly/react-core';
 
 export const DrawerResizableOnBottom: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const drawerRef = React.useRef<HTMLDivElement>(undefined);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const drawerRef = useRef<HTMLDivElement>(undefined);
 
   const onExpand = () => {
     drawerRef.current && drawerRef.current.focus();
@@ -42,7 +42,7 @@ export const DrawerResizableOnBottom: React.FunctionComponent = () => {
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button aria-expanded={isExpanded} onClick={onClick}>
         Toggle drawer
       </Button>
@@ -53,6 +53,6 @@ export const DrawerResizableOnBottom: React.FunctionComponent = () => {
           </DrawerContent>
         </Drawer>
       </div>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Drawer/examples/DrawerResizableOnInline.tsx b/packages/react-core/src/components/Drawer/examples/DrawerResizableOnInline.tsx
index ee13637e567..e4dd4a57bd5 100644
--- a/packages/react-core/src/components/Drawer/examples/DrawerResizableOnInline.tsx
+++ b/packages/react-core/src/components/Drawer/examples/DrawerResizableOnInline.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useRef, useState } from 'react';
 import {
   Drawer,
   DrawerPanelContent,
@@ -11,8 +11,8 @@ import {
 } from '@patternfly/react-core';
 
 export const DrawerResizableOnInline: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const drawerRef = React.useRef<HTMLDivElement>(undefined);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const drawerRef = useRef<HTMLDivElement>(undefined);
 
   const onExpand = () => {
     drawerRef.current && drawerRef.current.focus();
@@ -42,7 +42,7 @@ export const DrawerResizableOnInline: React.FunctionComponent = () => {
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button aria-expanded={isExpanded} onClick={onClick}>
         Toggle drawer
       </Button>
@@ -51,6 +51,6 @@ export const DrawerResizableOnInline: React.FunctionComponent = () => {
           <DrawerContentBody>{drawerContent}</DrawerContentBody>
         </DrawerContent>
       </Drawer>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Drawer/examples/DrawerSecondaryBackground.tsx b/packages/react-core/src/components/Drawer/examples/DrawerSecondaryBackground.tsx
index 3ad6042666b..485dff0dcbf 100644
--- a/packages/react-core/src/components/Drawer/examples/DrawerSecondaryBackground.tsx
+++ b/packages/react-core/src/components/Drawer/examples/DrawerSecondaryBackground.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useRef, useState } from 'react';
 import {
   Checkbox,
   Drawer,
@@ -15,12 +15,12 @@ import {
 } from '@patternfly/react-core';
 
 export const DrawerSecondaryBackground: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const [panelSecondary, setPanelSecondary] = React.useState(true);
-  const [contentSecondary, setContentSecondary] = React.useState(false);
-  const [sectionSecondary, setSectionSecondary] = React.useState(false);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const [panelSecondary, setPanelSecondary] = useState(true);
+  const [contentSecondary, setContentSecondary] = useState(false);
+  const [sectionSecondary, setSectionSecondary] = useState(false);
 
-  const drawerRef = React.useRef<HTMLSpanElement>(null);
+  const drawerRef = useRef<HTMLSpanElement>(null);
 
   const onExpand = () => {
     drawerRef.current && drawerRef.current.focus();
@@ -63,7 +63,7 @@ export const DrawerSecondaryBackground: React.FunctionComponent = () => {
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Checkbox
         label="Secondary panel"
         isChecked={panelSecondary}
@@ -103,6 +103,6 @@ export const DrawerSecondaryBackground: React.FunctionComponent = () => {
           <DrawerContentBody>{drawerContent}</DrawerContentBody>
         </DrawerContent>
       </Drawer>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Drawer/examples/DrawerStackedContentBodyElements.tsx b/packages/react-core/src/components/Drawer/examples/DrawerStackedContentBodyElements.tsx
index 6b5ae20a70e..c4f55ddb862 100644
--- a/packages/react-core/src/components/Drawer/examples/DrawerStackedContentBodyElements.tsx
+++ b/packages/react-core/src/components/Drawer/examples/DrawerStackedContentBodyElements.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useRef, useState } from 'react';
 import {
   Drawer,
   DrawerPanelContent,
@@ -13,8 +13,8 @@ import {
 } from '@patternfly/react-core';
 
 export const DrawerStackedContentBodyElements: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const drawerRef = React.useRef<HTMLDivElement>(undefined);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const drawerRef = useRef<HTMLDivElement>(undefined);
 
   const onExpand = () => {
     drawerRef.current && drawerRef.current.focus();
@@ -44,7 +44,7 @@ export const DrawerStackedContentBodyElements: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button aria-expanded={isExpanded} onClick={onClick}>
         Toggle drawer
       </Button>
@@ -55,6 +55,6 @@ export const DrawerStackedContentBodyElements: React.FunctionComponent = () => {
           <DrawerContentBody>content-body</DrawerContentBody>
         </DrawerContent>
       </Drawer>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Drawer/examples/DrawerStatic.tsx b/packages/react-core/src/components/Drawer/examples/DrawerStatic.tsx
index 599e16458f1..773d693207b 100644
--- a/packages/react-core/src/components/Drawer/examples/DrawerStatic.tsx
+++ b/packages/react-core/src/components/Drawer/examples/DrawerStatic.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useRef, useState } from 'react';
 import {
   Drawer,
   DrawerPanelContent,
@@ -12,8 +12,8 @@ import {
 import accessibility from '@patternfly/react-styles/css/utilities/Accessibility/accessibility';
 
 export const DrawerStatic: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const drawerRef = React.useRef<HTMLDivElement>(undefined);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const drawerRef = useRef<HTMLDivElement>(undefined);
 
   const onExpand = () => {
     drawerRef.current && drawerRef.current.focus();
@@ -44,7 +44,7 @@ export const DrawerStatic: React.FunctionComponent = () => {
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button className={accessibility.hiddenOnMd} aria-expanded={isExpanded} onClick={onClick}>
         Toggle drawer
       </Button>
@@ -53,6 +53,6 @@ export const DrawerStatic: React.FunctionComponent = () => {
           <DrawerContentBody>{drawerContent}</DrawerContentBody>
         </DrawerContent>
       </Drawer>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Dropdown/Dropdown.tsx b/packages/react-core/src/components/Dropdown/Dropdown.tsx
index 0c4481624a4..9ad39d49477 100644
--- a/packages/react-core/src/components/Dropdown/Dropdown.tsx
+++ b/packages/react-core/src/components/Dropdown/Dropdown.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { forwardRef, useEffect, useRef } from 'react';
 import { css } from '@patternfly/react-styles';
 import { Menu, MenuContent, MenuProps } from '../Menu';
 import { Popper } from '../../helpers/Popper/Popper';
@@ -47,7 +47,7 @@ export interface DropdownProps extends MenuProps, OUIAProps {
   /** Function callback called when user selects item. */
   onSelect?: (event?: React.MouseEvent<Element, MouseEvent>, value?: string | number) => void;
   /** Callback to allow the dropdown component to change the open state of the menu.
-   * Triggered by clicking outside of the menu, or by pressing any keys specificed in onOpenChangeKeys. */
+   * Triggered by clicking outside of the menu, or by pressing any keys specified in onOpenChangeKeys. */
   onOpenChange?: (isOpen: boolean) => void;
   /** Keys that trigger onOpenChange, defaults to tab and escape. It is highly recommended to include Escape in the array, while Tab may be omitted if the menu contains non-menu items that are focusable. */
   onOpenChangeKeys?: string[];
@@ -103,8 +103,8 @@ const DropdownBase: React.FunctionComponent<DropdownProps> = ({
   focusTimeoutDelay = 0,
   ...props
 }: DropdownProps) => {
-  const localMenuRef = React.useRef<HTMLDivElement>(undefined);
-  const localToggleRef = React.useRef<HTMLButtonElement>(undefined);
+  const localMenuRef = useRef<HTMLDivElement>(undefined);
+  const localToggleRef = useRef<HTMLButtonElement>(undefined);
   const ouiaProps = useOUIAProps(Dropdown.displayName, ouiaId, ouiaSafe);
 
   const menuRef = (innerRef as React.RefObject<HTMLDivElement | null>) || localMenuRef;
@@ -113,8 +113,8 @@ const DropdownBase: React.FunctionComponent<DropdownProps> = ({
       ? localToggleRef
       : (toggle?.toggleRef as React.RefObject<HTMLButtonElement | null>);
 
-  const prevIsOpen = React.useRef<boolean>(isOpen);
-  React.useEffect(() => {
+  const prevIsOpen = useRef<boolean>(isOpen);
+  useEffect(() => {
     // menu was opened, focus on first menu item
     if (prevIsOpen.current === false && isOpen === true && shouldFocusFirstItemOnOpen) {
       setTimeout(() => {
@@ -129,7 +129,7 @@ const DropdownBase: React.FunctionComponent<DropdownProps> = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isOpen]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     const handleMenuKeys = (event: KeyboardEvent) => {
       // Close the menu on tab or escape if onOpenChange is provided
       if (
@@ -213,7 +213,7 @@ const DropdownBase: React.FunctionComponent<DropdownProps> = ({
   );
 };
 
-export const Dropdown = React.forwardRef((props: DropdownProps, ref: React.Ref<any>) => (
+export const Dropdown = forwardRef((props: DropdownProps, ref: React.Ref<any>) => (
   <DropdownBase innerRef={ref} {...props} />
 ));
 Dropdown.displayName = 'Dropdown';
diff --git a/packages/react-core/src/components/Dropdown/DropdownGroup.tsx b/packages/react-core/src/components/Dropdown/DropdownGroup.tsx
index 721e6216071..ea1f63fd98b 100644
--- a/packages/react-core/src/components/Dropdown/DropdownGroup.tsx
+++ b/packages/react-core/src/components/Dropdown/DropdownGroup.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { css } from '@patternfly/react-styles';
 import { MenuGroupProps, MenuGroup } from '../Menu';
 
diff --git a/packages/react-core/src/components/Dropdown/DropdownItem.tsx b/packages/react-core/src/components/Dropdown/DropdownItem.tsx
index d6cf6e127c1..0c973f45e9e 100644
--- a/packages/react-core/src/components/Dropdown/DropdownItem.tsx
+++ b/packages/react-core/src/components/Dropdown/DropdownItem.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { forwardRef } from 'react';
 import { css } from '@patternfly/react-styles';
 import { MenuItemProps, MenuItem } from '../Menu';
 import { TooltipProps } from '../Tooltip';
@@ -65,7 +65,7 @@ const DropdownItemBase: React.FunctionComponent<DropdownItemProps> = ({
   );
 };
 
-export const DropdownItem = React.forwardRef(
+export const DropdownItem = forwardRef(
   (props: DropdownItemProps, ref: React.Ref<HTMLAnchorElement | HTMLButtonElement>) => (
     <DropdownItemBase {...props} innerRef={ref} />
   )
diff --git a/packages/react-core/src/components/Dropdown/DropdownList.tsx b/packages/react-core/src/components/Dropdown/DropdownList.tsx
index e591d1ae3f0..8f9b8fac4f0 100644
--- a/packages/react-core/src/components/Dropdown/DropdownList.tsx
+++ b/packages/react-core/src/components/Dropdown/DropdownList.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { css } from '@patternfly/react-styles';
 import { MenuListProps, MenuList } from '../Menu';
 
diff --git a/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx b/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx
index 09951f3ee11..73e6d5068d5 100644
--- a/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx
+++ b/packages/react-core/src/components/Dropdown/__tests__/Dropdown.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Dropdown } from '../../Dropdown';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/react-core/src/components/Dropdown/__tests__/DropdownGroup.test.tsx b/packages/react-core/src/components/Dropdown/__tests__/DropdownGroup.test.tsx
index d7dd551e3a4..789e8a86b6e 100644
--- a/packages/react-core/src/components/Dropdown/__tests__/DropdownGroup.test.tsx
+++ b/packages/react-core/src/components/Dropdown/__tests__/DropdownGroup.test.tsx
@@ -1,7 +1,5 @@
 import { DropdownGroup } from '../../Dropdown';
 import { render, screen } from '@testing-library/react';
-import React from 'react';
-
 jest.mock('../../Menu');
 
 const dropdownGroupChildren = <div>Dropdown Group children</div>;
diff --git a/packages/react-core/src/components/Dropdown/__tests__/DropdownItem.test.tsx b/packages/react-core/src/components/Dropdown/__tests__/DropdownItem.test.tsx
index a016915e514..e70b5ca8667 100644
--- a/packages/react-core/src/components/Dropdown/__tests__/DropdownItem.test.tsx
+++ b/packages/react-core/src/components/Dropdown/__tests__/DropdownItem.test.tsx
@@ -1,7 +1,5 @@
 import { DropdownItem } from '../../Dropdown';
 import { render, screen } from '@testing-library/react';
-import React from 'react';
-
 jest.mock('../../Menu');
 
 const dropdownItemChildren = <div>Dropdown Item children</div>;
diff --git a/packages/react-core/src/components/Dropdown/__tests__/DropdownList.test.tsx b/packages/react-core/src/components/Dropdown/__tests__/DropdownList.test.tsx
index ba9a61ee650..be2cdf8316a 100644
--- a/packages/react-core/src/components/Dropdown/__tests__/DropdownList.test.tsx
+++ b/packages/react-core/src/components/Dropdown/__tests__/DropdownList.test.tsx
@@ -1,7 +1,5 @@
 import { DropdownList } from '../../Dropdown';
 import { render, screen } from '@testing-library/react';
-import React from 'react';
-
 jest.mock('../../Menu');
 
 const dropdownListChildren = <div>Dropdown List children</div>;
diff --git a/packages/react-core/src/components/Dropdown/examples/DropdownBasic.tsx b/packages/react-core/src/components/Dropdown/examples/DropdownBasic.tsx
index d5948281fe2..adfbe3080e5 100644
--- a/packages/react-core/src/components/Dropdown/examples/DropdownBasic.tsx
+++ b/packages/react-core/src/components/Dropdown/examples/DropdownBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Dropdown, DropdownItem, DropdownList, Divider, MenuToggle, MenuToggleElement } from '@patternfly/react-core';
 
 export const DropdownBasic: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Dropdown/examples/DropdownWithDescriptions.tsx b/packages/react-core/src/components/Dropdown/examples/DropdownWithDescriptions.tsx
index 751dccbf546..3cb1f12e9d6 100644
--- a/packages/react-core/src/components/Dropdown/examples/DropdownWithDescriptions.tsx
+++ b/packages/react-core/src/components/Dropdown/examples/DropdownWithDescriptions.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Dropdown, DropdownItem, DropdownList, MenuToggle, MenuToggleElement } from '@patternfly/react-core';
 
 export const DropdownWithDescriptions: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Dropdown/examples/DropdownWithGroups.tsx b/packages/react-core/src/components/Dropdown/examples/DropdownWithGroups.tsx
index 5664eb5a8f3..cdd53aed518 100644
--- a/packages/react-core/src/components/Dropdown/examples/DropdownWithGroups.tsx
+++ b/packages/react-core/src/components/Dropdown/examples/DropdownWithGroups.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Dropdown,
   DropdownGroup,
diff --git a/packages/react-core/src/components/Dropdown/examples/DropdownWithKebabToggle.tsx b/packages/react-core/src/components/Dropdown/examples/DropdownWithKebabToggle.tsx
index 1ab5f49442b..c195359b0c2 100644
--- a/packages/react-core/src/components/Dropdown/examples/DropdownWithKebabToggle.tsx
+++ b/packages/react-core/src/components/Dropdown/examples/DropdownWithKebabToggle.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Dropdown, DropdownItem, DropdownList, Divider, MenuToggle, MenuToggleElement } from '@patternfly/react-core';
 import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
 
diff --git a/packages/react-core/src/components/DualListSelector/DualListSelector.tsx b/packages/react-core/src/components/DualListSelector/DualListSelector.tsx
index 2663f3fc74e..0487e89e813 100644
--- a/packages/react-core/src/components/DualListSelector/DualListSelector.tsx
+++ b/packages/react-core/src/components/DualListSelector/DualListSelector.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 import styles from '@patternfly/react-styles/css/components/DualListSelector/dual-list-selector';
 import { css } from '@patternfly/react-styles';
 import { GenerateId, PickOptional } from '../../helpers';
@@ -19,7 +19,7 @@ export interface DualListSelectorProps {
   children?: React.ReactNode;
 }
 
-class DualListSelector extends React.Component<DualListSelectorProps> {
+class DualListSelector extends Component<DualListSelectorProps> {
   static displayName = 'DualListSelector';
   static defaultProps: PickOptional<DualListSelectorProps> = {
     children: '',
diff --git a/packages/react-core/src/components/DualListSelector/DualListSelectorContext.ts b/packages/react-core/src/components/DualListSelector/DualListSelectorContext.ts
index 3eccc9a0dc6..ae05d7cdc01 100644
--- a/packages/react-core/src/components/DualListSelector/DualListSelectorContext.ts
+++ b/packages/react-core/src/components/DualListSelector/DualListSelectorContext.ts
@@ -1,10 +1,9 @@
-import * as React from 'react';
-
-export const DualListSelectorContext = React.createContext<{
+import { createContext } from 'react';
+export const DualListSelectorContext = createContext<{
   isTree?: boolean;
 }>({ isTree: false });
 
-export const DualListSelectorListContext = React.createContext<{
+export const DualListSelectorListContext = createContext<{
   setFocusedOption?: (id: string) => void;
   isTree?: boolean;
   ariaLabelledBy?: string;
@@ -16,6 +15,6 @@ export const DualListSelectorListContext = React.createContext<{
   isDisabled?: boolean;
 }>({});
 
-export const DualListSelectorPaneContext = React.createContext<{
+export const DualListSelectorPaneContext = createContext<{
   isChosen: boolean;
 }>({ isChosen: false });
diff --git a/packages/react-core/src/components/DualListSelector/DualListSelectorControl.tsx b/packages/react-core/src/components/DualListSelector/DualListSelectorControl.tsx
index 94c90eafb46..1781fa3d664 100644
--- a/packages/react-core/src/components/DualListSelector/DualListSelectorControl.tsx
+++ b/packages/react-core/src/components/DualListSelector/DualListSelectorControl.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef, useRef } from 'react';
 import { css } from '@patternfly/react-styles';
 import { Button, ButtonVariant } from '../Button';
 import { Tooltip } from '../Tooltip';
@@ -41,7 +41,7 @@ export const DualListSelectorControlBase: React.FunctionComponent<DualListSelect
   tooltipProps = {} as any,
   ...props
 }: DualListSelectorControlProps) => {
-  const privateRef = React.useRef(null);
+  const privateRef = useRef(null);
   const ref = innerRef || privateRef;
   return (
     <div className={css(styles.dualListSelectorControlsItem, className)} {...props}>
@@ -63,7 +63,7 @@ export const DualListSelectorControlBase: React.FunctionComponent<DualListSelect
 };
 DualListSelectorControlBase.displayName = 'DualListSelectorControlBase';
 
-export const DualListSelectorControl = React.forwardRef((props: DualListSelectorControlProps, ref: React.Ref<any>) => (
+export const DualListSelectorControl = forwardRef((props: DualListSelectorControlProps, ref: React.Ref<any>) => (
   <DualListSelectorControlBase innerRef={ref} {...props} />
 ));
 
diff --git a/packages/react-core/src/components/DualListSelector/DualListSelectorControlsWrapper.tsx b/packages/react-core/src/components/DualListSelector/DualListSelectorControlsWrapper.tsx
index 8a6ab82363e..3f9fcba50d7 100644
--- a/packages/react-core/src/components/DualListSelector/DualListSelectorControlsWrapper.tsx
+++ b/packages/react-core/src/components/DualListSelector/DualListSelectorControlsWrapper.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef, useEffect, useRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/DualListSelector/dual-list-selector';
 import { css } from '@patternfly/react-styles';
 import { handleArrows } from '../../helpers';
@@ -23,7 +23,7 @@ export const DualListSelectorControlsWrapperBase: React.FunctionComponent<DualLi
   'aria-label': ariaLabel = 'Controls for moving options between lists',
   ...props
 }: DualListSelectorControlsWrapperProps) => {
-  const ref = React.useRef(null);
+  const ref = useRef(null);
   const wrapperRef = innerRef || ref;
   // Adds keyboard navigation to the dynamically built dual list selector controls. Works when controls are dynamically built
   // as well as when they are passed in via children.
@@ -55,7 +55,7 @@ export const DualListSelectorControlsWrapperBase: React.FunctionComponent<DualLi
     );
   };
 
-  React.useEffect(() => {
+  useEffect(() => {
     window.addEventListener('keydown', handleKeys);
     return () => {
       window.removeEventListener('keydown', handleKeys);
@@ -78,7 +78,7 @@ export const DualListSelectorControlsWrapperBase: React.FunctionComponent<DualLi
 
 DualListSelectorControlsWrapperBase.displayName = 'DualListSelectorControlsWrapperBase';
 
-export const DualListSelectorControlsWrapper = React.forwardRef(
+export const DualListSelectorControlsWrapper = forwardRef(
   (props: DualListSelectorControlsWrapperProps, ref: React.Ref<HTMLDivElement>) => (
     <DualListSelectorControlsWrapperBase innerRef={ref as React.MutableRefObject<any>} role="group" {...props} />
   )
diff --git a/packages/react-core/src/components/DualListSelector/DualListSelectorList.tsx b/packages/react-core/src/components/DualListSelector/DualListSelectorList.tsx
index d799e4751b8..96287bdc7b8 100644
--- a/packages/react-core/src/components/DualListSelector/DualListSelectorList.tsx
+++ b/packages/react-core/src/components/DualListSelector/DualListSelectorList.tsx
@@ -1,7 +1,7 @@
+import { forwardRef, useContext } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DualListSelector/dual-list-selector';
 import { DualListSelectorListItem } from './DualListSelectorListItem';
-import * as React from 'react';
 import { DualListSelectorListContext } from './DualListSelectorContext';
 
 /** Acts as the container for DualListSelectorListItem sub-components. */
@@ -19,7 +19,7 @@ export const DualListSelectorListBase: React.FunctionComponent<DualListSelectorL
   ...props
 }: DualListSelectorListProps) => {
   const { isTree, ariaLabelledBy, focusedOption, displayOption, selectedOptions, id, options, isDisabled } =
-    React.useContext(DualListSelectorListContext);
+    useContext(DualListSelectorListContext);
 
   const hasOptions = () =>
     options.length !== 0 || (children !== undefined && (children as React.ReactNode[]).length !== 0);
@@ -60,10 +60,8 @@ export const DualListSelectorListBase: React.FunctionComponent<DualListSelectorL
 };
 DualListSelectorListBase.displayName = 'DualListSelectorListBase';
 
-export const DualListSelectorList = React.forwardRef(
-  (props: DualListSelectorListProps, ref: React.Ref<HTMLUListElement>) => (
-    <DualListSelectorListBase innerRef={ref as React.MutableRefObject<any>} {...props} />
-  )
-);
+export const DualListSelectorList = forwardRef((props: DualListSelectorListProps, ref: React.Ref<HTMLUListElement>) => (
+  <DualListSelectorListBase innerRef={ref as React.MutableRefObject<any>} {...props} />
+));
 
 DualListSelectorList.displayName = 'DualListSelectorList';
diff --git a/packages/react-core/src/components/DualListSelector/DualListSelectorListItem.tsx b/packages/react-core/src/components/DualListSelector/DualListSelectorListItem.tsx
index ed7cff94192..427ce035cab 100644
--- a/packages/react-core/src/components/DualListSelector/DualListSelectorListItem.tsx
+++ b/packages/react-core/src/components/DualListSelector/DualListSelectorListItem.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef, useContext, useRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/DualListSelector/dual-list-selector';
 import { css } from '@patternfly/react-styles';
 import { getUniqueId } from '../../helpers';
@@ -47,9 +47,9 @@ export const DualListSelectorListItemBase: React.FunctionComponent<DualListSelec
   draggableButtonAriaLabel = 'Reorder option',
   ...props
 }: DualListSelectorListItemProps) => {
-  const privateRef = React.useRef<HTMLLIElement>(null);
+  const privateRef = useRef<HTMLLIElement>(null);
   const ref = innerRef || privateRef;
-  const { setFocusedOption } = React.useContext(DualListSelectorListContext);
+  const { setFocusedOption } = useContext(DualListSelectorListContext);
 
   return (
     <li
@@ -99,7 +99,7 @@ export const DualListSelectorListItemBase: React.FunctionComponent<DualListSelec
 };
 DualListSelectorListItemBase.displayName = 'DualListSelectorListItemBase';
 
-export const DualListSelectorListItem = React.forwardRef(
+export const DualListSelectorListItem = forwardRef(
   (props: DualListSelectorListItemProps, ref: React.Ref<HTMLLIElement>) => (
     <DualListSelectorListItemBase innerRef={ref as React.MutableRefObject<any>} {...props} />
   )
diff --git a/packages/react-core/src/components/DualListSelector/DualListSelectorListWrapper.tsx b/packages/react-core/src/components/DualListSelector/DualListSelectorListWrapper.tsx
index f7f79aeed37..be6e9f535dd 100644
--- a/packages/react-core/src/components/DualListSelector/DualListSelectorListWrapper.tsx
+++ b/packages/react-core/src/components/DualListSelector/DualListSelectorListWrapper.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef, useContext, useEffect, useRef, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/DualListSelector/dual-list-selector';
 import { css } from '@patternfly/react-styles';
 import { getUniqueId, handleArrows } from '../../helpers';
@@ -38,10 +38,10 @@ export const DualListSelectorListWrapperBase: React.FunctionComponent<DualListSe
   isDisabled = false,
   ...props
 }: DualListSelectorListWrapperProps) => {
-  const [focusedOption, setFocusedOption] = React.useState('');
-  const ref = React.useRef(null);
+  const [focusedOption, setFocusedOption] = useState('');
+  const ref = useRef(null);
   const menuRef = innerRef || ref;
-  const { isTree } = React.useContext(DualListSelectorContext);
+  const { isTree } = useContext(DualListSelectorContext);
 
   // Sets up keyboard focus handling for the dual list selector menu child of the pane.
   const handleKeys = (event: KeyboardEvent) => {
@@ -85,7 +85,7 @@ export const DualListSelectorListWrapperBase: React.FunctionComponent<DualListSe
     );
   };
 
-  React.useEffect(() => {
+  useEffect(() => {
     window.addEventListener('keydown', handleKeys);
     return () => {
       window.removeEventListener('keydown', handleKeys);
@@ -115,7 +115,7 @@ export const DualListSelectorListWrapperBase: React.FunctionComponent<DualListSe
 };
 DualListSelectorListWrapperBase.displayName = 'DualListSelectorListWrapperBase';
 
-export const DualListSelectorListWrapper = React.forwardRef(
+export const DualListSelectorListWrapper = forwardRef(
   (props: DualListSelectorListWrapperProps, ref: React.Ref<HTMLDivElement>) => (
     <DualListSelectorListWrapperBase innerRef={ref as React.MutableRefObject<any>} {...props} />
   )
diff --git a/packages/react-core/src/components/DualListSelector/DualListSelectorPane.tsx b/packages/react-core/src/components/DualListSelector/DualListSelectorPane.tsx
index 8011cee0a5d..c3fecbda502 100644
--- a/packages/react-core/src/components/DualListSelector/DualListSelectorPane.tsx
+++ b/packages/react-core/src/components/DualListSelector/DualListSelectorPane.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/DualListSelector/dual-list-selector';
 import { css } from '@patternfly/react-styles';
 import { getUniqueId } from '../../helpers';
diff --git a/packages/react-core/src/components/DualListSelector/DualListSelectorTree.tsx b/packages/react-core/src/components/DualListSelector/DualListSelectorTree.tsx
index 8fb28a289b9..4555fb29b0b 100644
--- a/packages/react-core/src/components/DualListSelector/DualListSelectorTree.tsx
+++ b/packages/react-core/src/components/DualListSelector/DualListSelectorTree.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DualListSelector/dual-list-selector';
 import { DualListSelectorTreeItem } from './DualListSelectorTreeItem';
diff --git a/packages/react-core/src/components/DualListSelector/DualListSelectorTreeItem.tsx b/packages/react-core/src/components/DualListSelector/DualListSelectorTreeItem.tsx
index 1db39984828..b8769641d0a 100644
--- a/packages/react-core/src/components/DualListSelector/DualListSelectorTreeItem.tsx
+++ b/packages/react-core/src/components/DualListSelector/DualListSelectorTreeItem.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { memo, useContext, useEffect, useRef, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/DualListSelector/dual-list-selector';
 import { css } from '@patternfly/react-styles';
 import { DualListSelectorTreeItemData } from './DualListSelectorTree';
@@ -57,11 +57,11 @@ const DualListSelectorTreeItemBase: React.FunctionComponent<DualListSelectorTree
   useMemo,
   ...props
 }: DualListSelectorTreeItemProps) => {
-  const ref = React.useRef(null);
-  const [isExpanded, setIsExpanded] = React.useState(defaultExpanded || false);
-  const { setFocusedOption } = React.useContext(DualListSelectorListContext);
+  const ref = useRef(null);
+  const [isExpanded, setIsExpanded] = useState(defaultExpanded || false);
+  const { setFocusedOption } = useContext(DualListSelectorListContext);
 
-  React.useEffect(() => {
+  useEffect(() => {
     setIsExpanded(defaultExpanded);
   }, [defaultExpanded]);
 
@@ -161,7 +161,7 @@ const DualListSelectorTreeItemBase: React.FunctionComponent<DualListSelectorTree
   );
 };
 
-export const DualListSelectorTreeItem = React.memo(DualListSelectorTreeItemBase, (prevProps, nextProps) => {
+export const DualListSelectorTreeItem = memo(DualListSelectorTreeItemBase, (prevProps, nextProps) => {
   if (!nextProps.useMemo) {
     return false;
   }
diff --git a/packages/react-core/src/components/DualListSelector/__tests__/DualListSelector.test.tsx b/packages/react-core/src/components/DualListSelector/__tests__/DualListSelector.test.tsx
index 373aa0e993d..58ab92913eb 100644
--- a/packages/react-core/src/components/DualListSelector/__tests__/DualListSelector.test.tsx
+++ b/packages/react-core/src/components/DualListSelector/__tests__/DualListSelector.test.tsx
@@ -1,8 +1,6 @@
 import { render } from '@testing-library/react';
 import { DualListSelectorPane } from '../DualListSelectorPane';
 import { SearchInput } from '../../SearchInput';
-import React from 'react';
-
 describe('DualListSelector', () => {
   test('basic', () => {
     const { asFragment } = render(<DualListSelectorPane id="basicTest" />);
diff --git a/packages/react-core/src/components/DualListSelector/examples/DualListSelector.md b/packages/react-core/src/components/DualListSelector/examples/DualListSelector.md
index 8cb78306441..1ff7084efec 100644
--- a/packages/react-core/src/components/DualListSelector/examples/DualListSelector.md
+++ b/packages/react-core/src/components/DualListSelector/examples/DualListSelector.md
@@ -15,6 +15,7 @@ propComponents:
   ]
 ---
 
+import { Fragment, useEffect, useMemo, useState } from 'react';
 import AngleDoubleLeftIcon from '@patternfly/react-icons/dist/esm/icons/angle-double-left-icon';
 import AngleLeftIcon from '@patternfly/react-icons/dist/esm/icons/angle-left-icon';
 import AngleDoubleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-double-right-icon';
diff --git a/packages/react-core/src/components/DualListSelector/examples/DualListSelectorBasic.tsx b/packages/react-core/src/components/DualListSelector/examples/DualListSelectorBasic.tsx
index ec14a043dc2..b1e77ed2a6a 100644
--- a/packages/react-core/src/components/DualListSelector/examples/DualListSelectorBasic.tsx
+++ b/packages/react-core/src/components/DualListSelector/examples/DualListSelectorBasic.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   DualListSelector,
   DualListSelectorPane,
@@ -19,13 +19,13 @@ interface Option {
 }
 
 export const DualListSelectorBasic: React.FunctionComponent = () => {
-  const [availableOptions, setAvailableOptions] = React.useState<Option[]>([
+  const [availableOptions, setAvailableOptions] = useState<Option[]>([
     { text: 'Option 1', selected: false, isVisible: true },
     { text: 'Option 2', selected: false, isVisible: true },
     { text: 'Option 3', selected: false, isVisible: true },
     { text: 'Option 4', selected: false, isVisible: true }
   ]);
-  const [chosenOptions, setChosenOptions] = React.useState<Option[]>([]);
+  const [chosenOptions, setChosenOptions] = useState<Option[]>([]);
 
   // callback for moving selected options between lists
   const moveSelected = (fromAvailable: boolean) => {
diff --git a/packages/react-core/src/components/DualListSelector/examples/DualListSelectorBasicSearch.tsx b/packages/react-core/src/components/DualListSelector/examples/DualListSelectorBasicSearch.tsx
index e395b2bc8bc..3610893e173 100644
--- a/packages/react-core/src/components/DualListSelector/examples/DualListSelectorBasicSearch.tsx
+++ b/packages/react-core/src/components/DualListSelector/examples/DualListSelectorBasicSearch.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   Button,
   DualListSelector,
@@ -27,16 +27,16 @@ interface Option {
 }
 
 export const DualListSelectorSearch: React.FunctionComponent = () => {
-  const [availableOptions, setAvailableOptions] = React.useState<Option[]>([
+  const [availableOptions, setAvailableOptions] = useState<Option[]>([
     { text: 'Option 1', selected: false, isVisible: true },
     { text: 'Option 2', selected: false, isVisible: true },
     { text: 'Option 3', selected: false, isVisible: true },
     { text: 'Option 4', selected: false, isVisible: true }
   ]);
 
-  const [chosenOptions, setChosenOptions] = React.useState<Option[]>([]);
-  const [availableFilter, setAvailableFilter] = React.useState('');
-  const [chosenFilter, setChosenFilter] = React.useState('');
+  const [chosenOptions, setChosenOptions] = useState<Option[]>([]);
+  const [availableFilter, setAvailableFilter] = useState('');
+  const [chosenFilter, setChosenFilter] = useState('');
 
   // callback for moving selected options between lists
   const moveSelected = (fromAvailable: boolean) => {
diff --git a/packages/react-core/src/components/DualListSelector/examples/DualListSelectorBasicTooltips.tsx b/packages/react-core/src/components/DualListSelector/examples/DualListSelectorBasicTooltips.tsx
index aac0b2f9c45..96ed69cd375 100644
--- a/packages/react-core/src/components/DualListSelector/examples/DualListSelectorBasicTooltips.tsx
+++ b/packages/react-core/src/components/DualListSelector/examples/DualListSelectorBasicTooltips.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   DualListSelector,
   DualListSelectorPane,
@@ -19,13 +19,13 @@ interface Option {
 }
 
 export const DualListSelectorBasic: React.FunctionComponent = () => {
-  const [availableOptions, setAvailableOptions] = React.useState<Option[]>([
+  const [availableOptions, setAvailableOptions] = useState<Option[]>([
     { text: 'Option 1', selected: false, isVisible: true },
     { text: 'Option 2', selected: false, isVisible: true },
     { text: 'Option 3', selected: false, isVisible: true },
     { text: 'Option 4', selected: false, isVisible: true }
   ]);
-  const [chosenOptions, setChosenOptions] = React.useState<Option[]>([]);
+  const [chosenOptions, setChosenOptions] = useState<Option[]>([]);
 
   // callback for moving selected options between lists
   const moveSelected = (fromAvailable: boolean) => {
diff --git a/packages/react-core/src/components/DualListSelector/examples/DualListSelectorComplexOptionsActions.tsx b/packages/react-core/src/components/DualListSelector/examples/DualListSelectorComplexOptionsActions.tsx
index 5de70ac21e5..c07c4b33ea9 100644
--- a/packages/react-core/src/components/DualListSelector/examples/DualListSelectorComplexOptionsActions.tsx
+++ b/packages/react-core/src/components/DualListSelector/examples/DualListSelectorComplexOptionsActions.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import {
   Button,
   ButtonVariant,
@@ -36,19 +36,19 @@ interface Option {
 }
 
 export const DualListSelectorComplexOptionsActionsNext: React.FunctionComponent = () => {
-  const [availableOptions, setAvailableOptions] = React.useState<Option[]>([
+  const [availableOptions, setAvailableOptions] = useState<Option[]>([
     { text: 'Option 1', selected: false, isVisible: true },
     { text: 'Option 2', selected: false, isVisible: true },
     { text: 'Option 3', selected: false, isVisible: true },
     { text: 'Option 4', selected: false, isVisible: true }
   ]);
 
-  const [chosenOptions, setChosenOptions] = React.useState<Option[]>([]);
-  const [isAvailableKebabOpen, setIsAvailableKebabOpen] = React.useState(false);
-  const [isChosenKebabOpen, setIsChosenKebabOpen] = React.useState(false);
-  const [availableFilter, setAvailableFilter] = React.useState('');
-  const [chosenFilter, setChosenFilter] = React.useState('');
-  const [isDisabled, setIsDisabled] = React.useState(false);
+  const [chosenOptions, setChosenOptions] = useState<Option[]>([]);
+  const [isAvailableKebabOpen, setIsAvailableKebabOpen] = useState(false);
+  const [isChosenKebabOpen, setIsChosenKebabOpen] = useState(false);
+  const [availableFilter, setAvailableFilter] = useState('');
+  const [chosenFilter, setChosenFilter] = useState('');
+  const [isDisabled, setIsDisabled] = useState(false);
 
   // callback for moving selected options between lists
   const moveSelected = (fromAvailable: boolean) => {
@@ -233,7 +233,7 @@ export const DualListSelectorComplexOptionsActionsNext: React.FunctionComponent
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <DualListSelector>
         <DualListSelectorPane
           title="Available options"
@@ -331,6 +331,6 @@ export const DualListSelectorComplexOptionsActionsNext: React.FunctionComponent
         isChecked={isDisabled}
         onChange={() => setIsDisabled(!isDisabled)}
       />
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/DualListSelector/examples/DualListSelectorTree.tsx b/packages/react-core/src/components/DualListSelector/examples/DualListSelectorTree.tsx
index 9da2cda7645..e0ffd23cd0d 100644
--- a/packages/react-core/src/components/DualListSelector/examples/DualListSelectorTree.tsx
+++ b/packages/react-core/src/components/DualListSelector/examples/DualListSelectorTree.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useMemo, useState } from 'react';
 import {
   DualListSelector,
   DualListSelectorPane,
@@ -32,10 +32,10 @@ interface ExampleProps {
 }
 
 export const DualListSelectorComposableTree: React.FunctionComponent<ExampleProps> = ({ data }: ExampleProps) => {
-  const [checkedLeafIds, setCheckedLeafIds] = React.useState<string[]>([]);
-  const [chosenLeafIds, setChosenLeafIds] = React.useState<string[]>(['beans', 'beef', 'chicken', 'tofu']);
-  const [chosenFilter, setChosenFilter] = React.useState<string>('');
-  const [availableFilter, setAvailableFilter] = React.useState<string>('');
+  const [checkedLeafIds, setCheckedLeafIds] = useState<string[]>([]);
+  const [chosenLeafIds, setChosenLeafIds] = useState<string[]>(['beans', 'beef', 'chicken', 'tofu']);
+  const [chosenFilter, setChosenFilter] = useState<string>('');
+  const [availableFilter, setAvailableFilter] = useState<string>('');
 
   // helper function to build memoized lists
   const buildTextById = (node: FoodNode): { [key: string]: string } => {
@@ -80,7 +80,7 @@ export const DualListSelectorComposableTree: React.FunctionComponent<ExampleProp
   };
 
   // Builds a map of child leaf nodes by node id - memoized so that it only rebuilds the list if the data changes.
-  const { memoizedLeavesById, memoizedAllLeaves, memoizedNodeTexts } = React.useMemo(() => {
+  const { memoizedLeavesById, memoizedAllLeaves, memoizedNodeTexts } = useMemo(() => {
     let leavesById = {};
     let allLeaves: string[] = [];
     let nodeTexts = {};
diff --git a/packages/react-core/src/components/EmptyState/EmptyState.tsx b/packages/react-core/src/components/EmptyState/EmptyState.tsx
index 9fe0fd02a1f..f39ca81e911 100644
--- a/packages/react-core/src/components/EmptyState/EmptyState.tsx
+++ b/packages/react-core/src/components/EmptyState/EmptyState.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/EmptyState/empty-state';
 import { EmptyStateHeader } from './EmptyStateHeader';
diff --git a/packages/react-core/src/components/EmptyState/EmptyStateActions.tsx b/packages/react-core/src/components/EmptyState/EmptyStateActions.tsx
index aa448d976b5..e6a10d7cf9d 100644
--- a/packages/react-core/src/components/EmptyState/EmptyStateActions.tsx
+++ b/packages/react-core/src/components/EmptyState/EmptyStateActions.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/EmptyState/empty-state';
 
diff --git a/packages/react-core/src/components/EmptyState/EmptyStateBody.tsx b/packages/react-core/src/components/EmptyState/EmptyStateBody.tsx
index c80b90a49cf..7fd4250d6a5 100644
--- a/packages/react-core/src/components/EmptyState/EmptyStateBody.tsx
+++ b/packages/react-core/src/components/EmptyState/EmptyStateBody.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/EmptyState/empty-state';
 
diff --git a/packages/react-core/src/components/EmptyState/EmptyStateFooter.tsx b/packages/react-core/src/components/EmptyState/EmptyStateFooter.tsx
index 71d21e3a75f..44f3e90052b 100644
--- a/packages/react-core/src/components/EmptyState/EmptyStateFooter.tsx
+++ b/packages/react-core/src/components/EmptyState/EmptyStateFooter.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/EmptyState/empty-state';
 
diff --git a/packages/react-core/src/components/EmptyState/EmptyStateHeader.tsx b/packages/react-core/src/components/EmptyState/EmptyStateHeader.tsx
index a6d45ecd330..a0aa6658c44 100644
--- a/packages/react-core/src/components/EmptyState/EmptyStateHeader.tsx
+++ b/packages/react-core/src/components/EmptyState/EmptyStateHeader.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/EmptyState/empty-state';
 import { EmptyStateIcon } from './EmptyStateIcon';
diff --git a/packages/react-core/src/components/EmptyState/EmptyStateIcon.tsx b/packages/react-core/src/components/EmptyState/EmptyStateIcon.tsx
index dd9234e168d..4364fb5e321 100644
--- a/packages/react-core/src/components/EmptyState/EmptyStateIcon.tsx
+++ b/packages/react-core/src/components/EmptyState/EmptyStateIcon.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/EmptyState/empty-state';
 import { Spinner } from '../Spinner';
diff --git a/packages/react-core/src/components/EmptyState/__tests__/EmptyState.test.tsx b/packages/react-core/src/components/EmptyState/__tests__/EmptyState.test.tsx
index bbeb4cdeff2..7c5dd1933be 100644
--- a/packages/react-core/src/components/EmptyState/__tests__/EmptyState.test.tsx
+++ b/packages/react-core/src/components/EmptyState/__tests__/EmptyState.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 
 import AddressBookIcon from '@patternfly/react-icons/dist/esm/icons/address-book-icon';
diff --git a/packages/react-core/src/components/EmptyState/__tests__/Generated/EmptyStateActions.test.tsx b/packages/react-core/src/components/EmptyState/__tests__/Generated/EmptyStateActions.test.tsx
index dbfae3b5d6c..e5406b2b366 100644
--- a/packages/react-core/src/components/EmptyState/__tests__/Generated/EmptyStateActions.test.tsx
+++ b/packages/react-core/src/components/EmptyState/__tests__/Generated/EmptyStateActions.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { EmptyStateActions } from '../../EmptyStateActions';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/EmptyState/__tests__/Generated/EmptyStateBody.test.tsx b/packages/react-core/src/components/EmptyState/__tests__/Generated/EmptyStateBody.test.tsx
index f0a3fee5e27..617ebf88ac3 100644
--- a/packages/react-core/src/components/EmptyState/__tests__/Generated/EmptyStateBody.test.tsx
+++ b/packages/react-core/src/components/EmptyState/__tests__/Generated/EmptyStateBody.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { EmptyStateBody } from '../../EmptyStateBody';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/EmptyState/__tests__/Generated/EmptyStateIcon.test.tsx b/packages/react-core/src/components/EmptyState/__tests__/Generated/EmptyStateIcon.test.tsx
index 1a9e8cc9a6d..ff74157220e 100644
--- a/packages/react-core/src/components/EmptyState/__tests__/Generated/EmptyStateIcon.test.tsx
+++ b/packages/react-core/src/components/EmptyState/__tests__/Generated/EmptyStateIcon.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import UserIcon from '@patternfly/react-icons/dist/esm/icons/user-icon';
 import { EmptyStateIcon } from '../../EmptyStateIcon';
diff --git a/packages/react-core/src/components/EmptyState/examples/EmptyStateBasic.tsx b/packages/react-core/src/components/EmptyState/examples/EmptyStateBasic.tsx
index 907b6ff9d22..5d9ec5f69aa 100644
--- a/packages/react-core/src/components/EmptyState/examples/EmptyStateBasic.tsx
+++ b/packages/react-core/src/components/EmptyState/examples/EmptyStateBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button, EmptyState, EmptyStateBody, EmptyStateActions, EmptyStateFooter } from '@patternfly/react-core';
 import CubesIcon from '@patternfly/react-icons/dist/esm/icons/cubes-icon';
 
diff --git a/packages/react-core/src/components/EmptyState/examples/EmptyStateExtraLarge.tsx b/packages/react-core/src/components/EmptyState/examples/EmptyStateExtraLarge.tsx
index cb09ceb73a6..df77962cc9d 100644
--- a/packages/react-core/src/components/EmptyState/examples/EmptyStateExtraLarge.tsx
+++ b/packages/react-core/src/components/EmptyState/examples/EmptyStateExtraLarge.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   EmptyState,
diff --git a/packages/react-core/src/components/EmptyState/examples/EmptyStateExtraSmall.tsx b/packages/react-core/src/components/EmptyState/examples/EmptyStateExtraSmall.tsx
index ee483448546..68394ae4481 100644
--- a/packages/react-core/src/components/EmptyState/examples/EmptyStateExtraSmall.tsx
+++ b/packages/react-core/src/components/EmptyState/examples/EmptyStateExtraSmall.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   EmptyState,
diff --git a/packages/react-core/src/components/EmptyState/examples/EmptyStateLarge.tsx b/packages/react-core/src/components/EmptyState/examples/EmptyStateLarge.tsx
index 062f66a9845..a978914053a 100644
--- a/packages/react-core/src/components/EmptyState/examples/EmptyStateLarge.tsx
+++ b/packages/react-core/src/components/EmptyState/examples/EmptyStateLarge.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   EmptyState,
diff --git a/packages/react-core/src/components/EmptyState/examples/EmptyStateNoMatchFound.tsx b/packages/react-core/src/components/EmptyState/examples/EmptyStateNoMatchFound.tsx
index ebc08c8d641..3c5e91d6161 100644
--- a/packages/react-core/src/components/EmptyState/examples/EmptyStateNoMatchFound.tsx
+++ b/packages/react-core/src/components/EmptyState/examples/EmptyStateNoMatchFound.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button, EmptyState, EmptyStateBody, EmptyStateFooter, EmptyStateActions } from '@patternfly/react-core';
 import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
 
diff --git a/packages/react-core/src/components/EmptyState/examples/EmptyStateSmall.tsx b/packages/react-core/src/components/EmptyState/examples/EmptyStateSmall.tsx
index eae0cc8e481..faa4bce82ba 100644
--- a/packages/react-core/src/components/EmptyState/examples/EmptyStateSmall.tsx
+++ b/packages/react-core/src/components/EmptyState/examples/EmptyStateSmall.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   EmptyState,
diff --git a/packages/react-core/src/components/EmptyState/examples/EmptyStateSpinner.tsx b/packages/react-core/src/components/EmptyState/examples/EmptyStateSpinner.tsx
index 6acd843b291..c9e0632e839 100644
--- a/packages/react-core/src/components/EmptyState/examples/EmptyStateSpinner.tsx
+++ b/packages/react-core/src/components/EmptyState/examples/EmptyStateSpinner.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { EmptyState, Spinner } from '@patternfly/react-core';
 
 export const EmptyStateSpinner: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/EmptyState/examples/EmptyStateWithStatus.tsx b/packages/react-core/src/components/EmptyState/examples/EmptyStateWithStatus.tsx
index fe4f1e716ea..81765806961 100644
--- a/packages/react-core/src/components/EmptyState/examples/EmptyStateWithStatus.tsx
+++ b/packages/react-core/src/components/EmptyState/examples/EmptyStateWithStatus.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   EmptyState,
   EmptyStateBody,
diff --git a/packages/react-core/src/components/ExpandableSection/ExpandableSection.tsx b/packages/react-core/src/components/ExpandableSection/ExpandableSection.tsx
index 330d98d19f9..384c5ca79e5 100644
--- a/packages/react-core/src/components/ExpandableSection/ExpandableSection.tsx
+++ b/packages/react-core/src/components/ExpandableSection/ExpandableSection.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, createRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/ExpandableSection/expandable-section';
 import { css } from '@patternfly/react-styles';
 import lineClamp from '@patternfly/react-tokens/dist/esm/c_expandable_section_m_truncate__content_LineClamp';
@@ -21,7 +21,7 @@ export interface ExpandableSectionProps extends React.HTMLProps<HTMLDivElement>
   /** Additional classes added to the expandable section. */
   className?: string;
   /** Id of the content of the expandable section. When passing in the isDetached property, this
-   * property's value should match the contenId property of the expandable section toggle sub-component.
+   * property's value should match the contentId property of the expandable section toggle sub-component.
    */
   contentId?: string;
   /** Id of the toggle of the expandable section, which provides an accessible name to the
@@ -80,7 +80,7 @@ const setLineClamp = (lines: number, element: HTMLDivElement) => {
   element.style.setProperty(lineClamp.name, lines.toString());
 };
 
-class ExpandableSection extends React.Component<ExpandableSectionProps, ExpandableSectionState> {
+class ExpandableSection extends Component<ExpandableSectionProps, ExpandableSectionState> {
   static displayName = 'ExpandableSection';
   constructor(props: ExpandableSectionProps) {
     super(props);
@@ -92,7 +92,7 @@ class ExpandableSection extends React.Component<ExpandableSectionProps, Expandab
     };
   }
 
-  expandableContentRef = React.createRef<HTMLDivElement>();
+  expandableContentRef = createRef<HTMLDivElement>();
   observer: any = () => {};
 
   static defaultProps: PickOptional<ExpandableSectionProps> = {
diff --git a/packages/react-core/src/components/ExpandableSection/ExpandableSectionToggle.tsx b/packages/react-core/src/components/ExpandableSection/ExpandableSectionToggle.tsx
index 98377bc64ce..d1e4f83d3ab 100644
--- a/packages/react-core/src/components/ExpandableSection/ExpandableSectionToggle.tsx
+++ b/packages/react-core/src/components/ExpandableSection/ExpandableSectionToggle.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/ExpandableSection/expandable-section';
 import { css } from '@patternfly/react-styles';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
diff --git a/packages/react-core/src/components/ExpandableSection/__tests__/ExpandableSection.test.tsx b/packages/react-core/src/components/ExpandableSection/__tests__/ExpandableSection.test.tsx
index 2392923267c..833107ee2b5 100644
--- a/packages/react-core/src/components/ExpandableSection/__tests__/ExpandableSection.test.tsx
+++ b/packages/react-core/src/components/ExpandableSection/__tests__/ExpandableSection.test.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-
+import { Fragment } from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
@@ -45,14 +44,14 @@ test('Renders Uncontrolled ExpandableSection', () => {
 
 test('Detached ExpandableSection renders successfully', () => {
   const { asFragment } = render(
-    <React.Fragment>
+    <Fragment>
       <ExpandableSection isExpanded isDetached {...props}>
         test
       </ExpandableSection>
       <ExpandableSectionToggle isExpanded direction="up" {...props}>
         Toggle text
       </ExpandableSectionToggle>
-    </React.Fragment>
+    </Fragment>
   );
   expect(asFragment()).toMatchSnapshot();
 });
diff --git a/packages/react-core/src/components/ExpandableSection/examples/ExpandableSection.md b/packages/react-core/src/components/ExpandableSection/examples/ExpandableSection.md
index 8fefe685bae..65c02320e96 100644
--- a/packages/react-core/src/components/ExpandableSection/examples/ExpandableSection.md
+++ b/packages/react-core/src/components/ExpandableSection/examples/ExpandableSection.md
@@ -5,6 +5,7 @@ cssPrefix: pf-v6-c-expandable-section
 propComponents: ['ExpandableSection', 'ExpandableSectionToggle']
 ---
 
+import { useState } from 'react';
 import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
 
 ## Examples
diff --git a/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionBasic.tsx b/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionBasic.tsx
index 60246ffcaca..ff77ba98af2 100644
--- a/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionBasic.tsx
+++ b/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ExpandableSection } from '@patternfly/react-core';
 
 export const ExpandableSectionBasic: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionCustomToggle.tsx b/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionCustomToggle.tsx
index f7a74adfdbb..7c6b5f99a83 100644
--- a/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionCustomToggle.tsx
+++ b/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionCustomToggle.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ExpandableSection, Badge } from '@patternfly/react-core';
 import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
 
diff --git a/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionDetached.tsx b/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionDetached.tsx
index bcba03935c2..21d17d0e74a 100644
--- a/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionDetached.tsx
+++ b/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionDetached.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ExpandableSection, ExpandableSectionToggle, Stack, StackItem } from '@patternfly/react-core';
 
 export const ExpandableSectionDetached: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionDisclosure.tsx b/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionDisclosure.tsx
index 9aca30644eb..2990fe52bf5 100644
--- a/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionDisclosure.tsx
+++ b/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionDisclosure.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ExpandableSection } from '@patternfly/react-core';
 
 export const ExpandableSectionDisclosure: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionIndented.tsx b/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionIndented.tsx
index e0905d73dcf..f556ae705d9 100644
--- a/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionIndented.tsx
+++ b/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionIndented.tsx
@@ -1,9 +1,9 @@
-import React, { FormEvent } from 'react';
+import { FormEvent, useState } from 'react';
 import { ExpandableSection, Checkbox } from '@patternfly/react-core';
 
 export const ExpandableSectionIndented: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(true);
-  const [isDisplayLgChecked, setIsDisplayLgChecked] = React.useState(false);
+  const [isExpanded, setIsExpanded] = useState(true);
+  const [isDisplayLgChecked, setIsDisplayLgChecked] = useState(false);
 
   const onToggle = (_event: React.MouseEvent, isExpanded: boolean) => {
     setIsExpanded(isExpanded);
diff --git a/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionTruncateExpansion.tsx b/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionTruncateExpansion.tsx
index eaa4082186a..83de90fb416 100644
--- a/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionTruncateExpansion.tsx
+++ b/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionTruncateExpansion.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ExpandableSection, ExpandableSectionVariant } from '@patternfly/react-core';
 
 export const ExpandableSectionTruncateExpansion: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionUncontrolled.tsx b/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionUncontrolled.tsx
index 627940fc6d6..d8ecba22f0f 100644
--- a/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionUncontrolled.tsx
+++ b/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionUncontrolled.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ExpandableSection } from '@patternfly/react-core';
 
 export const ExpandableSectionUncontrolled: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionUncontrolledDynamicToggleText.tsx b/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionUncontrolledDynamicToggleText.tsx
index 0883285a878..e4d9a624f72 100644
--- a/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionUncontrolledDynamicToggleText.tsx
+++ b/packages/react-core/src/components/ExpandableSection/examples/ExpandableSectionUncontrolledDynamicToggleText.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ExpandableSection } from '@patternfly/react-core';
 
 export const ExpandableSectionUncontrolledDynamicToggle: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/FileUpload/FileUpload.tsx b/packages/react-core/src/components/FileUpload/FileUpload.tsx
index 08d48c50a80..d7e7cc09043 100644
--- a/packages/react-core/src/components/FileUpload/FileUpload.tsx
+++ b/packages/react-core/src/components/FileUpload/FileUpload.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { DropzoneInputProps, DropzoneOptions, FileRejection, useDropzone, ErrorCode } from 'react-dropzone';
 import { FileUploadField, FileUploadFieldProps } from './FileUploadField';
 import { readFile, fileReaderType } from '../../helpers/fileUtils';
diff --git a/packages/react-core/src/components/FileUpload/FileUploadField.tsx b/packages/react-core/src/components/FileUpload/FileUploadField.tsx
index 1d093a4e9d9..edbfc5d2cad 100644
--- a/packages/react-core/src/components/FileUpload/FileUploadField.tsx
+++ b/packages/react-core/src/components/FileUpload/FileUploadField.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/FileUpload/file-upload';
 import { css } from '@patternfly/react-styles';
 import { InputGroup, InputGroupItem } from '../InputGroup';
diff --git a/packages/react-core/src/components/FileUpload/FileUploadHelperText.tsx b/packages/react-core/src/components/FileUpload/FileUploadHelperText.tsx
index 9a045fb1071..7b12e3be4dd 100644
--- a/packages/react-core/src/components/FileUpload/FileUploadHelperText.tsx
+++ b/packages/react-core/src/components/FileUpload/FileUploadHelperText.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/FileUpload/file-upload';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/FileUpload/__tests__/FileUpload.test.tsx b/packages/react-core/src/components/FileUpload/__tests__/FileUpload.test.tsx
index 369ab6c089b..fe7bd06d254 100644
--- a/packages/react-core/src/components/FileUpload/__tests__/FileUpload.test.tsx
+++ b/packages/react-core/src/components/FileUpload/__tests__/FileUpload.test.tsx
@@ -1,5 +1,4 @@
 import { FileUpload } from '../FileUpload';
-import * as React from 'react';
 import { render } from '@testing-library/react';
 
 test('simple fileupload', () => {
diff --git a/packages/react-core/src/components/FileUpload/__tests__/FileUploadField.test.tsx b/packages/react-core/src/components/FileUpload/__tests__/FileUploadField.test.tsx
index 30cc28db40e..f073b8498c7 100644
--- a/packages/react-core/src/components/FileUpload/__tests__/FileUploadField.test.tsx
+++ b/packages/react-core/src/components/FileUpload/__tests__/FileUploadField.test.tsx
@@ -1,5 +1,4 @@
 import { FileUploadField } from '../FileUploadField';
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 
diff --git a/packages/react-core/src/components/FileUpload/__tests__/FileUploadHelperText.test.tsx b/packages/react-core/src/components/FileUpload/__tests__/FileUploadHelperText.test.tsx
index 566d62bff07..8f269d6832b 100644
--- a/packages/react-core/src/components/FileUpload/__tests__/FileUploadHelperText.test.tsx
+++ b/packages/react-core/src/components/FileUpload/__tests__/FileUploadHelperText.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { FileUploadHelperText } from '../FileUploadHelperText';
 import { render, screen } from '@testing-library/react';
 import styles from '@patternfly/react-styles/css/components/FileUpload/file-upload';
diff --git a/packages/react-core/src/components/FileUpload/examples/FileUploadCustomPreview.tsx b/packages/react-core/src/components/FileUpload/examples/FileUploadCustomPreview.tsx
index 845ee9df96d..c0aa86c7e67 100644
--- a/packages/react-core/src/components/FileUpload/examples/FileUploadCustomPreview.tsx
+++ b/packages/react-core/src/components/FileUpload/examples/FileUploadCustomPreview.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { FileUpload } from '@patternfly/react-core';
 import FileUploadIcon from '@patternfly/react-icons/dist/esm/icons/file-upload-icon';
 
diff --git a/packages/react-core/src/components/FileUpload/examples/FileUploadCustomUpload.tsx b/packages/react-core/src/components/FileUpload/examples/FileUploadCustomUpload.tsx
index a8366fae76e..27e4d3bffe8 100644
--- a/packages/react-core/src/components/FileUpload/examples/FileUploadCustomUpload.tsx
+++ b/packages/react-core/src/components/FileUpload/examples/FileUploadCustomUpload.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { FileUploadField, FileUploadHelperText, HelperText, HelperTextItem, Checkbox } from '@patternfly/react-core';
 
 export const CustomPreviewFileUpload: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/FileUpload/examples/FileUploadSimpleFile.tsx b/packages/react-core/src/components/FileUpload/examples/FileUploadSimpleFile.tsx
index f6388a51034..d8d5fae2610 100644
--- a/packages/react-core/src/components/FileUpload/examples/FileUploadSimpleFile.tsx
+++ b/packages/react-core/src/components/FileUpload/examples/FileUploadSimpleFile.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { FileUpload } from '@patternfly/react-core';
 
 export const SimpleFileUpload: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/FileUpload/examples/FileUploadSimpleText.tsx b/packages/react-core/src/components/FileUpload/examples/FileUploadSimpleText.tsx
index 5d9f57ad030..876d6f773ee 100644
--- a/packages/react-core/src/components/FileUpload/examples/FileUploadSimpleText.tsx
+++ b/packages/react-core/src/components/FileUpload/examples/FileUploadSimpleText.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { FileUpload, DropEvent } from '@patternfly/react-core';
 
 export const SimpleTextFileUpload: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/FileUpload/examples/FileUploadTextWithEdits.tsx b/packages/react-core/src/components/FileUpload/examples/FileUploadTextWithEdits.tsx
index 8abbea53552..18e3a368019 100644
--- a/packages/react-core/src/components/FileUpload/examples/FileUploadTextWithEdits.tsx
+++ b/packages/react-core/src/components/FileUpload/examples/FileUploadTextWithEdits.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { FileUpload, DropEvent } from '@patternfly/react-core';
 
 export const TextFileWithEditsAllowed: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/FileUpload/examples/FileUploadTextWithRestrictions.tsx b/packages/react-core/src/components/FileUpload/examples/FileUploadTextWithRestrictions.tsx
index c32904f687f..d0284856406 100644
--- a/packages/react-core/src/components/FileUpload/examples/FileUploadTextWithRestrictions.tsx
+++ b/packages/react-core/src/components/FileUpload/examples/FileUploadTextWithRestrictions.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   FileUpload,
   DropzoneErrorCode,
diff --git a/packages/react-core/src/components/FileUpload/examples/FileUploadWithHelperText.tsx b/packages/react-core/src/components/FileUpload/examples/FileUploadWithHelperText.tsx
index 9757bc0b7b8..ddeb124b14e 100644
--- a/packages/react-core/src/components/FileUpload/examples/FileUploadWithHelperText.tsx
+++ b/packages/react-core/src/components/FileUpload/examples/FileUploadWithHelperText.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { FileUpload, FileUploadHelperText, HelperText, HelperTextItem, DropEvent } from '@patternfly/react-core';
 
 export const FileUploadWithHelperText: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Form/ActionGroup.tsx b/packages/react-core/src/components/Form/ActionGroup.tsx
index acf4d479840..f01e78a3074 100644
--- a/packages/react-core/src/components/Form/ActionGroup.tsx
+++ b/packages/react-core/src/components/Form/ActionGroup.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Form/form';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Form/Form.tsx b/packages/react-core/src/components/Form/Form.tsx
index 0d28c8ca495..eae7a974c0f 100644
--- a/packages/react-core/src/components/Form/Form.tsx
+++ b/packages/react-core/src/components/Form/Form.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/Form/form';
 import { css } from '@patternfly/react-styles';
 import cssMaxWidth from '@patternfly/react-tokens/dist/esm/c_form_m_limit_width_MaxWidth';
@@ -48,6 +48,6 @@ const FormBase: React.FunctionComponent<FormProps> = ({
   </form>
 );
 
-export const Form = React.forwardRef((props: FormProps, ref: React.Ref<any>) => <FormBase innerRef={ref} {...props} />);
+export const Form = forwardRef((props: FormProps, ref: React.Ref<any>) => <FormBase innerRef={ref} {...props} />);
 
 Form.displayName = 'Form';
diff --git a/packages/react-core/src/components/Form/FormAlert.tsx b/packages/react-core/src/components/Form/FormAlert.tsx
index 89cffcf234c..9b9f8dae409 100644
--- a/packages/react-core/src/components/Form/FormAlert.tsx
+++ b/packages/react-core/src/components/Form/FormAlert.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Form/form';
 
diff --git a/packages/react-core/src/components/Form/FormContext.tsx b/packages/react-core/src/components/Form/FormContext.tsx
index 0e82fa14a96..5b1df6a4914 100644
--- a/packages/react-core/src/components/Form/FormContext.tsx
+++ b/packages/react-core/src/components/Form/FormContext.tsx
@@ -1,4 +1,4 @@
-import React, { Dispatch, SetStateAction } from 'react';
+import { createContext, Dispatch, SetStateAction, useContext, useState } from 'react';
 
 export interface FormContextProps {
   /** Record of values for all fieldIds */
@@ -35,7 +35,7 @@ export interface FormContextProps {
   setValidator(fieldId: string, validate: (value: string) => string | null): void;
 }
 
-const FormContext = React.createContext({} as FormContextProps);
+const FormContext = createContext({} as FormContextProps);
 
 export const FormContextConsumer = FormContext.Consumer;
 
@@ -47,10 +47,10 @@ export interface FormContextProviderProps {
 }
 
 export const FormContextProvider: React.FC<FormContextProviderProps> = ({ initialValues, children }) => {
-  const [values, setValues] = React.useState<Record<string, string>>(initialValues || {});
-  const [errors, setErrors] = React.useState<Record<string, string>>({});
-  const [validators, setValidators] = React.useState<Record<string, Function>>({});
-  const [touched, setTouched] = React.useState<Record<string, boolean>>({});
+  const [values, setValues] = useState<Record<string, string>>(initialValues || {});
+  const [errors, setErrors] = useState<Record<string, string>>({});
+  const [validators, setValidators] = useState<Record<string, Function>>({});
+  const [touched, setTouched] = useState<Record<string, boolean>>({});
   const isValid = Object.keys(errors)?.length === 0;
 
   const getValue = (fieldId: string) =>
@@ -127,4 +127,4 @@ export const FormContextProvider: React.FC<FormContextProviderProps> = ({ initia
 };
 FormContextProvider.displayName = 'FormContextProvider';
 
-export const useFormContext = () => React.useContext(FormContext);
+export const useFormContext = () => useContext(FormContext);
diff --git a/packages/react-core/src/components/Form/FormFieldGroup.tsx b/packages/react-core/src/components/Form/FormFieldGroup.tsx
index aeaef921c06..c42ac40baf9 100644
--- a/packages/react-core/src/components/Form/FormFieldGroup.tsx
+++ b/packages/react-core/src/components/Form/FormFieldGroup.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { InternalFormFieldGroup } from './InternalFormFieldGroup';
 
 export interface FormFieldGroupProps extends Omit<React.HTMLProps<HTMLDivElement>, 'label'> {
diff --git a/packages/react-core/src/components/Form/FormFieldGroupExpandable.tsx b/packages/react-core/src/components/Form/FormFieldGroupExpandable.tsx
index 995e1d06e87..cd52fc31ff1 100644
--- a/packages/react-core/src/components/Form/FormFieldGroupExpandable.tsx
+++ b/packages/react-core/src/components/Form/FormFieldGroupExpandable.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { useState } from 'react';
 import { InternalFormFieldGroup } from './InternalFormFieldGroup';
 
diff --git a/packages/react-core/src/components/Form/FormFieldGroupHeader.tsx b/packages/react-core/src/components/Form/FormFieldGroupHeader.tsx
index 637e485ab46..594371056ca 100644
--- a/packages/react-core/src/components/Form/FormFieldGroupHeader.tsx
+++ b/packages/react-core/src/components/Form/FormFieldGroupHeader.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Form/form';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Form/FormFieldGroupToggle.tsx b/packages/react-core/src/components/Form/FormFieldGroupToggle.tsx
index 8c3ce28ab18..f659108d90c 100644
--- a/packages/react-core/src/components/Form/FormFieldGroupToggle.tsx
+++ b/packages/react-core/src/components/Form/FormFieldGroupToggle.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Form/form';
 import { css } from '@patternfly/react-styles';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
diff --git a/packages/react-core/src/components/Form/FormGroup.tsx b/packages/react-core/src/components/Form/FormGroup.tsx
index 7e2394932ac..8c308779da0 100644
--- a/packages/react-core/src/components/Form/FormGroup.tsx
+++ b/packages/react-core/src/components/Form/FormGroup.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Fragment, isValidElement } from 'react';
 import styles from '@patternfly/react-styles/css/components/Form/form';
 import { ASTERISK } from '../../helpers/htmlConstants';
 import { css } from '@patternfly/react-styles';
@@ -62,7 +62,7 @@ export const FormGroup: React.FunctionComponent<FormGroupProps> = ({
         )}
       </LabelComponent>
       <>&nbsp;&nbsp;</>
-      {React.isValidElement(labelHelp) && <span className={styles.formGroupLabelHelp}>{labelHelp}</span>}
+      {isValidElement(labelHelp) && <span className={styles.formGroupLabelHelp}>{labelHelp}</span>}
     </>
   );
 
@@ -85,10 +85,10 @@ export const FormGroup: React.FunctionComponent<FormGroupProps> = ({
               {...(isGroupOrRadioGroup && { id: `${fieldId || randomId}-legend` })}
             >
               {labelInfo && (
-                <React.Fragment>
+                <Fragment>
                   <div className={css(styles.formGroupLabelMain)}>{labelContent}</div>
                   <div className={css(styles.formGroupLabelInfo)}>{labelInfo}</div>
-                </React.Fragment>
+                </Fragment>
               )}
               {!labelInfo && labelContent}
             </div>
diff --git a/packages/react-core/src/components/Form/FormGroupLabelHelp.tsx b/packages/react-core/src/components/Form/FormGroupLabelHelp.tsx
index f8bba50758c..0f14870d671 100644
--- a/packages/react-core/src/components/Form/FormGroupLabelHelp.tsx
+++ b/packages/react-core/src/components/Form/FormGroupLabelHelp.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { forwardRef, useRef } from 'react';
 import { Button, ButtonProps } from '../Button';
 import QuestionCircleIcon from '@patternfly/react-icons/dist/esm/icons/question-circle-icon';
 import { KeyTypes } from '../../helpers/constants';
@@ -21,7 +21,7 @@ const FormGroupLabelHelpBase: React.FunctionComponent<FormGroupLabelHelpProps> =
   innerRef,
   ...props
 }) => {
-  const ref = React.useRef<HTMLSpanElement>(null);
+  const ref = useRef<HTMLSpanElement>(null);
   const buttonRef = innerRef || ref;
 
   const isMutableRef = (ref: React.Ref<HTMLSpanElement>): ref is React.MutableRefObject<HTMLSpanElement> =>
@@ -50,7 +50,7 @@ const FormGroupLabelHelpBase: React.FunctionComponent<FormGroupLabelHelpProps> =
   );
 };
 
-export const FormGroupLabelHelp = React.forwardRef((props: FormGroupLabelHelpProps, ref: React.Ref<any>) => (
+export const FormGroupLabelHelp = forwardRef((props: FormGroupLabelHelpProps, ref: React.Ref<any>) => (
   <FormGroupLabelHelpBase innerRef={ref} {...props} />
 ));
 
diff --git a/packages/react-core/src/components/Form/FormHelperText.tsx b/packages/react-core/src/components/Form/FormHelperText.tsx
index 2807886eac9..31933732fe5 100644
--- a/packages/react-core/src/components/Form/FormHelperText.tsx
+++ b/packages/react-core/src/components/Form/FormHelperText.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Form/form';
 
diff --git a/packages/react-core/src/components/Form/FormSection.tsx b/packages/react-core/src/components/Form/FormSection.tsx
index ac2fe359a65..e0d9cc5e647 100644
--- a/packages/react-core/src/components/Form/FormSection.tsx
+++ b/packages/react-core/src/components/Form/FormSection.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Form/form';
 import { css } from '@patternfly/react-styles';
 import { GenerateId } from '../../helpers/GenerateId/GenerateId';
diff --git a/packages/react-core/src/components/Form/InternalFormFieldGroup.tsx b/packages/react-core/src/components/Form/InternalFormFieldGroup.tsx
index 36a412f93ea..6daaec42fc3 100644
--- a/packages/react-core/src/components/Form/InternalFormFieldGroup.tsx
+++ b/packages/react-core/src/components/Form/InternalFormFieldGroup.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Form/form';
 import { css } from '@patternfly/react-styles';
 import { FormFieldGroupToggle } from './FormFieldGroupToggle';
diff --git a/packages/react-core/src/components/Form/__tests__/ActionGroup.test.tsx b/packages/react-core/src/components/Form/__tests__/ActionGroup.test.tsx
index fa24a2fb0b8..ed595ce2017 100644
--- a/packages/react-core/src/components/Form/__tests__/ActionGroup.test.tsx
+++ b/packages/react-core/src/components/Form/__tests__/ActionGroup.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { ActionGroup } from '../ActionGroup';
 import { Form } from '../Form';
diff --git a/packages/react-core/src/components/Form/__tests__/Form.test.tsx b/packages/react-core/src/components/Form/__tests__/Form.test.tsx
index 34188e8eb98..9caf53ff004 100644
--- a/packages/react-core/src/components/Form/__tests__/Form.test.tsx
+++ b/packages/react-core/src/components/Form/__tests__/Form.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { Form } from '../Form';
 
diff --git a/packages/react-core/src/components/Form/__tests__/FormAlert.test.tsx b/packages/react-core/src/components/Form/__tests__/FormAlert.test.tsx
index df0e75d2b57..86c3a418983 100644
--- a/packages/react-core/src/components/Form/__tests__/FormAlert.test.tsx
+++ b/packages/react-core/src/components/Form/__tests__/FormAlert.test.tsx
@@ -1,7 +1,5 @@
 import { render } from '@testing-library/react';
 import { FormAlert } from '../FormAlert';
-import React from 'react';
-
 describe('Form Alert component', () => {
   test('should render form group required variant', () => {
     const { asFragment } = render(<FormAlert></FormAlert>);
diff --git a/packages/react-core/src/components/Form/__tests__/FormContext.test.tsx b/packages/react-core/src/components/Form/__tests__/FormContext.test.tsx
index 647c9320466..bcf099f6488 100644
--- a/packages/react-core/src/components/Form/__tests__/FormContext.test.tsx
+++ b/packages/react-core/src/components/Form/__tests__/FormContext.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { FormContextConsumer, FormContextProvider } from '../FormContext';
diff --git a/packages/react-core/src/components/Form/__tests__/FormFieldGroup.test.tsx b/packages/react-core/src/components/Form/__tests__/FormFieldGroup.test.tsx
index 3ddf4674ad7..b7b09c64141 100644
--- a/packages/react-core/src/components/Form/__tests__/FormFieldGroup.test.tsx
+++ b/packages/react-core/src/components/Form/__tests__/FormFieldGroup.test.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import { render, screen } from '@testing-library/react';
 
 import { FormFieldGroup } from '../FormFieldGroup';
diff --git a/packages/react-core/src/components/Form/__tests__/FormGroup.test.tsx b/packages/react-core/src/components/Form/__tests__/FormGroup.test.tsx
index 5c3a4153340..bd5d1ce56b2 100644
--- a/packages/react-core/src/components/Form/__tests__/FormGroup.test.tsx
+++ b/packages/react-core/src/components/Form/__tests__/FormGroup.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
@@ -54,7 +52,7 @@ describe('FormGroup', () => {
     expect(asFragment()).toMatchSnapshot();
   });
 
-  test('should render form group with additonal label info', () => {
+  test('should render form group with additional label info', () => {
     const { asFragment } = render(
       <FormGroup fieldId="id" label={<h1>Header</h1>} labelInfo="more info">
         <input aria-label="input" />
diff --git a/packages/react-core/src/components/Form/__tests__/FormHelperText.test.tsx b/packages/react-core/src/components/Form/__tests__/FormHelperText.test.tsx
index 1f8c1c547de..80bed220b45 100644
--- a/packages/react-core/src/components/Form/__tests__/FormHelperText.test.tsx
+++ b/packages/react-core/src/components/Form/__tests__/FormHelperText.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 
 import { FormHelperText } from '../FormHelperText';
diff --git a/packages/react-core/src/components/Form/__tests__/FormSection.test.tsx b/packages/react-core/src/components/Form/__tests__/FormSection.test.tsx
index f56813e27fd..353cfc6fe20 100644
--- a/packages/react-core/src/components/Form/__tests__/FormSection.test.tsx
+++ b/packages/react-core/src/components/Form/__tests__/FormSection.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { FormSection } from '../FormSection';
 import { render, screen } from '@testing-library/react';
 
diff --git a/packages/react-core/src/components/Form/__tests__/__snapshots__/FormGroup.test.tsx.snap b/packages/react-core/src/components/Form/__tests__/__snapshots__/FormGroup.test.tsx.snap
index d928dd27011..35f5452a5a7 100644
--- a/packages/react-core/src/components/Form/__tests__/__snapshots__/FormGroup.test.tsx.snap
+++ b/packages/react-core/src/components/Form/__tests__/__snapshots__/FormGroup.test.tsx.snap
@@ -154,7 +154,7 @@ exports[`FormGroup should render form group variant without label 1`] = `
 </DocumentFragment>
 `;
 
-exports[`FormGroup should render form group with additonal label info 1`] = `
+exports[`FormGroup should render form group with additional label info 1`] = `
 <DocumentFragment>
   <div
     class="pf-v6-c-form__group"
diff --git a/packages/react-core/src/components/Form/examples/Form.md b/packages/react-core/src/components/Form/examples/Form.md
index 2801a6b390d..242ef658fa6 100644
--- a/packages/react-core/src/components/Form/examples/Form.md
+++ b/packages/react-core/src/components/Form/examples/Form.md
@@ -22,6 +22,7 @@ propComponents:
   ]
 ---
 
+import { useRef, useEffect, useState } from 'react';
 import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
 import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon';
 import TrashIcon from '@patternfly/react-icons/dist/esm/icons/trash-icon';
diff --git a/packages/react-core/src/components/Form/examples/FormBasic.tsx b/packages/react-core/src/components/Form/examples/FormBasic.tsx
index a9e1b420b2e..93af5d17cb2 100644
--- a/packages/react-core/src/components/Form/examples/FormBasic.tsx
+++ b/packages/react-core/src/components/Form/examples/FormBasic.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useRef, useState } from 'react';
 import {
   Form,
   FormGroup,
@@ -15,10 +15,10 @@ import {
 } from '@patternfly/react-core';
 
 export const FormBasic: React.FunctionComponent = () => {
-  const [name, setName] = React.useState('');
-  const [email, setEmail] = React.useState('');
-  const [phone, setPhone] = React.useState('');
-  const labelHelpRef = React.useRef(null);
+  const [name, setName] = useState('');
+  const [email, setEmail] = useState('');
+  const [phone, setPhone] = useState('');
+  const labelHelpRef = useRef(null);
 
   const handleNameChange = (_event, name: string) => {
     setName(name);
diff --git a/packages/react-core/src/components/Form/examples/FormFieldGroups.tsx b/packages/react-core/src/components/Form/examples/FormFieldGroups.tsx
index 5a860605e9b..b216b76e340 100644
--- a/packages/react-core/src/components/Form/examples/FormFieldGroups.tsx
+++ b/packages/react-core/src/components/Form/examples/FormFieldGroups.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   Form,
   FormGroup,
@@ -36,7 +36,7 @@ export const FormFieldGroups: React.FunctionComponent = () => {
     '0-label4': ''
   };
 
-  const [inputValues, setInputValues] = React.useState(initialValues);
+  const [inputValues, setInputValues] = useState(initialValues);
 
   const handleChange = (event, value: string) => {
     const { name } = event.currentTarget;
diff --git a/packages/react-core/src/components/Form/examples/FormGrid.tsx b/packages/react-core/src/components/Form/examples/FormGrid.tsx
index fd937405890..85ac0181409 100644
--- a/packages/react-core/src/components/Form/examples/FormGrid.tsx
+++ b/packages/react-core/src/components/Form/examples/FormGrid.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   Form,
   FormGroup,
@@ -11,9 +11,9 @@ import {
 } from '@patternfly/react-core';
 
 export const FormGrid: React.FunctionComponent = () => {
-  const [name, setName] = React.useState('');
-  const [email, setEmail] = React.useState('');
-  const [phone, setPhone] = React.useState('');
+  const [name, setName] = useState('');
+  const [email, setEmail] = useState('');
+  const [phone, setPhone] = useState('');
 
   const handleNameChange = (_event, name: string) => {
     setName(name);
diff --git a/packages/react-core/src/components/Form/examples/FormGroupLabelInfo.tsx b/packages/react-core/src/components/Form/examples/FormGroupLabelInfo.tsx
index 9491659d507..4ea8f1bf4b5 100644
--- a/packages/react-core/src/components/Form/examples/FormGroupLabelInfo.tsx
+++ b/packages/react-core/src/components/Form/examples/FormGroupLabelInfo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useRef, useState } from 'react';
 import {
   Form,
   FormGroup,
@@ -11,8 +11,8 @@ import {
 } from '@patternfly/react-core';
 
 export const FormGroupLabelInfo: React.FunctionComponent = () => {
-  const [name, setName] = React.useState('');
-  const labelHelpRef = React.useRef(null);
+  const [name, setName] = useState('');
+  const labelHelpRef = useRef(null);
 
   const handleNameChange = (_event, name: string) => {
     setName(name);
diff --git a/packages/react-core/src/components/Form/examples/FormHorizontal.tsx b/packages/react-core/src/components/Form/examples/FormHorizontal.tsx
index 6ef67f48119..aaf4b02b43f 100644
--- a/packages/react-core/src/components/Form/examples/FormHorizontal.tsx
+++ b/packages/react-core/src/components/Form/examples/FormHorizontal.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   Form,
   FormGroup,
@@ -16,10 +16,10 @@ import {
 } from '@patternfly/react-core';
 
 export const FormHorizontal: React.FunctionComponent = () => {
-  const [name, setName] = React.useState('');
-  const [email, setEmail] = React.useState('');
-  const [experience, setExperience] = React.useState('');
-  const [option, setOption] = React.useState('please choose');
+  const [name, setName] = useState('');
+  const [email, setEmail] = useState('');
+  const [experience, setExperience] = useState('');
+  const [option, setOption] = useState('please choose');
 
   const handleNameChange = (_event, name: string) => {
     setName(name);
diff --git a/packages/react-core/src/components/Form/examples/FormHorizontalHelper.tsx b/packages/react-core/src/components/Form/examples/FormHorizontalHelper.tsx
index 1561865e59d..e06dece189d 100644
--- a/packages/react-core/src/components/Form/examples/FormHorizontalHelper.tsx
+++ b/packages/react-core/src/components/Form/examples/FormHorizontalHelper.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Form, FormGroup, Checkbox, HelperText, HelperTextItem, FormHelperText } from '@patternfly/react-core';
 
 export const FormHorizontalFormHelperText: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Form/examples/FormHorizontalStacked.tsx b/packages/react-core/src/components/Form/examples/FormHorizontalStacked.tsx
index a9b5549b8d5..115d240c975 100644
--- a/packages/react-core/src/components/Form/examples/FormHorizontalStacked.tsx
+++ b/packages/react-core/src/components/Form/examples/FormHorizontalStacked.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Form, FormGroup, Checkbox } from '@patternfly/react-core';
 
 export const FormHorizontalStacked: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Form/examples/FormInvalid.tsx b/packages/react-core/src/components/Form/examples/FormInvalid.tsx
index 23bbab072d7..a7475ccf8e3 100644
--- a/packages/react-core/src/components/Form/examples/FormInvalid.tsx
+++ b/packages/react-core/src/components/Form/examples/FormInvalid.tsx
@@ -1,12 +1,12 @@
-import React from 'react';
+import { useState } from 'react';
 import { Form, FormGroup, TextInput, HelperText, HelperTextItem, FormHelperText } from '@patternfly/react-core';
 import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
 
 export const FormInvalid: React.FunctionComponent = () => {
   type validate = 'success' | 'warning' | 'error' | 'default';
 
-  const [age, setAge] = React.useState('Five');
-  const [validated, setValidated] = React.useState<validate>('error');
+  const [age, setAge] = useState('Five');
+  const [validated, setValidated] = useState<validate>('error');
 
   const handleAgeChange = (_event, age: string) => {
     setAge(age);
diff --git a/packages/react-core/src/components/Form/examples/FormInvalidWithFormAlert.tsx b/packages/react-core/src/components/Form/examples/FormInvalidWithFormAlert.tsx
index aba3441b39e..9ec2a9f4419 100644
--- a/packages/react-core/src/components/Form/examples/FormInvalidWithFormAlert.tsx
+++ b/packages/react-core/src/components/Form/examples/FormInvalidWithFormAlert.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   Alert,
   Form,
@@ -14,8 +14,8 @@ import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclam
 export const FormInvalidWithAlert: React.FunctionComponent = () => {
   type validate = 'success' | 'warning' | 'error' | 'default';
 
-  const [age, setAge] = React.useState('Five');
-  const [validated, setValidated] = React.useState<validate>('error');
+  const [age, setAge] = useState('Five');
+  const [validated, setValidated] = useState<validate>('error');
 
   const handleAgeChange = (_event, age: string) => {
     setAge(age);
diff --git a/packages/react-core/src/components/Form/examples/FormLimitWidth.tsx b/packages/react-core/src/components/Form/examples/FormLimitWidth.tsx
index 11b10786dcc..ac3cfe2faf2 100644
--- a/packages/react-core/src/components/Form/examples/FormLimitWidth.tsx
+++ b/packages/react-core/src/components/Form/examples/FormLimitWidth.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useRef, useState } from 'react';
 import {
   Form,
   FormGroup,
@@ -15,10 +15,10 @@ import {
 } from '@patternfly/react-core';
 
 export const FormLimitWidth: React.FunctionComponent = () => {
-  const [name, setName] = React.useState('');
-  const [email, setEmail] = React.useState('');
-  const [phone, setPhone] = React.useState('');
-  const labelHelpRef = React.useRef(null);
+  const [name, setName] = useState('');
+  const [email, setEmail] = useState('');
+  const [phone, setPhone] = useState('');
+  const labelHelpRef = useRef(null);
 
   const handleNameChange = (_event, name: string) => {
     setName(name);
diff --git a/packages/react-core/src/components/Form/examples/FormSections.tsx b/packages/react-core/src/components/Form/examples/FormSections.tsx
index b6c195f121d..a3dd6877157 100644
--- a/packages/react-core/src/components/Form/examples/FormSections.tsx
+++ b/packages/react-core/src/components/Form/examples/FormSections.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { useState } from 'react';
 import { Form, FormGroup, FormSection, TextInput } from '@patternfly/react-core';
 
 export const FormSections: React.FunctionComponent = () => {
-  const [input1, setInput1] = React.useState('');
-  const [input2, setInput2] = React.useState('');
+  const [input1, setInput1] = useState('');
+  const [input2, setInput2] = useState('');
 
   const handleInputChange1 = (_event, input1: string) => {
     setInput1(input1);
diff --git a/packages/react-core/src/components/Form/examples/FormState.tsx b/packages/react-core/src/components/Form/examples/FormState.tsx
index b3cbd9f53e5..efbf6de8288 100644
--- a/packages/react-core/src/components/Form/examples/FormState.tsx
+++ b/packages/react-core/src/components/Form/examples/FormState.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   ActionGroup,
   Button,
@@ -21,8 +21,8 @@ import {
 import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
 
 export const FormState = () => {
-  const [isSelectOpen, setIsSelectOpen] = React.useState(false);
-  const [formStateExpanded, setFormStateExpanded] = React.useState(false);
+  const [isSelectOpen, setIsSelectOpen] = useState(false);
+  const [formStateExpanded, setFormStateExpanded] = useState(false);
 
   return (
     <FormContextProvider initialValues={{ 'select-id': 'Option 1' }}>
diff --git a/packages/react-core/src/components/Form/examples/FormValidated.tsx b/packages/react-core/src/components/Form/examples/FormValidated.tsx
index 19991464371..7725f415870 100644
--- a/packages/react-core/src/components/Form/examples/FormValidated.tsx
+++ b/packages/react-core/src/components/Form/examples/FormValidated.tsx
@@ -1,13 +1,13 @@
-import React from 'react';
+import { useEffect, useState } from 'react';
 import { Form, FormGroup, FormHelperText, HelperText, HelperTextItem, TextInput } from '@patternfly/react-core';
 import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
 
 export const FormValidated: React.FunctionComponent = () => {
   type validate = 'success' | 'warning' | 'error' | 'default';
 
-  const [age, setAge] = React.useState('Five');
-  const [validated, setValidated] = React.useState<validate>('default');
-  const [helperText, setHelperText] = React.useState('Enter your age to continue');
+  const [age, setAge] = useState('Five');
+  const [validated, setValidated] = useState<validate>('default');
+  const [helperText, setHelperText] = useState('Enter your age to continue');
 
   const handleAgeChange = (_event, age: string) => {
     setAge(age);
@@ -16,7 +16,7 @@ export const FormValidated: React.FunctionComponent = () => {
   };
 
   // useEffect is used to simulate a server call to validate the age 2000ms after the user has entered a value, preventing calling the server on every keystroke
-  React.useEffect(() => {
+  useEffect(() => {
     const timer = setTimeout(() => {
       if (/^\d+$/.test(age)) {
         if (parseInt(age) >= 21) {
diff --git a/packages/react-core/src/components/FormControl/FormControlIcon.tsx b/packages/react-core/src/components/FormControl/FormControlIcon.tsx
index 5275ab01d53..424baec7ce3 100644
--- a/packages/react-core/src/components/FormControl/FormControlIcon.tsx
+++ b/packages/react-core/src/components/FormControl/FormControlIcon.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/FormControl/form-control';
 import { css } from '@patternfly/react-styles';
 import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
diff --git a/packages/react-core/src/components/FormSelect/FormSelect.tsx b/packages/react-core/src/components/FormSelect/FormSelect.tsx
index 82f33c6f1b0..7e008b84530 100644
--- a/packages/react-core/src/components/FormSelect/FormSelect.tsx
+++ b/packages/react-core/src/components/FormSelect/FormSelect.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Children, Component } from 'react';
 import styles from '@patternfly/react-styles/css/components/FormControl/form-control';
 import { css } from '@patternfly/react-styles';
 import { PickOptional } from '../../helpers/typeUtils';
@@ -39,7 +39,7 @@ export interface FormSelectProps
   ouiaSafe?: boolean;
 }
 
-class FormSelect extends React.Component<FormSelectProps, { ouiaStateId: string }> {
+class FormSelect extends Component<FormSelectProps, { ouiaStateId: string }> {
   static displayName = 'FormSelect';
   constructor(props: FormSelectProps) {
     super(props);
@@ -71,7 +71,7 @@ class FormSelect extends React.Component<FormSelectProps, { ouiaStateId: string
   render() {
     const { children, className, value, validated, isDisabled, isRequired, ouiaId, ouiaSafe, ...props } = this.props;
     /* find selected option and get placeholder flag */
-    const selectedOption = React.Children.toArray(children).find((option: any) => option.props.value === value) as any;
+    const selectedOption = Children.toArray(children).find((option: any) => option.props.value === value) as any;
     const isSelectedPlaceholder = selectedOption && selectedOption.props.isPlaceholder;
     const hasStatusIcon = ['success', 'error', 'warning'].includes(validated);
 
diff --git a/packages/react-core/src/components/FormSelect/FormSelectOption.tsx b/packages/react-core/src/components/FormSelect/FormSelectOption.tsx
index 4b015629da9..a0d304b1c57 100644
--- a/packages/react-core/src/components/FormSelect/FormSelectOption.tsx
+++ b/packages/react-core/src/components/FormSelect/FormSelectOption.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 export interface FormSelectOptionProps extends Omit<React.HTMLProps<HTMLOptionElement>, 'disabled'> {
   /** additional classes added to the Select Option */
   className?: string;
diff --git a/packages/react-core/src/components/FormSelect/FormSelectOptionGroup.tsx b/packages/react-core/src/components/FormSelect/FormSelectOptionGroup.tsx
index c12ae0c1b3f..afe92ccce80 100644
--- a/packages/react-core/src/components/FormSelect/FormSelectOptionGroup.tsx
+++ b/packages/react-core/src/components/FormSelect/FormSelectOptionGroup.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 export interface FormSelectOptionGroupProps extends Omit<React.HTMLProps<HTMLOptGroupElement>, 'disabled'> {
   /** content rendered inside the Select Option Group */
   children?: React.ReactNode;
diff --git a/packages/react-core/src/components/FormSelect/__tests__/FormSelect.test.tsx b/packages/react-core/src/components/FormSelect/__tests__/FormSelect.test.tsx
index fec53d588fc..347a086492c 100644
--- a/packages/react-core/src/components/FormSelect/__tests__/FormSelect.test.tsx
+++ b/packages/react-core/src/components/FormSelect/__tests__/FormSelect.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-core/src/components/FormSelect/__tests__/Generated/FormSelectOption.test.tsx b/packages/react-core/src/components/FormSelect/__tests__/Generated/FormSelectOption.test.tsx
index 8592d0a9dfc..ddc9db33843 100644
--- a/packages/react-core/src/components/FormSelect/__tests__/Generated/FormSelectOption.test.tsx
+++ b/packages/react-core/src/components/FormSelect/__tests__/Generated/FormSelectOption.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { FormSelectOption } from '../../FormSelectOption';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/FormSelect/__tests__/Generated/FormSelectOptionGroup.test.tsx b/packages/react-core/src/components/FormSelect/__tests__/Generated/FormSelectOptionGroup.test.tsx
index fcb1a57b6f7..afa3cefaceb 100644
--- a/packages/react-core/src/components/FormSelect/__tests__/Generated/FormSelectOptionGroup.test.tsx
+++ b/packages/react-core/src/components/FormSelect/__tests__/Generated/FormSelectOptionGroup.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { FormSelectOptionGroup } from '../../FormSelectOptionGroup';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/FormSelect/examples/FormSelectBasic.tsx b/packages/react-core/src/components/FormSelect/examples/FormSelectBasic.tsx
index 0f63f953c0d..cf70afb039d 100644
--- a/packages/react-core/src/components/FormSelect/examples/FormSelectBasic.tsx
+++ b/packages/react-core/src/components/FormSelect/examples/FormSelectBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { FormSelect, FormSelectOption } from '@patternfly/react-core';
 
 export const FormSelectBasic: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/FormSelect/examples/FormSelectDisabled.tsx b/packages/react-core/src/components/FormSelect/examples/FormSelectDisabled.tsx
index 913d5640d29..257a8e8cd4a 100644
--- a/packages/react-core/src/components/FormSelect/examples/FormSelectDisabled.tsx
+++ b/packages/react-core/src/components/FormSelect/examples/FormSelectDisabled.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { FormSelect, FormSelectOption } from '@patternfly/react-core';
 
 export const FormSelectDisabled: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/FormSelect/examples/FormSelectGrouped.tsx b/packages/react-core/src/components/FormSelect/examples/FormSelectGrouped.tsx
index 238ce1836e8..9aafd8a6c5c 100644
--- a/packages/react-core/src/components/FormSelect/examples/FormSelectGrouped.tsx
+++ b/packages/react-core/src/components/FormSelect/examples/FormSelectGrouped.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { FormSelect, FormSelectOption, FormSelectOptionGroup } from '@patternfly/react-core';
 
 export const FormSelectGrouped: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/FormSelect/examples/FormSelectValidated.tsx b/packages/react-core/src/components/FormSelect/examples/FormSelectValidated.tsx
index 548444aa126..0ccd5624d33 100644
--- a/packages/react-core/src/components/FormSelect/examples/FormSelectValidated.tsx
+++ b/packages/react-core/src/components/FormSelect/examples/FormSelectValidated.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Form,
   FormGroup,
diff --git a/packages/react-core/src/components/HelperText/HelperText.tsx b/packages/react-core/src/components/HelperText/HelperText.tsx
index 4ba22cdc46f..31276b61968 100644
--- a/packages/react-core/src/components/HelperText/HelperText.tsx
+++ b/packages/react-core/src/components/HelperText/HelperText.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/HelperText/helper-text';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/HelperText/HelperTextItem.tsx b/packages/react-core/src/components/HelperText/HelperTextItem.tsx
index 328390ca4b3..5595c0dd3b6 100644
--- a/packages/react-core/src/components/HelperText/HelperTextItem.tsx
+++ b/packages/react-core/src/components/HelperText/HelperTextItem.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/HelperText/helper-text';
 import { css } from '@patternfly/react-styles';
 import MinusIcon from '@patternfly/react-icons/dist/esm/icons/minus-icon';
diff --git a/packages/react-core/src/components/HelperText/__tests__/HelperText.test.tsx b/packages/react-core/src/components/HelperText/__tests__/HelperText.test.tsx
index 354ec0a4206..ce769fdae96 100644
--- a/packages/react-core/src/components/HelperText/__tests__/HelperText.test.tsx
+++ b/packages/react-core/src/components/HelperText/__tests__/HelperText.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { HelperText } from '../HelperText';
 
diff --git a/packages/react-core/src/components/HelperText/__tests__/HelperTextItem.test.tsx b/packages/react-core/src/components/HelperText/__tests__/HelperTextItem.test.tsx
index 8bf3a0d7cfe..0213ffbbd9f 100644
--- a/packages/react-core/src/components/HelperText/__tests__/HelperTextItem.test.tsx
+++ b/packages/react-core/src/components/HelperText/__tests__/HelperTextItem.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { HelperTextItem } from '../HelperTextItem';
 
diff --git a/packages/react-core/src/components/HelperText/examples/HelperText.md b/packages/react-core/src/components/HelperText/examples/HelperText.md
index e96cad7b859..d7fb3bb2f1c 100644
--- a/packages/react-core/src/components/HelperText/examples/HelperText.md
+++ b/packages/react-core/src/components/HelperText/examples/HelperText.md
@@ -5,6 +5,7 @@ cssPrefix: pf-v6-c-helper-text
 propComponents: ['HelperText', 'HelperTextItem']
 ---
 
+import { Fragment } from 'react';
 import InfoIcon from '@patternfly/react-icons/dist/esm/icons/info-icon';
 import QuestionIcon from '@patternfly/react-icons/dist/esm/icons/question-icon';
 import CheckIcon from '@patternfly/react-icons/dist/esm/icons/check-icon';
diff --git a/packages/react-core/src/components/HelperText/examples/HelperTextBasic.tsx b/packages/react-core/src/components/HelperText/examples/HelperTextBasic.tsx
index 0ef67cced25..fbb168c8de2 100644
--- a/packages/react-core/src/components/HelperText/examples/HelperTextBasic.tsx
+++ b/packages/react-core/src/components/HelperText/examples/HelperTextBasic.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { HelperText, HelperTextItem } from '@patternfly/react-core';
 
 export const HelperTextBasic: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <HelperText>
       <HelperTextItem>This is default helper text</HelperTextItem>
     </HelperText>
@@ -18,5 +18,5 @@ export const HelperTextBasic: React.FunctionComponent = () => (
     <HelperText>
       <HelperTextItem variant="error">This is error helper text</HelperTextItem>
     </HelperText>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/HelperText/examples/HelperTextMultipleItems.tsx b/packages/react-core/src/components/HelperText/examples/HelperTextMultipleItems.tsx
index b8fc8b2afc8..0512e8c4e3f 100644
--- a/packages/react-core/src/components/HelperText/examples/HelperTextMultipleItems.tsx
+++ b/packages/react-core/src/components/HelperText/examples/HelperTextMultipleItems.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { HelperText, HelperTextItem } from '@patternfly/react-core';
 
 export const HelperTextMultipleItems: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/HelperText/examples/HelperTextWithCustomIcon.tsx b/packages/react-core/src/components/HelperText/examples/HelperTextWithCustomIcon.tsx
index 162f573a655..04dbb3c0a67 100644
--- a/packages/react-core/src/components/HelperText/examples/HelperTextWithCustomIcon.tsx
+++ b/packages/react-core/src/components/HelperText/examples/HelperTextWithCustomIcon.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { HelperText, HelperTextItem } from '@patternfly/react-core';
 import InfoIcon from '@patternfly/react-icons/dist/esm/icons/info-icon';
 import QuestionIcon from '@patternfly/react-icons/dist/esm/icons/question-icon';
@@ -7,7 +7,7 @@ import CheckIcon from '@patternfly/react-icons/dist/esm/icons/check-icon';
 import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
 
 export const HelperTextWithCustomIcon: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <HelperText>
       <HelperTextItem icon={<InfoIcon />}>This is default helper text</HelperTextItem>
     </HelperText>
@@ -31,5 +31,5 @@ export const HelperTextWithCustomIcon: React.FunctionComponent = () => (
         This is error helper text
       </HelperTextItem>
     </HelperText>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Hint/Hint.tsx b/packages/react-core/src/components/Hint/Hint.tsx
index 9a665a63bf0..5547c609a0f 100644
--- a/packages/react-core/src/components/Hint/Hint.tsx
+++ b/packages/react-core/src/components/Hint/Hint.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Hint/hint';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Hint/HintBody.tsx b/packages/react-core/src/components/Hint/HintBody.tsx
index 0bd1b7e843e..2abdde1560a 100644
--- a/packages/react-core/src/components/Hint/HintBody.tsx
+++ b/packages/react-core/src/components/Hint/HintBody.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Hint/hint';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Hint/HintFooter.tsx b/packages/react-core/src/components/Hint/HintFooter.tsx
index e019157cae5..d3f1a022a2c 100644
--- a/packages/react-core/src/components/Hint/HintFooter.tsx
+++ b/packages/react-core/src/components/Hint/HintFooter.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Hint/hint';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Hint/HintTitle.tsx b/packages/react-core/src/components/Hint/HintTitle.tsx
index 93f9a1a52e5..126888e25be 100644
--- a/packages/react-core/src/components/Hint/HintTitle.tsx
+++ b/packages/react-core/src/components/Hint/HintTitle.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Hint/hint';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Hint/__tests__/Hint.test.tsx b/packages/react-core/src/components/Hint/__tests__/Hint.test.tsx
index ed816111064..44e84a7fb12 100644
--- a/packages/react-core/src/components/Hint/__tests__/Hint.test.tsx
+++ b/packages/react-core/src/components/Hint/__tests__/Hint.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Hint } from '../Hint';
 import styles from '@patternfly/react-styles/css/components/Hint/hint';
diff --git a/packages/react-core/src/components/Hint/__tests__/HintBody.test.tsx b/packages/react-core/src/components/Hint/__tests__/HintBody.test.tsx
index 8c2c72b7b78..e2a2565655e 100644
--- a/packages/react-core/src/components/Hint/__tests__/HintBody.test.tsx
+++ b/packages/react-core/src/components/Hint/__tests__/HintBody.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import styles from '@patternfly/react-styles/css/components/Hint/hint';
diff --git a/packages/react-core/src/components/Hint/__tests__/HintFooter.test.tsx b/packages/react-core/src/components/Hint/__tests__/HintFooter.test.tsx
index 1e8e6daac33..855bb4f0c56 100644
--- a/packages/react-core/src/components/Hint/__tests__/HintFooter.test.tsx
+++ b/packages/react-core/src/components/Hint/__tests__/HintFooter.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import styles from '@patternfly/react-styles/css/components/Hint/hint';
diff --git a/packages/react-core/src/components/Hint/__tests__/HintTitle.test.tsx b/packages/react-core/src/components/Hint/__tests__/HintTitle.test.tsx
index 62164522f20..40bbbc917ce 100644
--- a/packages/react-core/src/components/Hint/__tests__/HintTitle.test.tsx
+++ b/packages/react-core/src/components/Hint/__tests__/HintTitle.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import styles from '@patternfly/react-styles/css/components/Hint/hint';
diff --git a/packages/react-core/src/components/Hint/examples/Hint.md b/packages/react-core/src/components/Hint/examples/Hint.md
index dae8524c1e6..57aa3740de1 100644
--- a/packages/react-core/src/components/Hint/examples/Hint.md
+++ b/packages/react-core/src/components/Hint/examples/Hint.md
@@ -5,6 +5,7 @@ cssPrefix: pf-v6-c-hint
 propComponents: ['Hint', 'HintTitle', 'HintBody', 'HintFooter']
 ---
 
+import { Fragment } from 'react';
 import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
 
 ## Examples
diff --git a/packages/react-core/src/components/Hint/examples/HintActionsWithNoOffset.tsx b/packages/react-core/src/components/Hint/examples/HintActionsWithNoOffset.tsx
index abc220e5d61..96e8259a5af 100644
--- a/packages/react-core/src/components/Hint/examples/HintActionsWithNoOffset.tsx
+++ b/packages/react-core/src/components/Hint/examples/HintActionsWithNoOffset.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Hint, HintTitle, HintBody, Button, Checkbox } from '@patternfly/react-core';
 
 export const HintActionsWithNoOffset: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Hint/examples/HintBasicWithTitle.tsx b/packages/react-core/src/components/Hint/examples/HintBasicWithTitle.tsx
index 94f7a9d6f68..1d7997114b2 100644
--- a/packages/react-core/src/components/Hint/examples/HintBasicWithTitle.tsx
+++ b/packages/react-core/src/components/Hint/examples/HintBasicWithTitle.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Hint,
   HintTitle,
diff --git a/packages/react-core/src/components/Hint/examples/HintBasicWithoutTitle.tsx b/packages/react-core/src/components/Hint/examples/HintBasicWithoutTitle.tsx
index 9c2f5cf82fd..7884dc245fa 100644
--- a/packages/react-core/src/components/Hint/examples/HintBasicWithoutTitle.tsx
+++ b/packages/react-core/src/components/Hint/examples/HintBasicWithoutTitle.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Hint,
   HintBody,
@@ -70,7 +70,7 @@ export const HintBasicWithoutTitle: React.FunctionComponent = () => {
     </Dropdown>
   );
   return (
-    <React.Fragment>
+    <Fragment>
       <Hint>
         <HintBody>
           Welcome to the new documentation experience.
@@ -90,6 +90,6 @@ export const HintBasicWithoutTitle: React.FunctionComponent = () => {
           </Button>
         </HintFooter>
       </Hint>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Icon/Icon.tsx b/packages/react-core/src/components/Icon/Icon.tsx
index 26304588e2a..01e051515f5 100644
--- a/packages/react-core/src/components/Icon/Icon.tsx
+++ b/packages/react-core/src/components/Icon/Icon.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Icon/icon';
 import { css } from '@patternfly/react-styles';
 import { Spinner } from '../Spinner';
diff --git a/packages/react-core/src/components/Icon/__tests__/Icon.test.tsx b/packages/react-core/src/components/Icon/__tests__/Icon.test.tsx
index 115340e045d..d76fe4b6334 100644
--- a/packages/react-core/src/components/Icon/__tests__/Icon.test.tsx
+++ b/packages/react-core/src/components/Icon/__tests__/Icon.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { kebabCase } from 'case-anything';
 import { Icon, IconSize } from '../Icon';
diff --git a/packages/react-core/src/components/Icon/examples/BodyIconSizes.tsx b/packages/react-core/src/components/Icon/examples/BodyIconSizes.tsx
index 97cfd0d9cad..e73b3a38326 100644
--- a/packages/react-core/src/components/Icon/examples/BodyIconSizes.tsx
+++ b/packages/react-core/src/components/Icon/examples/BodyIconSizes.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Icon } from '@patternfly/react-core';
 import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
 
 export const BodyIconSizes: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Icon size="bodySm">
       <PlusCircleIcon />
     </Icon>{' '}
@@ -13,5 +13,5 @@ export const BodyIconSizes: React.FunctionComponent = () => (
     <Icon size="bodyLg">
       <PlusCircleIcon />
     </Icon>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Icon/examples/HeadingIconSizes.tsx b/packages/react-core/src/components/Icon/examples/HeadingIconSizes.tsx
index a7ad0d280c0..ecfd754b517 100644
--- a/packages/react-core/src/components/Icon/examples/HeadingIconSizes.tsx
+++ b/packages/react-core/src/components/Icon/examples/HeadingIconSizes.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Icon } from '@patternfly/react-core';
 import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
 
 export const HeadingIconSizes: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Icon size="headingSm">
       <PlusCircleIcon />
     </Icon>{' '}
@@ -22,5 +22,5 @@ export const HeadingIconSizes: React.FunctionComponent = () => (
     <Icon size="heading_3xl">
       <PlusCircleIcon />
     </Icon>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Icon/examples/Icon.md b/packages/react-core/src/components/Icon/examples/Icon.md
index ec9cdb9030d..fcdef78bfb5 100644
--- a/packages/react-core/src/components/Icon/examples/Icon.md
+++ b/packages/react-core/src/components/Icon/examples/Icon.md
@@ -5,6 +5,7 @@ cssPrefix: pf-v6-c-icon
 propComponents: ['Icon']
 ---
 
+import { Fragment } from 'react';
 import LongArrowAltDownIcon from '@patternfly/react-icons/dist/esm/icons/long-arrow-alt-down-icon';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
 import AngleDownIcon from '@patternfly/react-icons/dist/esm/icons/angle-down-icon';
diff --git a/packages/react-core/src/components/Icon/examples/IconBasic.tsx b/packages/react-core/src/components/Icon/examples/IconBasic.tsx
index d5b4cb9f523..fb6ad36afb6 100644
--- a/packages/react-core/src/components/Icon/examples/IconBasic.tsx
+++ b/packages/react-core/src/components/Icon/examples/IconBasic.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Icon } from '@patternfly/react-core';
 import LongArrowAltDownIcon from '@patternfly/react-icons/dist/esm/icons/long-arrow-alt-down-icon';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
@@ -6,7 +6,7 @@ import AngleDownIcon from '@patternfly/react-icons/dist/esm/icons/angle-down-ico
 import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon';
 
 export const IconBasic: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Icon>
       <LongArrowAltDownIcon />
     </Icon>{' '}
@@ -19,5 +19,5 @@ export const IconBasic: React.FunctionComponent = () => (
     <Icon>
       <CogIcon />
     </Icon>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Icon/examples/IconContentSizes.tsx b/packages/react-core/src/components/Icon/examples/IconContentSizes.tsx
index 5267cac37be..26b78557a58 100644
--- a/packages/react-core/src/components/Icon/examples/IconContentSizes.tsx
+++ b/packages/react-core/src/components/Icon/examples/IconContentSizes.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Icon } from '@patternfly/react-core';
 import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
 
 export const IconContentSizes: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Icon size="3xl" iconSize="lg">
       <PlusCircleIcon />
     </Icon>{' '}
@@ -16,5 +16,5 @@ export const IconContentSizes: React.FunctionComponent = () => (
     <Icon size="3xl">
       <PlusCircleIcon />
     </Icon>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Icon/examples/IconCustomProgress.tsx b/packages/react-core/src/components/Icon/examples/IconCustomProgress.tsx
index faa64ccec9d..9e319fc0191 100644
--- a/packages/react-core/src/components/Icon/examples/IconCustomProgress.tsx
+++ b/packages/react-core/src/components/Icon/examples/IconCustomProgress.tsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Icon, Spinner, Checkbox } from '@patternfly/react-core';
 import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
 
 export const IconProgress: React.FunctionComponent = () => {
   const [isInProgress, setIsInProgress] = React.useState<boolean>(false);
   return (
-    <React.Fragment>
+    <Fragment>
       <div style={{ marginBottom: '12px' }}>
         <Checkbox
           label="Toggle in progress state"
@@ -19,6 +19,6 @@ export const IconProgress: React.FunctionComponent = () => {
       <Icon isInProgress={isInProgress} progressIcon={<Spinner diameter="2em" aria-label="Loading..." />}>
         <CheckCircleIcon />
       </Icon>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Icon/examples/IconInline.tsx b/packages/react-core/src/components/Icon/examples/IconInline.tsx
index 19b3a273b39..db07fb69ec8 100644
--- a/packages/react-core/src/components/Icon/examples/IconInline.tsx
+++ b/packages/react-core/src/components/Icon/examples/IconInline.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Icon, Content } from '@patternfly/react-core';
 import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
 
 export const IconInline: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Content>
       <h1>
         Heading
@@ -56,5 +56,5 @@ export const IconInline: React.FunctionComponent = () => (
       </Icon>
       extra large
     </Content>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Icon/examples/IconProgress.tsx b/packages/react-core/src/components/Icon/examples/IconProgress.tsx
index 892f4768cdc..b9889989a84 100644
--- a/packages/react-core/src/components/Icon/examples/IconProgress.tsx
+++ b/packages/react-core/src/components/Icon/examples/IconProgress.tsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Icon, Checkbox } from '@patternfly/react-core';
 import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
 
 export const IconProgress: React.FunctionComponent = () => {
   const [isInProgress, setIsInProgress] = React.useState<boolean>(false);
   return (
-    <React.Fragment>
+    <Fragment>
       <div style={{ marginBottom: '12px' }}>
         <Checkbox
           label="Toggle in progress state"
@@ -19,6 +19,6 @@ export const IconProgress: React.FunctionComponent = () => {
       <Icon isInProgress={isInProgress}>
         <CheckCircleIcon />
       </Icon>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Icon/examples/IconStatus.tsx b/packages/react-core/src/components/Icon/examples/IconStatus.tsx
index 3995b578695..01728bf3e47 100644
--- a/packages/react-core/src/components/Icon/examples/IconStatus.tsx
+++ b/packages/react-core/src/components/Icon/examples/IconStatus.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Icon } from '@patternfly/react-core';
 import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
 import ExclamationTriangleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon';
@@ -7,7 +7,7 @@ import InfoCircleIcon from '@patternfly/react-icons/dist/esm/icons/info-circle-i
 import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
 
 export const IconStatus: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Icon status="danger">
       <ExclamationCircleIcon />
     </Icon>{' '}
@@ -23,5 +23,5 @@ export const IconStatus: React.FunctionComponent = () => (
     <Icon status="custom">
       <BellIcon />
     </Icon>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Icon/examples/StandaloneIconSizes.tsx b/packages/react-core/src/components/Icon/examples/StandaloneIconSizes.tsx
index 87ab0a5375a..874c3490bf0 100644
--- a/packages/react-core/src/components/Icon/examples/StandaloneIconSizes.tsx
+++ b/packages/react-core/src/components/Icon/examples/StandaloneIconSizes.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Icon } from '@patternfly/react-core';
 import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
 
 export const StandaloneIconSizes: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Icon size="sm">
       <PlusCircleIcon />
     </Icon>{' '}
@@ -22,5 +22,5 @@ export const StandaloneIconSizes: React.FunctionComponent = () => (
     <Icon size="3xl">
       <PlusCircleIcon />
     </Icon>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/InputGroup/InputGroup.tsx b/packages/react-core/src/components/InputGroup/InputGroup.tsx
index e116eb465b7..2e5916926bd 100644
--- a/packages/react-core/src/components/InputGroup/InputGroup.tsx
+++ b/packages/react-core/src/components/InputGroup/InputGroup.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef, useRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/InputGroup/input-group';
 import { css } from '@patternfly/react-styles';
 
@@ -17,7 +17,7 @@ export const InputGroupBase: React.FunctionComponent<InputGroupProps> = ({
   innerRef,
   ...props
 }: InputGroupProps) => {
-  const ref = React.useRef(null);
+  const ref = useRef(null);
   const inputGroupRef = innerRef || ref;
 
   return (
@@ -28,7 +28,7 @@ export const InputGroupBase: React.FunctionComponent<InputGroupProps> = ({
 };
 InputGroupBase.displayName = 'InputGroupBase';
 
-export const InputGroup = React.forwardRef((props: InputGroupProps, ref: React.Ref<HTMLDivElement>) => (
+export const InputGroup = forwardRef((props: InputGroupProps, ref: React.Ref<HTMLDivElement>) => (
   <InputGroupBase innerRef={ref} {...props} />
 ));
 InputGroup.displayName = 'InputGroup';
diff --git a/packages/react-core/src/components/InputGroup/InputGroupItem.tsx b/packages/react-core/src/components/InputGroup/InputGroupItem.tsx
index 2426a5d9e7d..accd5842196 100644
--- a/packages/react-core/src/components/InputGroup/InputGroupItem.tsx
+++ b/packages/react-core/src/components/InputGroup/InputGroupItem.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/InputGroup/input-group';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/InputGroup/InputGroupText.tsx b/packages/react-core/src/components/InputGroup/InputGroupText.tsx
index 7b3ac759110..10a8338be85 100644
--- a/packages/react-core/src/components/InputGroup/InputGroupText.tsx
+++ b/packages/react-core/src/components/InputGroup/InputGroupText.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/InputGroup/input-group';
 import { css } from '@patternfly/react-styles';
 import { InputGroupItem } from './InputGroupItem';
diff --git a/packages/react-core/src/components/InputGroup/__tests__/InputGroup.test.tsx b/packages/react-core/src/components/InputGroup/__tests__/InputGroup.test.tsx
index 0c9b1534937..f6b5f0cd645 100644
--- a/packages/react-core/src/components/InputGroup/__tests__/InputGroup.test.tsx
+++ b/packages/react-core/src/components/InputGroup/__tests__/InputGroup.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 
 import { InputGroup } from '../InputGroup';
diff --git a/packages/react-core/src/components/InputGroup/__tests__/InputGroupText.test.tsx b/packages/react-core/src/components/InputGroup/__tests__/InputGroupText.test.tsx
index 76405bffb9a..bfa530e10f2 100644
--- a/packages/react-core/src/components/InputGroup/__tests__/InputGroupText.test.tsx
+++ b/packages/react-core/src/components/InputGroup/__tests__/InputGroupText.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 
 import { InputGroupText } from '../InputGroupText';
diff --git a/packages/react-core/src/components/InputGroup/examples/InputGroup.md b/packages/react-core/src/components/InputGroup/examples/InputGroup.md
index f9067c9a668..6d0d89210e6 100644
--- a/packages/react-core/src/components/InputGroup/examples/InputGroup.md
+++ b/packages/react-core/src/components/InputGroup/examples/InputGroup.md
@@ -5,6 +5,7 @@ cssPrefix: pf-v6-c-input-group
 propComponents: ['InputGroup', 'InputGroupItem', 'InputGroupText']
 ---
 
+import { Fragment } from 'react';
 import AtIcon from '@patternfly/react-icons/dist/esm/icons/at-icon';
 import DollarSignIcon from '@patternfly/react-icons/dist/esm/icons/dollar-sign-icon';
 import CalendarAltIcon from '@patternfly/react-icons/dist/esm/icons/calendar-alt-icon';
diff --git a/packages/react-core/src/components/InputGroup/examples/InputGroupBasic.tsx b/packages/react-core/src/components/InputGroup/examples/InputGroupBasic.tsx
index c2db8ff8e3e..79290d4a4ba 100644
--- a/packages/react-core/src/components/InputGroup/examples/InputGroupBasic.tsx
+++ b/packages/react-core/src/components/InputGroup/examples/InputGroupBasic.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { Fragment } from 'react';
 import AtIcon from '@patternfly/react-icons/dist/esm/icons/at-icon';
 import { InputGroup, InputGroupText, InputGroupItem, TextInput, ValidatedOptions } from '@patternfly/react-core';
 
 export const InputGroupBasic: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <InputGroup>
       <InputGroupItem isFill>
         <TextInput id="textInput-basic-1" type="email" aria-label="email input field" />
@@ -33,5 +33,5 @@ export const InputGroupBasic: React.FunctionComponent = () => (
         %
       </InputGroupText>
     </InputGroup>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/InputGroup/examples/InputGroupWithDropdown.tsx b/packages/react-core/src/components/InputGroup/examples/InputGroupWithDropdown.tsx
index c71847a6803..a74d789c126 100644
--- a/packages/react-core/src/components/InputGroup/examples/InputGroupWithDropdown.tsx
+++ b/packages/react-core/src/components/InputGroup/examples/InputGroupWithDropdown.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Button,
   InputGroup,
@@ -23,7 +23,7 @@ export const InputGroupWithDropdown: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <InputGroup>
         <InputGroupItem>
           <Dropdown
@@ -58,6 +58,6 @@ export const InputGroupWithDropdown: React.FunctionComponent = () => {
           </Button>
         </InputGroupItem>
       </InputGroup>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/InputGroup/examples/InputGroupWithPopover.tsx b/packages/react-core/src/components/InputGroup/examples/InputGroupWithPopover.tsx
index 20e95a97ea3..4f4927e7042 100644
--- a/packages/react-core/src/components/InputGroup/examples/InputGroupWithPopover.tsx
+++ b/packages/react-core/src/components/InputGroup/examples/InputGroupWithPopover.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import QuestionCircleIcon from '@patternfly/react-icons/dist/esm/icons/question-circle-icon';
 import { Button, InputGroup, InputGroupItem, TextInput, Popover, PopoverPosition } from '@patternfly/react-core';
 
@@ -6,7 +6,7 @@ export const InputGroupWithPopover: React.FunctionComponent = () => {
   const inputGroupRef1 = React.useRef(null);
   const inputGroupRef2 = React.useRef(null);
   return (
-    <React.Fragment>
+    <Fragment>
       <InputGroup ref={inputGroupRef1}>
         <InputGroupItem isFill>
           <TextInput
@@ -48,6 +48,6 @@ export const InputGroupWithPopover: React.FunctionComponent = () => {
           </Popover>
         </InputGroupItem>
       </InputGroup>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/InputGroup/examples/InputGroupWithSiblings.tsx b/packages/react-core/src/components/InputGroup/examples/InputGroupWithSiblings.tsx
index 1a3ff7bc887..432cb630edf 100644
--- a/packages/react-core/src/components/InputGroup/examples/InputGroupWithSiblings.tsx
+++ b/packages/react-core/src/components/InputGroup/examples/InputGroupWithSiblings.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { Fragment } from 'react';
 import DollarSignIcon from '@patternfly/react-icons/dist/esm/icons/dollar-sign-icon';
 import { Button, TextArea, InputGroup, InputGroupText, InputGroupItem, TextInput } from '@patternfly/react-core';
 
 export const InputGroupWithSiblings: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <InputGroup>
       <InputGroupItem>
         <Button id="textAreaButton1" variant="control">
@@ -49,5 +49,5 @@ export const InputGroupWithSiblings: React.FunctionComponent = () => (
       </InputGroupItem>
       <InputGroupText>.00</InputGroupText>
     </InputGroup>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/InputGroup/examples/InputGroupWithTextarea.tsx b/packages/react-core/src/components/InputGroup/examples/InputGroupWithTextarea.tsx
index a1233b0b3da..e5bd25e0821 100644
--- a/packages/react-core/src/components/InputGroup/examples/InputGroupWithTextarea.tsx
+++ b/packages/react-core/src/components/InputGroup/examples/InputGroupWithTextarea.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button, TextArea, InputGroup, InputGroupItem } from '@patternfly/react-core';
 
 export const InputGroupWithTextarea: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <InputGroup>
       <InputGroupItem isFill>
         <TextArea name="inputGroup-with-textarea" id="inputGroup-with-textarea" aria-label="textarea with button" />
@@ -13,5 +13,5 @@ export const InputGroupWithTextarea: React.FunctionComponent = () => (
         </Button>
       </InputGroupItem>
     </InputGroup>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/JumpLinks/JumpLinks.tsx b/packages/react-core/src/components/JumpLinks/JumpLinks.tsx
index a8c539723ce..af0af79a18f 100644
--- a/packages/react-core/src/components/JumpLinks/JumpLinks.tsx
+++ b/packages/react-core/src/components/JumpLinks/JumpLinks.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Children, cloneElement, Fragment, useCallback, useEffect, useRef, useState } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/JumpLinks/jump-links';
 import sidebarStyles from '@patternfly/react-styles/css/components/Sidebar/sidebar';
@@ -51,7 +51,7 @@ export interface JumpLinksProps extends Omit<React.HTMLProps<HTMLElement>, 'labe
 
 // Recursively find JumpLinkItems and return an array of all their scrollNodes
 const getScrollItems = (children: React.ReactNode, res: HTMLElement[]) => {
-  React.Children.forEach(children, (child: any) => {
+  Children.forEach(children, (child: any) => {
     if (canUseDOM && document.getElementById && document.querySelector && child.type === JumpLinksItem) {
       const scrollNode = child.props.node || child.props.href;
       if (typeof scrollNode === 'string') {
@@ -66,7 +66,7 @@ const getScrollItems = (children: React.ReactNode, res: HTMLElement[]) => {
         res.push(scrollNode);
       }
     }
-    if ([React.Fragment, JumpLinksList, JumpLinksItem].includes(child.type)) {
+    if ([Fragment, JumpLinksList, JumpLinksItem].includes(child.type)) {
       getScrollItems(child.props.children, res);
     }
   });
@@ -97,12 +97,12 @@ export const JumpLinks: React.FunctionComponent<JumpLinksProps> = ({
   ...props
 }: JumpLinksProps) => {
   const hasScrollSpy = Boolean(scrollableRef || scrollableSelector);
-  const [scrollItems, setScrollItems] = React.useState(hasScrollSpy ? getScrollItems(children, []) : []);
-  const [activeIndex, setActiveIndex] = React.useState(activeIndexProp);
-  const [isExpanded, setIsExpanded] = React.useState(isExpandedProp);
+  const [scrollItems, setScrollItems] = useState(hasScrollSpy ? getScrollItems(children, []) : []);
+  const [activeIndex, setActiveIndex] = useState(activeIndexProp);
+  const [isExpanded, setIsExpanded] = useState(isExpandedProp);
   // Boolean to disable scroll listener from overriding active state of clicked jumplink
-  const isLinkClicked = React.useRef(false);
-  const navRef = React.useRef<HTMLElement>(undefined);
+  const isLinkClicked = useRef(false);
+  const navRef = useRef<HTMLElement>(undefined);
 
   let scrollableElement: HTMLElement;
 
@@ -119,7 +119,7 @@ export const JumpLinks: React.FunctionComponent<JumpLinksProps> = ({
     }
   };
 
-  const scrollSpy = React.useCallback(() => {
+  const scrollSpy = useCallback(() => {
     if (!canUseDOM || !hasScrollSpy || !(scrollableElement instanceof HTMLElement)) {
       return;
     }
@@ -154,7 +154,7 @@ export const JumpLinks: React.FunctionComponent<JumpLinksProps> = ({
     });
   }, [scrollItems, hasScrollSpy, scrollableElement, offset]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     scrollableElement = getScrollableElement();
     if (!(scrollableElement instanceof HTMLElement)) {
       return;
@@ -164,7 +164,7 @@ export const JumpLinks: React.FunctionComponent<JumpLinksProps> = ({
     return () => scrollableElement.removeEventListener('scroll', scrollSpy);
   }, [scrollableElement, scrollSpy, getScrollableElement]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     scrollSpy();
   }, []);
 
@@ -172,12 +172,12 @@ export const JumpLinks: React.FunctionComponent<JumpLinksProps> = ({
   const cloneChildren = (children: React.ReactNode): React.ReactNode =>
     !hasScrollSpy
       ? children
-      : React.Children.map(children, (child: any) => {
+      : Children.map(children, (child: any) => {
           if (child.type === JumpLinksItem) {
             const { onClick: onClickProp, isActive: isActiveProp } = child.props;
             const itemIndex = jumpLinkIndex++;
             const scrollItem = scrollItems[itemIndex];
-            return React.cloneElement(child as React.ReactElement<JumpLinksItemProps>, {
+            return cloneElement(child as React.ReactElement<JumpLinksItemProps>, {
               onClick(ev: React.MouseEvent) {
                 isLinkClicked.current = true;
                 // Items might have rendered after this component. Do a quick refresh.
@@ -224,10 +224,10 @@ export const JumpLinks: React.FunctionComponent<JumpLinksProps> = ({
               isActive: isActiveProp || activeIndex === itemIndex,
               children: cloneChildren(child.props.children)
             });
-          } else if (child.type === React.Fragment) {
+          } else if (child.type === Fragment) {
             return cloneChildren(child.props.children);
           } else if (child.type === JumpLinksList) {
-            return React.cloneElement(child, { children: cloneChildren(child.props.children) });
+            return cloneElement(child, { children: cloneChildren(child.props.children) });
           }
           return child;
         });
diff --git a/packages/react-core/src/components/JumpLinks/JumpLinksItem.tsx b/packages/react-core/src/components/JumpLinks/JumpLinksItem.tsx
index b2854661840..23dd3b2ce06 100644
--- a/packages/react-core/src/components/JumpLinks/JumpLinksItem.tsx
+++ b/packages/react-core/src/components/JumpLinks/JumpLinksItem.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Children } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/JumpLinks/jump-links';
 import { JumpLinksList } from './JumpLinksList';
@@ -29,7 +29,7 @@ export const JumpLinksItem: React.FunctionComponent<JumpLinksItemProps> = ({
   className,
   ...props
 }: JumpLinksItemProps) => {
-  const childrenArr = React.Children.toArray(children) as any[];
+  const childrenArr = Children.toArray(children) as any[];
   const sublists = childrenArr.filter((child) => child.type === JumpLinksList);
   children = childrenArr.filter((child) => child.type !== JumpLinksList);
 
diff --git a/packages/react-core/src/components/JumpLinks/JumpLinksList.tsx b/packages/react-core/src/components/JumpLinks/JumpLinksList.tsx
index 68f6342af4c..bef5a5ced06 100644
--- a/packages/react-core/src/components/JumpLinks/JumpLinksList.tsx
+++ b/packages/react-core/src/components/JumpLinks/JumpLinksList.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/JumpLinks/jump-links';
 
diff --git a/packages/react-core/src/components/JumpLinks/__tests__/JumpLinks.test.tsx b/packages/react-core/src/components/JumpLinks/__tests__/JumpLinks.test.tsx
index f788d624916..60fe0eb74f5 100644
--- a/packages/react-core/src/components/JumpLinks/__tests__/JumpLinks.test.tsx
+++ b/packages/react-core/src/components/JumpLinks/__tests__/JumpLinks.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { JumpLinks } from '../JumpLinks';
 import { JumpLinksItem } from '../JumpLinksItem';
diff --git a/packages/react-core/src/components/JumpLinks/examples/JumpLinksBasic.tsx b/packages/react-core/src/components/JumpLinks/examples/JumpLinksBasic.tsx
index dcd15c04453..84f621e11b8 100644
--- a/packages/react-core/src/components/JumpLinks/examples/JumpLinksBasic.tsx
+++ b/packages/react-core/src/components/JumpLinks/examples/JumpLinksBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { JumpLinks, JumpLinksItem } from '@patternfly/react-core';
 
 export const JumpLinksBasic: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/JumpLinks/examples/JumpLinksExpandableVerticalWithSubsection.tsx b/packages/react-core/src/components/JumpLinks/examples/JumpLinksExpandableVerticalWithSubsection.tsx
index f05cf0f5c1d..de89738a9c0 100644
--- a/packages/react-core/src/components/JumpLinks/examples/JumpLinksExpandableVerticalWithSubsection.tsx
+++ b/packages/react-core/src/components/JumpLinks/examples/JumpLinksExpandableVerticalWithSubsection.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { JumpLinks, JumpLinksItem, JumpLinksList } from '@patternfly/react-core';
 
 export const JumpLinksExpandableVerticalWithSubsection: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/JumpLinks/examples/JumpLinksVertical.tsx b/packages/react-core/src/components/JumpLinks/examples/JumpLinksVertical.tsx
index 78ad737986e..f69a25cd466 100644
--- a/packages/react-core/src/components/JumpLinks/examples/JumpLinksVertical.tsx
+++ b/packages/react-core/src/components/JumpLinks/examples/JumpLinksVertical.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { JumpLinks, JumpLinksItem } from '@patternfly/react-core';
 
 export const JumpLinksVertical: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/JumpLinks/examples/JumpLinksVerticalWithLabel.tsx b/packages/react-core/src/components/JumpLinks/examples/JumpLinksVerticalWithLabel.tsx
index 8026e51a791..3618322a96a 100644
--- a/packages/react-core/src/components/JumpLinks/examples/JumpLinksVerticalWithLabel.tsx
+++ b/packages/react-core/src/components/JumpLinks/examples/JumpLinksVerticalWithLabel.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { JumpLinks, JumpLinksItem } from '@patternfly/react-core';
 
 export const JumpLinksVerticalWithLabel: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/JumpLinks/examples/JumpLinksWithCenteredList.tsx b/packages/react-core/src/components/JumpLinks/examples/JumpLinksWithCenteredList.tsx
index 01689f188b3..00cd3166636 100644
--- a/packages/react-core/src/components/JumpLinks/examples/JumpLinksWithCenteredList.tsx
+++ b/packages/react-core/src/components/JumpLinks/examples/JumpLinksWithCenteredList.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { JumpLinks, JumpLinksItem } from '@patternfly/react-core';
 
 export const JumpLinksWithCenteredList: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/JumpLinks/examples/JumpLinksWithLabel.tsx b/packages/react-core/src/components/JumpLinks/examples/JumpLinksWithLabel.tsx
index d716cab42bc..181c0384173 100644
--- a/packages/react-core/src/components/JumpLinks/examples/JumpLinksWithLabel.tsx
+++ b/packages/react-core/src/components/JumpLinks/examples/JumpLinksWithLabel.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { JumpLinks, JumpLinksItem } from '@patternfly/react-core';
 
 export const JumpLinksWithLabel: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Label/Label.tsx b/packages/react-core/src/components/Label/Label.tsx
index c0aeb2a7814..a3e54735a68 100644
--- a/packages/react-core/src/components/Label/Label.tsx
+++ b/packages/react-core/src/components/Label/Label.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-import { useState } from 'react';
+import { createRef, Fragment, useEffect, useRef, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/Label/label';
 import labelGrpStyles from '@patternfly/react-styles/css/components/Label/label-group';
 import { Button } from '../Button';
@@ -130,8 +129,8 @@ export const Label: React.FunctionComponent<LabelProps> = ({
 }: LabelProps) => {
   const [isEditableActive, setIsEditableActive] = useState<boolean>(false);
   const [currValue, setCurrValue] = useState(children);
-  const editableButtonRef = React.useRef<HTMLButtonElement>(undefined);
-  const editableInputRef = React.useRef<HTMLInputElement>(undefined);
+  const editableButtonRef = useRef<HTMLButtonElement>(undefined);
+  const editableInputRef = useRef<HTMLInputElement>(undefined);
 
   const isOverflowLabel = variant === 'overflow';
   const isAddLabel = variant === 'add';
@@ -145,7 +144,7 @@ export const Label: React.FunctionComponent<LabelProps> = ({
     _icon = icon;
   }
 
-  React.useEffect(() => {
+  useEffect(() => {
     document.addEventListener('mousedown', onDocMouseDown);
     document.addEventListener('keydown', onKeyDown);
     return () => {
@@ -154,7 +153,7 @@ export const Label: React.FunctionComponent<LabelProps> = ({
     };
   });
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (onLabelClick && href) {
       // eslint-disable-next-line no-console
       console.warn(
@@ -246,10 +245,10 @@ export const Label: React.FunctionComponent<LabelProps> = ({
   );
 
   const closeButton = <span className={css(styles.labelActions)}>{closeBtn || defaultCloseButton}</span>;
-  const textRef = React.createRef<any>();
+  const textRef = createRef<any>();
   // ref to apply tooltip when rendered is used
-  const componentRef = React.useRef(undefined);
-  const [isTooltipVisible, setIsTooltipVisible] = React.useState(false);
+  const componentRef = useRef(undefined);
+  const [isTooltipVisible, setIsTooltipVisible] = useState(false);
   useIsomorphicLayoutEffect(() => {
     const currTextRef = isEditable ? editableButtonRef : textRef;
     if (!isEditableActive) {
@@ -257,7 +256,7 @@ export const Label: React.FunctionComponent<LabelProps> = ({
     }
   }, [isEditableActive]);
   const content = (
-    <React.Fragment>
+    <Fragment>
       {_icon && <span className={css(styles.labelIcon)}>{_icon}</span>}
       <span
         ref={textRef}
@@ -270,10 +269,10 @@ export const Label: React.FunctionComponent<LabelProps> = ({
       >
         {children}
       </span>
-    </React.Fragment>
+    </Fragment>
   );
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (isEditableActive && editableInputRef) {
       editableInputRef.current && editableInputRef.current.focus();
     }
@@ -322,14 +321,14 @@ export const Label: React.FunctionComponent<LabelProps> = ({
 
   if (render) {
     labelComponentChild = (
-      <React.Fragment>
+      <Fragment>
         {isTooltipVisible && <Tooltip triggerRef={componentRef} content={children} position={tooltipPosition} />}
         {render({
           className: styles.labelContent,
           content,
           componentRef
         })}
-      </React.Fragment>
+      </Fragment>
     );
   } else if (isTooltipVisible) {
     labelComponentChild = (
diff --git a/packages/react-core/src/components/Label/LabelGroup.tsx b/packages/react-core/src/components/Label/LabelGroup.tsx
index a84913c930e..c3a293d1eac 100644
--- a/packages/react-core/src/components/Label/LabelGroup.tsx
+++ b/packages/react-core/src/components/Label/LabelGroup.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Children, Component, createRef, Fragment } from 'react';
 import styles from '@patternfly/react-styles/css/components/Label/label-group';
 import labelStyles from '@patternfly/react-styles/css/components/Label/label';
 import { css } from '@patternfly/react-styles';
@@ -18,7 +18,7 @@ export interface LabelGroupProps extends React.HTMLProps<HTMLUListElement> {
   defaultIsOpen?: boolean;
   /** Customizable "Show Less" text string */
   expandedText?: string;
-  /** Customizeable template string. Use variable "${remaining}" for the overflow label count. */
+  /** Customizable template string. Use variable "${remaining}" for the overflow label count. */
   collapsedText?: string;
   /** Category name text for the label group category.  If this prop is supplied the label group with have a label and category styling applied */
   categoryName?: string;
@@ -67,7 +67,7 @@ interface LabelGroupState {
   isTooltipVisible: boolean;
 }
 
-class LabelGroup extends React.Component<LabelGroupProps, LabelGroupState> {
+class LabelGroup extends Component<LabelGroupProps, LabelGroupState> {
   static displayName = 'LabelGroup';
   constructor(props: LabelGroupProps) {
     super(props);
@@ -76,7 +76,7 @@ class LabelGroup extends React.Component<LabelGroupProps, LabelGroupState> {
       isTooltipVisible: false
     };
   }
-  private headingRef = React.createRef<HTMLSpanElement>();
+  private headingRef = createRef<HTMLSpanElement>();
 
   static defaultProps: LabelGroupProps = {
     expandedText: 'Show Less',
@@ -156,7 +156,7 @@ class LabelGroup extends React.Component<LabelGroupProps, LabelGroupState> {
       ...rest
     } = this.props;
     const { isOpen } = this.state;
-    const renderedChildren = React.Children.toArray(children);
+    const renderedChildren = Children.toArray(children);
     const numChildren = renderedChildren.length;
     const collapsedTextResult = fillTemplate(collapsedText as string, {
       remaining: numChildren - numLabels
@@ -166,7 +166,7 @@ class LabelGroup extends React.Component<LabelGroupProps, LabelGroupState> {
       const labelArray = !isOpen ? renderedChildren.slice(0, numLabels) : renderedChildren;
 
       const content = (
-        <React.Fragment>
+        <Fragment>
           {categoryName && this.renderLabel(id)}
           <ul
             className={css(styles.labelGroupList)}
@@ -198,7 +198,7 @@ class LabelGroup extends React.Component<LabelGroupProps, LabelGroupState> {
               </li>
             )}
           </ul>
-        </React.Fragment>
+        </Fragment>
       );
 
       const close = (
diff --git a/packages/react-core/src/components/Label/__tests__/Label.test.tsx b/packages/react-core/src/components/Label/__tests__/Label.test.tsx
index 10fc31cb94c..f5991a4cddd 100644
--- a/packages/react-core/src/components/Label/__tests__/Label.test.tsx
+++ b/packages/react-core/src/components/Label/__tests__/Label.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import '@testing-library/jest-dom';
diff --git a/packages/react-core/src/components/Label/__tests__/LabelGroup.test.tsx b/packages/react-core/src/components/Label/__tests__/LabelGroup.test.tsx
index 5f02fd9c151..e30eccf5018 100644
--- a/packages/react-core/src/components/Label/__tests__/LabelGroup.test.tsx
+++ b/packages/react-core/src/components/Label/__tests__/LabelGroup.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-core/src/components/Label/examples/Label.md b/packages/react-core/src/components/Label/examples/Label.md
index f254b33c2bf..122b6764cd6 100644
--- a/packages/react-core/src/components/Label/examples/Label.md
+++ b/packages/react-core/src/components/Label/examples/Label.md
@@ -5,6 +5,7 @@ cssPrefix: ['pf-v6-c-label', 'pf-v6-c-label-group']
 propComponents: ['Label', 'LabelGroup']
 ---
 
+import { Fragment } from 'react';
 import CubeIcon from '@patternfly/react-icons/dist/esm/icons/cube-icon';
 import InfoCircleIcon from '@patternfly/react-icons/dist/esm/icons/info-circle-icon';
 import './Label.css';
diff --git a/packages/react-core/src/components/Label/examples/LabelCompact.tsx b/packages/react-core/src/components/Label/examples/LabelCompact.tsx
index fb737ca6a44..2b255c675af 100644
--- a/packages/react-core/src/components/Label/examples/LabelCompact.tsx
+++ b/packages/react-core/src/components/Label/examples/LabelCompact.tsx
@@ -1,10 +1,10 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Label } from '@patternfly/react-core';
 import CubeIcon from '@patternfly/react-icons/dist/esm/icons/cube-icon';
 import InfoCircleIcon from '@patternfly/react-icons/dist/esm/icons/info-circle-icon';
 
 export const LabelCompact: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Label isCompact>Compact</Label>
     <Label isCompact icon={<CubeIcon />}>
       Compact icon
@@ -79,5 +79,5 @@ export const LabelCompact: React.FunctionComponent = () => (
     >
       Compact clickable removable (disabled)
     </Label>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Label/examples/LabelCustomRender.tsx b/packages/react-core/src/components/Label/examples/LabelCustomRender.tsx
index d0c4936c70b..4f72f7298cb 100644
--- a/packages/react-core/src/components/Label/examples/LabelCustomRender.tsx
+++ b/packages/react-core/src/components/Label/examples/LabelCustomRender.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Label } from '@patternfly/react-core';
 import InfoCircleIcon from '@patternfly/react-icons/dist/esm/icons/info-circle-icon';
 
diff --git a/packages/react-core/src/components/Label/examples/LabelEditable.tsx b/packages/react-core/src/components/Label/examples/LabelEditable.tsx
index 14a9c1e5a74..75cca9015be 100644
--- a/packages/react-core/src/components/Label/examples/LabelEditable.tsx
+++ b/packages/react-core/src/components/Label/examples/LabelEditable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Label } from '@patternfly/react-core';
 
 export const LabelEditable: React.FunctionComponent = () => {
@@ -22,7 +22,7 @@ export const LabelEditable: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Label
         color="blue"
         onClose={() => {}}
@@ -52,6 +52,6 @@ export const LabelEditable: React.FunctionComponent = () => {
       >
         {compactLabelText}
       </Label>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Label/examples/LabelFilled.tsx b/packages/react-core/src/components/Label/examples/LabelFilled.tsx
index 09dc67cc309..a81a3fb50dd 100644
--- a/packages/react-core/src/components/Label/examples/LabelFilled.tsx
+++ b/packages/react-core/src/components/Label/examples/LabelFilled.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Label } from '@patternfly/react-core';
 import CubeIcon from '@patternfly/react-icons/dist/esm/icons/cube-icon';
 
@@ -8,7 +8,7 @@ export const LabelFilled: React.FunctionComponent = () => {
     console.log(color, 'label clicked');
   };
   return (
-    <React.Fragment>
+    <Fragment>
       <strong>Non-status:</strong>
       <br />
       <br />
@@ -447,6 +447,6 @@ export const LabelFilled: React.FunctionComponent = () => {
       <Label status="custom" onClose={() => Function.prototype} textMaxWidth="16ch">
         Custom label with text that overflows
       </Label>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Label/examples/LabelGroupBasic.tsx b/packages/react-core/src/components/Label/examples/LabelGroupBasic.tsx
index 8e0faf8e016..96baa168b40 100644
--- a/packages/react-core/src/components/Label/examples/LabelGroupBasic.tsx
+++ b/packages/react-core/src/components/Label/examples/LabelGroupBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Label, LabelGroup } from '@patternfly/react-core';
 import InfoCircleIcon from '@patternfly/react-icons/dist/esm/icons/info-circle-icon';
 
diff --git a/packages/react-core/src/components/Label/examples/LabelGroupCategory.tsx b/packages/react-core/src/components/Label/examples/LabelGroupCategory.tsx
index 205999b4a69..f68c1e63045 100644
--- a/packages/react-core/src/components/Label/examples/LabelGroupCategory.tsx
+++ b/packages/react-core/src/components/Label/examples/LabelGroupCategory.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Label, LabelGroup } from '@patternfly/react-core';
 import InfoCircleIcon from '@patternfly/react-icons/dist/esm/icons/info-circle-icon';
 
diff --git a/packages/react-core/src/components/Label/examples/LabelGroupCategoryRemovable.tsx b/packages/react-core/src/components/Label/examples/LabelGroupCategoryRemovable.tsx
index 31e12221da3..7b2a67c1cd8 100644
--- a/packages/react-core/src/components/Label/examples/LabelGroupCategoryRemovable.tsx
+++ b/packages/react-core/src/components/Label/examples/LabelGroupCategoryRemovable.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Label, LabelGroup, LabelProps } from '@patternfly/react-core';
 import InfoCircleIcon from '@patternfly/react-icons/dist/esm/icons/info-circle-icon';
 
diff --git a/packages/react-core/src/components/Label/examples/LabelGroupEditableAdd.tsx b/packages/react-core/src/components/Label/examples/LabelGroupEditableAdd.tsx
index 0024bd20aa4..9038b17a0e2 100644
--- a/packages/react-core/src/components/Label/examples/LabelGroupEditableAdd.tsx
+++ b/packages/react-core/src/components/Label/examples/LabelGroupEditableAdd.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { LabelGroup, Label } from '@patternfly/react-core';
 
 export const LabelGroupEditableAdd: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Label/examples/LabelGroupEditableAddDropdown.tsx b/packages/react-core/src/components/Label/examples/LabelGroupEditableAddDropdown.tsx
index 2cc11253ea5..9fa281067b5 100644
--- a/packages/react-core/src/components/Label/examples/LabelGroupEditableAddDropdown.tsx
+++ b/packages/react-core/src/components/Label/examples/LabelGroupEditableAddDropdown.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { LabelGroup, Label, Menu, MenuContent, MenuList, MenuItem, Popper } from '@patternfly/react-core';
 
 export const LabelGroupEditableAddDropdown: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Label/examples/LabelGroupEditableAddModal.tsx b/packages/react-core/src/components/Label/examples/LabelGroupEditableAddModal.tsx
index 3907eabb7c7..2ef1ff016b9 100644
--- a/packages/react-core/src/components/Label/examples/LabelGroupEditableAddModal.tsx
+++ b/packages/react-core/src/components/Label/examples/LabelGroupEditableAddModal.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   LabelGroup,
   Label,
diff --git a/packages/react-core/src/components/Label/examples/LabelGroupEditableLabels.tsx b/packages/react-core/src/components/Label/examples/LabelGroupEditableLabels.tsx
index f78b5aa062e..4e35edd9341 100644
--- a/packages/react-core/src/components/Label/examples/LabelGroupEditableLabels.tsx
+++ b/packages/react-core/src/components/Label/examples/LabelGroupEditableLabels.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { LabelGroup, Label } from '@patternfly/react-core';
 
 export const LabelGroupEditableLabels: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Label/examples/LabelGroupOverflow.tsx b/packages/react-core/src/components/Label/examples/LabelGroupOverflow.tsx
index dcfeeaf5b4d..a2bd75d8385 100644
--- a/packages/react-core/src/components/Label/examples/LabelGroupOverflow.tsx
+++ b/packages/react-core/src/components/Label/examples/LabelGroupOverflow.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Label, LabelGroup } from '@patternfly/react-core';
 import InfoCircleIcon from '@patternfly/react-icons/dist/esm/icons/info-circle-icon';
 
diff --git a/packages/react-core/src/components/Label/examples/LabelGroupVerticalCategoryOverflowRemovable.tsx b/packages/react-core/src/components/Label/examples/LabelGroupVerticalCategoryOverflowRemovable.tsx
index 25f5cb33124..d0836b118e1 100644
--- a/packages/react-core/src/components/Label/examples/LabelGroupVerticalCategoryOverflowRemovable.tsx
+++ b/packages/react-core/src/components/Label/examples/LabelGroupVerticalCategoryOverflowRemovable.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Label, LabelGroup, LabelProps } from '@patternfly/react-core';
 import InfoCircleIcon from '@patternfly/react-icons/dist/esm/icons/info-circle-icon';
 
diff --git a/packages/react-core/src/components/Label/examples/LabelOutline.tsx b/packages/react-core/src/components/Label/examples/LabelOutline.tsx
index 78698ec0640..54fac5111d3 100644
--- a/packages/react-core/src/components/Label/examples/LabelOutline.tsx
+++ b/packages/react-core/src/components/Label/examples/LabelOutline.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Label } from '@patternfly/react-core';
 import CubeIcon from '@patternfly/react-icons/dist/esm/icons/cube-icon';
 
@@ -8,7 +8,7 @@ export const LabelOutline: React.FunctionComponent = () => {
     console.log(color, 'label clicked');
   };
   return (
-    <React.Fragment>
+    <Fragment>
       <strong>Non-status:</strong>
       <br />
       <br />
@@ -548,6 +548,6 @@ export const LabelOutline: React.FunctionComponent = () => {
       <Label status="custom" variant="outline" onClose={() => Function.prototype} textMaxWidth="16ch">
         Custom label with text that overflows
       </Label>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/List/List.tsx b/packages/react-core/src/components/List/List.tsx
index f6062f4a4d0..d76842de30d 100644
--- a/packages/react-core/src/components/List/List.tsx
+++ b/packages/react-core/src/components/List/List.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/List/list';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/List/ListItem.tsx b/packages/react-core/src/components/List/ListItem.tsx
index 567f1d6f658..e9b0e86301d 100644
--- a/packages/react-core/src/components/List/ListItem.tsx
+++ b/packages/react-core/src/components/List/ListItem.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/List/list';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/List/__tests__/Generated/ListItem.test.tsx b/packages/react-core/src/components/List/__tests__/Generated/ListItem.test.tsx
index 4c519e10c97..9eb4309f382 100644
--- a/packages/react-core/src/components/List/__tests__/Generated/ListItem.test.tsx
+++ b/packages/react-core/src/components/List/__tests__/Generated/ListItem.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ListItem } from '../../ListItem';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/List/__tests__/List.test.tsx b/packages/react-core/src/components/List/__tests__/List.test.tsx
index 6eb1e175e65..c9e13bea094 100644
--- a/packages/react-core/src/components/List/__tests__/List.test.tsx
+++ b/packages/react-core/src/components/List/__tests__/List.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 
 import BookOpen from '@patternfly/react-icons/dist/esm/icons/book-open-icon';
diff --git a/packages/react-core/src/components/List/examples/ListBasic.tsx b/packages/react-core/src/components/List/examples/ListBasic.tsx
index 4bbc5e16741..8f2f5548bf2 100644
--- a/packages/react-core/src/components/List/examples/ListBasic.tsx
+++ b/packages/react-core/src/components/List/examples/ListBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { List, ListItem } from '@patternfly/react-core';
 
 export const ListBasic: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/List/examples/ListHorizontalRules.tsx b/packages/react-core/src/components/List/examples/ListHorizontalRules.tsx
index 94318250e30..91af371abbb 100644
--- a/packages/react-core/src/components/List/examples/ListHorizontalRules.tsx
+++ b/packages/react-core/src/components/List/examples/ListHorizontalRules.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { List, ListItem } from '@patternfly/react-core';
 
 export const ListHorizontalRules: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/List/examples/ListIcons.tsx b/packages/react-core/src/components/List/examples/ListIcons.tsx
index e5c040a5d1c..f484a5f3eeb 100644
--- a/packages/react-core/src/components/List/examples/ListIcons.tsx
+++ b/packages/react-core/src/components/List/examples/ListIcons.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { List, ListItem } from '@patternfly/react-core';
 import BookOpenIcon from '@patternfly/react-icons/dist/esm/icons/book-open-icon';
 import KeyIcon from '@patternfly/react-icons/dist/esm/icons/key-icon';
diff --git a/packages/react-core/src/components/List/examples/ListInline.tsx b/packages/react-core/src/components/List/examples/ListInline.tsx
index 1029d6544b0..d10b491c466 100644
--- a/packages/react-core/src/components/List/examples/ListInline.tsx
+++ b/packages/react-core/src/components/List/examples/ListInline.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { List, ListItem, ListVariant } from '@patternfly/react-core';
 
 export const ListInline: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/List/examples/ListLargeIcons.tsx b/packages/react-core/src/components/List/examples/ListLargeIcons.tsx
index 223905912d9..2790cc9531a 100644
--- a/packages/react-core/src/components/List/examples/ListLargeIcons.tsx
+++ b/packages/react-core/src/components/List/examples/ListLargeIcons.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { List, ListItem } from '@patternfly/react-core';
 import BookOpenIcon from '@patternfly/react-icons/dist/esm/icons/book-open-icon';
 import KeyIcon from '@patternfly/react-icons/dist/esm/icons/key-icon';
diff --git a/packages/react-core/src/components/List/examples/ListOrdered.tsx b/packages/react-core/src/components/List/examples/ListOrdered.tsx
index 3ff58c048c8..1d197c3c307 100644
--- a/packages/react-core/src/components/List/examples/ListOrdered.tsx
+++ b/packages/react-core/src/components/List/examples/ListOrdered.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { List, ListItem, ListComponent, OrderType } from '@patternfly/react-core';
 
 export const ListOrdered: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/List/examples/ListPlain.tsx b/packages/react-core/src/components/List/examples/ListPlain.tsx
index d238e104396..ec0c9646301 100644
--- a/packages/react-core/src/components/List/examples/ListPlain.tsx
+++ b/packages/react-core/src/components/List/examples/ListPlain.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { List, ListItem } from '@patternfly/react-core';
 
 export const ListPlain: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/LoginPage/Login.tsx b/packages/react-core/src/components/LoginPage/Login.tsx
index d6b53183803..4d9a1058475 100644
--- a/packages/react-core/src/components/LoginPage/Login.tsx
+++ b/packages/react-core/src/components/LoginPage/Login.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Login/login';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/LoginPage/LoginFooter.tsx b/packages/react-core/src/components/LoginPage/LoginFooter.tsx
index 4c6cc8d3df8..9f8ea66aaf6 100644
--- a/packages/react-core/src/components/LoginPage/LoginFooter.tsx
+++ b/packages/react-core/src/components/LoginPage/LoginFooter.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Login/login';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/LoginPage/LoginFooterItem.tsx b/packages/react-core/src/components/LoginPage/LoginFooterItem.tsx
index d454cee2e49..1cacb77a137 100644
--- a/packages/react-core/src/components/LoginPage/LoginFooterItem.tsx
+++ b/packages/react-core/src/components/LoginPage/LoginFooterItem.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-
+import { isValidElement } from 'react';
 export interface LoginFooterItemProps extends React.HTMLProps<HTMLAnchorElement> {
   /** Content rendered inside the footer link item */
   children?: React.ReactNode;
@@ -17,7 +16,7 @@ export const LoginFooterItem: React.FunctionComponent<LoginFooterItemProps> = ({
   target = '_blank',
   ...props
 }: LoginFooterItemProps) =>
-  React.isValidElement(children) ? (
+  isValidElement(children) ? (
     children
   ) : (
     <a target={target} href={href} {...props}>
diff --git a/packages/react-core/src/components/LoginPage/LoginForm.tsx b/packages/react-core/src/components/LoginPage/LoginForm.tsx
index 27a45a582c6..980422f585f 100644
--- a/packages/react-core/src/components/LoginPage/LoginForm.tsx
+++ b/packages/react-core/src/components/LoginPage/LoginForm.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useState } from 'react';
 import { Form, FormGroup, ActionGroup, FormHelperText } from '../Form';
 import { TextInput } from '../TextInput';
 import { Button } from '../Button';
@@ -81,7 +81,7 @@ export const LoginForm: React.FunctionComponent<LoginFormProps> = ({
   onChangeRememberMe = () => undefined as any,
   ...props
 }: LoginFormProps) => {
-  const [passwordHidden, setPasswordHidden] = React.useState(true);
+  const [passwordHidden, setPasswordHidden] = useState(true);
 
   const passwordInput = (
     <TextInput
diff --git a/packages/react-core/src/components/LoginPage/LoginHeader.tsx b/packages/react-core/src/components/LoginPage/LoginHeader.tsx
index 9d94a48c350..0bd16514616 100644
--- a/packages/react-core/src/components/LoginPage/LoginHeader.tsx
+++ b/packages/react-core/src/components/LoginPage/LoginHeader.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Login/login';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/LoginPage/LoginMainBody.tsx b/packages/react-core/src/components/LoginPage/LoginMainBody.tsx
index 55ea572ff90..614720bbaa2 100644
--- a/packages/react-core/src/components/LoginPage/LoginMainBody.tsx
+++ b/packages/react-core/src/components/LoginPage/LoginMainBody.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Login/login';
 
diff --git a/packages/react-core/src/components/LoginPage/LoginMainFooter.tsx b/packages/react-core/src/components/LoginPage/LoginMainFooter.tsx
index 3768b4a77d3..ec2d2462b69 100644
--- a/packages/react-core/src/components/LoginPage/LoginMainFooter.tsx
+++ b/packages/react-core/src/components/LoginPage/LoginMainFooter.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Login/login';
 
diff --git a/packages/react-core/src/components/LoginPage/LoginMainFooterBandItem.tsx b/packages/react-core/src/components/LoginPage/LoginMainFooterBandItem.tsx
index 69fe8ccf7ba..6d2d6f06c40 100644
--- a/packages/react-core/src/components/LoginPage/LoginMainFooterBandItem.tsx
+++ b/packages/react-core/src/components/LoginPage/LoginMainFooterBandItem.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Login/login';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/LoginPage/LoginMainFooterLinksItem.tsx b/packages/react-core/src/components/LoginPage/LoginMainFooterLinksItem.tsx
index be001ce277a..d3e206d450a 100644
--- a/packages/react-core/src/components/LoginPage/LoginMainFooterLinksItem.tsx
+++ b/packages/react-core/src/components/LoginPage/LoginMainFooterLinksItem.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Login/login';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/LoginPage/LoginMainHeader.tsx b/packages/react-core/src/components/LoginPage/LoginMainHeader.tsx
index 3ce1e7339d7..f12b50151f1 100644
--- a/packages/react-core/src/components/LoginPage/LoginMainHeader.tsx
+++ b/packages/react-core/src/components/LoginPage/LoginMainHeader.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Title, TitleSizes } from '../Title';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Login/login';
diff --git a/packages/react-core/src/components/LoginPage/LoginPage.tsx b/packages/react-core/src/components/LoginPage/LoginPage.tsx
index a822988447e..e0fa868a096 100644
--- a/packages/react-core/src/components/LoginPage/LoginPage.tsx
+++ b/packages/react-core/src/components/LoginPage/LoginPage.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Fragment } from 'react';
 import { css } from '@patternfly/react-styles';
 
 import { BackgroundImage } from '../BackgroundImage';
@@ -64,9 +64,9 @@ export const LoginPage: React.FunctionComponent<LoginPageProps> = ({
   ...props
 }: LoginPageProps) => {
   const HeaderBrand = (
-    <React.Fragment>
+    <Fragment>
       <Brand src={brandImgSrc} alt={brandImgAlt} />
-    </React.Fragment>
+    </Fragment>
   );
   const Header = <LoginHeader headerBrand={HeaderBrand} />;
   const Footer = (
@@ -77,7 +77,7 @@ export const LoginPage: React.FunctionComponent<LoginPageProps> = ({
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       {backgroundImgSrc && <BackgroundImage src={backgroundImgSrc} />}
       <Login header={Header} footer={Footer} className={css(className)} {...props}>
         <LoginMainHeader title={loginTitle} subtitle={loginSubtitle} headerUtilities={headerUtilities} />
@@ -91,7 +91,7 @@ export const LoginPage: React.FunctionComponent<LoginPageProps> = ({
           />
         )}
       </Login>
-    </React.Fragment>
+    </Fragment>
   );
 };
 LoginPage.displayName = 'LoginPage';
diff --git a/packages/react-core/src/components/LoginPage/__tests__/Generated/LoginFooter.test.tsx b/packages/react-core/src/components/LoginPage/__tests__/Generated/LoginFooter.test.tsx
index 8e5e102a6df..2102d881fdb 100644
--- a/packages/react-core/src/components/LoginPage/__tests__/Generated/LoginFooter.test.tsx
+++ b/packages/react-core/src/components/LoginPage/__tests__/Generated/LoginFooter.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { LoginFooter } from '../../LoginFooter';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/LoginPage/__tests__/Generated/LoginHeader.test.tsx b/packages/react-core/src/components/LoginPage/__tests__/Generated/LoginHeader.test.tsx
index 65c9fb7b712..fc6af641554 100644
--- a/packages/react-core/src/components/LoginPage/__tests__/Generated/LoginHeader.test.tsx
+++ b/packages/react-core/src/components/LoginPage/__tests__/Generated/LoginHeader.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { LoginHeader } from '../../LoginHeader';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/LoginPage/__tests__/Login.test.tsx b/packages/react-core/src/components/LoginPage/__tests__/Login.test.tsx
index 127f2d8865c..ab14cf6d0bc 100644
--- a/packages/react-core/src/components/LoginPage/__tests__/Login.test.tsx
+++ b/packages/react-core/src/components/LoginPage/__tests__/Login.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { Login } from '../Login';
 import { LoginFooter } from '../LoginFooter';
diff --git a/packages/react-core/src/components/LoginPage/__tests__/LoginFooterItem.test.tsx b/packages/react-core/src/components/LoginPage/__tests__/LoginFooterItem.test.tsx
index 5ed4da86d3f..95b91c6b60b 100644
--- a/packages/react-core/src/components/LoginPage/__tests__/LoginFooterItem.test.tsx
+++ b/packages/react-core/src/components/LoginPage/__tests__/LoginFooterItem.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 
diff --git a/packages/react-core/src/components/LoginPage/__tests__/LoginForm.test.tsx b/packages/react-core/src/components/LoginPage/__tests__/LoginForm.test.tsx
index 17bcd979b1d..302b3d919d1 100644
--- a/packages/react-core/src/components/LoginPage/__tests__/LoginForm.test.tsx
+++ b/packages/react-core/src/components/LoginPage/__tests__/LoginForm.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-core/src/components/LoginPage/__tests__/LoginMainBody.test.tsx b/packages/react-core/src/components/LoginPage/__tests__/LoginMainBody.test.tsx
index 03ddfd46c8e..0214cdb3947 100644
--- a/packages/react-core/src/components/LoginPage/__tests__/LoginMainBody.test.tsx
+++ b/packages/react-core/src/components/LoginPage/__tests__/LoginMainBody.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { LoginMainBody } from '../LoginMainBody';
 
diff --git a/packages/react-core/src/components/LoginPage/__tests__/LoginMainFooter.test.tsx b/packages/react-core/src/components/LoginPage/__tests__/LoginMainFooter.test.tsx
index 042d3c0e548..f521a12b0a3 100644
--- a/packages/react-core/src/components/LoginPage/__tests__/LoginMainFooter.test.tsx
+++ b/packages/react-core/src/components/LoginPage/__tests__/LoginMainFooter.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { LoginMainFooter } from '../LoginMainFooter';
 
diff --git a/packages/react-core/src/components/LoginPage/__tests__/LoginMainFooterBandItem.test.tsx b/packages/react-core/src/components/LoginPage/__tests__/LoginMainFooterBandItem.test.tsx
index 35cbed3b1be..094ce547745 100644
--- a/packages/react-core/src/components/LoginPage/__tests__/LoginMainFooterBandItem.test.tsx
+++ b/packages/react-core/src/components/LoginPage/__tests__/LoginMainFooterBandItem.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 
diff --git a/packages/react-core/src/components/LoginPage/__tests__/LoginMainFooterLinksItem.test.tsx b/packages/react-core/src/components/LoginPage/__tests__/LoginMainFooterLinksItem.test.tsx
index 6d92e775e48..b7f91c539f1 100644
--- a/packages/react-core/src/components/LoginPage/__tests__/LoginMainFooterLinksItem.test.tsx
+++ b/packages/react-core/src/components/LoginPage/__tests__/LoginMainFooterLinksItem.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { LoginMainFooterLinksItem } from '../LoginMainFooterLinksItem';
 
diff --git a/packages/react-core/src/components/LoginPage/__tests__/LoginMainHeader.test.tsx b/packages/react-core/src/components/LoginPage/__tests__/LoginMainHeader.test.tsx
index b8513298cb2..c98f755f512 100644
--- a/packages/react-core/src/components/LoginPage/__tests__/LoginMainHeader.test.tsx
+++ b/packages/react-core/src/components/LoginPage/__tests__/LoginMainHeader.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { LoginMainHeader } from '../LoginMainHeader';
 
diff --git a/packages/react-core/src/components/LoginPage/__tests__/LoginPage.test.tsx b/packages/react-core/src/components/LoginPage/__tests__/LoginPage.test.tsx
index d025f407ee1..e76f7589645 100644
--- a/packages/react-core/src/components/LoginPage/__tests__/LoginPage.test.tsx
+++ b/packages/react-core/src/components/LoginPage/__tests__/LoginPage.test.tsx
@@ -1,13 +1,13 @@
-import * as React from 'react';
+import { Fragment } from 'react';
 import { render } from '@testing-library/react';
 
 import { LoginPage } from '../LoginPage';
 import { ListVariant } from '../../List';
 
-const needAccountMesseage = (
-  <React.Fragment>
+const needAccountMessage = (
+  <Fragment>
     Login to your account <a href="https://www.patternfly.org">Need an account?</a>
-  </React.Fragment>
+  </Fragment>
 );
 
 test('check loginpage example against snapshot', () => {
@@ -20,7 +20,7 @@ test('check loginpage example against snapshot', () => {
       footerListItems="English"
       textContent="This is placeholder text only."
       loginTitle="Log into your account"
-      signUpForAccountMessage={needAccountMesseage}
+      signUpForAccountMessage={needAccountMessage}
       socialMediaLoginContent="Footer"
     />
   );
diff --git a/packages/react-core/src/components/LoginPage/examples/LoginPage.md b/packages/react-core/src/components/LoginPage/examples/LoginPage.md
index c9546615ddc..c191d6dff15 100644
--- a/packages/react-core/src/components/LoginPage/examples/LoginPage.md
+++ b/packages/react-core/src/components/LoginPage/examples/LoginPage.md
@@ -18,6 +18,7 @@ propComponents:
   ]
 ---
 
+import { Fragment } from 'react';
 import brandImg from '../../assets/PF-IconLogo.svg';
 import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
 import GoogleIcon from '@patternfly/react-icons/dist/esm/icons/google-icon';
diff --git a/packages/react-core/src/components/LoginPage/examples/LoginPageBasic.tsx b/packages/react-core/src/components/LoginPage/examples/LoginPageBasic.tsx
index 7952fe386e4..a13fcb66a6e 100644
--- a/packages/react-core/src/components/LoginPage/examples/LoginPageBasic.tsx
+++ b/packages/react-core/src/components/LoginPage/examples/LoginPageBasic.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import brandImg from '../../assets/PF-IconLogo.svg';
 import {
   LoginFooterItem,
@@ -45,7 +45,7 @@ export const SimpleLoginPage: React.FunctionComponent = () => {
   };
 
   const socialMediaLoginContent = (
-    <React.Fragment>
+    <Fragment>
       <LoginMainFooterLinksItem>
         <Button variant="plain" aria-label="Login with Google" icon={<GoogleIcon />} />
       </LoginMainFooterLinksItem>
@@ -61,7 +61,7 @@ export const SimpleLoginPage: React.FunctionComponent = () => {
       <LoginMainFooterLinksItem>
         <Button variant="plain" aria-label="Login with Gitlab" icon={<GitlabIcon />} />
       </LoginMainFooterLinksItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   const signUpForAccountMessage = (
@@ -77,7 +77,7 @@ export const SimpleLoginPage: React.FunctionComponent = () => {
   );
 
   const listItem = (
-    <React.Fragment>
+    <Fragment>
       <ListItem>
         <LoginFooterItem href="https://www.patternfly.org/">Terms of Use </LoginFooterItem>
       </ListItem>
@@ -87,7 +87,7 @@ export const SimpleLoginPage: React.FunctionComponent = () => {
       <ListItem>
         <LoginFooterItem href="https://www.patternfly.org/">Privacy Policy</LoginFooterItem>
       </ListItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   const loginForm = (
diff --git a/packages/react-core/src/components/LoginPage/examples/LoginPageLanguageSelect.tsx b/packages/react-core/src/components/LoginPage/examples/LoginPageLanguageSelect.tsx
index b2140181c92..23ce6b7a56e 100644
--- a/packages/react-core/src/components/LoginPage/examples/LoginPageLanguageSelect.tsx
+++ b/packages/react-core/src/components/LoginPage/examples/LoginPageLanguageSelect.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import brandImg from '../../assets/PF-IconLogo.svg';
 import {
   LoginFooterItem,
@@ -118,7 +118,7 @@ export const LoginPageLanguageSelect: React.FunctionComponent = () => {
   };
 
   const socialMediaLoginContent = (
-    <React.Fragment>
+    <Fragment>
       <LoginMainFooterLinksItem>
         <Button variant="plain" aria-label="Login with Google" icon={<GoogleIcon />} />
       </LoginMainFooterLinksItem>
@@ -134,7 +134,7 @@ export const LoginPageLanguageSelect: React.FunctionComponent = () => {
       <LoginMainFooterLinksItem>
         <Button variant="plain" aria-label="Login with Gitlab" icon={<GitlabIcon />} />
       </LoginMainFooterLinksItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   const signUpForAccountMessage = (
@@ -150,7 +150,7 @@ export const LoginPageLanguageSelect: React.FunctionComponent = () => {
   );
 
   const listItem = (
-    <React.Fragment>
+    <Fragment>
       <ListItem>
         <LoginFooterItem href="https://www.patternfly.org/">Terms of Use </LoginFooterItem>
       </ListItem>
@@ -160,7 +160,7 @@ export const LoginPageLanguageSelect: React.FunctionComponent = () => {
       <ListItem>
         <LoginFooterItem href="https://www.patternfly.org/">Privacy Policy</LoginFooterItem>
       </ListItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   const loginForm = (
diff --git a/packages/react-core/src/components/LoginPage/examples/LoginPageShowHidePassword.tsx b/packages/react-core/src/components/LoginPage/examples/LoginPageShowHidePassword.tsx
index 84ab045f460..1abf80bbcaa 100644
--- a/packages/react-core/src/components/LoginPage/examples/LoginPageShowHidePassword.tsx
+++ b/packages/react-core/src/components/LoginPage/examples/LoginPageShowHidePassword.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import brandImg from '../../assets/PF-IconLogo.svg';
 import {
   LoginFooterItem,
@@ -45,7 +45,7 @@ export const LoginPageHideShowPassword: React.FunctionComponent = () => {
   };
 
   const socialMediaLoginContent = (
-    <React.Fragment>
+    <Fragment>
       <LoginMainFooterLinksItem>
         <Button variant="plain" aria-label="Login with Google" icon={<GoogleIcon />} />
       </LoginMainFooterLinksItem>
@@ -61,7 +61,7 @@ export const LoginPageHideShowPassword: React.FunctionComponent = () => {
       <LoginMainFooterLinksItem>
         <Button variant="plain" aria-label="Login with Gitlab" icon={<GitlabIcon />} />
       </LoginMainFooterLinksItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   const signUpForAccountMessage = (
@@ -77,7 +77,7 @@ export const LoginPageHideShowPassword: React.FunctionComponent = () => {
   );
 
   const listItem = (
-    <React.Fragment>
+    <Fragment>
       <ListItem>
         <LoginFooterItem href="https://www.patternfly.org/">Terms of Use </LoginFooterItem>
       </ListItem>
@@ -87,7 +87,7 @@ export const LoginPageHideShowPassword: React.FunctionComponent = () => {
       <ListItem>
         <LoginFooterItem href="https://www.patternfly.org/">Privacy Policy</LoginFooterItem>
       </ListItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   const loginForm = (
diff --git a/packages/react-core/src/components/Masthead/Masthead.tsx b/packages/react-core/src/components/Masthead/Masthead.tsx
index 990c6fc353b..d9b1001759c 100644
--- a/packages/react-core/src/components/Masthead/Masthead.tsx
+++ b/packages/react-core/src/components/Masthead/Masthead.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useContext } from 'react';
 import styles from '@patternfly/react-styles/css/components/Masthead/masthead';
 import { css } from '@patternfly/react-styles';
 import { formatBreakpointMods } from '../../helpers/util';
@@ -38,7 +38,7 @@ export const Masthead: React.FunctionComponent<MastheadProps> = ({
   inset,
   ...props
 }: MastheadProps) => {
-  const { width, getBreakpoint } = React.useContext(PageContext);
+  const { width, getBreakpoint } = useContext(PageContext);
   return (
     <header
       className={css(
diff --git a/packages/react-core/src/components/Masthead/MastheadBrand.tsx b/packages/react-core/src/components/Masthead/MastheadBrand.tsx
index e255a473298..b7c0aebed11 100644
--- a/packages/react-core/src/components/Masthead/MastheadBrand.tsx
+++ b/packages/react-core/src/components/Masthead/MastheadBrand.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Masthead/masthead';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Masthead/MastheadContent.tsx b/packages/react-core/src/components/Masthead/MastheadContent.tsx
index 7c502657eb8..c1bb9245b45 100644
--- a/packages/react-core/src/components/Masthead/MastheadContent.tsx
+++ b/packages/react-core/src/components/Masthead/MastheadContent.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Masthead/masthead';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Masthead/MastheadLogo.tsx b/packages/react-core/src/components/Masthead/MastheadLogo.tsx
index dcefa93f871..97718d17d59 100644
--- a/packages/react-core/src/components/Masthead/MastheadLogo.tsx
+++ b/packages/react-core/src/components/Masthead/MastheadLogo.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Masthead/masthead';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Masthead/MastheadMain.tsx b/packages/react-core/src/components/Masthead/MastheadMain.tsx
index ce3ed13cbef..6cf242819b5 100644
--- a/packages/react-core/src/components/Masthead/MastheadMain.tsx
+++ b/packages/react-core/src/components/Masthead/MastheadMain.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Masthead/masthead';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Masthead/MastheadToggle.tsx b/packages/react-core/src/components/Masthead/MastheadToggle.tsx
index 2f2c36b10d0..c3baa6632d4 100644
--- a/packages/react-core/src/components/Masthead/MastheadToggle.tsx
+++ b/packages/react-core/src/components/Masthead/MastheadToggle.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Masthead/masthead';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Masthead/__tests__/Masthead.test.tsx b/packages/react-core/src/components/Masthead/__tests__/Masthead.test.tsx
index b1e72a72b4c..c6ece9b7def 100644
--- a/packages/react-core/src/components/Masthead/__tests__/Masthead.test.tsx
+++ b/packages/react-core/src/components/Masthead/__tests__/Masthead.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { Masthead, MastheadMain, MastheadLogo, MastheadContent, MastheadBrand, MastheadToggle } from '../index';
 
diff --git a/packages/react-core/src/components/Masthead/examples/MastheadBasic.tsx b/packages/react-core/src/components/Masthead/examples/MastheadBasic.tsx
index d9259f14fdc..f58bcf95a15 100644
--- a/packages/react-core/src/components/Masthead/examples/MastheadBasic.tsx
+++ b/packages/react-core/src/components/Masthead/examples/MastheadBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Masthead,
   MastheadMain,
diff --git a/packages/react-core/src/components/Masthead/examples/MastheadBasicMixedContent.tsx b/packages/react-core/src/components/Masthead/examples/MastheadBasicMixedContent.tsx
index 8e40a2fc6cb..321ca742a49 100644
--- a/packages/react-core/src/components/Masthead/examples/MastheadBasicMixedContent.tsx
+++ b/packages/react-core/src/components/Masthead/examples/MastheadBasicMixedContent.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Masthead,
   MastheadMain,
diff --git a/packages/react-core/src/components/Masthead/examples/MastheadDisplayInline.tsx b/packages/react-core/src/components/Masthead/examples/MastheadDisplayInline.tsx
index 52578b2ee24..9189edb9b22 100644
--- a/packages/react-core/src/components/Masthead/examples/MastheadDisplayInline.tsx
+++ b/packages/react-core/src/components/Masthead/examples/MastheadDisplayInline.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Masthead,
   MastheadMain,
diff --git a/packages/react-core/src/components/Masthead/examples/MastheadDisplayStack.tsx b/packages/react-core/src/components/Masthead/examples/MastheadDisplayStack.tsx
index e1979de2d60..269a83cbb92 100644
--- a/packages/react-core/src/components/Masthead/examples/MastheadDisplayStack.tsx
+++ b/packages/react-core/src/components/Masthead/examples/MastheadDisplayStack.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Masthead,
   MastheadMain,
diff --git a/packages/react-core/src/components/Masthead/examples/MastheadDisplayStackInlineResponsive.tsx b/packages/react-core/src/components/Masthead/examples/MastheadDisplayStackInlineResponsive.tsx
index 8914fbf3e7f..a9c22579ae8 100644
--- a/packages/react-core/src/components/Masthead/examples/MastheadDisplayStackInlineResponsive.tsx
+++ b/packages/react-core/src/components/Masthead/examples/MastheadDisplayStackInlineResponsive.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Masthead,
   MastheadMain,
diff --git a/packages/react-core/src/components/Masthead/examples/MastheadInsets.tsx b/packages/react-core/src/components/Masthead/examples/MastheadInsets.tsx
index 375f600c74d..cc7df8ff43f 100644
--- a/packages/react-core/src/components/Masthead/examples/MastheadInsets.tsx
+++ b/packages/react-core/src/components/Masthead/examples/MastheadInsets.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Masthead,
   MastheadMain,
diff --git a/packages/react-core/src/components/Masthead/examples/MastheadLogoCustomComponent.tsx b/packages/react-core/src/components/Masthead/examples/MastheadLogoCustomComponent.tsx
index 99cfae24ce2..912fdea522c 100644
--- a/packages/react-core/src/components/Masthead/examples/MastheadLogoCustomComponent.tsx
+++ b/packages/react-core/src/components/Masthead/examples/MastheadLogoCustomComponent.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Masthead,
   MastheadMain,
diff --git a/packages/react-core/src/components/Menu/DrilldownMenu.tsx b/packages/react-core/src/components/Menu/DrilldownMenu.tsx
index e12dddad4a0..be111a5dfa9 100644
--- a/packages/react-core/src/components/Menu/DrilldownMenu.tsx
+++ b/packages/react-core/src/components/Menu/DrilldownMenu.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { createRef } from 'react';
 import { Menu } from './Menu';
 import { MenuContent } from './MenuContent';
 import { MenuList } from './MenuList';
@@ -30,7 +30,7 @@ export const DrilldownMenu: React.FunctionComponent<DrilldownMenuProps> = ({
         parentMenu={menuId}
         isMenuDrilledIn={isMenuDrilledIn}
         isRootMenu={false}
-        ref={React.createRef()}
+        ref={createRef()}
         {...context}
         {...props}
       >
diff --git a/packages/react-core/src/components/Menu/Menu.tsx b/packages/react-core/src/components/Menu/Menu.tsx
index b003efdaffb..2caa51a2807 100644
--- a/packages/react-core/src/components/Menu/Menu.tsx
+++ b/packages/react-core/src/components/Menu/Menu.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, createRef, forwardRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/Menu/menu';
 import breadcrumbStyles from '@patternfly/react-styles/css/components/Breadcrumb/breadcrumb';
 import { css } from '@patternfly/react-styles';
@@ -73,11 +73,11 @@ export interface MenuState {
   currentDrilldownMenuId: string;
 }
 
-class MenuBase extends React.Component<MenuProps, MenuState> {
+class MenuBase extends Component<MenuProps, MenuState> {
   static displayName = 'Menu';
   static contextType = MenuContext;
   context!: React.ContextType<typeof MenuContext>;
-  private menuRef = React.createRef<HTMLDivElement>();
+  private menuRef = createRef<HTMLDivElement>();
   private activeMenu = null as Element;
   static defaultProps: MenuProps = {
     ouiaSafe: true,
@@ -339,7 +339,7 @@ class MenuBase extends React.Component<MenuProps, MenuState> {
   }
 }
 
-export const Menu = React.forwardRef((props: MenuProps, ref: React.Ref<HTMLDivElement>) => (
+export const Menu = forwardRef((props: MenuProps, ref: React.Ref<HTMLDivElement>) => (
   <MenuBase {...props} innerRef={ref} />
 ));
 Menu.displayName = 'Menu';
diff --git a/packages/react-core/src/components/Menu/MenuBreadcrumb.tsx b/packages/react-core/src/components/Menu/MenuBreadcrumb.tsx
index 83084b3d284..5159dc8e15e 100644
--- a/packages/react-core/src/components/Menu/MenuBreadcrumb.tsx
+++ b/packages/react-core/src/components/Menu/MenuBreadcrumb.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import styles from '@patternfly/react-styles/css/components/Menu/menu';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Menu/MenuContainer.tsx b/packages/react-core/src/components/Menu/MenuContainer.tsx
index 888e7c7dbe4..547f9e5bc23 100644
--- a/packages/react-core/src/components/Menu/MenuContainer.tsx
+++ b/packages/react-core/src/components/Menu/MenuContainer.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useEffect, useRef } from 'react';
 import { onToggleArrowKeydownDefault, Popper } from '../../helpers';
 
 export interface MenuPopperProps {
@@ -30,7 +30,7 @@ export interface MenuContainerProps {
   /** Flag to indicate if menu is opened.*/
   isOpen: boolean;
   /** Callback to change the open state of the menu.
-   * Triggered by clicking outside of the menu, or by pressing any keys specificed in onOpenChangeKeys. */
+   * Triggered by clicking outside of the menu, or by pressing any keys specified in onOpenChangeKeys. */
   onOpenChange?: (isOpen: boolean) => void;
   /** Keys that trigger onOpenChange, defaults to tab and escape. It is highly recommended to include Escape in the array, while Tab may be omitted if the menu contains non-menu items that are focusable. */
   onOpenChangeKeys?: string[];
@@ -66,8 +66,8 @@ export const MenuContainer: React.FunctionComponent<MenuContainerProps> = ({
   shouldPreventScrollOnItemFocus = true,
   focusTimeoutDelay = 0
 }: MenuContainerProps) => {
-  const prevIsOpen = React.useRef<boolean>(isOpen);
-  React.useEffect(() => {
+  const prevIsOpen = useRef<boolean>(isOpen);
+  useEffect(() => {
     // menu was opened, focus on first menu item
     if (prevIsOpen.current === false && isOpen === true && shouldFocusFirstItemOnOpen) {
       setTimeout(() => {
@@ -82,7 +82,7 @@ export const MenuContainer: React.FunctionComponent<MenuContainerProps> = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isOpen]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     const handleMenuKeys = (event: KeyboardEvent) => {
       // Close the menu on tab or escape if onOpenChange is provided
       if (
diff --git a/packages/react-core/src/components/Menu/MenuContent.tsx b/packages/react-core/src/components/Menu/MenuContent.tsx
index 8aca9ae2e63..3e354f58613 100644
--- a/packages/react-core/src/components/Menu/MenuContent.tsx
+++ b/packages/react-core/src/components/Menu/MenuContent.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { createRef, forwardRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/Menu/menu';
 import { css } from '@patternfly/react-styles';
 import { MenuContext } from './MenuContext';
@@ -18,9 +18,9 @@ export interface MenuContentProps extends React.HTMLProps<HTMLElement> {
   getHeight?: (height: string) => void;
 }
 
-export const MenuContent = React.forwardRef((props: MenuContentProps, ref: React.Ref<HTMLDivElement>) => {
+export const MenuContent = forwardRef((props: MenuContentProps, ref: React.Ref<HTMLDivElement>) => {
   const { getHeight, children, menuHeight, maxMenuHeight, ...rest } = props;
-  const menuContentRef = React.createRef<HTMLDivElement>();
+  const menuContentRef = createRef<HTMLDivElement>();
   const refCallback = (el: HTMLElement, menuId: string, onGetMenuHeight: (menuId: string, height: number) => void) => {
     if (el) {
       let clientHeight = el.clientHeight;
diff --git a/packages/react-core/src/components/Menu/MenuContext.ts b/packages/react-core/src/components/Menu/MenuContext.ts
index 4b24a96ccfc..d1c9d626240 100644
--- a/packages/react-core/src/components/Menu/MenuContext.ts
+++ b/packages/react-core/src/components/Menu/MenuContext.ts
@@ -1,6 +1,5 @@
-import * as React from 'react';
-
-export const MenuContext = React.createContext<{
+import { createContext } from 'react';
+export const MenuContext = createContext<{
   menuId?: string;
   parentMenu?: string;
   onSelect?: (event?: any, itemId?: any) => void;
@@ -39,7 +38,7 @@ export const MenuContext = React.createContext<{
   role: 'menu'
 });
 
-export const MenuItemContext = React.createContext<{
+export const MenuItemContext = createContext<{
   itemId?: any;
   isDisabled?: boolean;
 }>({
diff --git a/packages/react-core/src/components/Menu/MenuFooter.tsx b/packages/react-core/src/components/Menu/MenuFooter.tsx
index a408b5030fa..193c8a18780 100644
--- a/packages/react-core/src/components/Menu/MenuFooter.tsx
+++ b/packages/react-core/src/components/Menu/MenuFooter.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Menu/menu';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Menu/MenuGroup.tsx b/packages/react-core/src/components/Menu/MenuGroup.tsx
index 91e235f087a..b046fac2520 100644
--- a/packages/react-core/src/components/Menu/MenuGroup.tsx
+++ b/packages/react-core/src/components/Menu/MenuGroup.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/Menu/menu';
 import { css } from '@patternfly/react-styles';
 
@@ -43,7 +43,7 @@ const MenuGroupBase: React.FunctionComponent<MenuGroupProps> = ({
   );
 };
 
-export const MenuGroup = React.forwardRef((props: MenuGroupProps, ref: React.Ref<HTMLElement>) => (
+export const MenuGroup = forwardRef((props: MenuGroupProps, ref: React.Ref<HTMLElement>) => (
   <MenuGroupBase {...props} innerRef={ref} />
 ));
 MenuGroup.displayName = 'MenuGroup';
diff --git a/packages/react-core/src/components/Menu/MenuItem.tsx b/packages/react-core/src/components/Menu/MenuItem.tsx
index e08211f04b9..024f150f14b 100644
--- a/packages/react-core/src/components/Menu/MenuItem.tsx
+++ b/packages/react-core/src/components/Menu/MenuItem.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { createContext, forwardRef, useContext, useEffect, useRef, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/Menu/menu';
 import { css } from '@patternfly/react-styles';
 import topOffset from '@patternfly/react-tokens/dist/esm/c_menu_m_flyout__menu_top_offset';
@@ -85,7 +85,7 @@ export interface MenuItemProps extends Omit<React.HTMLProps<HTMLLIElement>, 'onC
   id?: string;
 }
 
-const FlyoutContext = React.createContext({
+const FlyoutContext = createContext({
   direction: 'right' as 'left' | 'right'
 });
 
@@ -138,16 +138,16 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
     setFlyoutRef,
     disableHover,
     role: menuRole
-  } = React.useContext(MenuContext);
+  } = useContext(MenuContext);
   let Component = (to ? 'a' : component) as any;
   if (hasCheckbox && !to) {
     Component = 'label' as any;
   }
-  const [flyoutTarget, setFlyoutTarget] = React.useState(null);
-  const flyoutContext = React.useContext(FlyoutContext);
-  const [flyoutXDirection, setFlyoutXDirection] = React.useState(flyoutContext.direction);
-  const ref = React.useRef<HTMLLIElement>(undefined);
-  const privateRef = React.useRef(undefined);
+  const [flyoutTarget, setFlyoutTarget] = useState(null);
+  const flyoutContext = useContext(FlyoutContext);
+  const [flyoutXDirection, setFlyoutXDirection] = useState(flyoutContext.direction);
+  const ref = useRef<HTMLLIElement>(undefined);
+  const privateRef = useRef(undefined);
   const innerComponentRef = innerRef || privateRef;
   const flyoutVisible = ref === flyoutRef;
 
@@ -202,11 +202,11 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
     }
   }, [flyoutVisible, flyoutMenu]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     setFlyoutXDirection(flyoutContext.direction);
   }, [flyoutContext]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (flyoutTarget) {
       if (flyoutVisible) {
         const flyoutMenu = (flyoutTarget as HTMLElement).nextElementSibling;
@@ -323,7 +323,7 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
     }
   };
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (isFocused && ref.current) {
       const itemEl = ref.current;
       const parentListEl = itemEl.parentElement;
@@ -466,7 +466,7 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
   );
 };
 
-export const MenuItem = React.forwardRef((props: MenuItemProps, ref: React.Ref<any>) => (
+export const MenuItem = forwardRef((props: MenuItemProps, ref: React.Ref<any>) => (
   <MenuItemBase {...props} innerRef={ref} />
 ));
 
diff --git a/packages/react-core/src/components/Menu/MenuItemAction.tsx b/packages/react-core/src/components/Menu/MenuItemAction.tsx
index 5ed556e83ef..7fdf117cc22 100644
--- a/packages/react-core/src/components/Menu/MenuItemAction.tsx
+++ b/packages/react-core/src/components/Menu/MenuItemAction.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/Menu/menu';
 import { css } from '@patternfly/react-styles';
 import StarIcon from '@patternfly/react-icons/dist/esm/icons/star-icon';
@@ -72,7 +72,7 @@ const MenuItemActionBase: React.FunctionComponent<MenuItemActionProps> = ({
   </MenuContext.Consumer>
 );
 
-export const MenuItemAction = React.forwardRef((props: MenuItemActionProps, ref: React.Ref<HTMLButtonElement>) => (
+export const MenuItemAction = forwardRef((props: MenuItemActionProps, ref: React.Ref<HTMLButtonElement>) => (
   <MenuItemActionBase {...props} innerRef={ref} />
 ));
 MenuItemAction.displayName = 'MenuItemAction';
diff --git a/packages/react-core/src/components/Menu/MenuList.tsx b/packages/react-core/src/components/Menu/MenuList.tsx
index c5fb57e9de4..bc1ca6f1f94 100644
--- a/packages/react-core/src/components/Menu/MenuList.tsx
+++ b/packages/react-core/src/components/Menu/MenuList.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useContext } from 'react';
 import styles from '@patternfly/react-styles/css/components/Menu/menu';
 import { css } from '@patternfly/react-styles';
 import { MenuContext } from './MenuContext';
@@ -23,7 +23,7 @@ export const MenuList: React.FunctionComponent<MenuListProps> = ({
   'aria-label': ariaLabel,
   ...props
 }: MenuListProps) => {
-  const { role } = React.useContext(MenuContext);
+  const { role } = useContext(MenuContext);
 
   return (
     <ul
diff --git a/packages/react-core/src/components/Menu/MenuSearch.tsx b/packages/react-core/src/components/Menu/MenuSearch.tsx
index 4ab12f76108..1f9089e56cf 100644
--- a/packages/react-core/src/components/Menu/MenuSearch.tsx
+++ b/packages/react-core/src/components/Menu/MenuSearch.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/Menu/menu';
 import { css } from '@patternfly/react-styles';
 
@@ -9,7 +9,7 @@ export interface MenuSearchProps extends React.HTMLProps<HTMLElement> {
   innerRef?: React.Ref<any>;
 }
 
-export const MenuSearch = React.forwardRef((props: MenuSearchProps, ref: React.Ref<HTMLDivElement>) => (
+export const MenuSearch = forwardRef((props: MenuSearchProps, ref: React.Ref<HTMLDivElement>) => (
   <div {...props} className={css(styles.menuSearch, props.className)} ref={ref} />
 ));
 MenuSearch.displayName = 'MenuSearch';
diff --git a/packages/react-core/src/components/Menu/MenuSearchInput.tsx b/packages/react-core/src/components/Menu/MenuSearchInput.tsx
index 8dd048ec414..cd9b57526d4 100644
--- a/packages/react-core/src/components/Menu/MenuSearchInput.tsx
+++ b/packages/react-core/src/components/Menu/MenuSearchInput.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Menu/menu';
 
@@ -9,7 +9,7 @@ export interface MenuSearchInputProps extends React.HTMLProps<HTMLElement> {
   innerRef?: React.Ref<any>;
 }
 
-export const MenuSearchInput = React.forwardRef((props: MenuSearchInputProps, ref: React.Ref<HTMLDivElement>) => (
+export const MenuSearchInput = forwardRef((props: MenuSearchInputProps, ref: React.Ref<HTMLDivElement>) => (
   // Update to use the styles object when core adds the class
   <div {...props} className={css(`${styles.menuSearch}-input`, props.className)} ref={ref} />
 ));
diff --git a/packages/react-core/src/components/Menu/__tests__/Menu.test.tsx b/packages/react-core/src/components/Menu/__tests__/Menu.test.tsx
index 8a96e9d6c82..44bcb2c0fb4 100644
--- a/packages/react-core/src/components/Menu/__tests__/Menu.test.tsx
+++ b/packages/react-core/src/components/Menu/__tests__/Menu.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 
diff --git a/packages/react-core/src/components/Menu/examples/Menu.md b/packages/react-core/src/components/Menu/examples/Menu.md
index b10614b416d..105e82ad476 100644
--- a/packages/react-core/src/components/Menu/examples/Menu.md
+++ b/packages/react-core/src/components/Menu/examples/Menu.md
@@ -20,6 +20,7 @@ propComponents:
 ouia: true
 ---
 
+import { Fragment } from 'react';
 import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon';
 import ClipboardIcon from '@patternfly/react-icons/dist/esm/icons/clipboard-icon';
 import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
diff --git a/packages/react-core/src/components/Menu/examples/MenuBasic.tsx b/packages/react-core/src/components/Menu/examples/MenuBasic.tsx
index 2d8ac58ea11..9cfd8c6f48f 100644
--- a/packages/react-core/src/components/Menu/examples/MenuBasic.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuBasic.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Menu, MenuContent, MenuList, MenuItem, Checkbox } from '@patternfly/react-core';
 
 export const MenuBasic: React.FunctionComponent = () => {
@@ -16,7 +16,7 @@ export const MenuBasic: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Menu activeItemId={activeItem} onSelect={onSelect} isPlain={isPlain}>
         <MenuContent>
           <MenuList>
@@ -56,6 +56,6 @@ export const MenuBasic: React.FunctionComponent = () => {
           name="toggle-plain"
         />
       </div>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Menu/examples/MenuDangerMenuItem.tsx b/packages/react-core/src/components/Menu/examples/MenuDangerMenuItem.tsx
index a3a1f9d57b2..cbe5cca57fc 100644
--- a/packages/react-core/src/components/Menu/examples/MenuDangerMenuItem.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuDangerMenuItem.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Divider, Menu, MenuContent, MenuItem, MenuList } from '@patternfly/react-core';
 
 export const MenuDangerMenuItem: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Menu/examples/MenuFilterDrilldown.tsx b/packages/react-core/src/components/Menu/examples/MenuFilterDrilldown.tsx
index 0d60d442563..de9925cc349 100644
--- a/packages/react-core/src/components/Menu/examples/MenuFilterDrilldown.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuFilterDrilldown.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Menu,
   MenuContent,
diff --git a/packages/react-core/src/components/Menu/examples/MenuFilteringWithSearchInput.tsx b/packages/react-core/src/components/Menu/examples/MenuFilteringWithSearchInput.tsx
index 99a5656057b..7e650dcfdd1 100644
--- a/packages/react-core/src/components/Menu/examples/MenuFilteringWithSearchInput.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuFilteringWithSearchInput.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Menu,
   MenuList,
diff --git a/packages/react-core/src/components/Menu/examples/MenuOptionMultiSelect.tsx b/packages/react-core/src/components/Menu/examples/MenuOptionMultiSelect.tsx
index 40a582ef81a..7f04d95f6c4 100644
--- a/packages/react-core/src/components/Menu/examples/MenuOptionMultiSelect.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuOptionMultiSelect.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Menu, MenuContent, MenuList, MenuItem } from '@patternfly/react-core';
 import TableIcon from '@patternfly/react-icons/dist/esm/icons/table-icon';
 
diff --git a/packages/react-core/src/components/Menu/examples/MenuOptionSingleSelect.tsx b/packages/react-core/src/components/Menu/examples/MenuOptionSingleSelect.tsx
index 9e318899d4d..f0933e56841 100644
--- a/packages/react-core/src/components/Menu/examples/MenuOptionSingleSelect.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuOptionSingleSelect.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Menu, MenuContent, MenuList, MenuItem } from '@patternfly/react-core';
 import TableIcon from '@patternfly/react-icons/dist/esm/icons/table-icon';
 
diff --git a/packages/react-core/src/components/Menu/examples/MenuScrollable.tsx b/packages/react-core/src/components/Menu/examples/MenuScrollable.tsx
index 013e446de26..14fa48aef16 100644
--- a/packages/react-core/src/components/Menu/examples/MenuScrollable.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuScrollable.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Menu, MenuContent, MenuList, MenuItem } from '@patternfly/react-core';
 
 export const MenuScrollable: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Menu/examples/MenuScrollableCustomMenuHeight.tsx b/packages/react-core/src/components/Menu/examples/MenuScrollableCustomMenuHeight.tsx
index 3f24110b15a..0cb266f0a26 100644
--- a/packages/react-core/src/components/Menu/examples/MenuScrollableCustomMenuHeight.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuScrollableCustomMenuHeight.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Menu, MenuContent, MenuList, MenuItem } from '@patternfly/react-core';
 
 export const MenuScrollableCustomMenuHeight: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Menu/examples/MenuWithActions.tsx b/packages/react-core/src/components/Menu/examples/MenuWithActions.tsx
index a69cc94da9e..c36a34ab9ac 100644
--- a/packages/react-core/src/components/Menu/examples/MenuWithActions.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuWithActions.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Menu, MenuContent, MenuGroup, MenuList, MenuItem, MenuItemAction } from '@patternfly/react-core';
 import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon';
 import ClipboardIcon from '@patternfly/react-icons/dist/esm/icons/clipboard-icon';
diff --git a/packages/react-core/src/components/Menu/examples/MenuWithCheckbox.tsx b/packages/react-core/src/components/Menu/examples/MenuWithCheckbox.tsx
index 4994d96edcd..7669eaa4d73 100644
--- a/packages/react-core/src/components/Menu/examples/MenuWithCheckbox.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuWithCheckbox.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Menu, MenuContent, MenuList, MenuItem } from '@patternfly/react-core';
 
 export const MenuWithCheckbox: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Menu/examples/MenuWithDescription.tsx b/packages/react-core/src/components/Menu/examples/MenuWithDescription.tsx
index de92d8a7913..a7010bece52 100644
--- a/packages/react-core/src/components/Menu/examples/MenuWithDescription.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuWithDescription.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Menu, MenuContent, MenuList, MenuItem } from '@patternfly/react-core';
 import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
 
diff --git a/packages/react-core/src/components/Menu/examples/MenuWithDrilldown.tsx b/packages/react-core/src/components/Menu/examples/MenuWithDrilldown.tsx
index 01596e28616..dfffc827a9b 100644
--- a/packages/react-core/src/components/Menu/examples/MenuWithDrilldown.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuWithDrilldown.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Menu, MenuContent, MenuList, MenuItem, Divider, DrilldownMenu } from '@patternfly/react-core';
 import StorageDomainIcon from '@patternfly/react-icons/dist/esm/icons/storage-domain-icon';
 import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
diff --git a/packages/react-core/src/components/Menu/examples/MenuWithDrilldownBreadcrumbs.tsx b/packages/react-core/src/components/Menu/examples/MenuWithDrilldownBreadcrumbs.tsx
index c19c579d06a..d6ec14ffefb 100644
--- a/packages/react-core/src/components/Menu/examples/MenuWithDrilldownBreadcrumbs.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuWithDrilldownBreadcrumbs.tsx
@@ -1,4 +1,4 @@
-import React, { type JSX } from 'react';
+import { type JSX, useState } from 'react';
 import {
   Badge,
   Breadcrumb,
@@ -26,12 +26,12 @@ import AngleLeftIcon from '@patternfly/react-icons/dist/esm/icons/angle-left-ico
 import CubeIcon from '@patternfly/react-icons/dist/esm/icons/cube-icon';
 
 export const MenuWithDrilldownBreadcrumbs: React.FunctionComponent = () => {
-  const [menuDrilledIn, setMenuDrilledIn] = React.useState<string[]>([]);
-  const [drilldownPath, setDrilldownPath] = React.useState<string[]>([]);
-  const [menuHeights, setMenuHeights] = React.useState<any>({});
-  const [activeMenu, setActiveMenu] = React.useState<string>('breadcrumbs-rootMenu');
-  const [breadcrumb, setBreadcrumb] = React.useState<JSX.Element | null>();
-  const [withMaxMenuHeight, setWithMaxMenuHeight] = React.useState(false);
+  const [menuDrilledIn, setMenuDrilledIn] = useState<string[]>([]);
+  const [drilldownPath, setDrilldownPath] = useState<string[]>([]);
+  const [menuHeights, setMenuHeights] = useState<any>({});
+  const [activeMenu, setActiveMenu] = useState<string>('breadcrumbs-rootMenu');
+  const [breadcrumb, setBreadcrumb] = useState<JSX.Element | null>();
+  const [withMaxMenuHeight, setWithMaxMenuHeight] = useState(false);
 
   const onToggle = (isOpen: boolean, key: string) => {
     switch (key) {
diff --git a/packages/react-core/src/components/Menu/examples/MenuWithDrilldownInitialState.tsx b/packages/react-core/src/components/Menu/examples/MenuWithDrilldownInitialState.tsx
index 8bb03299ba5..69d8909fbe9 100644
--- a/packages/react-core/src/components/Menu/examples/MenuWithDrilldownInitialState.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuWithDrilldownInitialState.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Menu, MenuContent, MenuList, MenuItem, Divider, DrilldownMenu } from '@patternfly/react-core';
 import StorageDomainIcon from '@patternfly/react-icons/dist/esm/icons/storage-domain-icon';
 import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
diff --git a/packages/react-core/src/components/Menu/examples/MenuWithDrilldownSubmenuFunctions.tsx b/packages/react-core/src/components/Menu/examples/MenuWithDrilldownSubmenuFunctions.tsx
index 8ce63c4f23e..d868155abdd 100644
--- a/packages/react-core/src/components/Menu/examples/MenuWithDrilldownSubmenuFunctions.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuWithDrilldownSubmenuFunctions.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Menu, MenuContent, MenuList, MenuItem, Divider, DrilldownMenu } from '@patternfly/react-core';
 import StorageDomainIcon from '@patternfly/react-icons/dist/esm/icons/storage-domain-icon';
 import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
diff --git a/packages/react-core/src/components/Menu/examples/MenuWithFavorites.tsx b/packages/react-core/src/components/Menu/examples/MenuWithFavorites.tsx
index 62e2b91fd60..a5de6ba02d8 100644
--- a/packages/react-core/src/components/Menu/examples/MenuWithFavorites.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuWithFavorites.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Menu, MenuContent, MenuItem, MenuItemAction, MenuGroup, MenuList, Divider } from '@patternfly/react-core';
 import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon';
 import ClipboardIcon from '@patternfly/react-icons/dist/esm/icons/clipboard-icon';
@@ -55,7 +55,7 @@ export const MenuWithFavorites: React.FunctionComponent = () => {
     <Menu onSelect={onSelect} onActionClick={onFavorite} activeItemId={activeItem}>
       <MenuContent>
         {favorites.length > 0 && (
-          <React.Fragment>
+          <Fragment>
             <MenuGroup label="Favorites" labelHeadingLevel="h3">
               <MenuList>
                 {items
@@ -77,7 +77,7 @@ export const MenuWithFavorites: React.FunctionComponent = () => {
               </MenuList>
             </MenuGroup>
             <Divider />
-          </React.Fragment>
+          </Fragment>
         )}
         <MenuGroup label="All actions" labelHeadingLevel="h3">
           <MenuList>
diff --git a/packages/react-core/src/components/Menu/examples/MenuWithFooter.tsx b/packages/react-core/src/components/Menu/examples/MenuWithFooter.tsx
index 3bd369b25de..eff3431967d 100644
--- a/packages/react-core/src/components/Menu/examples/MenuWithFooter.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuWithFooter.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Menu, MenuList, MenuItem, MenuContent, MenuFooter, Button } from '@patternfly/react-core';
 
 export const MenuWithFooter: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Menu/examples/MenuWithIcons.tsx b/packages/react-core/src/components/Menu/examples/MenuWithIcons.tsx
index 0e0947d3758..ab9fdb780c1 100644
--- a/packages/react-core/src/components/Menu/examples/MenuWithIcons.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuWithIcons.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Menu, MenuContent, MenuList, MenuItem } from '@patternfly/react-core';
 import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
 import LayerGroupIcon from '@patternfly/react-icons/dist/esm/icons/layer-group-icon';
diff --git a/packages/react-core/src/components/Menu/examples/MenuWithLinks.tsx b/packages/react-core/src/components/Menu/examples/MenuWithLinks.tsx
index 07d4fc5eb0f..9fafd131a14 100644
--- a/packages/react-core/src/components/Menu/examples/MenuWithLinks.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuWithLinks.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Menu, MenuContent, MenuList, MenuItem } from '@patternfly/react-core';
 
 export const MenuWithLinks: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Menu/examples/MenuWithSeparators.tsx b/packages/react-core/src/components/Menu/examples/MenuWithSeparators.tsx
index 6c1980def14..6c319da9bc0 100644
--- a/packages/react-core/src/components/Menu/examples/MenuWithSeparators.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuWithSeparators.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Divider, Menu, MenuContent, MenuList, MenuItem } from '@patternfly/react-core';
 
 export const MenuWithSeparators: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Menu/examples/MenuWithTitledGroups.tsx b/packages/react-core/src/components/Menu/examples/MenuWithTitledGroups.tsx
index 6318fbaaf04..1ea4f912309 100644
--- a/packages/react-core/src/components/Menu/examples/MenuWithTitledGroups.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuWithTitledGroups.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Menu, MenuContent, MenuGroup, MenuList, MenuItem, Divider } from '@patternfly/react-core';
 
 export const MenuWithTitledGroups: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Menu/examples/MenuWithViewMore.tsx b/packages/react-core/src/components/Menu/examples/MenuWithViewMore.tsx
index 94b8879d6e0..f856a0968ad 100644
--- a/packages/react-core/src/components/Menu/examples/MenuWithViewMore.tsx
+++ b/packages/react-core/src/components/Menu/examples/MenuWithViewMore.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Menu, MenuList, MenuItem, MenuContent, Spinner } from '@patternfly/react-core';
 
 export const MenuWithViewMore: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
index 25c6e807bda..e48982bd87c 100644
--- a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
+++ b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, forwardRef, isValidElement } from 'react';
 import styles from '@patternfly/react-styles/css/components/MenuToggle/menu-toggle';
 import { css } from '@patternfly/react-styles';
 import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon';
@@ -72,7 +72,7 @@ interface MenuToggleState {
   ouiaStateId: string;
 }
 
-class MenuToggleBase extends React.Component<MenuToggleProps, MenuToggleState> {
+class MenuToggleBase extends Component<MenuToggleProps, MenuToggleState> {
   displayName = 'MenuToggleBase';
   static defaultProps: MenuToggleProps = {
     className: '',
@@ -146,7 +146,7 @@ class MenuToggleBase extends React.Component<MenuToggleProps, MenuToggleState> {
       <>
         {icon && <span className={css(styles.menuToggleIcon)}>{icon}</span>}
         {isTypeahead ? children : children && <span className={css(styles.menuToggleText)}>{children}</span>}
-        {React.isValidElement(badge) && <span className={css(styles.menuToggleCount)}>{badge}</span>}
+        {isValidElement(badge) && <span className={css(styles.menuToggleCount)}>{badge}</span>}
         {isTypeahead ? (
           <button
             type="button"
@@ -234,7 +234,7 @@ class MenuToggleBase extends React.Component<MenuToggleProps, MenuToggleState> {
   }
 }
 
-export const MenuToggle = React.forwardRef((props: MenuToggleProps, ref: React.Ref<MenuToggleElement>) => (
+export const MenuToggle = forwardRef((props: MenuToggleProps, ref: React.Ref<MenuToggleElement>) => (
   <MenuToggleBase innerRef={ref} {...props} />
 ));
 
diff --git a/packages/react-core/src/components/MenuToggle/MenuToggleAction.tsx b/packages/react-core/src/components/MenuToggle/MenuToggleAction.tsx
index bd4bb02a5a6..dd682f267bc 100644
--- a/packages/react-core/src/components/MenuToggle/MenuToggleAction.tsx
+++ b/packages/react-core/src/components/MenuToggle/MenuToggleAction.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 import styles from '@patternfly/react-styles/css/components/MenuToggle/menu-toggle';
 import { css } from '@patternfly/react-styles';
 
@@ -15,7 +15,7 @@ export interface MenuToggleActionProps {
   id?: string;
 }
 
-class MenuToggleAction extends React.Component<MenuToggleActionProps> {
+class MenuToggleAction extends Component<MenuToggleActionProps> {
   static displayName = 'MenuToggleAction';
   static defaultProps: MenuToggleActionProps = {
     className: '',
diff --git a/packages/react-core/src/components/MenuToggle/MenuToggleCheckbox.tsx b/packages/react-core/src/components/MenuToggle/MenuToggleCheckbox.tsx
index e983aa9c3f7..459417d2a57 100644
--- a/packages/react-core/src/components/MenuToggle/MenuToggleCheckbox.tsx
+++ b/packages/react-core/src/components/MenuToggle/MenuToggleCheckbox.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 import styles from '@patternfly/react-styles/css/components/Check/check';
 import { css } from '@patternfly/react-styles';
 import { PickOptional } from '../../helpers/typeUtils';
@@ -33,7 +33,7 @@ export interface MenuToggleCheckboxProps
   ouiaSafe?: boolean;
 }
 
-class MenuToggleCheckbox extends React.Component<MenuToggleCheckboxProps, { ouiaStateId: string }> {
+class MenuToggleCheckbox extends Component<MenuToggleCheckboxProps, { ouiaStateId: string }> {
   static displayName = 'MenuToggleCheckbox';
   static defaultProps: PickOptional<MenuToggleCheckboxProps> = {
     isValid: true,
diff --git a/packages/react-core/src/components/MenuToggle/__tests__/MenuToggle.test.tsx b/packages/react-core/src/components/MenuToggle/__tests__/MenuToggle.test.tsx
index 4923df83da9..1afb98f9117 100644
--- a/packages/react-core/src/components/MenuToggle/__tests__/MenuToggle.test.tsx
+++ b/packages/react-core/src/components/MenuToggle/__tests__/MenuToggle.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { MenuToggle } from '../MenuToggle';
 import { MenuToggleCheckbox } from '../MenuToggleCheckbox';
 import { Badge } from '../../Badge';
diff --git a/packages/react-core/src/components/MenuToggle/examples/MenuToggle.md b/packages/react-core/src/components/MenuToggle/examples/MenuToggle.md
index 16c94cdcb67..83bcbb26024 100644
--- a/packages/react-core/src/components/MenuToggle/examples/MenuToggle.md
+++ b/packages/react-core/src/components/MenuToggle/examples/MenuToggle.md
@@ -6,8 +6,8 @@ cssPrefix: pf-v6-c-menu-toggle
 propComponents: ['MenuToggle', 'MenuToggleAction', 'MenuToggleCheckbox']
 ---
 
+import { Fragment } from 'react';
 import './MenuToggle.css'
-
 import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon';
 import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
 import imgAvatar from '@patternfly/react-core/src/components/assets/avatarImg.svg';
@@ -20,7 +20,6 @@ import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
 A toggle is collapsed until it is selected by a user.
 
 ```ts
-import React from 'react';
 import { MenuToggle } from '@patternfly/react-core';
 
 <MenuToggle>Collapsed</MenuToggle>
@@ -32,7 +31,6 @@ import { MenuToggle } from '@patternfly/react-core';
 When a user selects a toggle, it becomes expanded and is styled with a blue underline. To flag expanded toggles, and apply expanded styling, use the `isExpanded` property .
 
 ```ts
-import React from 'react';
 import { MenuToggle } from '@patternfly/react-core';
 
 <MenuToggle isExpanded>Expanded</MenuToggle>;
@@ -52,7 +50,6 @@ You can pass `size="sm"` to a MenuToggle to style it as a small toggle, such as
 To disable the selection and expansion of a toggle, use the `isDisabled` property.
 
 ```ts
-import React from 'react';
 import { MenuToggle } from '@patternfly/react-core';
 
 <MenuToggle isDisabled>Disabled</MenuToggle>
@@ -64,7 +61,6 @@ import { MenuToggle } from '@patternfly/react-core';
 To display a count of selected items in a toggle, use the `badge` property. You can also pass in `variant="plainText"` for a badge only toggle.
 
 ```ts
-import React from 'react';
 import { MenuToggle, Badge } from '@patternfly/react-core';
 
 <React.Fragment>
@@ -80,7 +76,6 @@ To add a recognizable icon to a menu toggle, use the `icon` property. The follow
 For most basic icons, it is recommended to wrap it inside our [icon component](/components/icon).
 
 ```ts
-import React from 'react';
 import { MenuToggle } from '@patternfly/react-core';
 import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon';
 
@@ -114,7 +109,6 @@ You can also pass images into the `icon` property. The following example passes
 This can be used alongside a text label that provides more context for the image.
 
 ```ts
-import React from 'react';
 import { MenuToggle, Avatar } from '@patternfly/react-core';
 import imgAvatar from '@patternfly/react-core/src/components/assets/avatarImg.svg';
 
@@ -130,7 +124,6 @@ import imgAvatar from '@patternfly/react-core/src/components/assets/avatarImg.sv
 Variant styling can be applied to menu toggles. In the following example, the toggle uses primary styling by passing `variant="primary"` into the `<MenuToggle>` component. Additional variant options include “default”, “plain”, “plainText”, “secondary”, and “typeahead”.
 
 ```ts
-import React from 'react';
 import { MenuToggle } from '@patternfly/react-core';
 import CogIcon from '@patternfly/react-icons/dist/esm/icons/cog-icon';
 
@@ -153,7 +146,6 @@ To apply plain styling to a menu toggle with an icon, pass in `variant="plain"`.
 If the toggle does not have any visible text content, use the `aria-label` property to provide an accessible name.
 
 ```ts
-import React from 'react';
 import { MenuToggle } from '@patternfly/react-core';
 import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
 
@@ -171,7 +163,6 @@ import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-ico
 To apply plain styling to a menu toggle with a text label, pass in `variant="plainText"`. Unlike the “plain” variant, “plainText” adds a caret pointing down in the toggle.
 
 ```ts
-import React from 'react';
 import { MenuToggle } from '@patternfly/react-core';
 
 <React.Fragment>
@@ -236,7 +227,6 @@ A full height toggle fills the height of its parent. To flag a full height toggl
 In the following example, the toggle fills the size of the "80px" `<div>` element that it is within.
 
 ```ts
-import React from 'react';
 import { MenuToggle } from '@patternfly/react-core';
 
 <div style={{ height: "80px" }}>
@@ -253,7 +243,6 @@ A full width toggle fills the width of its parent. To flag a full width toggle,
 In the following example, the toggle fills the width of its parent as the window size changes.
 
 ```ts
-import React from 'react';
 import { MenuToggle } from '@patternfly/react-core';
 
 const fullWidth: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/MenuToggle/examples/MenuTogglePlaceholder.tsx b/packages/react-core/src/components/MenuToggle/examples/MenuTogglePlaceholder.tsx
index dee77fd77ff..025974d48c1 100644
--- a/packages/react-core/src/components/MenuToggle/examples/MenuTogglePlaceholder.tsx
+++ b/packages/react-core/src/components/MenuToggle/examples/MenuTogglePlaceholder.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { MenuToggle } from '@patternfly/react-core';
 
 export const MenuTogglePlaceholder: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/MenuToggle/examples/MenuToggleSmall.tsx b/packages/react-core/src/components/MenuToggle/examples/MenuToggleSmall.tsx
index 34dc4e24bd4..9a43cb3a3c5 100644
--- a/packages/react-core/src/components/MenuToggle/examples/MenuToggleSmall.tsx
+++ b/packages/react-core/src/components/MenuToggle/examples/MenuToggleSmall.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { MenuToggle } from '@patternfly/react-core';
 
 export const MenuToggleSmall: React.FunctionComponent = () => <MenuToggle size="sm">Small toggle</MenuToggle>;
diff --git a/packages/react-core/src/components/MenuToggle/examples/MenuToggleSplitButtonAction.tsx b/packages/react-core/src/components/MenuToggle/examples/MenuToggleSplitButtonAction.tsx
index f2eb92d3235..5fb9204f913 100644
--- a/packages/react-core/src/components/MenuToggle/examples/MenuToggleSplitButtonAction.tsx
+++ b/packages/react-core/src/components/MenuToggle/examples/MenuToggleSplitButtonAction.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { MenuToggleAction, MenuToggle } from '@patternfly/react-core';
 
 export const MenuToggleSplitButtonAction: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <MenuToggle
       splitButtonItems={[
         <MenuToggleAction id="split-button-action-example-with-toggle-button" key="split-action" aria-label="Action">
@@ -37,5 +37,5 @@ export const MenuToggleSplitButtonAction: React.FunctionComponent = () => (
       ]}
       aria-label="Menu toggle with action split button"
     />
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/MenuToggle/examples/MenuToggleSplitButtonCheckbox.tsx b/packages/react-core/src/components/MenuToggle/examples/MenuToggleSplitButtonCheckbox.tsx
index e276ad0d89c..1ac7dc1c47b 100644
--- a/packages/react-core/src/components/MenuToggle/examples/MenuToggleSplitButtonCheckbox.tsx
+++ b/packages/react-core/src/components/MenuToggle/examples/MenuToggleSplitButtonCheckbox.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { MenuToggleCheckbox, MenuToggle } from '@patternfly/react-core';
 
 export const MenuToggleSplitButtonCheckbox: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <MenuToggle
       splitButtonItems={[
         <MenuToggleCheckbox id="split-button-checkbox-example" key="split-checkbox" aria-label="Select all" />
@@ -23,5 +23,5 @@ export const MenuToggleSplitButtonCheckbox: React.FunctionComponent = () => (
       ]}
       aria-label="Menu toggle with checkbox split button"
     />
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/MenuToggle/examples/MenuToggleSplitButtonCheckboxWithText.tsx b/packages/react-core/src/components/MenuToggle/examples/MenuToggleSplitButtonCheckboxWithText.tsx
index 8dbe750d14a..75ddc5619bb 100644
--- a/packages/react-core/src/components/MenuToggle/examples/MenuToggleSplitButtonCheckboxWithText.tsx
+++ b/packages/react-core/src/components/MenuToggle/examples/MenuToggleSplitButtonCheckboxWithText.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { MenuToggleCheckbox, MenuToggle } from '@patternfly/react-core';
 
 export const MenuToggleSplitButtonCheckboxWithText: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <MenuToggle
       splitButtonItems={[
         <MenuToggleCheckbox
@@ -41,5 +41,5 @@ export const MenuToggleSplitButtonCheckboxWithText: React.FunctionComponent = ()
       ]}
       aria-label="Secondary menu toggle with checkbox split button"
     />
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/MenuToggle/examples/MenuToggleSplitButtonCheckboxWithToggleText.tsx b/packages/react-core/src/components/MenuToggle/examples/MenuToggleSplitButtonCheckboxWithToggleText.tsx
index 8df1027d3fc..84164356ce9 100644
--- a/packages/react-core/src/components/MenuToggle/examples/MenuToggleSplitButtonCheckboxWithToggleText.tsx
+++ b/packages/react-core/src/components/MenuToggle/examples/MenuToggleSplitButtonCheckboxWithToggleText.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { MenuToggleCheckbox, MenuToggle } from '@patternfly/react-core';
 
 export const MenuToggleSplitButtonCheckboxWithToggleText: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <MenuToggle
       splitButtonItems={[
         <MenuToggleCheckbox
@@ -41,5 +41,5 @@ export const MenuToggleSplitButtonCheckboxWithToggleText: React.FunctionComponen
     >
       10 selected
     </MenuToggle>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/MenuToggle/examples/MenuToggleStatus.tsx b/packages/react-core/src/components/MenuToggle/examples/MenuToggleStatus.tsx
index 380cd3081a3..f86e5b3e300 100644
--- a/packages/react-core/src/components/MenuToggle/examples/MenuToggleStatus.tsx
+++ b/packages/react-core/src/components/MenuToggle/examples/MenuToggleStatus.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { MenuToggle, HelperText, HelperTextItem } from '@patternfly/react-core';
 
 export const MenuToggleStatus: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <MenuToggle status="success">Success</MenuToggle>
     <br />
     <br />
@@ -16,5 +16,5 @@ export const MenuToggleStatus: React.FunctionComponent = () => (
     <HelperText>
       <HelperTextItem variant="error">Danger text that explains the issue.</HelperTextItem>
     </HelperText>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/MenuToggle/examples/MenuToggleTypeahead.tsx b/packages/react-core/src/components/MenuToggle/examples/MenuToggleTypeahead.tsx
index 72082c5cd3f..6cb4f054a31 100644
--- a/packages/react-core/src/components/MenuToggle/examples/MenuToggleTypeahead.tsx
+++ b/packages/react-core/src/components/MenuToggle/examples/MenuToggleTypeahead.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   MenuToggle,
   TextInputGroup,
diff --git a/packages/react-core/src/components/Modal/Modal.tsx b/packages/react-core/src/components/Modal/Modal.tsx
index cbdcb960bc3..852c0a6dcd3 100644
--- a/packages/react-core/src/components/Modal/Modal.tsx
+++ b/packages/react-core/src/components/Modal/Modal.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 import * as ReactDOM from 'react-dom';
 import { canUseDOM, KeyTypes, PickOptional } from '../../helpers';
 import { css } from '@patternfly/react-styles';
@@ -63,7 +63,7 @@ interface ModalState {
   ouiaStateId: string;
 }
 
-class Modal extends React.Component<ModalProps, ModalState> {
+class Modal extends Component<ModalProps, ModalState> {
   static displayName = 'Modal';
   static currentId = 0;
   boxId = '';
diff --git a/packages/react-core/src/components/Modal/ModalBody.tsx b/packages/react-core/src/components/Modal/ModalBody.tsx
index aa6689cd69b..a8771798e91 100644
--- a/packages/react-core/src/components/Modal/ModalBody.tsx
+++ b/packages/react-core/src/components/Modal/ModalBody.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/ModalBox/modal-box';
 
diff --git a/packages/react-core/src/components/Modal/ModalBox.tsx b/packages/react-core/src/components/Modal/ModalBox.tsx
index b52a9660ece..ed4d4b4b24b 100644
--- a/packages/react-core/src/components/Modal/ModalBox.tsx
+++ b/packages/react-core/src/components/Modal/ModalBox.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/ModalBox/modal-box';
 import topSpacer from '@patternfly/react-tokens/dist/esm/c_modal_box_m_align_top_spacer';
diff --git a/packages/react-core/src/components/Modal/ModalBoxCloseButton.tsx b/packages/react-core/src/components/Modal/ModalBoxCloseButton.tsx
index 35d3d57d831..ec508859877 100644
--- a/packages/react-core/src/components/Modal/ModalBoxCloseButton.tsx
+++ b/packages/react-core/src/components/Modal/ModalBoxCloseButton.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/ModalBox/modal-box';
 import { Button } from '../Button';
diff --git a/packages/react-core/src/components/Modal/ModalBoxDescription.tsx b/packages/react-core/src/components/Modal/ModalBoxDescription.tsx
index 1ce6385e88c..d82260e50d6 100644
--- a/packages/react-core/src/components/Modal/ModalBoxDescription.tsx
+++ b/packages/react-core/src/components/Modal/ModalBoxDescription.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/ModalBox/modal-box';
 
diff --git a/packages/react-core/src/components/Modal/ModalBoxTitle.tsx b/packages/react-core/src/components/Modal/ModalBoxTitle.tsx
index 0c64eacfca6..3fc265110e8 100644
--- a/packages/react-core/src/components/Modal/ModalBoxTitle.tsx
+++ b/packages/react-core/src/components/Modal/ModalBoxTitle.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useRef, useState } from 'react';
 import modalStyles from '@patternfly/react-styles/css/components/ModalBox/modal-box';
 import { css } from '@patternfly/react-styles';
 import { capitalize } from '../../helpers';
@@ -35,8 +35,8 @@ export const ModalBoxTitle: React.FunctionComponent<ModalBoxTitleProps> = ({
   titleScreenReaderText,
   ...props
 }: ModalBoxTitleProps) => {
-  const [hasTooltip, setHasTooltip] = React.useState(false);
-  const h1 = React.useRef<HTMLHeadingElement>(null);
+  const [hasTooltip, setHasTooltip] = useState(false);
+  const h1 = useRef<HTMLHeadingElement>(null);
   const label =
     titleScreenReaderText ||
     (isVariantIcon(titleIconVariant) ? `${capitalize(titleIconVariant)} alert:` : titleScreenReaderText);
diff --git a/packages/react-core/src/components/Modal/ModalContent.tsx b/packages/react-core/src/components/Modal/ModalContent.tsx
index 425a165c02b..935a7ccf230 100644
--- a/packages/react-core/src/components/Modal/ModalContent.tsx
+++ b/packages/react-core/src/components/Modal/ModalContent.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { FocusTrap } from '../../helpers';
 import bullsEyeStyles from '@patternfly/react-styles/css/layouts/Bullseye/bullseye';
 import { css } from '@patternfly/react-styles';
diff --git a/packages/react-core/src/components/Modal/ModalFooter.tsx b/packages/react-core/src/components/Modal/ModalFooter.tsx
index eee3e83302e..e59d6b5b56d 100644
--- a/packages/react-core/src/components/Modal/ModalFooter.tsx
+++ b/packages/react-core/src/components/Modal/ModalFooter.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/ModalBox/modal-box';
 
diff --git a/packages/react-core/src/components/Modal/ModalHeader.tsx b/packages/react-core/src/components/Modal/ModalHeader.tsx
index 71fffa70485..673cfe3473f 100644
--- a/packages/react-core/src/components/Modal/ModalHeader.tsx
+++ b/packages/react-core/src/components/Modal/ModalHeader.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/ModalBox/modal-box';
 import { ModalBoxDescription } from './ModalBoxDescription';
diff --git a/packages/react-core/src/components/Modal/__tests__/Modal.test.tsx b/packages/react-core/src/components/Modal/__tests__/Modal.test.tsx
index af0446c1f22..4fda267e141 100644
--- a/packages/react-core/src/components/Modal/__tests__/Modal.test.tsx
+++ b/packages/react-core/src/components/Modal/__tests__/Modal.test.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-
+import { useState } from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import '@testing-library/jest-dom';
@@ -22,8 +21,8 @@ const props = {
 const target = document.createElement('div');
 
 const ModalWithSiblings = () => {
-  const [isOpen, setIsOpen] = React.useState(true);
-  const [isModalMounted, setIsModalMounted] = React.useState(true);
+  const [isOpen, setIsOpen] = useState(true);
+  const [isModalMounted, setIsModalMounted] = useState(true);
   const modalProps = { ...props, isOpen, appendTo: target, onClose: () => setIsOpen(false) };
 
   return (
@@ -40,8 +39,8 @@ const ModalWithSiblings = () => {
 };
 
 const ModalWithAdjacentModal = () => {
-  const [isOpen, setIsOpen] = React.useState(true);
-  const [isModalMounted, setIsModalMounted] = React.useState(true);
+  const [isOpen, setIsOpen] = useState(true);
+  const [isModalMounted, setIsModalMounted] = useState(true);
   const modalProps = { ...props, isOpen, appendTo: target, onClose: () => setIsOpen(false) };
 
   return (
diff --git a/packages/react-core/src/components/Modal/__tests__/ModalBody.test.tsx b/packages/react-core/src/components/Modal/__tests__/ModalBody.test.tsx
index c1379a8b745..6760c7384d6 100644
--- a/packages/react-core/src/components/Modal/__tests__/ModalBody.test.tsx
+++ b/packages/react-core/src/components/Modal/__tests__/ModalBody.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 
 import { ModalBody } from '../ModalBody';
diff --git a/packages/react-core/src/components/Modal/__tests__/ModalBox.test.tsx b/packages/react-core/src/components/Modal/__tests__/ModalBox.test.tsx
index 9a8f8b24cad..47037db6eb1 100644
--- a/packages/react-core/src/components/Modal/__tests__/ModalBox.test.tsx
+++ b/packages/react-core/src/components/Modal/__tests__/ModalBox.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 
 import { ModalBox } from '../ModalBox';
diff --git a/packages/react-core/src/components/Modal/__tests__/ModalBoxCloseButton.test.tsx b/packages/react-core/src/components/Modal/__tests__/ModalBoxCloseButton.test.tsx
index 13339dfd28f..1e482bc7f73 100644
--- a/packages/react-core/src/components/Modal/__tests__/ModalBoxCloseButton.test.tsx
+++ b/packages/react-core/src/components/Modal/__tests__/ModalBoxCloseButton.test.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-core/src/components/Modal/__tests__/ModalBoxDescription.test.tsx b/packages/react-core/src/components/Modal/__tests__/ModalBoxDescription.test.tsx
index 8aca48ac935..ba2ba864a69 100644
--- a/packages/react-core/src/components/Modal/__tests__/ModalBoxDescription.test.tsx
+++ b/packages/react-core/src/components/Modal/__tests__/ModalBoxDescription.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ModalBoxDescription } from '../ModalBoxDescription';
 
diff --git a/packages/react-core/src/components/Modal/__tests__/ModalBoxHeader.test.tsx b/packages/react-core/src/components/Modal/__tests__/ModalBoxHeader.test.tsx
index 5c724c9c1c3..51f17685648 100644
--- a/packages/react-core/src/components/Modal/__tests__/ModalBoxHeader.test.tsx
+++ b/packages/react-core/src/components/Modal/__tests__/ModalBoxHeader.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 
 import { ModalHeader } from '../ModalHeader';
diff --git a/packages/react-core/src/components/Modal/__tests__/ModalBoxTitle.test.tsx b/packages/react-core/src/components/Modal/__tests__/ModalBoxTitle.test.tsx
index 6351e5c5989..d22d62bdfc8 100644
--- a/packages/react-core/src/components/Modal/__tests__/ModalBoxTitle.test.tsx
+++ b/packages/react-core/src/components/Modal/__tests__/ModalBoxTitle.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 
diff --git a/packages/react-core/src/components/Modal/__tests__/ModalContent.test.tsx b/packages/react-core/src/components/Modal/__tests__/ModalContent.test.tsx
index a3419ee83e0..8f2d272982a 100644
--- a/packages/react-core/src/components/Modal/__tests__/ModalContent.test.tsx
+++ b/packages/react-core/src/components/Modal/__tests__/ModalContent.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 
 import { ModalContent } from '../ModalContent';
diff --git a/packages/react-core/src/components/Modal/__tests__/ModalFooter.test.tsx b/packages/react-core/src/components/Modal/__tests__/ModalFooter.test.tsx
index 09010f6f74e..78f178688a7 100644
--- a/packages/react-core/src/components/Modal/__tests__/ModalFooter.test.tsx
+++ b/packages/react-core/src/components/Modal/__tests__/ModalFooter.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ModalFooter } from '../ModalFooter';
 
diff --git a/packages/react-core/src/components/Modal/examples/Modal.md b/packages/react-core/src/components/Modal/examples/Modal.md
index e3e77986fa9..245ec9176b5 100644
--- a/packages/react-core/src/components/Modal/examples/Modal.md
+++ b/packages/react-core/src/components/Modal/examples/Modal.md
@@ -6,6 +6,7 @@ propComponents: ['Modal', 'ModalBody', 'ModalHeader', 'ModalFooter']
 ouia: true
 ---
 
+import { Fragment } from 'react';
 import WarningTriangleIcon from '@patternfly/react-icons/dist/esm/icons/warning-triangle-icon';
 import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon';
 import BullhornIcon from '@patternfly/react-icons/dist/esm/icons/bullhorn-icon';
diff --git a/packages/react-core/src/components/Modal/examples/ModalBasic.tsx b/packages/react-core/src/components/Modal/examples/ModalBasic.tsx
index ddcb9f5c60e..d5ab9b2b079 100644
--- a/packages/react-core/src/components/Modal/examples/ModalBasic.tsx
+++ b/packages/react-core/src/components/Modal/examples/ModalBasic.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from '@patternfly/react-core';
 
 export const ModalBasic: React.FunctionComponent = () => {
@@ -9,7 +9,7 @@ export const ModalBasic: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle} ouiaId="ShowBasicModal">
         Show basic modal
       </Button>
@@ -37,6 +37,6 @@ export const ModalBasic: React.FunctionComponent = () => {
           </Button>
         </ModalFooter>
       </Modal>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Modal/examples/ModalCustomFocus.tsx b/packages/react-core/src/components/Modal/examples/ModalCustomFocus.tsx
index 6c4cc85e49d..53f53e349d2 100644
--- a/packages/react-core/src/components/Modal/examples/ModalCustomFocus.tsx
+++ b/packages/react-core/src/components/Modal/examples/ModalCustomFocus.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from '@patternfly/react-core';
 
 export const ModalCustomFocus: React.FunctionComponent = () => {
@@ -9,7 +9,7 @@ export const ModalCustomFocus: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle} ouiaId="ShowBasicModal">
         Show modal with custom focus
       </Button>
@@ -37,6 +37,6 @@ export const ModalCustomFocus: React.FunctionComponent = () => {
           </ModalFooter>
         </ModalBody>
       </Modal>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Modal/examples/ModalCustomHeader.tsx b/packages/react-core/src/components/Modal/examples/ModalCustomHeader.tsx
index 4337d03fd53..ae88353ee72 100644
--- a/packages/react-core/src/components/Modal/examples/ModalCustomHeader.tsx
+++ b/packages/react-core/src/components/Modal/examples/ModalCustomHeader.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Button,
   Modal,
@@ -22,7 +22,7 @@ export const ModalCustomHeaderFooter: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show custom header/footer modal
       </Button>
@@ -61,6 +61,6 @@ export const ModalCustomHeaderFooter: React.FunctionComponent = () => {
           </Title>
         </ModalFooter>
       </Modal>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Modal/examples/ModalCustomTitleIcon.tsx b/packages/react-core/src/components/Modal/examples/ModalCustomTitleIcon.tsx
index 121da226fef..8741d4c68a6 100644
--- a/packages/react-core/src/components/Modal/examples/ModalCustomTitleIcon.tsx
+++ b/packages/react-core/src/components/Modal/examples/ModalCustomTitleIcon.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from '@patternfly/react-core';
 import BullhornIcon from '@patternfly/react-icons/dist/esm/icons/bullhorn-icon';
 
@@ -10,7 +10,7 @@ export const ModalCustomTitleIcon: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show custom title icon modal
       </Button>
@@ -47,6 +47,6 @@ export const ModalCustomTitleIcon: React.FunctionComponent = () => {
           </Button>
         </ModalFooter>
       </Modal>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Modal/examples/ModalCustomWidth.tsx b/packages/react-core/src/components/Modal/examples/ModalCustomWidth.tsx
index 4d59cfa991f..d464c5f4e1d 100644
--- a/packages/react-core/src/components/Modal/examples/ModalCustomWidth.tsx
+++ b/packages/react-core/src/components/Modal/examples/ModalCustomWidth.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from '@patternfly/react-core';
 
 export const ModalCustomWidth: React.FunctionComponent = () => {
@@ -9,7 +9,7 @@ export const ModalCustomWidth: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show custom width modal
       </Button>
@@ -37,6 +37,6 @@ export const ModalCustomWidth: React.FunctionComponent = () => {
           </Button>
         </ModalFooter>
       </Modal>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Modal/examples/ModalNoHeaderFooter.tsx b/packages/react-core/src/components/Modal/examples/ModalNoHeaderFooter.tsx
index 3db47bad2da..730782aaa6e 100644
--- a/packages/react-core/src/components/Modal/examples/ModalNoHeaderFooter.tsx
+++ b/packages/react-core/src/components/Modal/examples/ModalNoHeaderFooter.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button, Modal, ModalBody, ModalVariant } from '@patternfly/react-core';
 
 export const ModalNoHeaderFooter: React.FunctionComponent = () => {
@@ -9,7 +9,7 @@ export const ModalNoHeaderFooter: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show no header/footer modal
       </Button>
@@ -34,6 +34,6 @@ export const ModalNoHeaderFooter: React.FunctionComponent = () => {
           est laborum.
         </ModalBody>
       </Modal>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Modal/examples/ModalSize.tsx b/packages/react-core/src/components/Modal/examples/ModalSize.tsx
index 7b41438c25c..caef963c893 100644
--- a/packages/react-core/src/components/Modal/examples/ModalSize.tsx
+++ b/packages/react-core/src/components/Modal/examples/ModalSize.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button, Modal, ModalBody, ModalFooter, ModalHeader, ModalVariant, Radio } from '@patternfly/react-core';
 
 export const ModalSize: React.FunctionComponent = () => {
@@ -26,7 +26,7 @@ export const ModalSize: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       {renderSizeOptions}
       <br />
       <Button variant="primary" onClick={handleModalToggle}>
@@ -57,6 +57,6 @@ export const ModalSize: React.FunctionComponent = () => {
           </Button>
         </ModalFooter>
       </Modal>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Modal/examples/ModalTitleIcon.tsx b/packages/react-core/src/components/Modal/examples/ModalTitleIcon.tsx
index 2e43cc60e0a..d422124089b 100644
--- a/packages/react-core/src/components/Modal/examples/ModalTitleIcon.tsx
+++ b/packages/react-core/src/components/Modal/examples/ModalTitleIcon.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from '@patternfly/react-core';
 
 export const ModalTitleIcon: React.FunctionComponent = () => {
@@ -9,7 +9,7 @@ export const ModalTitleIcon: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show title icon modal
       </Button>
@@ -42,6 +42,6 @@ export const ModalTitleIcon: React.FunctionComponent = () => {
           </Button>
         </ModalFooter>
       </Modal>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Modal/examples/ModalTopAligned.tsx b/packages/react-core/src/components/Modal/examples/ModalTopAligned.tsx
index 02f9177bbd8..99d021475f1 100644
--- a/packages/react-core/src/components/Modal/examples/ModalTopAligned.tsx
+++ b/packages/react-core/src/components/Modal/examples/ModalTopAligned.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from '@patternfly/react-core';
 
 export const ModalTopAligned: React.FunctionComponent = () => {
@@ -9,7 +9,7 @@ export const ModalTopAligned: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show top aligned modal
       </Button>
@@ -37,6 +37,6 @@ export const ModalTopAligned: React.FunctionComponent = () => {
           </Button>
         </ModalFooter>
       </Modal>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Modal/examples/ModalWithDescription.tsx b/packages/react-core/src/components/Modal/examples/ModalWithDescription.tsx
index 99faec812ce..d92739aa7c6 100644
--- a/packages/react-core/src/components/Modal/examples/ModalWithDescription.tsx
+++ b/packages/react-core/src/components/Modal/examples/ModalWithDescription.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button, Modal, ModalBody, ModalHeader, ModalFooter, ModalVariant } from '@patternfly/react-core';
 
 export const ModalWithDescription: React.FunctionComponent = () => {
@@ -9,7 +9,7 @@ export const ModalWithDescription: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show modal with description
       </Button>
@@ -74,6 +74,6 @@ export const ModalWithDescription: React.FunctionComponent = () => {
           </Button>
         </ModalFooter>
       </Modal>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Modal/examples/ModalWithDropdown.tsx b/packages/react-core/src/components/Modal/examples/ModalWithDropdown.tsx
index 53779a8af77..2425c07aab1 100644
--- a/packages/react-core/src/components/Modal/examples/ModalWithDropdown.tsx
+++ b/packages/react-core/src/components/Modal/examples/ModalWithDropdown.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Button,
   Dropdown,
@@ -46,7 +46,7 @@ export const ModalWithDropdown: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show dropdown modal
       </Button>
@@ -110,6 +110,6 @@ export const ModalWithDropdown: React.FunctionComponent = () => {
           </Button>
         </ModalFooter>
       </Modal>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Modal/examples/ModalWithForm.tsx b/packages/react-core/src/components/Modal/examples/ModalWithForm.tsx
index 4995ffd558e..50820630501 100644
--- a/packages/react-core/src/components/Modal/examples/ModalWithForm.tsx
+++ b/packages/react-core/src/components/Modal/examples/ModalWithForm.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Button,
   Form,
@@ -38,7 +38,7 @@ export const ModalWithForm: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show modal with form
       </Button>
@@ -154,7 +154,7 @@ export const ModalWithForm: React.FunctionComponent = () => {
                     <div>
                       The
                       <a href="https://schema.org/address" target="_blank" rel="noopener noreferrer">
-                        adress
+                        address
                       </a>
                       of a
                       <a href="https://schema.org/Person" target="_blank" rel="noopener noreferrer">
@@ -197,6 +197,6 @@ export const ModalWithForm: React.FunctionComponent = () => {
           </Button>
         </ModalFooter>
       </Modal>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Modal/examples/ModalWithHelp.tsx b/packages/react-core/src/components/Modal/examples/ModalWithHelp.tsx
index 9c628d8cdfd..5d526d9fcdc 100644
--- a/packages/react-core/src/components/Modal/examples/ModalWithHelp.tsx
+++ b/packages/react-core/src/components/Modal/examples/ModalWithHelp.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button, Modal, ModalBody, ModalFooter, ModalHeader, Popover } from '@patternfly/react-core';
 import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon';
 
@@ -10,7 +10,7 @@ export const ModalWithHelp: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show with help modal
       </Button>
@@ -55,6 +55,6 @@ export const ModalWithHelp: React.FunctionComponent = () => {
           </Button>
         </ModalFooter>
       </Modal>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Modal/examples/ModalWithOverflowingContent.tsx b/packages/react-core/src/components/Modal/examples/ModalWithOverflowingContent.tsx
index 243bcde9327..1efb9ca744c 100644
--- a/packages/react-core/src/components/Modal/examples/ModalWithOverflowingContent.tsx
+++ b/packages/react-core/src/components/Modal/examples/ModalWithOverflowingContent.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button, Modal, ModalBody, ModalHeader, ModalFooter, ModalVariant } from '@patternfly/react-core';
 
 export const ModalWithOverflowingContent: React.FunctionComponent = () => {
@@ -9,7 +9,7 @@ export const ModalWithOverflowingContent: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show modal
       </Button>
@@ -69,6 +69,6 @@ export const ModalWithOverflowingContent: React.FunctionComponent = () => {
           </Button>
         </ModalFooter>
       </Modal>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Modal/examples/ModalWithWizard.tsx b/packages/react-core/src/components/Modal/examples/ModalWithWizard.tsx
index 4e030dd91f7..6aae60a84d1 100644
--- a/packages/react-core/src/components/Modal/examples/ModalWithWizard.tsx
+++ b/packages/react-core/src/components/Modal/examples/ModalWithWizard.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button, Modal, ModalVariant, Wizard, WizardHeader, WizardStep } from '@patternfly/react-core';
 
 export const ModalWithWizard: React.FunctionComponent = () => {
@@ -19,7 +19,7 @@ export const ModalWithWizard: React.FunctionComponent = () => {
   ));
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show wizard modal
       </Button>
@@ -53,6 +53,6 @@ export const ModalWithWizard: React.FunctionComponent = () => {
           </WizardStep>
         </Wizard>
       </Modal>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUpload.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUpload.tsx
index b7c96c3e131..60ead5ba24b 100644
--- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUpload.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUpload.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { createContext } from 'react';
 import { DropzoneOptions, useDropzone } from 'react-dropzone';
 import { DropEvent } from '../../helpers/typeUtils';
 import styles from '@patternfly/react-styles/css/components/MultipleFileUpload/multiple-file-upload';
@@ -22,7 +22,7 @@ export interface MultipleFileUploadProps extends Omit<React.HTMLProps<HTMLDivEle
   onFileDrop?: (event: DropEvent, data: File[]) => void;
 }
 
-export const MultipleFileUploadContext = React.createContext({
+export const MultipleFileUploadContext = createContext({
   open: () => {}
 });
 
diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx
index 9741b5efeb4..f2ec99a6a98 100644
--- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadButton.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useContext } from 'react';
 import styles from '@patternfly/react-styles/css/components/MultipleFileUpload/multiple-file-upload';
 import { css } from '@patternfly/react-styles';
 import { MultipleFileUploadContext } from './MultipleFileUpload';
@@ -25,7 +25,7 @@ export const MultipleFileUploadButton: React.FunctionComponent<MultipleFileUploa
       "For accessibility reasons an aria-label should be specified on MultipleFileUploadButton if a browseButtonText isn't"
     );
   }
-  const { open } = React.useContext(MultipleFileUploadContext);
+  const { open } = useContext(MultipleFileUploadContext);
 
   return (
     <div className={css(styles.multipleFileUploadUpload, className)} {...props}>
diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadInfo.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadInfo.tsx
index bf79578943c..a0a2fe45ba4 100644
--- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadInfo.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadInfo.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/MultipleFileUpload/multiple-file-upload';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx
index 14b3f79c48c..94cdc3d39b5 100644
--- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadMain.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/MultipleFileUpload/multiple-file-upload';
 import { css } from '@patternfly/react-styles';
 import { MultipleFileUploadTitle } from './MultipleFileUploadTitle';
diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatus.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatus.tsx
index 50165bf004f..e987b89932f 100644
--- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatus.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatus.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useEffect, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/MultipleFileUpload/multiple-file-upload';
 import { css } from '@patternfly/react-styles';
 import { ExpandableSection } from '../ExpandableSection';
@@ -34,10 +34,10 @@ export const MultipleFileUploadStatus: React.FunctionComponent<MultipleFileUploa
   'aria-label': ariaLabel,
   ...props
 }: MultipleFileUploadStatusProps) => {
-  const [icon, setIcon] = React.useState<React.ReactNode>();
-  const [isOpen, setIsOpen] = React.useState(true);
+  const [icon, setIcon] = useState<React.ReactNode>();
+  const [isOpen, setIsOpen] = useState(true);
 
-  React.useEffect(() => {
+  useEffect(() => {
     switch (statusToggleIcon) {
       case 'danger':
         setIcon(<TimesCircleIcon />);
diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx
index d6c01822ce3..76be7bd2741 100644
--- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useEffect, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/MultipleFileUpload/multiple-file-upload';
 import { css } from '@patternfly/react-styles';
 import { Progress } from '../Progress';
@@ -80,8 +80,8 @@ export const MultipleFileUploadStatusItem: React.FunctionComponent<MultipleFileU
   progressHelperText,
   ...props
 }: MultipleFileUploadStatusItemProps) => {
-  const [loadPercentage, setLoadPercentage] = React.useState(0);
-  const [loadResult, setLoadResult] = React.useState<undefined | 'danger' | 'success'>();
+  const [loadPercentage, setLoadPercentage] = useState(0);
+  const [loadResult, setLoadResult] = useState<undefined | 'danger' | 'success'>();
 
   function readFile(file: File) {
     return new Promise((resolve, reject) => {
@@ -97,7 +97,7 @@ export const MultipleFileUploadStatusItem: React.FunctionComponent<MultipleFileU
     });
   }
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (customFileHandler) {
       customFileHandler(file);
     } else {
diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadTitle.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadTitle.tsx
index 64df6f5bbab..44e6472b100 100644
--- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadTitle.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadTitle.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/MultipleFileUpload/multiple-file-upload';
 import { css } from '@patternfly/react-styles';
 import { MultipleFileUploadTitleIcon } from './MultipleFileUploadTitleIcon';
diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadTitleIcon.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadTitleIcon.tsx
index 39bd72a40d7..fdc6f4dc5e9 100644
--- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadTitleIcon.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadTitleIcon.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/MultipleFileUpload/multiple-file-upload';
 import { css } from '@patternfly/react-styles';
 export interface MultipleFileUploadTitleIconProps extends React.HTMLProps<HTMLDivElement> {
diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadTitleText.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadTitleText.tsx
index 4b45a0eadd8..7d2cf4c1363 100644
--- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadTitleText.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadTitleText.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/MultipleFileUpload/multiple-file-upload';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadTitleTextSeparator.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadTitleTextSeparator.tsx
index 3d36745c2c1..91f5aa43565 100644
--- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadTitleTextSeparator.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadTitleTextSeparator.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/MultipleFileUpload/multiple-file-upload';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUpload.test.tsx b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUpload.test.tsx
index a090ffd363c..03628ccb0fd 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUpload.test.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUpload.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { MultipleFileUpload } from '../MultipleFileUpload';
 
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadButton.test.tsx b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadButton.test.tsx
index 86f5138fcd5..e1b9a016c0e 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadButton.test.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadButton.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { MultipleFileUploadButton } from '../MultipleFileUploadButton';
 
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadInfo.test.tsx b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadInfo.test.tsx
index 7cd86199bf7..564bc72f8d7 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadInfo.test.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadInfo.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { MultipleFileUploadInfo } from '../MultipleFileUploadInfo';
 
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadMain.test.tsx b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadMain.test.tsx
index 9b999d837aa..dc5a4bc25ce 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadMain.test.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadMain.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { MultipleFileUploadMain } from '../MultipleFileUploadMain';
 
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadStatus.test.tsx b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadStatus.test.tsx
index 5c129564f4e..e7b69e4e294 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadStatus.test.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadStatus.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { MultipleFileUploadStatus } from '../MultipleFileUploadStatus';
 import InProgressIcon from '@patternfly/react-icons/dist/esm/icons/in-progress-icon';
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadStatusItem.test.tsx b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadStatusItem.test.tsx
index e0e03319fb4..79b8081ea6b 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadStatusItem.test.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadStatusItem.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 
 import { MultipleFileUploadStatusItem } from '../MultipleFileUploadStatusItem';
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitle.test.tsx b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitle.test.tsx
index c75908c453f..e8ea53cc998 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitle.test.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitle.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { MultipleFileUploadTitle } from '../MultipleFileUploadTitle';
 
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleIcon.test.tsx b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleIcon.test.tsx
index 6a8c81d7a52..a34290ccef3 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleIcon.test.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleIcon.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { MultipleFileUploadTitleIcon } from '../MultipleFileUploadTitleIcon';
 
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleText.test.tsx b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleText.test.tsx
index 5fb79577157..2adc61519aa 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleText.test.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleText.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { MultipleFileUploadTitleText } from '../MultipleFileUploadTitleText';
 
diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleTextSeparator.test.tsx b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleTextSeparator.test.tsx
index c2f8fd39cf2..320872f5531 100644
--- a/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleTextSeparator.test.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/MultipleFileUploadTitleTextSeparator.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { MultipleFileUploadTitleTextSeparator } from '../MultipleFileUploadTitleTextSeparator';
 
diff --git a/packages/react-core/src/components/MultipleFileUpload/examples/MultipleFileUploadBasic.tsx b/packages/react-core/src/components/MultipleFileUpload/examples/MultipleFileUploadBasic.tsx
index 176c0853549..a26be260968 100644
--- a/packages/react-core/src/components/MultipleFileUpload/examples/MultipleFileUploadBasic.tsx
+++ b/packages/react-core/src/components/MultipleFileUpload/examples/MultipleFileUploadBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   MultipleFileUpload,
   MultipleFileUploadMain,
diff --git a/packages/react-core/src/components/Nav/Nav.tsx b/packages/react-core/src/components/Nav/Nav.tsx
index b3689142324..9da5847431f 100644
--- a/packages/react-core/src/components/Nav/Nav.tsx
+++ b/packages/react-core/src/components/Nav/Nav.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, createContext, createRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/Nav/nav';
 import { css } from '@patternfly/react-styles';
 import { getOUIAProps, OUIAProps, getDefaultOUIAId } from '../../helpers';
@@ -60,9 +60,9 @@ export interface NavContextProps {
   navRef?: React.RefObject<HTMLElement | null>;
 }
 export const navContextDefaults = {};
-export const NavContext = React.createContext<NavContextProps>(navContextDefaults);
+export const NavContext = createContext<NavContextProps>(navContextDefaults);
 
-class Nav extends React.Component<
+class Nav extends Component<
   NavProps,
   { isScrollable: boolean; ouiaStateId: string; flyoutRef: React.Ref<HTMLLIElement> | null }
 > {
@@ -79,7 +79,7 @@ class Nav extends React.Component<
     flyoutRef: null as React.Ref<HTMLLIElement>
   };
 
-  navRef = React.createRef<HTMLElement>();
+  navRef = createRef<HTMLElement>();
 
   // Callback from NavItem
   onSelect(
diff --git a/packages/react-core/src/components/Nav/NavExpandable.tsx b/packages/react-core/src/components/Nav/NavExpandable.tsx
index c9034353d84..df6878150e9 100644
--- a/packages/react-core/src/components/Nav/NavExpandable.tsx
+++ b/packages/react-core/src/components/Nav/NavExpandable.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 import styles from '@patternfly/react-styles/css/components/Nav/nav';
 import { css } from '@patternfly/react-styles';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
@@ -15,7 +15,7 @@ export interface NavExpandableProps
   title: React.ReactNode;
   /** If defined, screen readers will read this text instead of the list title */
   srText?: string;
-  /** Boolean to programatically expand or collapse section */
+  /** Boolean to pragmatically expand or collapse section */
   isExpanded?: boolean;
   /** Anything that can be rendered inside of the expandable list */
   children?: React.ReactNode;
@@ -40,7 +40,7 @@ interface NavExpandableState {
   ouiaStateId: string;
 }
 
-class NavExpandable extends React.Component<NavExpandableProps, NavExpandableState> {
+class NavExpandable extends Component<NavExpandableProps, NavExpandableState> {
   static displayName = 'NavExpandable';
   static defaultProps: PickOptional<NavExpandableProps> = {
     srText: '',
diff --git a/packages/react-core/src/components/Nav/NavGroup.tsx b/packages/react-core/src/components/Nav/NavGroup.tsx
index af6601fa80c..85f61a20746 100644
--- a/packages/react-core/src/components/Nav/NavGroup.tsx
+++ b/packages/react-core/src/components/Nav/NavGroup.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Nav/nav';
 import { css } from '@patternfly/react-styles';
 import { getUniqueId } from '../../helpers/util';
diff --git a/packages/react-core/src/components/Nav/NavItem.tsx b/packages/react-core/src/components/Nav/NavItem.tsx
index 50e4dbe6bc5..aea1b9b4ae6 100644
--- a/packages/react-core/src/components/Nav/NavItem.tsx
+++ b/packages/react-core/src/components/Nav/NavItem.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement, Fragment, isValidElement, useContext, useEffect, useRef, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/Nav/nav';
 import menuStyles from '@patternfly/react-styles/css/components/Menu/menu';
 import dividerStyles from '@patternfly/react-styles/css/components/Divider/divider';
@@ -63,13 +63,13 @@ export const NavItem: React.FunctionComponent<NavItemProps> = ({
   icon,
   ...props
 }: NavItemProps) => {
-  const { flyoutRef, setFlyoutRef, navRef } = React.useContext(NavContext);
-  const { isSidebarOpen } = React.useContext(PageSidebarContext);
-  const [flyoutTarget, setFlyoutTarget] = React.useState(null);
-  const [isHovered, setIsHovered] = React.useState(false);
-  const ref = React.useRef<HTMLLIElement>(undefined);
+  const { flyoutRef, setFlyoutRef, navRef } = useContext(NavContext);
+  const { isSidebarOpen } = useContext(PageSidebarContext);
+  const [flyoutTarget, setFlyoutTarget] = useState(null);
+  const [isHovered, setIsHovered] = useState(false);
+  const ref = useRef<HTMLLIElement>(undefined);
   const flyoutVisible = ref === flyoutRef;
-  const popperRef = React.useRef<HTMLDivElement>(undefined);
+  const popperRef = useRef<HTMLDivElement>(undefined);
   const hasFlyout = flyout !== undefined;
   const Component = hasFlyout ? 'button' : (component as any);
 
@@ -137,7 +137,7 @@ export const NavItem: React.FunctionComponent<NavItemProps> = ({
     }
   };
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (hasFlyout) {
       window.addEventListener('click', onFlyoutClick);
     }
@@ -148,7 +148,7 @@ export const NavItem: React.FunctionComponent<NavItemProps> = ({
     };
   }, []);
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (flyoutTarget) {
       if (flyoutVisible) {
         const flyoutItems = Array.from(
@@ -201,7 +201,7 @@ export const NavItem: React.FunctionComponent<NavItemProps> = ({
   };
 
   const renderClonedChild = (context: any, child: React.ReactElement<any>): React.ReactNode =>
-    React.cloneElement(child, {
+    cloneElement(child, {
       onClick: (e: MouseEvent) => context.onSelect(e, groupId, itemId, to, preventDefault, onClick),
       'aria-current': isActive ? 'page' : null,
       ...(styleChildren && {
@@ -209,10 +209,10 @@ export const NavItem: React.FunctionComponent<NavItemProps> = ({
       }),
       tabIndex: child.props.tabIndex || tabIndex,
       children: hasFlyout ? (
-        <React.Fragment>
+        <Fragment>
           {child.props.children}
           {flyoutButton}
-        </React.Fragment>
+        </Fragment>
       ) : (
         child.props.children
       )
@@ -255,7 +255,7 @@ export const NavItem: React.FunctionComponent<NavItemProps> = ({
       >
         <NavContext.Consumer>
           {(context) =>
-            React.isValidElement(children)
+            isValidElement(children)
               ? renderClonedChild(context, children as React.ReactElement<any>)
               : renderDefaultLink(context)
           }
diff --git a/packages/react-core/src/components/Nav/NavItemSeparator.tsx b/packages/react-core/src/components/Nav/NavItemSeparator.tsx
index db5754b2721..8f6bf243169 100644
--- a/packages/react-core/src/components/Nav/NavItemSeparator.tsx
+++ b/packages/react-core/src/components/Nav/NavItemSeparator.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Divider, DividerProps } from '../Divider';
 
 export const NavItemSeparator: React.FunctionComponent<DividerProps> = ({
diff --git a/packages/react-core/src/components/Nav/NavList.tsx b/packages/react-core/src/components/Nav/NavList.tsx
index 34b06e98d2a..877363556e4 100644
--- a/packages/react-core/src/components/Nav/NavList.tsx
+++ b/packages/react-core/src/components/Nav/NavList.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, createRef, Fragment } from 'react';
 import styles from '@patternfly/react-styles/css/components/Nav/nav';
 import { css } from '@patternfly/react-styles';
 import { Button } from '../Button';
@@ -21,7 +21,7 @@ export interface NavListProps
   forwardScrollAriaLabel?: string;
 }
 
-class NavList extends React.Component<NavListProps> {
+class NavList extends Component<NavListProps> {
   static displayName = 'NavList';
   static contextType = NavContext;
   context!: React.ContextType<typeof NavContext>;
@@ -36,7 +36,7 @@ class NavList extends React.Component<NavListProps> {
     scrollViewAtEnd: false
   };
 
-  navList = React.createRef<HTMLUListElement>();
+  navList = createRef<HTMLUListElement>();
   observer: any = () => {};
 
   handleScrollButtons = () => {
@@ -128,7 +128,7 @@ class NavList extends React.Component<NavListProps> {
         {({ isHorizontal }) => (
           <PageSidebarContext.Consumer>
             {({ isSidebarOpen }) => (
-              <React.Fragment>
+              <Fragment>
                 {isHorizontal && (!scrollViewAtStart || !scrollViewAtEnd) && (
                   <div className={css(styles.navScrollButton)}>
                     <Button
@@ -162,7 +162,7 @@ class NavList extends React.Component<NavListProps> {
                     />
                   </div>
                 )}
-              </React.Fragment>
+              </Fragment>
             )}
           </PageSidebarContext.Consumer>
         )}
diff --git a/packages/react-core/src/components/Nav/__tests__/Generated/NavExpandable.test.tsx b/packages/react-core/src/components/Nav/__tests__/Generated/NavExpandable.test.tsx
index fc81a4bd495..ced760d7c8c 100644
--- a/packages/react-core/src/components/Nav/__tests__/Generated/NavExpandable.test.tsx
+++ b/packages/react-core/src/components/Nav/__tests__/Generated/NavExpandable.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { NavExpandable } from '../../NavExpandable';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Nav/__tests__/Generated/NavGroup.test.tsx b/packages/react-core/src/components/Nav/__tests__/Generated/NavGroup.test.tsx
index 33bf0fc5f91..c290f1390dc 100644
--- a/packages/react-core/src/components/Nav/__tests__/Generated/NavGroup.test.tsx
+++ b/packages/react-core/src/components/Nav/__tests__/Generated/NavGroup.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { NavGroup } from '../../NavGroup';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Nav/__tests__/Generated/NavItem.test.tsx b/packages/react-core/src/components/Nav/__tests__/Generated/NavItem.test.tsx
index a3561cb03ac..432ae3332e5 100644
--- a/packages/react-core/src/components/Nav/__tests__/Generated/NavItem.test.tsx
+++ b/packages/react-core/src/components/Nav/__tests__/Generated/NavItem.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { NavItem } from '../../NavItem';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Nav/__tests__/Generated/NavList.test.tsx b/packages/react-core/src/components/Nav/__tests__/Generated/NavList.test.tsx
index 391e820e0dd..cd210461d34 100644
--- a/packages/react-core/src/components/Nav/__tests__/Generated/NavList.test.tsx
+++ b/packages/react-core/src/components/Nav/__tests__/Generated/NavList.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render } from '@testing-library/react';
 import * as ReactCoreUtils from '../../../../helpers/util';
 
diff --git a/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx b/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx
index 3562f6b91f6..6153183accb 100644
--- a/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx
+++ b/packages/react-core/src/components/Nav/__tests__/Nav.test.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-
+import { StrictMode } from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import '@testing-library/jest-dom';
@@ -47,7 +46,7 @@ describe('Nav', () => {
   test('Renders nav list in strict mode', () => {
     const consoleError = jest.spyOn(console, 'error');
     const { asFragment } = renderNav(
-      <React.StrictMode>
+      <StrictMode>
         <Nav className="test-nav-class">
           <NavList className="test-nav-list-class">
             {props.items.map((item) => (
@@ -57,7 +56,7 @@ describe('Nav', () => {
             ))}
           </NavList>
         </Nav>
-      </React.StrictMode>
+      </StrictMode>
     );
     expect(consoleError).not.toHaveBeenCalled();
     expect(asFragment()).toMatchSnapshot();
diff --git a/packages/react-core/src/components/Nav/examples/NavDefault.tsx b/packages/react-core/src/components/Nav/examples/NavDefault.tsx
index 46304e866b7..c3bc1386532 100644
--- a/packages/react-core/src/components/Nav/examples/NavDefault.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavDefault.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Nav, NavItem, NavList } from '@patternfly/react-core';
 
 export const NavDefault: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Nav/examples/NavDrilldown.tsx b/packages/react-core/src/components/Nav/examples/NavDrilldown.tsx
index 0319a3b3c1c..f4217edc458 100644
--- a/packages/react-core/src/components/Nav/examples/NavDrilldown.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavDrilldown.tsx
@@ -1,4 +1,4 @@
-import React, { type JSX } from 'react';
+import { type JSX, useState } from 'react';
 
 import { Nav, MenuContent, MenuItem, MenuList, DrilldownMenu, Menu } from '@patternfly/react-core';
 
@@ -46,10 +46,10 @@ const subMenuOne: JSX.Element = (
 );
 
 export const NavigationDrilldown: React.FunctionComponent = () => {
-  const [menuDrilledIn, setMenuDrilledIn] = React.useState<string[]>([]);
-  const [drilldownPath, setDrilldownPath] = React.useState<string[]>([]);
-  const [menuHeights, setMenuHeights] = React.useState<MenuHeights>({});
-  const [activeMenu, setActiveMenu] = React.useState('nav-drilldown-rootMenu');
+  const [menuDrilledIn, setMenuDrilledIn] = useState<string[]>([]);
+  const [drilldownPath, setDrilldownPath] = useState<string[]>([]);
+  const [menuHeights, setMenuHeights] = useState<MenuHeights>({});
+  const [activeMenu, setActiveMenu] = useState('nav-drilldown-rootMenu');
 
   const onDrillIn = (
     _event: React.KeyboardEvent | React.MouseEvent,
diff --git a/packages/react-core/src/components/Nav/examples/NavExpandable.tsx b/packages/react-core/src/components/Nav/examples/NavExpandable.tsx
index ee4a3505513..3461449e6fc 100644
--- a/packages/react-core/src/components/Nav/examples/NavExpandable.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavExpandable.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Nav, NavExpandable, NavItem, NavList } from '@patternfly/react-core';
 
 export const NavExpandableExample: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Nav/examples/NavExpandableThirdLevel.tsx b/packages/react-core/src/components/Nav/examples/NavExpandableThirdLevel.tsx
index 3d97ca34d40..5c50aef9d32 100644
--- a/packages/react-core/src/components/Nav/examples/NavExpandableThirdLevel.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavExpandableThirdLevel.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Nav, NavExpandable, NavItem, NavList } from '@patternfly/react-core';
 
 export const NavExpandableThirdLevel: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Nav/examples/NavFlyout.tsx b/packages/react-core/src/components/Nav/examples/NavFlyout.tsx
index 6e80b16ba9d..a0d42e028d7 100644
--- a/packages/react-core/src/components/Nav/examples/NavFlyout.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavFlyout.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Nav, NavItem, NavList, Menu, MenuContent, MenuList, MenuItem } from '@patternfly/react-core';
 
 export const NavFlyout: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Nav/examples/NavGrouped.tsx b/packages/react-core/src/components/Nav/examples/NavGrouped.tsx
index f6534a57e6e..e6288c70a61 100644
--- a/packages/react-core/src/components/Nav/examples/NavGrouped.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavGrouped.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Nav, NavItem, NavGroup } from '@patternfly/react-core';
 
 export const NavGrouped: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Nav/examples/NavHorizontalNav.tsx b/packages/react-core/src/components/Nav/examples/NavHorizontalNav.tsx
index d23b7ce641a..3ed10875e86 100644
--- a/packages/react-core/src/components/Nav/examples/NavHorizontalNav.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavHorizontalNav.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Nav, NavItem, NavList } from '@patternfly/react-core';
 
 export const NavHorizontalNav: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Nav/examples/NavHorizontalSubNav.tsx b/packages/react-core/src/components/Nav/examples/NavHorizontalSubNav.tsx
index 2d2dd459ff2..85f0c8726a7 100644
--- a/packages/react-core/src/components/Nav/examples/NavHorizontalSubNav.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavHorizontalSubNav.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Nav, NavItem, NavList } from '@patternfly/react-core';
 
 export const NavHorizontalSubNav: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Nav/examples/NavIcons.tsx b/packages/react-core/src/components/Nav/examples/NavIcons.tsx
index f4da1f19888..8650cf9a922 100644
--- a/packages/react-core/src/components/Nav/examples/NavIcons.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavIcons.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Nav, NavItem, NavList } from '@patternfly/react-core';
 import CubeIcon from '@patternfly/react-icons/dist/esm/icons/cube-icon';
 import FolderIcon from '@patternfly/react-icons/dist/esm/icons/folder-icon';
diff --git a/packages/react-core/src/components/Nav/examples/NavMixed.tsx b/packages/react-core/src/components/Nav/examples/NavMixed.tsx
index 7cfc5537c25..a53de216055 100644
--- a/packages/react-core/src/components/Nav/examples/NavMixed.tsx
+++ b/packages/react-core/src/components/Nav/examples/NavMixed.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Nav, NavExpandable, NavItem, NavItemSeparator, NavList } from '@patternfly/react-core';
 
 export const NavMixed: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/NotificationBadge/NotificationBadge.tsx b/packages/react-core/src/components/NotificationBadge/NotificationBadge.tsx
index 4bedc1d1f4e..b8b34f2f4f0 100644
--- a/packages/react-core/src/components/NotificationBadge/NotificationBadge.tsx
+++ b/packages/react-core/src/components/NotificationBadge/NotificationBadge.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Button, ButtonVariant, ButtonProps } from '../Button';
 import AttentionBellIcon from '@patternfly/react-icons/dist/esm/icons/attention-bell-icon';
 import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
diff --git a/packages/react-core/src/components/NotificationBadge/__tests__/NotificationBadge.test.tsx b/packages/react-core/src/components/NotificationBadge/__tests__/NotificationBadge.test.tsx
index d94a1c45ff6..928d82dedc7 100644
--- a/packages/react-core/src/components/NotificationBadge/__tests__/NotificationBadge.test.tsx
+++ b/packages/react-core/src/components/NotificationBadge/__tests__/NotificationBadge.test.tsx
@@ -1,5 +1,4 @@
 import { NotificationBadge } from '../NotificationBadge';
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 
 Object.values([true, false]).forEach((attentionVariant) => {
diff --git a/packages/react-core/src/components/NotificationBadge/examples/NotificationBadgeBasic.tsx b/packages/react-core/src/components/NotificationBadge/examples/NotificationBadgeBasic.tsx
index 510ce8c4376..24a86c1b1dd 100644
--- a/packages/react-core/src/components/NotificationBadge/examples/NotificationBadgeBasic.tsx
+++ b/packages/react-core/src/components/NotificationBadge/examples/NotificationBadgeBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { NotificationBadge, NotificationBadgeVariant } from '@patternfly/react-core';
 
 export const NotificationBadgeBasic: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/NotificationBadge/examples/NotificationBadgeWithCount.tsx b/packages/react-core/src/components/NotificationBadge/examples/NotificationBadgeWithCount.tsx
index 68c1b0220c5..6fc325742eb 100644
--- a/packages/react-core/src/components/NotificationBadge/examples/NotificationBadgeWithCount.tsx
+++ b/packages/react-core/src/components/NotificationBadge/examples/NotificationBadgeWithCount.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { NotificationBadge, NotificationBadgeVariant } from '@patternfly/react-core';
 
 export const NotificationBadgeWithCount: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/NotificationDrawer/NotificationDrawer.tsx b/packages/react-core/src/components/NotificationDrawer/NotificationDrawer.tsx
index 3d126b2888d..805a65b8899 100644
--- a/packages/react-core/src/components/NotificationDrawer/NotificationDrawer.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/NotificationDrawer.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-
+import { forwardRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/NotificationDrawer/notification-drawer';
 import { css } from '@patternfly/react-styles';
 
@@ -22,7 +21,7 @@ const NotificationDrawerBase: React.FunctionComponent<NotificationDrawerProps> =
     {children}
   </div>
 );
-export const NotificationDrawer = React.forwardRef((props: NotificationDrawerProps, ref: React.Ref<any>) => (
+export const NotificationDrawer = forwardRef((props: NotificationDrawerProps, ref: React.Ref<any>) => (
   <NotificationDrawerBase innerRef={ref} {...props} />
 ));
 NotificationDrawer.displayName = 'NotificationDrawer';
diff --git a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerBody.tsx b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerBody.tsx
index 0d1faa7736b..0d7e0546bdb 100644
--- a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerBody.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerBody.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import styles from '@patternfly/react-styles/css/components/NotificationDrawer/notification-drawer';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerGroup.tsx b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerGroup.tsx
index 23baf293dfb..4249c5110ed 100644
--- a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerGroup.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerGroup.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-
+import { useEffect, useRef, useState } from 'react';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/NotificationDrawer/notification-drawer';
@@ -59,9 +58,9 @@ export const NotificationDrawerGroup: React.FunctionComponent<NotificationDrawer
   headingLevel: HeadingLevel = 'h1',
   ...props
 }: NotificationDrawerGroupProps) => {
-  const titleRef = React.useRef(null);
-  const [isTooltipVisible, setIsTooltipVisible] = React.useState(false);
-  React.useEffect(() => {
+  const titleRef = useRef(null);
+  const [isTooltipVisible, setIsTooltipVisible] = useState(false);
+  useEffect(() => {
     // Title will always truncate on overflow regardless of truncateTitle prop
     const showTooltip = titleRef.current && titleRef.current.offsetHeight < titleRef.current.scrollHeight;
     if (isTooltipVisible !== showTooltip) {
diff --git a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerGroupList.tsx b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerGroupList.tsx
index 65fff1140e0..a8b24ec0660 100644
--- a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerGroupList.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerGroupList.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/NotificationDrawer/notification-drawer';
 
diff --git a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerHeader.tsx b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerHeader.tsx
index dd2a3c49d39..e940b9763d4 100644
--- a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerHeader.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerHeader.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/NotificationDrawer/notification-drawer';
 import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
diff --git a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerList.tsx b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerList.tsx
index 2f186ce71ff..ad5efe006b7 100644
--- a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerList.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerList.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/NotificationDrawer/notification-drawer';
 
diff --git a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerListItem.tsx b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerListItem.tsx
index b65a448e5d9..92c3640b160 100644
--- a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerListItem.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerListItem.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/NotificationDrawer/notification-drawer';
 
diff --git a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerListItemBody.tsx b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerListItemBody.tsx
index 4c0ce7db37d..bfd9e7b6cd3 100644
--- a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerListItemBody.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerListItemBody.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-
+import { Fragment } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/NotificationDrawer/notification-drawer';
 
@@ -18,11 +17,11 @@ export const NotificationDrawerListItemBody: React.FunctionComponent<Notificatio
   timestamp,
   ...props
 }: NotificationDrawerListItemBodyProps) => (
-  <React.Fragment>
+  <Fragment>
     <div {...props} className={css(styles.notificationDrawerListItemDescription, className)}>
       {children}
     </div>
     {timestamp && <div className={css(styles.notificationDrawerListItemTimestamp, className)}>{timestamp}</div>}
-  </React.Fragment>
+  </Fragment>
 );
 NotificationDrawerListItemBody.displayName = 'NotificationDrawerListItemBody';
diff --git a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerListItemHeader.tsx b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerListItemHeader.tsx
index a33e19eb1f3..18b843f9aff 100644
--- a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerListItemHeader.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerListItemHeader.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-
+import { Fragment, useEffect, useRef, useState } from 'react';
 import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
 import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
 import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
@@ -70,9 +69,9 @@ export const NotificationDrawerListItemHeader: React.FunctionComponent<Notificat
   actionHasNoOffset = false,
   ...props
 }: NotificationDrawerListItemHeaderProps) => {
-  const titleRef = React.useRef(null);
-  const [isTooltipVisible, setIsTooltipVisible] = React.useState(false);
-  React.useEffect(() => {
+  const titleRef = useRef(null);
+  const [isTooltipVisible, setIsTooltipVisible] = useState(false);
+  useEffect(() => {
     if (!titleRef.current || !truncateTitle) {
       return;
     }
@@ -95,7 +94,7 @@ export const NotificationDrawerListItemHeader: React.FunctionComponent<Notificat
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <div {...props} className={css(styles.notificationDrawerListItemHeader, className)}>
         <span className={css(styles.notificationDrawerListItemHeaderIcon)}>{icon ? icon : <Icon />}</span>
         {isTooltipVisible ? (
@@ -111,7 +110,7 @@ export const NotificationDrawerListItemHeader: React.FunctionComponent<Notificat
           {children}
         </div>
       )}
-    </React.Fragment>
+    </Fragment>
   );
 };
 NotificationDrawerListItemHeader.displayName = 'NotificationDrawerListItemHeader';
diff --git a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawer.test.tsx b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawer.test.tsx
index 41b13b38b91..626eeda2e40 100644
--- a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawer.test.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawer.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 
diff --git a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerBody.test.tsx b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerBody.test.tsx
index 73c2590b858..44372003815 100644
--- a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerBody.test.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerBody.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 
diff --git a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerGroup.test.tsx b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerGroup.test.tsx
index 64e6514124d..e926dbd97b6 100644
--- a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerGroup.test.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerGroup.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 
diff --git a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerGroupList.test.tsx b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerGroupList.test.tsx
index 6936d8755d9..ba2addc090c 100644
--- a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerGroupList.test.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerGroupList.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 
diff --git a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerHeader.test.tsx b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerHeader.test.tsx
index b43f185d70c..fc498c5db30 100644
--- a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerHeader.test.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerHeader.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 
diff --git a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerList.test.tsx b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerList.test.tsx
index 5f9fe254c27..4a012532ae0 100644
--- a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerList.test.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerList.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 
diff --git a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItem.test.tsx b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItem.test.tsx
index ded15c1fe24..06dddb1ba6f 100644
--- a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItem.test.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItem.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 
@@ -32,7 +30,7 @@ describe('NotificationDrawerListItem', () => {
     expect(screen.getByRole('listitem')).toContainHTML('<span class="pf-v6-screen-reader">unread</span>');
   });
 
-  test('drawer list item screen reader textcan be customized', () => {
+  test('drawer list item screen reader text can be customized', () => {
     render(<NotificationDrawerListItem readStateScreenReaderText="was read" />);
     expect(screen.getByRole('listitem')).toContainHTML('<span class="pf-v6-screen-reader">was read</span>');
   });
diff --git a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItemBody.test.tsx b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItemBody.test.tsx
index 34abdf85cd8..be2cc4cfb84 100644
--- a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItemBody.test.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItemBody.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 
diff --git a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItemHeader.test.tsx b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItemHeader.test.tsx
index 0ea3683db89..71245c21eb8 100644
--- a/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItemHeader.test.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/__tests__/NotificationDrawerListItemHeader.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 
diff --git a/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerBasic.tsx b/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerBasic.tsx
index 6b71ea88a02..778f977b477 100644
--- a/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerBasic.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   NotificationDrawer,
   NotificationDrawerBody,
diff --git a/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerGroups.tsx b/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerGroups.tsx
index e4bdfafc581..b3c05e21b35 100644
--- a/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerGroups.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerGroups.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   EmptyState,
diff --git a/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerLightweight.tsx b/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerLightweight.tsx
index 9021d0812ea..5d28f124e69 100644
--- a/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerLightweight.tsx
+++ b/packages/react-core/src/components/NotificationDrawer/examples/NotificationDrawerLightweight.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   EmptyState,
diff --git a/packages/react-core/src/components/NumberInput/NumberInput.tsx b/packages/react-core/src/components/NumberInput/NumberInput.tsx
index eb8d404bcb2..41e074db844 100644
--- a/packages/react-core/src/components/NumberInput/NumberInput.tsx
+++ b/packages/react-core/src/components/NumberInput/NumberInput.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/NumberInput/number-input';
 import { css } from '@patternfly/react-styles';
 import MinusIcon from '@patternfly/react-icons/dist/esm/icons/minus-icon';
diff --git a/packages/react-core/src/components/NumberInput/__tests__/NumberInput.test.tsx b/packages/react-core/src/components/NumberInput/__tests__/NumberInput.test.tsx
index 7506929d2d0..f8e4cd8e202 100644
--- a/packages/react-core/src/components/NumberInput/__tests__/NumberInput.test.tsx
+++ b/packages/react-core/src/components/NumberInput/__tests__/NumberInput.test.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import { NumberInput } from '../NumberInput';
 import userEvent from '@testing-library/user-event';
@@ -216,7 +216,7 @@ describe('numberInput', () => {
     const consoleSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
 
     const NumberInputWrapper = () => {
-      const [value, setValue] = React.useState(0);
+      const [value, setValue] = useState(0);
       const onChange = (event) => setValue(event.currentTarget.value);
       const inputProps = { onChange };
 
diff --git a/packages/react-core/src/components/NumberInput/examples/NumberInput.md b/packages/react-core/src/components/NumberInput/examples/NumberInput.md
index 6c55fcb5bc9..aae81092837 100644
--- a/packages/react-core/src/components/NumberInput/examples/NumberInput.md
+++ b/packages/react-core/src/components/NumberInput/examples/NumberInput.md
@@ -5,6 +5,8 @@ cssPrefix: pf-v6-c-number-input
 propComponents: ['NumberInput']
 ---
 
+import { Fragment } from 'react';
+
 ## Examples
 
 ### Default
diff --git a/packages/react-core/src/components/NumberInput/examples/NumberInputCustomStep.tsx b/packages/react-core/src/components/NumberInput/examples/NumberInputCustomStep.tsx
index c63f02b754b..1fee41baee3 100644
--- a/packages/react-core/src/components/NumberInput/examples/NumberInputCustomStep.tsx
+++ b/packages/react-core/src/components/NumberInput/examples/NumberInputCustomStep.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { NumberInput } from '@patternfly/react-core';
 
 export const NumberInputCustomStep: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/NumberInput/examples/NumberInputCustomStepAndThreshold.tsx b/packages/react-core/src/components/NumberInput/examples/NumberInputCustomStepAndThreshold.tsx
index f410c255616..09f79ff90e5 100644
--- a/packages/react-core/src/components/NumberInput/examples/NumberInputCustomStepAndThreshold.tsx
+++ b/packages/react-core/src/components/NumberInput/examples/NumberInputCustomStepAndThreshold.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { NumberInput } from '@patternfly/react-core';
 
 export const NumberInputCustomStepAndThreshold: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/NumberInput/examples/NumberInputDefault.tsx b/packages/react-core/src/components/NumberInput/examples/NumberInputDefault.tsx
index 4f86471db04..b4581a34533 100644
--- a/packages/react-core/src/components/NumberInput/examples/NumberInputDefault.tsx
+++ b/packages/react-core/src/components/NumberInput/examples/NumberInputDefault.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { NumberInput } from '@patternfly/react-core';
 
 export const NumberInputDefault: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/NumberInput/examples/NumberInputDisabled.tsx b/packages/react-core/src/components/NumberInput/examples/NumberInputDisabled.tsx
index 5f182ac00df..92f56e999c8 100644
--- a/packages/react-core/src/components/NumberInput/examples/NumberInputDisabled.tsx
+++ b/packages/react-core/src/components/NumberInput/examples/NumberInputDisabled.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { NumberInput } from '@patternfly/react-core';
 
 export const NumberInputDisabled: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/NumberInput/examples/NumberInputUnit.tsx b/packages/react-core/src/components/NumberInput/examples/NumberInputUnit.tsx
index 5cab6f02cc5..18c9ae808cb 100644
--- a/packages/react-core/src/components/NumberInput/examples/NumberInputUnit.tsx
+++ b/packages/react-core/src/components/NumberInput/examples/NumberInputUnit.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { NumberInput } from '@patternfly/react-core';
 
 export const NumberInputUnit: React.FunctionComponent = () => {
@@ -26,7 +26,7 @@ export const NumberInputUnit: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <NumberInput
         value={value1}
         onMinus={onMinus1}
@@ -52,6 +52,6 @@ export const NumberInputUnit: React.FunctionComponent = () => {
         unit="$"
         unitPosition="before"
       />
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/NumberInput/examples/NumberInputUnitThreshold.tsx b/packages/react-core/src/components/NumberInput/examples/NumberInputUnitThreshold.tsx
index 98cf3c66ed9..c52cef28436 100644
--- a/packages/react-core/src/components/NumberInput/examples/NumberInputUnitThreshold.tsx
+++ b/packages/react-core/src/components/NumberInput/examples/NumberInputUnitThreshold.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { NumberInput } from '@patternfly/react-core';
 
 export const NumberInputUnitThreshold: React.FunctionComponent = () => {
@@ -43,7 +43,7 @@ export const NumberInputUnitThreshold: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       With a minimum value of 0 and maximum value of 10
       <br />
       <NumberInput
@@ -60,6 +60,6 @@ export const NumberInputUnitThreshold: React.FunctionComponent = () => {
         plusBtnAriaLabel="plus"
         unit="%"
       />
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/NumberInput/examples/NumberInputVaryingSizes.tsx b/packages/react-core/src/components/NumberInput/examples/NumberInputVaryingSizes.tsx
index 9b4bc27f322..e06ba3c14bc 100644
--- a/packages/react-core/src/components/NumberInput/examples/NumberInputVaryingSizes.tsx
+++ b/packages/react-core/src/components/NumberInput/examples/NumberInputVaryingSizes.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { NumberInput } from '@patternfly/react-core';
 
 export const NumberInputVaryingSizes: React.FunctionComponent = () => {
@@ -24,7 +24,7 @@ export const NumberInputVaryingSizes: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <NumberInput
         value={input1Value}
         onMinus={() => onMinus(input1Value, setInput1Value)}
@@ -75,6 +75,6 @@ export const NumberInputVaryingSizes: React.FunctionComponent = () => {
         plusBtnAriaLabel="input 4 plus"
         widthChars={5}
       />
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/NumberInput/examples/NumberInputWithStatus.tsx b/packages/react-core/src/components/NumberInput/examples/NumberInputWithStatus.tsx
index fd9b9c0c533..95a9c18e942 100644
--- a/packages/react-core/src/components/NumberInput/examples/NumberInputWithStatus.tsx
+++ b/packages/react-core/src/components/NumberInput/examples/NumberInputWithStatus.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { NumberInput, ValidatedOptions } from '@patternfly/react-core';
 
 export const NumberInputWithStatus: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/OverflowMenu/OverflowMenu.tsx b/packages/react-core/src/components/OverflowMenu/OverflowMenu.tsx
index 75837ee1968..c1e10cda2e1 100644
--- a/packages/react-core/src/components/OverflowMenu/OverflowMenu.tsx
+++ b/packages/react-core/src/components/OverflowMenu/OverflowMenu.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 import styles from '@patternfly/react-styles/css/components/OverflowMenu/overflow-menu';
 import { css } from '@patternfly/react-styles';
 import { OverflowMenuContext } from './OverflowMenuContext';
@@ -22,7 +22,7 @@ export interface OverflowMenuState extends React.HTMLProps<HTMLDivElement> {
   breakpointRef: HTMLElement;
 }
 
-class OverflowMenu extends React.Component<OverflowMenuProps, OverflowMenuState> {
+class OverflowMenu extends Component<OverflowMenuProps, OverflowMenuState> {
   static displayName = 'OverflowMenu';
   constructor(props: OverflowMenuProps) {
     super(props);
diff --git a/packages/react-core/src/components/OverflowMenu/OverflowMenuContent.tsx b/packages/react-core/src/components/OverflowMenu/OverflowMenuContent.tsx
index d8ba43068e3..c64fd7bfb62 100644
--- a/packages/react-core/src/components/OverflowMenu/OverflowMenuContent.tsx
+++ b/packages/react-core/src/components/OverflowMenu/OverflowMenuContent.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/OverflowMenu/overflow-menu';
 import { OverflowMenuContext } from './OverflowMenuContext';
diff --git a/packages/react-core/src/components/OverflowMenu/OverflowMenuContext.tsx b/packages/react-core/src/components/OverflowMenu/OverflowMenuContext.tsx
index 59860d88ed7..f05150158e4 100644
--- a/packages/react-core/src/components/OverflowMenu/OverflowMenuContext.tsx
+++ b/packages/react-core/src/components/OverflowMenu/OverflowMenuContext.tsx
@@ -1,6 +1,6 @@
-import * as React from 'react';
+import { createContext } from 'react';
 
-export const OverflowMenuContext = React.createContext<{
+export const OverflowMenuContext = createContext<{
   isBelowBreakpoint?: boolean;
 }>({
   isBelowBreakpoint: false
diff --git a/packages/react-core/src/components/OverflowMenu/OverflowMenuControl.tsx b/packages/react-core/src/components/OverflowMenu/OverflowMenuControl.tsx
index cd4472555ec..7c11587ae0e 100644
--- a/packages/react-core/src/components/OverflowMenu/OverflowMenuControl.tsx
+++ b/packages/react-core/src/components/OverflowMenu/OverflowMenuControl.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/OverflowMenu/overflow-menu';
 import { OverflowMenuContext } from './OverflowMenuContext';
diff --git a/packages/react-core/src/components/OverflowMenu/OverflowMenuDropdownItem.tsx b/packages/react-core/src/components/OverflowMenu/OverflowMenuDropdownItem.tsx
index b7e0d79ca13..754c1615ef2 100644
--- a/packages/react-core/src/components/OverflowMenu/OverflowMenuDropdownItem.tsx
+++ b/packages/react-core/src/components/OverflowMenu/OverflowMenuDropdownItem.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { DropdownItem, DropdownItemProps } from '../Dropdown';
 import { OverflowMenuContext } from './OverflowMenuContext';
 
diff --git a/packages/react-core/src/components/OverflowMenu/OverflowMenuGroup.tsx b/packages/react-core/src/components/OverflowMenu/OverflowMenuGroup.tsx
index e4126ac3f98..e1b41de7b1a 100644
--- a/packages/react-core/src/components/OverflowMenu/OverflowMenuGroup.tsx
+++ b/packages/react-core/src/components/OverflowMenu/OverflowMenuGroup.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/OverflowMenu/overflow-menu';
 import { OverflowMenuContext } from './OverflowMenuContext';
diff --git a/packages/react-core/src/components/OverflowMenu/OverflowMenuItem.tsx b/packages/react-core/src/components/OverflowMenu/OverflowMenuItem.tsx
index 9252ac232c5..a4497084825 100644
--- a/packages/react-core/src/components/OverflowMenu/OverflowMenuItem.tsx
+++ b/packages/react-core/src/components/OverflowMenu/OverflowMenuItem.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/OverflowMenu/overflow-menu';
 import { OverflowMenuContext } from './OverflowMenuContext';
diff --git a/packages/react-core/src/components/OverflowMenu/__tests__/Generated/OverflowMenuControl.test.tsx b/packages/react-core/src/components/OverflowMenu/__tests__/Generated/OverflowMenuControl.test.tsx
index 7d03074c3d2..aa0f6906e2f 100644
--- a/packages/react-core/src/components/OverflowMenu/__tests__/Generated/OverflowMenuControl.test.tsx
+++ b/packages/react-core/src/components/OverflowMenu/__tests__/Generated/OverflowMenuControl.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { OverflowMenuControl } from '../../OverflowMenuControl';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/OverflowMenu/__tests__/Generated/OverflowMenuDropdownItem.test.tsx b/packages/react-core/src/components/OverflowMenu/__tests__/Generated/OverflowMenuDropdownItem.test.tsx
index 147ffc87aa4..b10aa071bb1 100644
--- a/packages/react-core/src/components/OverflowMenu/__tests__/Generated/OverflowMenuDropdownItem.test.tsx
+++ b/packages/react-core/src/components/OverflowMenu/__tests__/Generated/OverflowMenuDropdownItem.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render } from '@testing-library/react';
 
 import { OverflowMenuDropdownItem } from '../../OverflowMenuDropdownItem';
diff --git a/packages/react-core/src/components/OverflowMenu/__tests__/OverflowMenu.test.tsx b/packages/react-core/src/components/OverflowMenu/__tests__/OverflowMenu.test.tsx
index 9562f2e9fec..211ec3de20b 100644
--- a/packages/react-core/src/components/OverflowMenu/__tests__/OverflowMenu.test.tsx
+++ b/packages/react-core/src/components/OverflowMenu/__tests__/OverflowMenu.test.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-
+import { createRef } from 'react';
 import { render, screen } from '@testing-library/react';
 
 import styles from '@patternfly/react-styles/css/components/OverflowMenu/overflow-menu';
@@ -70,7 +69,7 @@ describe('OverflowMenu', () => {
 
   test('should call resizeObserver on React ref containerRefElement', () => {
     const resizeObserver = jest.spyOn(getResizeObserver, 'getResizeObserver');
-    const containerRef = React.createRef<HTMLDivElement>();
+    const containerRef = createRef<HTMLDivElement>();
 
     render(
       <div ref={containerRef}>
diff --git a/packages/react-core/src/components/OverflowMenu/__tests__/OverflowMenuControl.test.tsx b/packages/react-core/src/components/OverflowMenu/__tests__/OverflowMenuControl.test.tsx
index e3c0cc2a997..c8427f604e9 100644
--- a/packages/react-core/src/components/OverflowMenu/__tests__/OverflowMenuControl.test.tsx
+++ b/packages/react-core/src/components/OverflowMenu/__tests__/OverflowMenuControl.test.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import { render, screen } from '@testing-library/react';
 
 import styles from '@patternfly/react-styles/css/components/OverflowMenu/overflow-menu';
diff --git a/packages/react-core/src/components/OverflowMenu/__tests__/OverflowMenuGroup.test.tsx b/packages/react-core/src/components/OverflowMenu/__tests__/OverflowMenuGroup.test.tsx
index d0486c36219..3c261210ecb 100644
--- a/packages/react-core/src/components/OverflowMenu/__tests__/OverflowMenuGroup.test.tsx
+++ b/packages/react-core/src/components/OverflowMenu/__tests__/OverflowMenuGroup.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 
 import styles from '@patternfly/react-styles/css/components/OverflowMenu/overflow-menu';
diff --git a/packages/react-core/src/components/OverflowMenu/__tests__/OverflowMenuItem.test.tsx b/packages/react-core/src/components/OverflowMenu/__tests__/OverflowMenuItem.test.tsx
index ad760a31571..4cede4bb050 100644
--- a/packages/react-core/src/components/OverflowMenu/__tests__/OverflowMenuItem.test.tsx
+++ b/packages/react-core/src/components/OverflowMenu/__tests__/OverflowMenuItem.test.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import { render, screen } from '@testing-library/react';
 
 import styles from '@patternfly/react-styles/css/components/OverflowMenu/overflow-menu';
diff --git a/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuBreakpointOnContainer.tsx b/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuBreakpointOnContainer.tsx
index a366aed251b..bf7da51a3fc 100644
--- a/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuBreakpointOnContainer.tsx
+++ b/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuBreakpointOnContainer.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   OverflowMenu,
   OverflowMenuControl,
diff --git a/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuGroupTypes.tsx b/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuGroupTypes.tsx
index 5ca834db7db..146fd403b0a 100644
--- a/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuGroupTypes.tsx
+++ b/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuGroupTypes.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   OverflowMenu,
   OverflowMenuControl,
diff --git a/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuMultiGroup.tsx b/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuMultiGroup.tsx
index 67e546d63a0..7af612a39db 100644
--- a/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuMultiGroup.tsx
+++ b/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuMultiGroup.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   OverflowMenu,
   OverflowMenuControl,
diff --git a/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuPersistent.tsx b/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuPersistent.tsx
index c2d033aab98..734ba6b8d0e 100644
--- a/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuPersistent.tsx
+++ b/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuPersistent.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   OverflowMenu,
   OverflowMenuControl,
diff --git a/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuSimple.tsx b/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuSimple.tsx
index 3510baa7a07..92069de66eb 100644
--- a/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuSimple.tsx
+++ b/packages/react-core/src/components/OverflowMenu/examples/OverflowMenuSimple.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   OverflowMenu,
   OverflowMenuControl,
diff --git a/packages/react-core/src/components/Page/Page.tsx b/packages/react-core/src/components/Page/Page.tsx
index 46ca3eecc14..31bed9618e7 100644
--- a/packages/react-core/src/components/Page/Page.tsx
+++ b/packages/react-core/src/components/Page/Page.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, createRef, type JSX } from 'react';
 import styles from '@patternfly/react-styles/css/components/Page/page';
 import { css } from '@patternfly/react-styles';
 import globalBreakpointXl from '@patternfly/react-tokens/dist/esm/t_global_breakpoint_xl';
@@ -11,8 +11,6 @@ import { getBreakpoint, getVerticalBreakpoint } from '../../helpers/util';
 import { PageContextProvider } from './PageContext';
 import { PageBody } from './PageBody';
 
-import type { JSX } from 'react';
-
 export enum PageLayouts {
   vertical = 'vertical',
   horizontal = 'horizontal'
@@ -111,7 +109,7 @@ export interface PageState {
   height: number;
 }
 
-class Page extends React.Component<PageProps, PageState> {
+class Page extends Component<PageProps, PageState> {
   static displayName = 'Page';
   static defaultProps: PageProps = {
     isManagedSidebar: false,
@@ -124,8 +122,8 @@ class Page extends React.Component<PageProps, PageState> {
     getBreakpoint,
     getVerticalBreakpoint
   };
-  mainRef = React.createRef<HTMLDivElement>();
-  pageRef = React.createRef<HTMLDivElement>();
+  mainRef = createRef<HTMLDivElement>();
+  pageRef = createRef<HTMLDivElement>();
   observer: any = () => {};
 
   constructor(props: PageProps) {
diff --git a/packages/react-core/src/components/Page/PageBody.tsx b/packages/react-core/src/components/Page/PageBody.tsx
index 808e7a8259e..44912b5ab7c 100644
--- a/packages/react-core/src/components/Page/PageBody.tsx
+++ b/packages/react-core/src/components/Page/PageBody.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Page/page';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Page/PageBreadcrumb.tsx b/packages/react-core/src/components/Page/PageBreadcrumb.tsx
index e948503e8d3..a36db981ebf 100644
--- a/packages/react-core/src/components/Page/PageBreadcrumb.tsx
+++ b/packages/react-core/src/components/Page/PageBreadcrumb.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useContext, useEffect } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Page/page';
 import { formatBreakpointMods, Mods } from '../../helpers/util';
@@ -47,9 +47,9 @@ export const PageBreadcrumb = ({
   hasBodyWrapper = true,
   ...props
 }: PageBreadcrumbProps) => {
-  const { height, getVerticalBreakpoint } = React.useContext(PageContext);
+  const { height, getVerticalBreakpoint } = useContext(PageContext);
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (hasOverflowScroll && !ariaLabel) {
       /* eslint-disable no-console */
       console.warn('PageBreadcrumb: An accessible aria-label is required when hasOverflowScroll is set to true.');
diff --git a/packages/react-core/src/components/Page/PageContext.tsx b/packages/react-core/src/components/Page/PageContext.tsx
index c3d17dd4489..4dd1a898ae6 100644
--- a/packages/react-core/src/components/Page/PageContext.tsx
+++ b/packages/react-core/src/components/Page/PageContext.tsx
@@ -1,4 +1,5 @@
-import * as React from 'react';
+import { createContext } from 'react';
+
 import { getBreakpoint, getVerticalBreakpoint } from '../../helpers/util';
 
 export interface PageContextProps {
@@ -21,7 +22,7 @@ export const pageContextDefaults: PageContextProps = {
   getVerticalBreakpoint
 };
 
-export const PageContext = React.createContext<PageContextProps>(pageContextDefaults);
+export const PageContext = createContext<PageContextProps>(pageContextDefaults);
 
 export const PageContextProvider = PageContext.Provider;
 export const PageContextConsumer = PageContext.Consumer;
diff --git a/packages/react-core/src/components/Page/PageGroup.tsx b/packages/react-core/src/components/Page/PageGroup.tsx
index 67e37cd08af..105a9979ec6 100644
--- a/packages/react-core/src/components/Page/PageGroup.tsx
+++ b/packages/react-core/src/components/Page/PageGroup.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useContext, useEffect } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Page/page';
 import { formatBreakpointMods } from '../../helpers/util';
@@ -40,9 +40,9 @@ export const PageGroup = ({
   'aria-label': ariaLabel,
   ...props
 }: PageGroupProps) => {
-  const { height, getVerticalBreakpoint } = React.useContext(PageContext);
+  const { height, getVerticalBreakpoint } = useContext(PageContext);
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (hasOverflowScroll && !ariaLabel) {
       /* eslint-disable no-console */
       console.warn('PageGroup: An accessible aria-label is required when hasOverflowScroll is set to true.');
diff --git a/packages/react-core/src/components/Page/PageSection.tsx b/packages/react-core/src/components/Page/PageSection.tsx
index 25ae28baacc..774ba67a3c3 100644
--- a/packages/react-core/src/components/Page/PageSection.tsx
+++ b/packages/react-core/src/components/Page/PageSection.tsx
@@ -1,12 +1,10 @@
-import * as React from 'react';
+import { useContext, useEffect, type JSX } from 'react';
 import styles from '@patternfly/react-styles/css/components/Page/page';
 import { css } from '@patternfly/react-styles';
 import { formatBreakpointMods } from '../../helpers/util';
 import { PageContext } from './PageContext';
 import { PageBody } from './PageBody';
 
-import type { JSX } from 'react';
-
 export enum PageSectionVariants {
   default = 'default',
   secondary = 'secondary'
@@ -102,9 +100,9 @@ export const PageSection: React.FunctionComponent<PageSectionProps> = ({
   hasBodyWrapper = true,
   ...props
 }: PageSectionProps) => {
-  const { height, getVerticalBreakpoint } = React.useContext(PageContext);
+  const { height, getVerticalBreakpoint } = useContext(PageContext);
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (hasOverflowScroll && !ariaLabel) {
       /* eslint-disable no-console */
       console.warn('PageSection: An accessible aria-label is required when hasOverflowScroll is set to true.');
diff --git a/packages/react-core/src/components/Page/PageSidebar.tsx b/packages/react-core/src/components/Page/PageSidebar.tsx
index 3ece4f4e226..4d98af8bf7e 100644
--- a/packages/react-core/src/components/Page/PageSidebar.tsx
+++ b/packages/react-core/src/components/Page/PageSidebar.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { createContext } from 'react';
 import styles from '@patternfly/react-styles/css/components/Page/page';
 import { css } from '@patternfly/react-styles';
 import { PageContextConsumer } from './PageContext';
@@ -25,7 +25,7 @@ export interface PageSidebarContextProps {
 export const pageSidebarContextDefaults: PageSidebarContextProps = {
   isSidebarOpen: true
 };
-export const PageSidebarContext = React.createContext<Partial<PageSidebarContextProps>>(pageSidebarContextDefaults);
+export const PageSidebarContext = createContext<Partial<PageSidebarContextProps>>(pageSidebarContextDefaults);
 
 export const PageSidebar: React.FunctionComponent<PageSidebarProps> = ({
   className = '',
diff --git a/packages/react-core/src/components/Page/PageSidebarBody.tsx b/packages/react-core/src/components/Page/PageSidebarBody.tsx
index 11e194d310f..ef9eb06cdd0 100644
--- a/packages/react-core/src/components/Page/PageSidebarBody.tsx
+++ b/packages/react-core/src/components/Page/PageSidebarBody.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Page/page';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Page/PageToggleButton.tsx b/packages/react-core/src/components/Page/PageToggleButton.tsx
index de96bce02a6..d26ea303b74 100644
--- a/packages/react-core/src/components/Page/PageToggleButton.tsx
+++ b/packages/react-core/src/components/Page/PageToggleButton.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Button, ButtonProps, ButtonVariant } from '../../components/Button';
 import { PageContextConsumer, PageContextProps } from './PageContext';
 
diff --git a/packages/react-core/src/components/Page/__tests__/Generated/PageSidebar.test.tsx b/packages/react-core/src/components/Page/__tests__/Generated/PageSidebar.test.tsx
index 27317fbcfe0..391e7581843 100644
--- a/packages/react-core/src/components/Page/__tests__/Generated/PageSidebar.test.tsx
+++ b/packages/react-core/src/components/Page/__tests__/Generated/PageSidebar.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { PageSidebar } from '../../PageSidebar';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Page/__tests__/Page.test.tsx b/packages/react-core/src/components/Page/__tests__/Page.test.tsx
index a747f9fa8cc..dea572265bb 100644
--- a/packages/react-core/src/components/Page/__tests__/Page.test.tsx
+++ b/packages/react-core/src/components/Page/__tests__/Page.test.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import { render, screen } from '@testing-library/react';
 
 import { Page } from '../Page';
diff --git a/packages/react-core/src/components/Page/__tests__/PageBody.test.tsx b/packages/react-core/src/components/Page/__tests__/PageBody.test.tsx
index b2238f2d6db..3380ae053b8 100644
--- a/packages/react-core/src/components/Page/__tests__/PageBody.test.tsx
+++ b/packages/react-core/src/components/Page/__tests__/PageBody.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { PageBody } from '../PageBody';
 import styles from '@patternfly/react-styles/css/components/Page/page';
diff --git a/packages/react-core/src/components/Page/__tests__/PageBreadcrumb.test.tsx b/packages/react-core/src/components/Page/__tests__/PageBreadcrumb.test.tsx
index d018da31caa..dc5734a1ee0 100644
--- a/packages/react-core/src/components/Page/__tests__/PageBreadcrumb.test.tsx
+++ b/packages/react-core/src/components/Page/__tests__/PageBreadcrumb.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { PageBreadcrumb } from '../PageBreadcrumb';
 import styles from '@patternfly/react-styles/css/components/Page/page';
diff --git a/packages/react-core/src/components/Page/__tests__/PageGroup.test.tsx b/packages/react-core/src/components/Page/__tests__/PageGroup.test.tsx
index 73312b277f0..6ff0d053100 100644
--- a/packages/react-core/src/components/Page/__tests__/PageGroup.test.tsx
+++ b/packages/react-core/src/components/Page/__tests__/PageGroup.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { PageGroup } from '../PageGroup';
 import styles from '@patternfly/react-styles/css/components/Page/page';
diff --git a/packages/react-core/src/components/Page/__tests__/PageSection.test.tsx b/packages/react-core/src/components/Page/__tests__/PageSection.test.tsx
index b68f1c54b80..d0662dead9c 100644
--- a/packages/react-core/src/components/Page/__tests__/PageSection.test.tsx
+++ b/packages/react-core/src/components/Page/__tests__/PageSection.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { PageSection, PageSectionTypes } from '../PageSection';
 import styles from '@patternfly/react-styles/css/components/Page/page';
diff --git a/packages/react-core/src/components/Page/__tests__/PageSidebarBody.test.tsx b/packages/react-core/src/components/Page/__tests__/PageSidebarBody.test.tsx
index e0a7a738e3d..412392594bf 100644
--- a/packages/react-core/src/components/Page/__tests__/PageSidebarBody.test.tsx
+++ b/packages/react-core/src/components/Page/__tests__/PageSidebarBody.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { PageSidebarBody } from '../PageSidebarBody';
 import styles from '@patternfly/react-styles/css/components/Page/page';
diff --git a/packages/react-core/src/components/Page/examples/PageCenteredSection.tsx b/packages/react-core/src/components/Page/examples/PageCenteredSection.tsx
index 10d136138b7..f7cd297809d 100644
--- a/packages/react-core/src/components/Page/examples/PageCenteredSection.tsx
+++ b/packages/react-core/src/components/Page/examples/PageCenteredSection.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Page,
   Masthead,
diff --git a/packages/react-core/src/components/Page/examples/PageGroupSection.tsx b/packages/react-core/src/components/Page/examples/PageGroupSection.tsx
index 419b8e161aa..fea37838ef4 100644
--- a/packages/react-core/src/components/Page/examples/PageGroupSection.tsx
+++ b/packages/react-core/src/components/Page/examples/PageGroupSection.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Page,
   Masthead,
diff --git a/packages/react-core/src/components/Page/examples/PageHorizontalNav.tsx b/packages/react-core/src/components/Page/examples/PageHorizontalNav.tsx
index 42a6b56899d..bb3b4b44d42 100644
--- a/packages/react-core/src/components/Page/examples/PageHorizontalNav.tsx
+++ b/packages/react-core/src/components/Page/examples/PageHorizontalNav.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Page,
   Masthead,
diff --git a/packages/react-core/src/components/Page/examples/PageMainSectionPadding.tsx b/packages/react-core/src/components/Page/examples/PageMainSectionPadding.tsx
index 863ea9d3f9f..8e88b709566 100644
--- a/packages/react-core/src/components/Page/examples/PageMainSectionPadding.tsx
+++ b/packages/react-core/src/components/Page/examples/PageMainSectionPadding.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Page,
   Masthead,
diff --git a/packages/react-core/src/components/Page/examples/PageMainSectionVariations.tsx b/packages/react-core/src/components/Page/examples/PageMainSectionVariations.tsx
index 377ba7b5f6d..6e7713c6e64 100644
--- a/packages/react-core/src/components/Page/examples/PageMainSectionVariations.tsx
+++ b/packages/react-core/src/components/Page/examples/PageMainSectionVariations.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Page,
   Masthead,
diff --git a/packages/react-core/src/components/Page/examples/PageMultipleSidebarBody.tsx b/packages/react-core/src/components/Page/examples/PageMultipleSidebarBody.tsx
index 0aa8fb5c4c3..ac4135dd7c8 100644
--- a/packages/react-core/src/components/Page/examples/PageMultipleSidebarBody.tsx
+++ b/packages/react-core/src/components/Page/examples/PageMultipleSidebarBody.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Page,
   Masthead,
diff --git a/packages/react-core/src/components/Page/examples/PageUncontrolledNav.tsx b/packages/react-core/src/components/Page/examples/PageUncontrolledNav.tsx
index c67d85f3799..716246d5302 100644
--- a/packages/react-core/src/components/Page/examples/PageUncontrolledNav.tsx
+++ b/packages/react-core/src/components/Page/examples/PageUncontrolledNav.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Page,
   Masthead,
diff --git a/packages/react-core/src/components/Page/examples/PageVerticalNav.tsx b/packages/react-core/src/components/Page/examples/PageVerticalNav.tsx
index 57a22536664..299d572b90e 100644
--- a/packages/react-core/src/components/Page/examples/PageVerticalNav.tsx
+++ b/packages/react-core/src/components/Page/examples/PageVerticalNav.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Page,
   Masthead,
diff --git a/packages/react-core/src/components/Page/examples/PageWithOrWithoutFill.tsx b/packages/react-core/src/components/Page/examples/PageWithOrWithoutFill.tsx
index 94eb74ced61..21927ad8bfb 100644
--- a/packages/react-core/src/components/Page/examples/PageWithOrWithoutFill.tsx
+++ b/packages/react-core/src/components/Page/examples/PageWithOrWithoutFill.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Page,
   Masthead,
diff --git a/packages/react-core/src/components/Pagination/Navigation.tsx b/packages/react-core/src/components/Pagination/Navigation.tsx
index 5efdc74c3a1..6deddc61eb9 100644
--- a/packages/react-core/src/components/Pagination/Navigation.tsx
+++ b/packages/react-core/src/components/Pagination/Navigation.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 import styles from '@patternfly/react-styles/css/components/Pagination/pagination';
 import { css } from '@patternfly/react-styles';
 import AngleLeftIcon from '@patternfly/react-icons/dist/esm/icons/angle-left-icon';
@@ -64,7 +64,7 @@ export interface NavigationState {
   userInputPage?: number | string;
 }
 
-class Navigation extends React.Component<NavigationProps, NavigationState> {
+class Navigation extends Component<NavigationProps, NavigationState> {
   static displayName = 'Navigation';
   constructor(props: NavigationProps) {
     super(props);
diff --git a/packages/react-core/src/components/Pagination/Pagination.tsx b/packages/react-core/src/components/Pagination/Pagination.tsx
index 25c57ac6f62..c2c66413481 100644
--- a/packages/react-core/src/components/Pagination/Pagination.tsx
+++ b/packages/react-core/src/components/Pagination/Pagination.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useEffect, useRef } from 'react';
 import { ToggleTemplate, PaginationToggleTemplateProps } from './ToggleTemplate';
 import styles from '@patternfly/react-styles/css/components/Pagination/pagination';
 import { css } from '@patternfly/react-styles';
@@ -163,7 +163,7 @@ export interface PaginationProps extends React.HTMLProps<HTMLDivElement>, OUIAPr
   toggleTemplate?: ((props: PaginationToggleTemplateProps) => React.ReactElement<any>) | string;
   /** Position where pagination is rendered. */
   variant?: 'top' | 'bottom' | PaginationVariant;
-  /** Id to ideintify widget on page. */
+  /** Id to identify widget on page. */
   widgetId?: string;
   /** Value to overwrite the randomly generated data-ouia-component-id.*/
   ouiaId?: number | string;
@@ -234,14 +234,14 @@ export const Pagination: React.FunctionComponent<PaginationProps> = ({
   menuAppendTo,
   ...props
 }: PaginationProps) => {
-  const paginationRef = React.useRef<HTMLDivElement>(null);
-  const containerRef = React.useRef<HTMLDivElement>(null);
+  const paginationRef = useRef<HTMLDivElement>(null);
+  const containerRef = useRef<HTMLDivElement>(null);
 
   const getLastPage = () =>
     // when itemCount is not known let's set lastPage as page+1 as we don't know the total count
     itemCount || itemCount === 0 ? Math.ceil(itemCount / perPage) || 0 : page + 1;
 
-  React.useEffect(() => {
+  useEffect(() => {
     const node = paginationRef.current;
     handleInputWidth(getLastPage(), node);
   }, [perPage, itemCount]);
diff --git a/packages/react-core/src/components/Pagination/PaginationOptionsMenu.tsx b/packages/react-core/src/components/Pagination/PaginationOptionsMenu.tsx
index 58b8fc7fa1f..4b9fb9ddad1 100644
--- a/packages/react-core/src/components/Pagination/PaginationOptionsMenu.tsx
+++ b/packages/react-core/src/components/Pagination/PaginationOptionsMenu.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Pagination/pagination';
 import { Menu, MenuContent, MenuList, MenuItem } from '../Menu';
@@ -89,9 +89,9 @@ export const PaginationOptionsMenu: React.FunctionComponent<PaginationOptionsMen
   shouldPreventScrollOnItemFocus = true,
   focusTimeoutDelay = 0
 }: PaginationOptionsMenuProps) => {
-  const [isOpen, setIsOpen] = React.useState(false);
-  const toggleRef = React.useRef<HTMLButtonElement>(null);
-  const menuRef = React.useRef<HTMLDivElement>(null);
+  const [isOpen, setIsOpen] = useState(false);
+  const toggleRef = useRef<HTMLButtonElement>(null);
+  const menuRef = useRef<HTMLDivElement>(null);
 
   const onToggle = () => {
     setIsOpen((prevState) => !prevState);
@@ -121,7 +121,7 @@ export const PaginationOptionsMenu: React.FunctionComponent<PaginationOptionsMen
     return onPerPageSelect(_evt, newPerPage, newPage, startIdx, endIdx);
   };
 
-  React.useEffect(() => {
+  useEffect(() => {
     const handleMenuKeys = (event: KeyboardEvent) => {
       // Close the menu on tab or escape
       if (
diff --git a/packages/react-core/src/components/Pagination/ToggleTemplate.tsx b/packages/react-core/src/components/Pagination/ToggleTemplate.tsx
index aa5e0f971f5..27f58ac0d69 100644
--- a/packages/react-core/src/components/Pagination/ToggleTemplate.tsx
+++ b/packages/react-core/src/components/Pagination/ToggleTemplate.tsx
@@ -1,9 +1,9 @@
-import * as React from 'react';
-
 /** Allows more customization of the pagination dropdown toggle. The following properties
  * should be passed into the pagination component's toggleTemplate property.
  */
 
+import { Fragment } from 'react';
+
 export interface PaginationToggleTemplateProps {
   /** The first index of the items being paginated */
   firstIndex?: number;
@@ -24,11 +24,11 @@ export const ToggleTemplate: React.FunctionComponent<PaginationToggleTemplatePro
   itemsTitle = 'items',
   ofWord = 'of'
 }: PaginationToggleTemplateProps) => (
-  <React.Fragment>
+  <Fragment>
     <b>
       {firstIndex} - {lastIndex}
     </b>{' '}
     {ofWord} <b>{itemCount}</b> {itemsTitle}
-  </React.Fragment>
+  </Fragment>
 );
 ToggleTemplate.displayName = 'ToggleTemplate';
diff --git a/packages/react-core/src/components/Pagination/__tests__/Generated/Navigation.test.tsx b/packages/react-core/src/components/Pagination/__tests__/Generated/Navigation.test.tsx
index 4ebe5662e66..f4f2511067a 100644
--- a/packages/react-core/src/components/Pagination/__tests__/Generated/Navigation.test.tsx
+++ b/packages/react-core/src/components/Pagination/__tests__/Generated/Navigation.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { Navigation } from '../../Navigation';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Pagination/__tests__/Generated/PaginationOptionsMenu.test.tsx b/packages/react-core/src/components/Pagination/__tests__/Generated/PaginationOptionsMenu.test.tsx
index bd7bccfa0cc..0370aea7cf1 100644
--- a/packages/react-core/src/components/Pagination/__tests__/Generated/PaginationOptionsMenu.test.tsx
+++ b/packages/react-core/src/components/Pagination/__tests__/Generated/PaginationOptionsMenu.test.tsx
@@ -1,7 +1,7 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
+import { Fragment } from 'react';
 import { render } from '@testing-library/react';
 import { PaginationOptionsMenu } from '../../PaginationOptionsMenu';
 // any missing imports can usually be resolved by adding them here
@@ -26,12 +26,12 @@ it('PaginationOptionsMenu should match snapshot (auto-generated)', () => {
       perPage={0}
       lastPage={42}
       toggleTemplate={({ firstIndex, lastIndex, itemCount, itemsTitle }: PaginationToggleTemplateProps) => (
-        <React.Fragment>
+        <Fragment>
           <b>
             {firstIndex} - {lastIndex}
           </b>
           Custom toggle template of<b>{itemCount}</b> {itemsTitle}
-        </React.Fragment>
+        </Fragment>
       )}
       onPerPageSelect={() => null as any}
     />
diff --git a/packages/react-core/src/components/Pagination/__tests__/Generated/ToggleTemplate.test.tsx b/packages/react-core/src/components/Pagination/__tests__/Generated/ToggleTemplate.test.tsx
index 21d7f773545..cd15d0cce3c 100644
--- a/packages/react-core/src/components/Pagination/__tests__/Generated/ToggleTemplate.test.tsx
+++ b/packages/react-core/src/components/Pagination/__tests__/Generated/ToggleTemplate.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ToggleTemplate } from '../../ToggleTemplate';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Pagination/__tests__/Pagination.test.tsx b/packages/react-core/src/components/Pagination/__tests__/Pagination.test.tsx
index 60bb4437fac..c38ba33dc40 100644
--- a/packages/react-core/src/components/Pagination/__tests__/Pagination.test.tsx
+++ b/packages/react-core/src/components/Pagination/__tests__/Pagination.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-core/src/components/Pagination/__tests__/PaginationOptionsMenu.test.tsx b/packages/react-core/src/components/Pagination/__tests__/PaginationOptionsMenu.test.tsx
index 5a457a713bc..f005db01acb 100644
--- a/packages/react-core/src/components/Pagination/__tests__/PaginationOptionsMenu.test.tsx
+++ b/packages/react-core/src/components/Pagination/__tests__/PaginationOptionsMenu.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { PaginationOptionsMenu } from '../PaginationOptionsMenu';
 import { render, screen } from '@testing-library/react';
 
diff --git a/packages/react-core/src/components/Pagination/examples/Pagination.md b/packages/react-core/src/components/Pagination/examples/Pagination.md
index c6eb95e01c7..2ba27a5a928 100644
--- a/packages/react-core/src/components/Pagination/examples/Pagination.md
+++ b/packages/react-core/src/components/Pagination/examples/Pagination.md
@@ -6,6 +6,8 @@ propComponents: ['Pagination', PaginationTitles, PerPageOptions, PaginationToggl
 ouia: true
 ---
 
+import { Fragment } from 'react';
+
 ## Examples
 
 ### Top
diff --git a/packages/react-core/src/components/Pagination/examples/PaginationBottom.tsx b/packages/react-core/src/components/Pagination/examples/PaginationBottom.tsx
index b2005686809..eed56b6cf43 100644
--- a/packages/react-core/src/components/Pagination/examples/PaginationBottom.tsx
+++ b/packages/react-core/src/components/Pagination/examples/PaginationBottom.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Pagination, PaginationVariant } from '@patternfly/react-core';
 
 export const PaginationBottom: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Pagination/examples/PaginationCompact.tsx b/packages/react-core/src/components/Pagination/examples/PaginationCompact.tsx
index 954edcee953..afa53d3b0a6 100644
--- a/packages/react-core/src/components/Pagination/examples/PaginationCompact.tsx
+++ b/packages/react-core/src/components/Pagination/examples/PaginationCompact.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Pagination } from '@patternfly/react-core';
 
 export const PaginationCompact: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Pagination/examples/PaginationDisabled.tsx b/packages/react-core/src/components/Pagination/examples/PaginationDisabled.tsx
index f9ae68d14ff..61abb5a270c 100644
--- a/packages/react-core/src/components/Pagination/examples/PaginationDisabled.tsx
+++ b/packages/react-core/src/components/Pagination/examples/PaginationDisabled.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Pagination } from '@patternfly/react-core';
 
 export const PaginationDisabled: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Pagination/examples/PaginationIndeterminate.tsx b/packages/react-core/src/components/Pagination/examples/PaginationIndeterminate.tsx
index d4a4bfcfb08..584b91198ef 100644
--- a/packages/react-core/src/components/Pagination/examples/PaginationIndeterminate.tsx
+++ b/packages/react-core/src/components/Pagination/examples/PaginationIndeterminate.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Pagination } from '@patternfly/react-core';
 
 export const PaginationIndeterminate: React.FunctionComponent = () => {
@@ -21,13 +21,13 @@ export const PaginationIndeterminate: React.FunctionComponent = () => {
   return (
     <Pagination
       toggleTemplate={({ firstIndex, lastIndex }) => (
-        <React.Fragment>
+        <Fragment>
           <b>
             {firstIndex} - {lastIndex}
           </b>
           of
           <b>many</b>
-        </React.Fragment>
+        </Fragment>
       )}
       widgetId="indeterminate-example"
       perPage={perPage}
diff --git a/packages/react-core/src/components/Pagination/examples/PaginationInset.tsx b/packages/react-core/src/components/Pagination/examples/PaginationInset.tsx
index 59cbed9e461..44bcc59ab76 100644
--- a/packages/react-core/src/components/Pagination/examples/PaginationInset.tsx
+++ b/packages/react-core/src/components/Pagination/examples/PaginationInset.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Pagination } from '@patternfly/react-core';
 
 export const PaginationInset: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Pagination/examples/PaginationNoItems.tsx b/packages/react-core/src/components/Pagination/examples/PaginationNoItems.tsx
index 321b9a286bc..f9d9a1b2ee2 100644
--- a/packages/react-core/src/components/Pagination/examples/PaginationNoItems.tsx
+++ b/packages/react-core/src/components/Pagination/examples/PaginationNoItems.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Pagination } from '@patternfly/react-core';
 
 export const PaginationNoItems: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Pagination/examples/PaginationOffset.tsx b/packages/react-core/src/components/Pagination/examples/PaginationOffset.tsx
index da4e669a8b3..a22d8841312 100644
--- a/packages/react-core/src/components/Pagination/examples/PaginationOffset.tsx
+++ b/packages/react-core/src/components/Pagination/examples/PaginationOffset.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Pagination } from '@patternfly/react-core';
 
 export const PaginationOffset: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Pagination/examples/PaginationOnePage.tsx b/packages/react-core/src/components/Pagination/examples/PaginationOnePage.tsx
index 100f7d8b20d..7a3cefda36f 100644
--- a/packages/react-core/src/components/Pagination/examples/PaginationOnePage.tsx
+++ b/packages/react-core/src/components/Pagination/examples/PaginationOnePage.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Pagination } from '@patternfly/react-core';
 
 export const PaginationOnePage: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Pagination/examples/PaginationSticky.tsx b/packages/react-core/src/components/Pagination/examples/PaginationSticky.tsx
index 7298b129a51..6d31193a90c 100644
--- a/packages/react-core/src/components/Pagination/examples/PaginationSticky.tsx
+++ b/packages/react-core/src/components/Pagination/examples/PaginationSticky.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Pagination, PaginationVariant, Gallery, GalleryItem, Card, CardBody } from '@patternfly/react-core';
 
 export const PaginationSticky: React.FunctionComponent = () => {
@@ -37,7 +37,7 @@ export const PaginationSticky: React.FunctionComponent = () => {
   };
 
   return isTopSticky ? (
-    <React.Fragment>
+    <Fragment>
       <Pagination
         itemCount={itemCount}
         perPage={perPage}
@@ -50,9 +50,9 @@ export const PaginationSticky: React.FunctionComponent = () => {
         <button onClick={onToggleSticky}>Toggle to bottom position</button>
       </Pagination>
       <Gallery hasGutter>{buildCards()}</Gallery>
-    </React.Fragment>
+    </Fragment>
   ) : (
-    <React.Fragment>
+    <Fragment>
       <Gallery hasGutter>{buildCards()}</Gallery>
       <Pagination
         itemCount={itemCount}
@@ -66,6 +66,6 @@ export const PaginationSticky: React.FunctionComponent = () => {
       >
         <button onClick={onToggleSticky}>Toggle to top position</button>
       </Pagination>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Pagination/examples/PaginationTop.tsx b/packages/react-core/src/components/Pagination/examples/PaginationTop.tsx
index f51ca55f0ba..b03bc13fdb8 100644
--- a/packages/react-core/src/components/Pagination/examples/PaginationTop.tsx
+++ b/packages/react-core/src/components/Pagination/examples/PaginationTop.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Pagination } from '@patternfly/react-core';
 
 export const PaginationTop: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Panel/Panel.tsx b/packages/react-core/src/components/Panel/Panel.tsx
index c2bc5696f3e..31c82bd70c8 100644
--- a/packages/react-core/src/components/Panel/Panel.tsx
+++ b/packages/react-core/src/components/Panel/Panel.tsx
@@ -1,4 +1,5 @@
-import * as React from 'react';
+import { forwardRef } from 'react';
+
 import styles from '@patternfly/react-styles/css/components/Panel/panel';
 import { css } from '@patternfly/react-styles';
 
@@ -37,7 +38,5 @@ const PanelBase: React.FunctionComponent<PanelProps> = ({
   </div>
 );
 
-export const Panel = React.forwardRef((props: PanelProps, ref: React.Ref<any>) => (
-  <PanelBase innerRef={ref} {...props} />
-));
+export const Panel = forwardRef((props: PanelProps, ref: React.Ref<any>) => <PanelBase innerRef={ref} {...props} />);
 Panel.displayName = 'Panel';
diff --git a/packages/react-core/src/components/Panel/PanelFooter.tsx b/packages/react-core/src/components/Panel/PanelFooter.tsx
index 05cfc734e4b..00d1836a516 100644
--- a/packages/react-core/src/components/Panel/PanelFooter.tsx
+++ b/packages/react-core/src/components/Panel/PanelFooter.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Panel/panel';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Panel/PanelHeader.tsx b/packages/react-core/src/components/Panel/PanelHeader.tsx
index 25bf1d2f5e2..f7ce4dd5176 100644
--- a/packages/react-core/src/components/Panel/PanelHeader.tsx
+++ b/packages/react-core/src/components/Panel/PanelHeader.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Panel/panel';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Panel/PanelMain.tsx b/packages/react-core/src/components/Panel/PanelMain.tsx
index 2c35dd34078..08f84df5116 100644
--- a/packages/react-core/src/components/Panel/PanelMain.tsx
+++ b/packages/react-core/src/components/Panel/PanelMain.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Panel/panel';
 import { css } from '@patternfly/react-styles';
 import cssMaxHeight from '@patternfly/react-tokens/dist/esm/c_panel__main_MaxHeight';
diff --git a/packages/react-core/src/components/Panel/PanelMainBody.tsx b/packages/react-core/src/components/Panel/PanelMainBody.tsx
index 49f69a7f9d9..ef6eafe9328 100644
--- a/packages/react-core/src/components/Panel/PanelMainBody.tsx
+++ b/packages/react-core/src/components/Panel/PanelMainBody.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Panel/panel';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Panel/__tests__/Panel.test.tsx b/packages/react-core/src/components/Panel/__tests__/Panel.test.tsx
index 36a58030c21..e456c5de1cc 100644
--- a/packages/react-core/src/components/Panel/__tests__/Panel.test.tsx
+++ b/packages/react-core/src/components/Panel/__tests__/Panel.test.tsx
@@ -1,10 +1,9 @@
-import * as React from 'react';
+import { createRef, useEffect, useState } from 'react';
 import { render, screen } from '@testing-library/react';
 import { Panel } from '../Panel';
 import { PanelMain } from '../PanelMain';
 import { PanelMainBody } from '../PanelMainBody';
 import userEvent from '@testing-library/user-event';
-import { useEffect } from 'react';
 import styles from '@patternfly/react-styles/css/components/Panel/panel';
 
 test('Renders without children', () => {
@@ -58,10 +57,10 @@ test(`Renders with class name ${styles.modifiers.scrollable} when isScrollable i
 
 test('Renders with ref', async () => {
   const user = userEvent.setup();
-  const panelRef: React.RefObject<HTMLDivElement | null> = React.createRef();
+  const panelRef: React.RefObject<HTMLDivElement | null> = createRef();
 
   const BasicPanel = () => {
-    const [lastClickWasInPanel, setLastClickWasInPanel] = React.useState(false);
+    const [lastClickWasInPanel, setLastClickWasInPanel] = useState(false);
 
     const handleClick = (event) => {
       if (panelRef.current && panelRef.current.contains(event.target)) {
diff --git a/packages/react-core/src/components/Panel/__tests__/PanelFooter.test.tsx b/packages/react-core/src/components/Panel/__tests__/PanelFooter.test.tsx
index a7167c5346d..e034305f800 100644
--- a/packages/react-core/src/components/Panel/__tests__/PanelFooter.test.tsx
+++ b/packages/react-core/src/components/Panel/__tests__/PanelFooter.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { PanelFooter } from '../PanelFooter';
 import styles from '@patternfly/react-styles/css/components/Panel/panel';
diff --git a/packages/react-core/src/components/Panel/__tests__/PanelHeader.test.tsx b/packages/react-core/src/components/Panel/__tests__/PanelHeader.test.tsx
index 134c11e66bf..31de4c11be4 100644
--- a/packages/react-core/src/components/Panel/__tests__/PanelHeader.test.tsx
+++ b/packages/react-core/src/components/Panel/__tests__/PanelHeader.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { PanelHeader } from '../PanelHeader';
 import styles from '@patternfly/react-styles/css/components/Panel/panel';
diff --git a/packages/react-core/src/components/Panel/__tests__/PanelMain.test.tsx b/packages/react-core/src/components/Panel/__tests__/PanelMain.test.tsx
index f79f1ffc207..f78986f7f23 100644
--- a/packages/react-core/src/components/Panel/__tests__/PanelMain.test.tsx
+++ b/packages/react-core/src/components/Panel/__tests__/PanelMain.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { PanelMain } from '../PanelMain';
 import cssPanelMainMaxHeight from '@patternfly/react-tokens/dist/esm/c_panel__main_MaxHeight';
diff --git a/packages/react-core/src/components/Panel/__tests__/PanelMainBody.test.tsx b/packages/react-core/src/components/Panel/__tests__/PanelMainBody.test.tsx
index 71d08e55204..b65c1823ee7 100644
--- a/packages/react-core/src/components/Panel/__tests__/PanelMainBody.test.tsx
+++ b/packages/react-core/src/components/Panel/__tests__/PanelMainBody.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { PanelMainBody } from '../PanelMainBody';
 import styles from '@patternfly/react-styles/css/components/Panel/panel';
diff --git a/packages/react-core/src/components/Panel/examples/Panel.md b/packages/react-core/src/components/Panel/examples/Panel.md
index eb2b19cf863..a3cd9c5fc6d 100644
--- a/packages/react-core/src/components/Panel/examples/Panel.md
+++ b/packages/react-core/src/components/Panel/examples/Panel.md
@@ -10,7 +10,6 @@ propComponents: [Panel, PanelMain, PanelMainBody, PanelHeader, PanelFooter]
 ### Basic
 
 ```js
-import React from 'react';
 import { Panel, PanelMain, PanelMainBody } from '@patternfly/react-core';
 
 const BasicPanel = () => (
@@ -25,7 +24,6 @@ const BasicPanel = () => (
 ### Header
 
 ```js
-import React from 'react';
 import { Panel, PanelMain, PanelMainBody, PanelHeader, Divider } from '@patternfly/react-core';
 
 const HeaderPanel = () => (
@@ -42,7 +40,6 @@ const HeaderPanel = () => (
 ### Footer
 
 ```js
-import React from 'react';
 import { Panel, PanelMain, PanelMainBody, PanelFooter } from '@patternfly/react-core';
 
 const FooterPanel = () => (
@@ -58,7 +55,6 @@ const FooterPanel = () => (
 ### Header and footer
 
 ```js
-import React from 'react';
 import { Panel, PanelMain, PanelMainBody, PanelHeader, Divider, PanelFooter } from '@patternfly/react-core';
 
 const HeaderFooterPanel = () => (
@@ -76,7 +72,6 @@ const HeaderFooterPanel = () => (
 ### No body
 
 ```js
-import React from 'react';
 import { Panel, PanelMain } from '@patternfly/react-core';
 
 const NoBodyPanel = () => (
@@ -89,7 +84,6 @@ const NoBodyPanel = () => (
 ### Raised
 
 ```js
-import React from 'react';
 import { Panel, PanelMain, PanelMainBody } from '@patternfly/react-core';
 
 const RaisedPanel = () => (
@@ -104,7 +98,6 @@ const RaisedPanel = () => (
 ### Bordered
 
 ```js
-import React from 'react';
 import { Panel, PanelMain, PanelMainBody } from '@patternfly/react-core';
 
 const BorderedPanel = () => (
@@ -119,7 +112,6 @@ const BorderedPanel = () => (
 ### Secondary variant
 
 ```js
-import React from 'react';
 import { Panel, PanelMain, PanelMainBody } from '@patternfly/react-core';
 
 const PanelSecondaryVariant = () => (
@@ -134,7 +126,6 @@ const PanelSecondaryVariant = () => (
 ### Scrollable
 
 ```js
-import React from 'react';
 import { Panel, PanelMain, PanelMainBody } from '@patternfly/react-core';
 
 const ScrollablePanel = () => (
@@ -175,7 +166,6 @@ const ScrollablePanel = () => (
 ### Scrollable with header and footer
 
 ```js
-import React from 'react';
 import { Panel, PanelMain, PanelMainBody, PanelHeader, Divider, PanelFooter } from '@patternfly/react-core';
 
 const ScrollableHeaderFooterPanel = () => (
diff --git a/packages/react-core/src/components/Popover/Popover.tsx b/packages/react-core/src/components/Popover/Popover.tsx
index be203dae3ab..fd2b18e160a 100644
--- a/packages/react-core/src/components/Popover/Popover.tsx
+++ b/packages/react-core/src/components/Popover/Popover.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { ReactElement, useEffect, useRef, useState } from 'react';
 import { KeyTypes } from '../../helpers/constants';
 import styles from '@patternfly/react-styles/css/components/Popover/popover';
 import { css } from '@patternfly/react-styles';
@@ -11,7 +11,6 @@ import { PopoverCloseButton } from './PopoverCloseButton';
 import { PopoverArrow } from './PopoverArrow';
 import popoverMaxWidth from '@patternfly/react-tokens/dist/esm/c_popover_MaxWidth';
 import popoverMinWidth from '@patternfly/react-tokens/dist/esm/c_popover_MinWidth';
-import { ReactElement } from 'react';
 import { FocusTrap } from '../../helpers';
 import { Popper } from '../../helpers/Popper/Popper';
 import { getUniqueId } from '../../helpers/util';
@@ -279,14 +278,14 @@ export const Popover: React.FunctionComponent<PopoverProps> = ({
   // const hideOnClick = true;
   const uniqueId = id || getUniqueId();
   const triggerManually = isVisible !== null;
-  const [visible, setVisible] = React.useState(false);
-  const [focusTrapActive, setFocusTrapActive] = React.useState(Boolean(propWithFocusTrap));
-  const popoverRef = React.useRef(null);
+  const [visible, setVisible] = useState(false);
+  const [focusTrapActive, setFocusTrapActive] = useState(Boolean(propWithFocusTrap));
+  const popoverRef = useRef(null);
 
-  React.useEffect(() => {
+  useEffect(() => {
     onMount();
   }, []);
-  React.useEffect(() => {
+  useEffect(() => {
     if (triggerManually) {
       if (isVisible) {
         show(undefined, true);
diff --git a/packages/react-core/src/components/Popover/PopoverArrow.tsx b/packages/react-core/src/components/Popover/PopoverArrow.tsx
index 97c8c8db739..d6d2cbb7201 100644
--- a/packages/react-core/src/components/Popover/PopoverArrow.tsx
+++ b/packages/react-core/src/components/Popover/PopoverArrow.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Popover/popover';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Popover/PopoverBody.tsx b/packages/react-core/src/components/Popover/PopoverBody.tsx
index 28a7d4e8112..35b0adc7ae1 100644
--- a/packages/react-core/src/components/Popover/PopoverBody.tsx
+++ b/packages/react-core/src/components/Popover/PopoverBody.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Popover/popover';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Popover/PopoverCloseButton.tsx b/packages/react-core/src/components/Popover/PopoverCloseButton.tsx
index 58303eb16dd..aa36b6420af 100644
--- a/packages/react-core/src/components/Popover/PopoverCloseButton.tsx
+++ b/packages/react-core/src/components/Popover/PopoverCloseButton.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Popover/popover';
 import { Button } from '../Button';
diff --git a/packages/react-core/src/components/Popover/PopoverContent.tsx b/packages/react-core/src/components/Popover/PopoverContent.tsx
index 839ad882943..ffb996aee69 100644
--- a/packages/react-core/src/components/Popover/PopoverContent.tsx
+++ b/packages/react-core/src/components/Popover/PopoverContent.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Popover/popover';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Popover/PopoverContext.tsx b/packages/react-core/src/components/Popover/PopoverContext.tsx
index c2f9e4d99c7..19477c9264f 100644
--- a/packages/react-core/src/components/Popover/PopoverContext.tsx
+++ b/packages/react-core/src/components/Popover/PopoverContext.tsx
@@ -1,7 +1,6 @@
-import * as React from 'react';
-
+import { createContext } from 'react';
 interface PopoverContextProps {
   headerComponent?: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
 }
 
-export const PopoverContext = React.createContext<Partial<PopoverContextProps>>({});
+export const PopoverContext = createContext<Partial<PopoverContextProps>>({});
diff --git a/packages/react-core/src/components/Popover/PopoverDialog.tsx b/packages/react-core/src/components/Popover/PopoverDialog.tsx
index bc6096b06d0..41c6569e32e 100644
--- a/packages/react-core/src/components/Popover/PopoverDialog.tsx
+++ b/packages/react-core/src/components/Popover/PopoverDialog.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Popover/popover';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Popover/PopoverFooter.tsx b/packages/react-core/src/components/Popover/PopoverFooter.tsx
index 8643cbe5587..929bb5800a8 100644
--- a/packages/react-core/src/components/Popover/PopoverFooter.tsx
+++ b/packages/react-core/src/components/Popover/PopoverFooter.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Popover/popover';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Popover/PopoverHeader.tsx b/packages/react-core/src/components/Popover/PopoverHeader.tsx
index d0c27faeda4..bbcd0575f48 100644
--- a/packages/react-core/src/components/Popover/PopoverHeader.tsx
+++ b/packages/react-core/src/components/Popover/PopoverHeader.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Popover/popover';
 import { PopoverHeaderIcon } from './PopoverHeaderIcon';
diff --git a/packages/react-core/src/components/Popover/PopoverHeaderIcon.tsx b/packages/react-core/src/components/Popover/PopoverHeaderIcon.tsx
index 1ec4b05c7fe..eae053cf9b4 100644
--- a/packages/react-core/src/components/Popover/PopoverHeaderIcon.tsx
+++ b/packages/react-core/src/components/Popover/PopoverHeaderIcon.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Popover/popover';
 
diff --git a/packages/react-core/src/components/Popover/PopoverHeaderText.tsx b/packages/react-core/src/components/Popover/PopoverHeaderText.tsx
index 18551723a03..c072bab6620 100644
--- a/packages/react-core/src/components/Popover/PopoverHeaderText.tsx
+++ b/packages/react-core/src/components/Popover/PopoverHeaderText.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Popover/popover';
 
diff --git a/packages/react-core/src/components/Popover/__tests__/Generated/PopoverArrow.test.tsx b/packages/react-core/src/components/Popover/__tests__/Generated/PopoverArrow.test.tsx
index db36e57cbe0..f08a9a43459 100644
--- a/packages/react-core/src/components/Popover/__tests__/Generated/PopoverArrow.test.tsx
+++ b/packages/react-core/src/components/Popover/__tests__/Generated/PopoverArrow.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { PopoverArrow } from '../../PopoverArrow';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Popover/__tests__/Generated/PopoverBody.test.tsx b/packages/react-core/src/components/Popover/__tests__/Generated/PopoverBody.test.tsx
index 3a86b68156a..aa81e0fc8e5 100644
--- a/packages/react-core/src/components/Popover/__tests__/Generated/PopoverBody.test.tsx
+++ b/packages/react-core/src/components/Popover/__tests__/Generated/PopoverBody.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { PopoverBody } from '../../PopoverBody';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Popover/__tests__/Generated/PopoverCloseButton.test.tsx b/packages/react-core/src/components/Popover/__tests__/Generated/PopoverCloseButton.test.tsx
index 7982387c77b..50f0bc43950 100644
--- a/packages/react-core/src/components/Popover/__tests__/Generated/PopoverCloseButton.test.tsx
+++ b/packages/react-core/src/components/Popover/__tests__/Generated/PopoverCloseButton.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { PopoverCloseButton } from '../../PopoverCloseButton';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Popover/__tests__/Generated/PopoverContent.test.tsx b/packages/react-core/src/components/Popover/__tests__/Generated/PopoverContent.test.tsx
index dad0ad250a8..5a3522547f2 100644
--- a/packages/react-core/src/components/Popover/__tests__/Generated/PopoverContent.test.tsx
+++ b/packages/react-core/src/components/Popover/__tests__/Generated/PopoverContent.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { PopoverContent } from '../../PopoverContent';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Popover/__tests__/Generated/PopoverDialog.test.tsx b/packages/react-core/src/components/Popover/__tests__/Generated/PopoverDialog.test.tsx
index c22f55e8a70..3a8a81a2a48 100644
--- a/packages/react-core/src/components/Popover/__tests__/Generated/PopoverDialog.test.tsx
+++ b/packages/react-core/src/components/Popover/__tests__/Generated/PopoverDialog.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { PopoverDialog } from '../../PopoverDialog';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Popover/__tests__/Generated/PopoverFooter.test.tsx b/packages/react-core/src/components/Popover/__tests__/Generated/PopoverFooter.test.tsx
index 9ed13beb164..9ca41fbb012 100644
--- a/packages/react-core/src/components/Popover/__tests__/Generated/PopoverFooter.test.tsx
+++ b/packages/react-core/src/components/Popover/__tests__/Generated/PopoverFooter.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { PopoverFooter } from '../../PopoverFooter';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Popover/__tests__/Generated/PopoverHeader.test.tsx b/packages/react-core/src/components/Popover/__tests__/Generated/PopoverHeader.test.tsx
index 8345d084b00..7bc52490fea 100644
--- a/packages/react-core/src/components/Popover/__tests__/Generated/PopoverHeader.test.tsx
+++ b/packages/react-core/src/components/Popover/__tests__/Generated/PopoverHeader.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { PopoverHeader } from '../../PopoverHeader';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Popover/__tests__/Popover.test.tsx b/packages/react-core/src/components/Popover/__tests__/Popover.test.tsx
index e24cf0f7404..85ae5a0001e 100644
--- a/packages/react-core/src/components/Popover/__tests__/Popover.test.tsx
+++ b/packages/react-core/src/components/Popover/__tests__/Popover.test.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { StrictMode } from 'react';
 import { render } from '@testing-library/react';
 import { Popover, PopoverPosition } from '../Popover';
 
@@ -94,7 +94,7 @@ test('popover can close from content (uncontrolled)', () => {
 test('popover renders in strict mode', () => {
   const consoleError = jest.spyOn(console, 'error');
   const { asFragment } = render(
-    <React.StrictMode>
+    <StrictMode>
       <Popover
         id="test"
         position="top"
@@ -109,7 +109,7 @@ test('popover renders in strict mode', () => {
       >
         <div>Toggle Popover</div>
       </Popover>
-    </React.StrictMode>
+    </StrictMode>
   );
   expect(consoleError).not.toHaveBeenCalled();
   expect(asFragment()).toMatchSnapshot();
diff --git a/packages/react-core/src/components/Popover/examples/PopoverAdvanced.tsx b/packages/react-core/src/components/Popover/examples/PopoverAdvanced.tsx
index 36f96bfce66..5ebed4efc3a 100644
--- a/packages/react-core/src/components/Popover/examples/PopoverAdvanced.tsx
+++ b/packages/react-core/src/components/Popover/examples/PopoverAdvanced.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Popover, PopoverPosition, Checkbox, Button } from '@patternfly/react-core';
 
 export const PopoverAdvanced: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Popover/examples/PopoverAlert.tsx b/packages/react-core/src/components/Popover/examples/PopoverAlert.tsx
index a3884a71f89..de2bccb8ef3 100644
--- a/packages/react-core/src/components/Popover/examples/PopoverAlert.tsx
+++ b/packages/react-core/src/components/Popover/examples/PopoverAlert.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Popover, Button } from '@patternfly/react-core';
 import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
 import InfoCircleIcon from '@patternfly/react-icons/dist/esm/icons/info-circle-icon';
diff --git a/packages/react-core/src/components/Popover/examples/PopoverBasic.tsx b/packages/react-core/src/components/Popover/examples/PopoverBasic.tsx
index 4324eac6ee0..bb3ac377201 100644
--- a/packages/react-core/src/components/Popover/examples/PopoverBasic.tsx
+++ b/packages/react-core/src/components/Popover/examples/PopoverBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Popover, Button } from '@patternfly/react-core';
 
 export const PopoverBasic: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Popover/examples/PopoverCloseControlled.tsx b/packages/react-core/src/components/Popover/examples/PopoverCloseControlled.tsx
index f34c801b13c..8ea7d0d0572 100644
--- a/packages/react-core/src/components/Popover/examples/PopoverCloseControlled.tsx
+++ b/packages/react-core/src/components/Popover/examples/PopoverCloseControlled.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Popover, Button } from '@patternfly/react-core';
 
 export const PopoverCloseControlled: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Popover/examples/PopoverCloseUncontrolled.tsx b/packages/react-core/src/components/Popover/examples/PopoverCloseUncontrolled.tsx
index fe434217c3a..08b0e4e4f2c 100644
--- a/packages/react-core/src/components/Popover/examples/PopoverCloseUncontrolled.tsx
+++ b/packages/react-core/src/components/Popover/examples/PopoverCloseUncontrolled.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Popover, Button } from '@patternfly/react-core';
 
 export const PopoverCloseUncontrolled: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Popover/examples/PopoverCustomFocus.tsx b/packages/react-core/src/components/Popover/examples/PopoverCustomFocus.tsx
index 5bf84ffdadf..221cf1f3e01 100644
--- a/packages/react-core/src/components/Popover/examples/PopoverCustomFocus.tsx
+++ b/packages/react-core/src/components/Popover/examples/PopoverCustomFocus.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Popover, Button } from '@patternfly/react-core';
 
 export const PopoverCustomFocus: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Popover/examples/PopoverHover.tsx b/packages/react-core/src/components/Popover/examples/PopoverHover.tsx
index 0ed28b4fd80..7cc26aa67a6 100644
--- a/packages/react-core/src/components/Popover/examples/PopoverHover.tsx
+++ b/packages/react-core/src/components/Popover/examples/PopoverHover.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Popover, Button } from '@patternfly/react-core';
 
 export const PopoverHover: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Popover/examples/PopoverReactRef.tsx b/packages/react-core/src/components/Popover/examples/PopoverReactRef.tsx
index 32336376df1..f800a87c968 100644
--- a/packages/react-core/src/components/Popover/examples/PopoverReactRef.tsx
+++ b/packages/react-core/src/components/Popover/examples/PopoverReactRef.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Popover } from '@patternfly/react-core';
 
 export const PopoverReactRef: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Popover/examples/PopoverSelectorRef.tsx b/packages/react-core/src/components/Popover/examples/PopoverSelectorRef.tsx
index 25a25483890..bab54eb1618 100644
--- a/packages/react-core/src/components/Popover/examples/PopoverSelectorRef.tsx
+++ b/packages/react-core/src/components/Popover/examples/PopoverSelectorRef.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Popover } from '@patternfly/react-core';
 
 export const PopoverSelectorRef: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Popover/examples/PopoverWidthAuto.tsx b/packages/react-core/src/components/Popover/examples/PopoverWidthAuto.tsx
index 60dc0a9b58f..6abc5628011 100644
--- a/packages/react-core/src/components/Popover/examples/PopoverWidthAuto.tsx
+++ b/packages/react-core/src/components/Popover/examples/PopoverWidthAuto.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Popover, Button } from '@patternfly/react-core';
 
 export const PopoverWidthAuto: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Popover/examples/PopoverWithIconInTheTitle.tsx b/packages/react-core/src/components/Popover/examples/PopoverWithIconInTheTitle.tsx
index cda741f49db..24e4a9a85b4 100644
--- a/packages/react-core/src/components/Popover/examples/PopoverWithIconInTheTitle.tsx
+++ b/packages/react-core/src/components/Popover/examples/PopoverWithIconInTheTitle.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Popover, Button } from '@patternfly/react-core';
 import BullhornIcon from '@patternfly/react-icons/dist/esm/icons/bullhorn-icon';
 
diff --git a/packages/react-core/src/components/Popover/examples/PopoverWithoutHeaderFooterCloseNoPadding.tsx b/packages/react-core/src/components/Popover/examples/PopoverWithoutHeaderFooterCloseNoPadding.tsx
index 1110afd1858..a166d84aad8 100644
--- a/packages/react-core/src/components/Popover/examples/PopoverWithoutHeaderFooterCloseNoPadding.tsx
+++ b/packages/react-core/src/components/Popover/examples/PopoverWithoutHeaderFooterCloseNoPadding.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Popover, Button } from '@patternfly/react-core';
 
 export const PopoverWithoutHeaderFooterCloseNoPadding: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Progress/Progress.tsx b/packages/react-core/src/components/Progress/Progress.tsx
index 5faf76f30df..8fa3dcdbaf9 100644
--- a/packages/react-core/src/components/Progress/Progress.tsx
+++ b/packages/react-core/src/components/Progress/Progress.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 import styles from '@patternfly/react-styles/css/components/Progress/progress';
 import { css } from '@patternfly/react-styles';
 import { ProgressContainer, ProgressMeasureLocation } from './ProgressContainer';
@@ -48,7 +48,7 @@ export interface ProgressProps extends Omit<React.HTMLProps<HTMLDivElement>, 'si
   helperText?: React.ReactNode;
 }
 
-class Progress extends React.Component<ProgressProps> {
+class Progress extends Component<ProgressProps> {
   static displayName = 'Progress';
   static defaultProps: ProgressProps = {
     className: '',
diff --git a/packages/react-core/src/components/Progress/ProgressBar.tsx b/packages/react-core/src/components/Progress/ProgressBar.tsx
index 2815b97196e..b5dba415417 100644
--- a/packages/react-core/src/components/Progress/ProgressBar.tsx
+++ b/packages/react-core/src/components/Progress/ProgressBar.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Progress/progress';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Progress/ProgressContainer.tsx b/packages/react-core/src/components/Progress/ProgressContainer.tsx
index 76666fdec43..91f27e7ba7c 100644
--- a/packages/react-core/src/components/Progress/ProgressContainer.tsx
+++ b/packages/react-core/src/components/Progress/ProgressContainer.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Fragment, useState } from 'react';
 import progressStyle from '@patternfly/react-styles/css/components/Progress/progress';
 import { css } from '@patternfly/react-styles';
 import { Tooltip, TooltipPosition } from '../Tooltip';
@@ -79,7 +79,7 @@ export const ProgressContainer: React.FunctionComponent<ProgressContainerProps>
   helperText
 }: ProgressContainerProps) => {
   const StatusIcon = variantToIcon.hasOwnProperty(variant) && variantToIcon[variant];
-  const [tooltip, setTooltip] = React.useState('');
+  const [tooltip, setTooltip] = useState('');
   const onMouseEnter = (event: any) => {
     if (event.target.offsetWidth < event.target.scrollWidth) {
       setTooltip(title || event.target.innerHTML);
@@ -102,7 +102,7 @@ export const ProgressContainer: React.FunctionComponent<ProgressContainerProps>
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       {title &&
         (tooltip ? (
           <Tooltip position={tooltipPosition} content={tooltip} isVisible>
@@ -127,7 +127,7 @@ export const ProgressContainer: React.FunctionComponent<ProgressContainerProps>
         {measureLocation === ProgressMeasureLocation.inside && `${value}%`}
       </ProgressBar>
       {helperText && <ProgressHelperText>{helperText}</ProgressHelperText>}
-    </React.Fragment>
+    </Fragment>
   );
 };
 ProgressContainer.displayName = 'ProgressContainer';
diff --git a/packages/react-core/src/components/Progress/ProgressHelperText.tsx b/packages/react-core/src/components/Progress/ProgressHelperText.tsx
index 6c2863c2f8c..dbbba690e48 100644
--- a/packages/react-core/src/components/Progress/ProgressHelperText.tsx
+++ b/packages/react-core/src/components/Progress/ProgressHelperText.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import progressStyle from '@patternfly/react-styles/css/components/Progress/progress';
 
 export interface ProgressHelperTextProps extends React.HTMLProps<HTMLDivElement> {
diff --git a/packages/react-core/src/components/Progress/__tests__/Generated/ProgressBar.test.tsx b/packages/react-core/src/components/Progress/__tests__/Generated/ProgressBar.test.tsx
index 1dcacf58209..ad75874d845 100644
--- a/packages/react-core/src/components/Progress/__tests__/Generated/ProgressBar.test.tsx
+++ b/packages/react-core/src/components/Progress/__tests__/Generated/ProgressBar.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ProgressBar } from '../../ProgressBar';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Progress/__tests__/Generated/ProgressContainer.test.tsx b/packages/react-core/src/components/Progress/__tests__/Generated/ProgressContainer.test.tsx
index 4e14d940da4..30349f9f773 100644
--- a/packages/react-core/src/components/Progress/__tests__/Generated/ProgressContainer.test.tsx
+++ b/packages/react-core/src/components/Progress/__tests__/Generated/ProgressContainer.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ProgressContainer } from '../../ProgressContainer';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Progress/__tests__/Progress.test.tsx b/packages/react-core/src/components/Progress/__tests__/Progress.test.tsx
index 24194cb6e7b..5aaa17af300 100644
--- a/packages/react-core/src/components/Progress/__tests__/Progress.test.tsx
+++ b/packages/react-core/src/components/Progress/__tests__/Progress.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Progress, ProgressSize } from '../Progress';
 import { ProgressVariant, ProgressMeasureLocation } from '../ProgressContainer';
diff --git a/packages/react-core/src/components/Progress/__tests__/ProgressHelperText.test.tsx b/packages/react-core/src/components/Progress/__tests__/ProgressHelperText.test.tsx
index 787cee92e5a..37240ce77e3 100644
--- a/packages/react-core/src/components/Progress/__tests__/ProgressHelperText.test.tsx
+++ b/packages/react-core/src/components/Progress/__tests__/ProgressHelperText.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { ProgressHelperText } from '../ProgressHelperText';
 import styles from '@patternfly/react-styles/css/components/Progress/progress';
diff --git a/packages/react-core/src/components/Progress/examples/ProgressBasic.tsx b/packages/react-core/src/components/Progress/examples/ProgressBasic.tsx
index 8354e262026..66e8296a064 100644
--- a/packages/react-core/src/components/Progress/examples/ProgressBasic.tsx
+++ b/packages/react-core/src/components/Progress/examples/ProgressBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Progress } from '@patternfly/react-core';
 
 export const ProgressBasic: React.FunctionComponent = () => <Progress value={33} title="Title" />;
diff --git a/packages/react-core/src/components/Progress/examples/ProgressFailure.tsx b/packages/react-core/src/components/Progress/examples/ProgressFailure.tsx
index d41f6768909..a1fa9778504 100644
--- a/packages/react-core/src/components/Progress/examples/ProgressFailure.tsx
+++ b/packages/react-core/src/components/Progress/examples/ProgressFailure.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Progress, ProgressVariant } from '@patternfly/react-core';
 
 export const ProgressFailure: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Progress/examples/ProgressFailureWithoutMeasure.tsx b/packages/react-core/src/components/Progress/examples/ProgressFailureWithoutMeasure.tsx
index 164a997e98d..b6fe09370e4 100644
--- a/packages/react-core/src/components/Progress/examples/ProgressFailureWithoutMeasure.tsx
+++ b/packages/react-core/src/components/Progress/examples/ProgressFailureWithoutMeasure.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Progress, ProgressMeasureLocation, ProgressVariant } from '@patternfly/react-core';
 
 export const ProgressFailureWithoutMeasure: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Progress/examples/ProgressFiniteStep.tsx b/packages/react-core/src/components/Progress/examples/ProgressFiniteStep.tsx
index a00e6b2c1df..94b27ce8e22 100644
--- a/packages/react-core/src/components/Progress/examples/ProgressFiniteStep.tsx
+++ b/packages/react-core/src/components/Progress/examples/ProgressFiniteStep.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Progress, ProgressMeasureLocation } from '@patternfly/react-core';
 
 export const ProgressFiniteStep: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Progress/examples/ProgressHelperText.tsx b/packages/react-core/src/components/Progress/examples/ProgressHelperText.tsx
index bda9c2e5b9b..13c2255b8c6 100644
--- a/packages/react-core/src/components/Progress/examples/ProgressHelperText.tsx
+++ b/packages/react-core/src/components/Progress/examples/ProgressHelperText.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Progress, ProgressProps, HelperText, HelperTextItem, Radio } from '@patternfly/react-core';
 
 export const ProgressHelperText: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Progress/examples/ProgressInside.tsx b/packages/react-core/src/components/Progress/examples/ProgressInside.tsx
index 63702846161..dbf3d0037e5 100644
--- a/packages/react-core/src/components/Progress/examples/ProgressInside.tsx
+++ b/packages/react-core/src/components/Progress/examples/ProgressInside.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Progress, ProgressMeasureLocation } from '@patternfly/react-core';
 
 export const ProgressInside: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Progress/examples/ProgressInsideSuccess.tsx b/packages/react-core/src/components/Progress/examples/ProgressInsideSuccess.tsx
index 9b731eac103..e7c96f20bdd 100644
--- a/packages/react-core/src/components/Progress/examples/ProgressInsideSuccess.tsx
+++ b/packages/react-core/src/components/Progress/examples/ProgressInsideSuccess.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Progress, ProgressMeasureLocation, ProgressVariant } from '@patternfly/react-core';
 
 export const ProgressInsideSuccess: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Progress/examples/ProgressLarge.tsx b/packages/react-core/src/components/Progress/examples/ProgressLarge.tsx
index 6ef927cf25a..16c6517d0b1 100644
--- a/packages/react-core/src/components/Progress/examples/ProgressLarge.tsx
+++ b/packages/react-core/src/components/Progress/examples/ProgressLarge.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Progress, ProgressSize } from '@patternfly/react-core';
 
 export const ProgressLarge: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Progress/examples/ProgressOutside.tsx b/packages/react-core/src/components/Progress/examples/ProgressOutside.tsx
index c2069fe2bed..a3e06e570d4 100644
--- a/packages/react-core/src/components/Progress/examples/ProgressOutside.tsx
+++ b/packages/react-core/src/components/Progress/examples/ProgressOutside.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Progress, ProgressMeasureLocation } from '@patternfly/react-core';
 
 export const ProgressOutside: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Progress/examples/ProgressOutsideFailure.tsx b/packages/react-core/src/components/Progress/examples/ProgressOutsideFailure.tsx
index b6e879d3e2e..6f3762f0190 100644
--- a/packages/react-core/src/components/Progress/examples/ProgressOutsideFailure.tsx
+++ b/packages/react-core/src/components/Progress/examples/ProgressOutsideFailure.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Progress, ProgressMeasureLocation, ProgressVariant } from '@patternfly/react-core';
 
 export const ProgressOutsideFailure: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Progress/examples/ProgressSingleLine.tsx b/packages/react-core/src/components/Progress/examples/ProgressSingleLine.tsx
index b529a39c012..a71dd9f1e10 100644
--- a/packages/react-core/src/components/Progress/examples/ProgressSingleLine.tsx
+++ b/packages/react-core/src/components/Progress/examples/ProgressSingleLine.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Progress, ProgressMeasureLocation } from '@patternfly/react-core';
 
 export const ProgressSingleLine: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Progress/examples/ProgressSmall.tsx b/packages/react-core/src/components/Progress/examples/ProgressSmall.tsx
index c732475d330..a78d61c00ce 100644
--- a/packages/react-core/src/components/Progress/examples/ProgressSmall.tsx
+++ b/packages/react-core/src/components/Progress/examples/ProgressSmall.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Progress, ProgressSize } from '@patternfly/react-core';
 
 export const ProgressSmall: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Progress/examples/ProgressStepInstruction.tsx b/packages/react-core/src/components/Progress/examples/ProgressStepInstruction.tsx
index 3376f7bdf68..868544f491a 100644
--- a/packages/react-core/src/components/Progress/examples/ProgressStepInstruction.tsx
+++ b/packages/react-core/src/components/Progress/examples/ProgressStepInstruction.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Progress } from '@patternfly/react-core';
 
 export const ProgressStepInstruction: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Progress/examples/ProgressSuccess.tsx b/packages/react-core/src/components/Progress/examples/ProgressSuccess.tsx
index ef9ffc4bc26..16b7f8ee820 100644
--- a/packages/react-core/src/components/Progress/examples/ProgressSuccess.tsx
+++ b/packages/react-core/src/components/Progress/examples/ProgressSuccess.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Progress, ProgressVariant } from '@patternfly/react-core';
 
 export const ProgressSuccess: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Progress/examples/ProgressTitleOutsideOfProgressBar.tsx b/packages/react-core/src/components/Progress/examples/ProgressTitleOutsideOfProgressBar.tsx
index f570629a753..3157c5a7d13 100644
--- a/packages/react-core/src/components/Progress/examples/ProgressTitleOutsideOfProgressBar.tsx
+++ b/packages/react-core/src/components/Progress/examples/ProgressTitleOutsideOfProgressBar.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   DescriptionList,
   DescriptionListGroup,
diff --git a/packages/react-core/src/components/Progress/examples/ProgressTruncateTitle.tsx b/packages/react-core/src/components/Progress/examples/ProgressTruncateTitle.tsx
index a2f455256ba..fefbf7dc149 100644
--- a/packages/react-core/src/components/Progress/examples/ProgressTruncateTitle.tsx
+++ b/packages/react-core/src/components/Progress/examples/ProgressTruncateTitle.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Progress } from '@patternfly/react-core';
 
 export const ProgressTruncateTitle: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Progress/examples/ProgressWarning.tsx b/packages/react-core/src/components/Progress/examples/ProgressWarning.tsx
index 4eefe9880ef..790f94aa181 100644
--- a/packages/react-core/src/components/Progress/examples/ProgressWarning.tsx
+++ b/packages/react-core/src/components/Progress/examples/ProgressWarning.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Progress, ProgressVariant } from '@patternfly/react-core';
 
 export const ProgressWarning: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Progress/examples/ProgressWithoutMeasure.tsx b/packages/react-core/src/components/Progress/examples/ProgressWithoutMeasure.tsx
index 4cf8f4af7bb..f63d4600e10 100644
--- a/packages/react-core/src/components/Progress/examples/ProgressWithoutMeasure.tsx
+++ b/packages/react-core/src/components/Progress/examples/ProgressWithoutMeasure.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Progress, ProgressMeasureLocation } from '@patternfly/react-core';
 
 export const ProgressWithoutMeasure: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/ProgressStepper/ProgressStep.tsx b/packages/react-core/src/components/ProgressStepper/ProgressStep.tsx
index 163f4bc6e0e..5dd65e940a4 100644
--- a/packages/react-core/src/components/ProgressStepper/ProgressStep.tsx
+++ b/packages/react-core/src/components/ProgressStepper/ProgressStep.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/ProgressStepper/progress-stepper';
 import { css } from '@patternfly/react-styles';
 import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
@@ -70,7 +70,7 @@ export const ProgressStep: React.FunctionComponent<ProgressStepProps> = ({
 }: ProgressStepProps) => {
   const _icon = icon !== undefined ? icon : variantIcons[variant];
   const Component = popoverRender !== undefined ? 'button' : 'div';
-  const stepRef = React.useRef(undefined);
+  const stepRef = useRef(undefined);
 
   if (props.id === undefined || titleId === undefined) {
     /* eslint-disable no-console */
diff --git a/packages/react-core/src/components/ProgressStepper/ProgressStepper.tsx b/packages/react-core/src/components/ProgressStepper/ProgressStepper.tsx
index 7d4edbea555..037410ccbcd 100644
--- a/packages/react-core/src/components/ProgressStepper/ProgressStepper.tsx
+++ b/packages/react-core/src/components/ProgressStepper/ProgressStepper.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/ProgressStepper/progress-stepper';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/ProgressStepper/__tests__/ProgressStep.test.tsx b/packages/react-core/src/components/ProgressStepper/__tests__/ProgressStep.test.tsx
index 1fb64297dee..5352aac0e88 100644
--- a/packages/react-core/src/components/ProgressStepper/__tests__/ProgressStep.test.tsx
+++ b/packages/react-core/src/components/ProgressStepper/__tests__/ProgressStep.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { ProgressStep, ProgressStepVariant } from '../ProgressStep';
 import { capitalize } from '../../../helpers';
diff --git a/packages/react-core/src/components/ProgressStepper/__tests__/ProgressStepper.test.tsx b/packages/react-core/src/components/ProgressStepper/__tests__/ProgressStepper.test.tsx
index e3ea90d11a2..5cf65d3871f 100644
--- a/packages/react-core/src/components/ProgressStepper/__tests__/ProgressStepper.test.tsx
+++ b/packages/react-core/src/components/ProgressStepper/__tests__/ProgressStepper.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { ProgressStepper } from '../ProgressStepper';
 import styles from '@patternfly/react-styles/css/components/ProgressStepper/progress-stepper';
diff --git a/packages/react-core/src/components/ProgressStepper/examples/ProgressStepper.md b/packages/react-core/src/components/ProgressStepper/examples/ProgressStepper.md
index 7148ed3c163..ac021e6ee42 100644
--- a/packages/react-core/src/components/ProgressStepper/examples/ProgressStepper.md
+++ b/packages/react-core/src/components/ProgressStepper/examples/ProgressStepper.md
@@ -5,6 +5,7 @@ cssPrefix: pf-v6-c-progress-stepper
 propComponents: ['ProgressStepper', 'ProgressStep']
 ---
 
+import { Fragment } from 'react';
 import InProgressIcon from '@patternfly/react-icons/dist/esm/icons/in-progress-icon';
 import PendingIcon from '@patternfly/react-icons/dist/esm/icons/pending-icon';
 
diff --git a/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasic.tsx b/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasic.tsx
index c1b6e6d21d8..3ef5eedf446 100644
--- a/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasic.tsx
+++ b/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ProgressStepper, ProgressStep } from '@patternfly/react-core';
 
 export const ProgressStepperBasic: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasicFailure.tsx b/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasicFailure.tsx
index de7263121a6..5ea29b09fc0 100644
--- a/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasicFailure.tsx
+++ b/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasicFailure.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ProgressStepper, ProgressStep } from '@patternfly/react-core';
 
 export const ProgressStepperBasicFailure: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasicIssue.tsx b/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasicIssue.tsx
index 367ac3d809d..6780a2b3a1f 100644
--- a/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasicIssue.tsx
+++ b/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasicIssue.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ProgressStepper, ProgressStep } from '@patternfly/react-core';
 
 export const ProgressStepperBasicIssue: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasicWithAlignment.tsx b/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasicWithAlignment.tsx
index d98d731975c..bd1b04863a1 100644
--- a/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasicWithAlignment.tsx
+++ b/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasicWithAlignment.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { ProgressStepper, ProgressStep, Checkbox } from '@patternfly/react-core';
 
 export const ProgressStepperBasicWithAlignment: React.FunctionComponent = () => {
@@ -6,7 +6,7 @@ export const ProgressStepperBasicWithAlignment: React.FunctionComponent = () =>
   const [isCenterAligned, setIsCenterAligned] = React.useState(false);
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Checkbox
         label="Vertical alignment"
         isChecked={isVertical}
@@ -58,6 +58,6 @@ export const ProgressStepperBasicWithAlignment: React.FunctionComponent = () =>
           Third step
         </ProgressStep>
       </ProgressStepper>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasicWithDescription.tsx b/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasicWithDescription.tsx
index 0e72a71118d..fdb9edb6eaa 100644
--- a/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasicWithDescription.tsx
+++ b/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperBasicWithDescription.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ProgressStepper, ProgressStep } from '@patternfly/react-core';
 
 export const ProgressStepperBasicWithDescription: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperCompact.tsx b/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperCompact.tsx
index e4177241a7f..7f07918d82f 100644
--- a/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperCompact.tsx
+++ b/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperCompact.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { ProgressStepper, ProgressStep, Checkbox } from '@patternfly/react-core';
 
 export const ProgressStepperCompact: React.FunctionComponent = () => {
@@ -6,7 +6,7 @@ export const ProgressStepperCompact: React.FunctionComponent = () => {
   const [isCenterAligned, setIsCenterAligned] = React.useState(false);
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Checkbox
         label="Vertical alignment"
         isChecked={isVertical}
@@ -46,6 +46,6 @@ export const ProgressStepperCompact: React.FunctionComponent = () => {
           Third step
         </ProgressStep>
       </ProgressStepper>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperCustomIcons.tsx b/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperCustomIcons.tsx
index 94f42be4b43..22b723ec529 100644
--- a/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperCustomIcons.tsx
+++ b/packages/react-core/src/components/ProgressStepper/examples/ProgressStepperCustomIcons.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ProgressStepper, ProgressStep } from '@patternfly/react-core';
 import InProgressIcon from '@patternfly/react-icons/dist/esm/icons/in-progress-icon';
 import PendingIcon from '@patternfly/react-icons/dist/esm/icons/pending-icon';
diff --git a/packages/react-core/src/components/Radio/Radio.tsx b/packages/react-core/src/components/Radio/Radio.tsx
index 001a55ca063..7c3a1c45b6b 100644
--- a/packages/react-core/src/components/Radio/Radio.tsx
+++ b/packages/react-core/src/components/Radio/Radio.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 import styles from '@patternfly/react-styles/css/components/Radio/radio';
 import { css } from '@patternfly/react-styles';
 import { PickOptional } from '../../helpers/typeUtils';
@@ -47,7 +47,7 @@ export interface RadioProps
   ouiaSafe?: boolean;
 }
 
-class Radio extends React.Component<RadioProps, { ouiaStateId: string }> {
+class Radio extends Component<RadioProps, { ouiaStateId: string }> {
   static displayName = 'Radio';
   static defaultProps: PickOptional<RadioProps> = {
     className: '',
diff --git a/packages/react-core/src/components/Radio/__tests__/Radio.test.tsx b/packages/react-core/src/components/Radio/__tests__/Radio.test.tsx
index df31b91493e..4e6f2c2808e 100644
--- a/packages/react-core/src/components/Radio/__tests__/Radio.test.tsx
+++ b/packages/react-core/src/components/Radio/__tests__/Radio.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-core/src/components/Radio/examples/Radio.md b/packages/react-core/src/components/Radio/examples/Radio.md
index 978b3961a3f..13e954222c8 100644
--- a/packages/react-core/src/components/Radio/examples/Radio.md
+++ b/packages/react-core/src/components/Radio/examples/Radio.md
@@ -7,6 +7,8 @@ propComponents: ['Radio']
 ouia: true
 ---
 
+import { Fragment } from 'react';
+
 ## Examples
 
 ### Controlled
diff --git a/packages/react-core/src/components/Radio/examples/RadioControlled.tsx b/packages/react-core/src/components/Radio/examples/RadioControlled.tsx
index 957da3eb7e0..12a66ad7739 100644
--- a/packages/react-core/src/components/Radio/examples/RadioControlled.tsx
+++ b/packages/react-core/src/components/Radio/examples/RadioControlled.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Radio } from '@patternfly/react-core';
 
 export const RadioControlled: React.FunctionComponent = () => {
@@ -8,7 +8,7 @@ export const RadioControlled: React.FunctionComponent = () => {
     setCheck1(true);
   };
   return (
-    <React.Fragment>
+    <Fragment>
       <Radio
         isChecked={check1}
         name="radio-1"
@@ -16,6 +16,6 @@ export const RadioControlled: React.FunctionComponent = () => {
         label="Controlled Radio"
         id="radio-controlled"
       ></Radio>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Radio/examples/RadioDisabled.tsx b/packages/react-core/src/components/Radio/examples/RadioDisabled.tsx
index 08183cb58b4..53d58977144 100644
--- a/packages/react-core/src/components/Radio/examples/RadioDisabled.tsx
+++ b/packages/react-core/src/components/Radio/examples/RadioDisabled.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Radio } from '@patternfly/react-core';
 
 export const RadioDisabled: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Radio id="radio-disabled" label="Disabled radio example" isDisabled name="radio-5" />
     <Radio
       id="radio-disabled-checked"
@@ -11,5 +11,5 @@ export const RadioDisabled: React.FunctionComponent = () => (
       isDisabled
       name="radio-6"
     />
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Radio/examples/RadioLabelWraps.tsx b/packages/react-core/src/components/Radio/examples/RadioLabelWraps.tsx
index c7888590b8f..1977696666f 100644
--- a/packages/react-core/src/components/Radio/examples/RadioLabelWraps.tsx
+++ b/packages/react-core/src/components/Radio/examples/RadioLabelWraps.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Radio } from '@patternfly/react-core';
 
 export const RadioLabelWraps: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Radio/examples/RadioReversed.tsx b/packages/react-core/src/components/Radio/examples/RadioReversed.tsx
index 3544734ca5c..d61a9a6aa3b 100644
--- a/packages/react-core/src/components/Radio/examples/RadioReversed.tsx
+++ b/packages/react-core/src/components/Radio/examples/RadioReversed.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Radio } from '@patternfly/react-core';
 
 export const RadioReversed: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Radio/examples/RadioStandaloneInput.tsx b/packages/react-core/src/components/Radio/examples/RadioStandaloneInput.tsx
index 4f0aac7f8e1..7ea7cbe6fcd 100644
--- a/packages/react-core/src/components/Radio/examples/RadioStandaloneInput.tsx
+++ b/packages/react-core/src/components/Radio/examples/RadioStandaloneInput.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Radio } from '@patternfly/react-core';
 
 export const RadioStandaloneInput: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Radio/examples/RadioUncontrolled.tsx b/packages/react-core/src/components/Radio/examples/RadioUncontrolled.tsx
index da70f382536..e210004088e 100644
--- a/packages/react-core/src/components/Radio/examples/RadioUncontrolled.tsx
+++ b/packages/react-core/src/components/Radio/examples/RadioUncontrolled.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Radio } from '@patternfly/react-core';
 
 export const RadioUncontrolled: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Radio/examples/RadioWithBody.tsx b/packages/react-core/src/components/Radio/examples/RadioWithBody.tsx
index 804550d5ad0..a3e04e849e1 100644
--- a/packages/react-core/src/components/Radio/examples/RadioWithBody.tsx
+++ b/packages/react-core/src/components/Radio/examples/RadioWithBody.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Radio } from '@patternfly/react-core';
 
 export const RadioWithBody: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Radio/examples/RadioWithDescription.tsx b/packages/react-core/src/components/Radio/examples/RadioWithDescription.tsx
index 2e92b7795b7..be993a20479 100644
--- a/packages/react-core/src/components/Radio/examples/RadioWithDescription.tsx
+++ b/packages/react-core/src/components/Radio/examples/RadioWithDescription.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Radio } from '@patternfly/react-core';
 
 export const RadioWithDescription: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Radio/examples/RadioWithDescriptionAndBody.tsx b/packages/react-core/src/components/Radio/examples/RadioWithDescriptionAndBody.tsx
index c50158c3968..2e5c2734cb9 100644
--- a/packages/react-core/src/components/Radio/examples/RadioWithDescriptionAndBody.tsx
+++ b/packages/react-core/src/components/Radio/examples/RadioWithDescriptionAndBody.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Radio } from '@patternfly/react-core';
 
 export const RadioWithDescriptionAndBody: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/SearchInput/AdvancedSearchMenu.tsx b/packages/react-core/src/components/SearchInput/AdvancedSearchMenu.tsx
index f8d927619ce..e4b1aa93ba2 100644
--- a/packages/react-core/src/components/SearchInput/AdvancedSearchMenu.tsx
+++ b/packages/react-core/src/components/SearchInput/AdvancedSearchMenu.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { Button } from '../Button';
 import { ActionGroup, Form, FormGroup } from '../Form';
 import { TextInput } from '../TextInput';
@@ -67,10 +67,10 @@ export const AdvancedSearchMenu: React.FunctionComponent<AdvancedSearchMenuProps
   isSearchMenuOpen,
   onToggleAdvancedMenu
 }: AdvancedSearchMenuProps) => {
-  const firstAttrRef = React.useRef(null);
-  const [putFocusBackOnInput, setPutFocusBackOnInput] = React.useState(false);
+  const firstAttrRef = useRef(null);
+  const [putFocusBackOnInput, setPutFocusBackOnInput] = useState(false);
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (attributes.length > 0 && !advancedSearchDelimiter) {
       // eslint-disable-next-line no-console
       console.error(
@@ -79,7 +79,7 @@ export const AdvancedSearchMenu: React.FunctionComponent<AdvancedSearchMenuProps
     }
   });
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (isSearchMenuOpen && firstAttrRef && firstAttrRef.current) {
       firstAttrRef.current.focus();
       setPutFocusBackOnInput(true);
@@ -88,7 +88,7 @@ export const AdvancedSearchMenu: React.FunctionComponent<AdvancedSearchMenuProps
     }
   }, [isSearchMenuOpen]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     document.addEventListener('mousedown', onDocClick);
     document.addEventListener('touchstart', onDocClick);
     document.addEventListener('keydown', onEscPress);
diff --git a/packages/react-core/src/components/SearchInput/SearchInput.tsx b/packages/react-core/src/components/SearchInput/SearchInput.tsx
index 01939fd3d80..034ca70bd64 100644
--- a/packages/react-core/src/components/SearchInput/SearchInput.tsx
+++ b/packages/react-core/src/components/SearchInput/SearchInput.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef, useEffect, useRef, useState } from 'react';
 import { css } from '@patternfly/react-styles';
 import { Button, ButtonVariant } from '../Button';
 import { Badge } from '../Badge';
@@ -16,7 +16,7 @@ import { Popper } from '../../helpers';
 import textInputGroupStyles from '@patternfly/react-styles/css/components/TextInputGroup/text-input-group';
 
 /** Properties for adding search attributes to an advanced search input. These properties must
- * be passed in as an object within an array to the search input component's attribute properrty.
+ * be passed in as an object within an array to the search input component's attribute property.
  */
 
 export interface SearchInputSearchAttribute {
@@ -122,7 +122,7 @@ export interface SearchInputProps extends Omit<React.HTMLProps<HTMLDivElement>,
   submitSearchButtonLabel?: string;
   /** Value of the search input. */
   value?: string;
-  /** Name attribue for the search input */
+  /** Name attribute for the search input */
   name?: string;
   /** Additional props to spread to the search input element. */
   inputProps?: any;
@@ -164,19 +164,19 @@ const SearchInputBase: React.FunctionComponent<SearchInputProps> = ({
   inputProps,
   ...props
 }: SearchInputProps) => {
-  const [isSearchMenuOpen, setIsSearchMenuOpen] = React.useState(false);
-  const [searchValue, setSearchValue] = React.useState(value);
-  const searchInputRef = React.useRef(null);
-  const ref = React.useRef(null);
+  const [isSearchMenuOpen, setIsSearchMenuOpen] = useState(false);
+  const [searchValue, setSearchValue] = useState(value);
+  const searchInputRef = useRef(null);
+  const ref = useRef(null);
   const searchInputInputRef = innerRef || ref;
-  const searchInputExpandableToggleRef = React.useRef(null);
-  const triggerRef = React.useRef(null);
-  const popperRef = React.useRef(null);
-  const [focusAfterExpandChange, setFocusAfterExpandChange] = React.useState(false);
+  const searchInputExpandableToggleRef = useRef(null);
+  const triggerRef = useRef(null);
+  const popperRef = useRef(null);
+  const [focusAfterExpandChange, setFocusAfterExpandChange] = useState(false);
 
   const { isExpanded, onToggleExpand, toggleAriaLabel } = expandableInput || {};
 
-  React.useEffect(() => {
+  useEffect(() => {
     // this effect and the focusAfterExpandChange variable are needed to focus the input/toggle as needed when the
     // expansion toggle is fired without focusing on mount
     if (!focusAfterExpandChange) {
@@ -189,11 +189,11 @@ const SearchInputBase: React.FunctionComponent<SearchInputProps> = ({
     setFocusAfterExpandChange(false);
   }, [focusAfterExpandChange, isExpanded, searchInputInputRef, searchInputExpandableToggleRef]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     setSearchValue(value);
   }, [value]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (attributes.length > 0 && !advancedSearchDelimiter) {
       // eslint-disable-next-line no-console
       console.error(
@@ -202,7 +202,7 @@ const SearchInputBase: React.FunctionComponent<SearchInputProps> = ({
     }
   });
 
-  React.useEffect(() => {
+  useEffect(() => {
     setIsSearchMenuOpen(isAdvancedSearchOpen);
   }, [isAdvancedSearchOpen]);
 
@@ -472,7 +472,7 @@ const SearchInputBase: React.FunctionComponent<SearchInputProps> = ({
 };
 SearchInputBase.displayName = 'SearchInputBase';
 
-export const SearchInput = React.forwardRef((props: SearchInputProps, ref: React.Ref<HTMLInputElement>) => (
+export const SearchInput = forwardRef((props: SearchInputProps, ref: React.Ref<HTMLInputElement>) => (
   <SearchInputBase {...props} innerRef={ref as React.MutableRefObject<any>} />
 ));
 SearchInput.displayName = 'SearchInput';
diff --git a/packages/react-core/src/components/SearchInput/__tests__/SearchInput.test.tsx b/packages/react-core/src/components/SearchInput/__tests__/SearchInput.test.tsx
index 6782e6c4e87..03c6e294c31 100644
--- a/packages/react-core/src/components/SearchInput/__tests__/SearchInput.test.tsx
+++ b/packages/react-core/src/components/SearchInput/__tests__/SearchInput.test.tsx
@@ -1,5 +1,4 @@
-import React from 'react';
-
+import { StrictMode } from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
@@ -43,7 +42,7 @@ describe('SearchInput', () => {
 
     const consoleError = jest.spyOn(console, 'error');
     const { asFragment } = render(
-      <React.StrictMode>
+      <StrictMode>
         <SearchInput
           attributes={[
             { attr: 'username', display: 'Username' },
@@ -55,7 +54,7 @@ describe('SearchInput', () => {
           onSearch={props.onSearch}
           onClear={props.onClear}
         />
-      </React.StrictMode>
+      </StrictMode>
     );
     await user.click(screen.getByRole('button', { name: 'Search' }));
     expect(consoleError).not.toHaveBeenCalled();
diff --git a/packages/react-core/src/components/SearchInput/examples/SearchInputAdvanced.tsx b/packages/react-core/src/components/SearchInput/examples/SearchInputAdvanced.tsx
index bc51ac7d2ac..1aa3fd6641d 100644
--- a/packages/react-core/src/components/SearchInput/examples/SearchInputAdvanced.tsx
+++ b/packages/react-core/src/components/SearchInput/examples/SearchInputAdvanced.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button, Checkbox, FormGroup, SearchInput } from '@patternfly/react-core';
 import ExternalLinkSquareAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-square-alt-icon';
 
diff --git a/packages/react-core/src/components/SearchInput/examples/SearchInputBasic.tsx b/packages/react-core/src/components/SearchInput/examples/SearchInputBasic.tsx
index b3553edc53e..fff5d272e0b 100644
--- a/packages/react-core/src/components/SearchInput/examples/SearchInputBasic.tsx
+++ b/packages/react-core/src/components/SearchInput/examples/SearchInputBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { SearchInput } from '@patternfly/react-core';
 
 export const SearchInputBasic: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/SearchInput/examples/SearchInputFocusSearch.tsx b/packages/react-core/src/components/SearchInput/examples/SearchInputFocusSearch.tsx
index 2acdf8d9167..076eb4a067c 100644
--- a/packages/react-core/src/components/SearchInput/examples/SearchInputFocusSearch.tsx
+++ b/packages/react-core/src/components/SearchInput/examples/SearchInputFocusSearch.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { SearchInput, Button } from '@patternfly/react-core';
 
 export const SearchInputFocusSearch: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/SearchInput/examples/SearchInputWithExpandable.tsx b/packages/react-core/src/components/SearchInput/examples/SearchInputWithExpandable.tsx
index 99960331bef..cabb37f388f 100644
--- a/packages/react-core/src/components/SearchInput/examples/SearchInputWithExpandable.tsx
+++ b/packages/react-core/src/components/SearchInput/examples/SearchInputWithExpandable.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { SearchInput } from '@patternfly/react-core';
 
 export const SearchInputWithExpandable: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/SearchInput/examples/SearchInputWithNavigableOptions.tsx b/packages/react-core/src/components/SearchInput/examples/SearchInputWithNavigableOptions.tsx
index 3a0f4ff7c47..a8725e72cce 100644
--- a/packages/react-core/src/components/SearchInput/examples/SearchInputWithNavigableOptions.tsx
+++ b/packages/react-core/src/components/SearchInput/examples/SearchInputWithNavigableOptions.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { SearchInput } from '@patternfly/react-core';
 
 export const SearchInputWithNavigableOptions: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/SearchInput/examples/SearchInputWithResultCount.tsx b/packages/react-core/src/components/SearchInput/examples/SearchInputWithResultCount.tsx
index c89c6a523dc..51e4c7f863b 100644
--- a/packages/react-core/src/components/SearchInput/examples/SearchInputWithResultCount.tsx
+++ b/packages/react-core/src/components/SearchInput/examples/SearchInputWithResultCount.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { SearchInput } from '@patternfly/react-core';
 
 export const SearchInputWithResultCount: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/SearchInput/examples/SearchInputWithSubmitButton.tsx b/packages/react-core/src/components/SearchInput/examples/SearchInputWithSubmitButton.tsx
index 6c82e1e4422..9f488b4a14e 100644
--- a/packages/react-core/src/components/SearchInput/examples/SearchInputWithSubmitButton.tsx
+++ b/packages/react-core/src/components/SearchInput/examples/SearchInputWithSubmitButton.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { SearchInput } from '@patternfly/react-core';
 
 export const SearchInputWithSubmitButton: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Select/Select.tsx b/packages/react-core/src/components/Select/Select.tsx
index 8a75e5011e1..d42ec485eca 100644
--- a/packages/react-core/src/components/Select/Select.tsx
+++ b/packages/react-core/src/components/Select/Select.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { forwardRef, useEffect, useRef } from 'react';
 import { css } from '@patternfly/react-styles';
 import { Menu, MenuContent, MenuProps } from '../Menu';
 import { Popper } from '../../helpers/Popper/Popper';
@@ -58,7 +58,7 @@ export interface SelectProps extends MenuProps, OUIAProps {
   /** Function callback when user selects an option. */
   onSelect?: (event?: React.MouseEvent<Element, MouseEvent>, value?: string | number) => void;
   /** Callback to allow the select component to change the open state of the menu.
-   * Triggered by clicking outside of the menu, or by pressing any keys specificed in onOpenChangeKeys. */
+   * Triggered by clicking outside of the menu, or by pressing any keys specified in onOpenChangeKeys. */
   onOpenChange?: (isOpen: boolean) => void;
   /** Keys that trigger onOpenChange, defaults to tab and escape. It is highly recommended to include Escape in the array, while Tab may be omitted if the menu contains non-menu items that are focusable. */
   onOpenChangeKeys?: string[];
@@ -113,8 +113,8 @@ const SelectBase: React.FunctionComponent<SelectProps & OUIAProps> = ({
   focusTimeoutDelay = 0,
   ...props
 }: SelectProps & OUIAProps) => {
-  const localMenuRef = React.useRef<HTMLDivElement>(undefined);
-  const localToggleRef = React.useRef<HTMLButtonElement>(undefined);
+  const localMenuRef = useRef<HTMLDivElement>(undefined);
+  const localToggleRef = useRef<HTMLButtonElement>(undefined);
 
   const menuRef = (innerRef as React.RefObject<HTMLDivElement | null>) || localMenuRef;
   const toggleRef =
@@ -122,8 +122,8 @@ const SelectBase: React.FunctionComponent<SelectProps & OUIAProps> = ({
       ? localToggleRef
       : (toggle?.toggleRef as React.RefObject<HTMLButtonElement | null>);
 
-  const prevIsOpen = React.useRef<boolean>(isOpen);
-  React.useEffect(() => {
+  const prevIsOpen = useRef<boolean>(isOpen);
+  useEffect(() => {
     // menu was opened, focus on first menu item
     if (prevIsOpen.current === false && isOpen === true && shouldFocusFirstItemOnOpen) {
       setTimeout(() => {
@@ -136,7 +136,7 @@ const SelectBase: React.FunctionComponent<SelectProps & OUIAProps> = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isOpen]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     const handleMenuKeys = (event: KeyboardEvent) => {
       // Close the menu on tab or escape if onOpenChange is provided
       if (
@@ -225,8 +225,6 @@ const SelectBase: React.FunctionComponent<SelectProps & OUIAProps> = ({
   );
 };
 
-export const Select = React.forwardRef((props: SelectProps, ref: React.Ref<any>) => (
-  <SelectBase innerRef={ref} {...props} />
-));
+export const Select = forwardRef((props: SelectProps, ref: React.Ref<any>) => <SelectBase innerRef={ref} {...props} />);
 
 Select.displayName = 'Select';
diff --git a/packages/react-core/src/components/Select/SelectGroup.tsx b/packages/react-core/src/components/Select/SelectGroup.tsx
index 744de685390..a4576329ad6 100644
--- a/packages/react-core/src/components/Select/SelectGroup.tsx
+++ b/packages/react-core/src/components/Select/SelectGroup.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { css } from '@patternfly/react-styles';
 import { MenuGroupProps, MenuGroup } from '../Menu';
 
diff --git a/packages/react-core/src/components/Select/SelectList.tsx b/packages/react-core/src/components/Select/SelectList.tsx
index f86fb0fc9d5..16069d954a2 100644
--- a/packages/react-core/src/components/Select/SelectList.tsx
+++ b/packages/react-core/src/components/Select/SelectList.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { css } from '@patternfly/react-styles';
 import { MenuListProps, MenuList } from '../Menu';
 
diff --git a/packages/react-core/src/components/Select/SelectOption.tsx b/packages/react-core/src/components/Select/SelectOption.tsx
index ba050908dd2..ebca2d92699 100644
--- a/packages/react-core/src/components/Select/SelectOption.tsx
+++ b/packages/react-core/src/components/Select/SelectOption.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { forwardRef } from 'react';
 import { css } from '@patternfly/react-styles';
 import { MenuItemProps, MenuItem } from '../Menu';
 
@@ -45,7 +45,7 @@ const SelectOptionBase: React.FunctionComponent<MenuItemProps> = ({
   </MenuItem>
 );
 
-export const SelectOption = React.forwardRef((props: SelectOptionProps, ref: React.Ref<any>) => (
+export const SelectOption = forwardRef((props: SelectOptionProps, ref: React.Ref<any>) => (
   <SelectOptionBase {...props} innerRef={ref} />
 ));
 
diff --git a/packages/react-core/src/components/Select/examples/Select.md b/packages/react-core/src/components/Select/examples/Select.md
index 9cc5a799a44..0bc0fbd9162 100644
--- a/packages/react-core/src/components/Select/examples/Select.md
+++ b/packages/react-core/src/components/Select/examples/Select.md
@@ -8,6 +8,7 @@ propComponents:
 ouia: true
 ---
 
+import { Fragment } from 'react';
 import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
 import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
 
diff --git a/packages/react-core/src/components/Select/examples/SelectBasic.tsx b/packages/react-core/src/components/Select/examples/SelectBasic.tsx
index a149e5d3994..0edba4c5b9c 100644
--- a/packages/react-core/src/components/Select/examples/SelectBasic.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectBasic.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Select, SelectOption, SelectList, MenuToggle, MenuToggleElement, Checkbox } from '@patternfly/react-core';
 
 export const SelectBasic: React.FunctionComponent = () => {
@@ -35,7 +35,7 @@ export const SelectBasic: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Checkbox
         id="toggle-disabled"
         label="isDisabled"
@@ -58,6 +58,6 @@ export const SelectBasic: React.FunctionComponent = () => {
           <SelectOption value="Option 3">Option 3</SelectOption>
         </SelectList>
       </Select>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Select/examples/SelectCheckbox.tsx b/packages/react-core/src/components/Select/examples/SelectCheckbox.tsx
index 41525ea1803..a3d3105caeb 100644
--- a/packages/react-core/src/components/Select/examples/SelectCheckbox.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectCheckbox.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Select, SelectOption, SelectList, MenuToggle, MenuToggleElement, Badge } from '@patternfly/react-core';
 
 export const SelectCheckbox: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Select/examples/SelectFooter.tsx b/packages/react-core/src/components/Select/examples/SelectFooter.tsx
index 5172816e5af..d2333c630cb 100644
--- a/packages/react-core/src/components/Select/examples/SelectFooter.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectFooter.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { MenuToggle, MenuFooter, Select, SelectList, SelectOption, Button } from '@patternfly/react-core';
 
 export const SelectFooter: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Select/examples/SelectGrouped.tsx b/packages/react-core/src/components/Select/examples/SelectGrouped.tsx
index 81a47422024..6108a41f266 100644
--- a/packages/react-core/src/components/Select/examples/SelectGrouped.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectGrouped.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Select,
   SelectOption,
diff --git a/packages/react-core/src/components/Select/examples/SelectMultiTypeahead.tsx b/packages/react-core/src/components/Select/examples/SelectMultiTypeahead.tsx
index 5eda6185cfc..640043aeb24 100644
--- a/packages/react-core/src/components/Select/examples/SelectMultiTypeahead.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectMultiTypeahead.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Select,
   SelectOption,
diff --git a/packages/react-core/src/components/Select/examples/SelectMultiTypeaheadCheckbox.tsx b/packages/react-core/src/components/Select/examples/SelectMultiTypeaheadCheckbox.tsx
index f074768f20c..5c55ab6eaa1 100644
--- a/packages/react-core/src/components/Select/examples/SelectMultiTypeaheadCheckbox.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectMultiTypeaheadCheckbox.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Select,
   SelectOption,
diff --git a/packages/react-core/src/components/Select/examples/SelectMultiTypeaheadCreatable.tsx b/packages/react-core/src/components/Select/examples/SelectMultiTypeaheadCreatable.tsx
index 25c9b222bdb..1b718d8c954 100644
--- a/packages/react-core/src/components/Select/examples/SelectMultiTypeaheadCreatable.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectMultiTypeaheadCreatable.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Select,
   SelectOption,
diff --git a/packages/react-core/src/components/Select/examples/SelectOptionVariations.tsx b/packages/react-core/src/components/Select/examples/SelectOptionVariations.tsx
index 6a1effbe171..6a4030af40f 100644
--- a/packages/react-core/src/components/Select/examples/SelectOptionVariations.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectOptionVariations.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Select, SelectOption, SelectList, MenuToggle, MenuToggleElement } from '@patternfly/react-core';
 import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
 
diff --git a/packages/react-core/src/components/Select/examples/SelectTypeahead.tsx b/packages/react-core/src/components/Select/examples/SelectTypeahead.tsx
index a3ba98cb990..b95a28c7984 100644
--- a/packages/react-core/src/components/Select/examples/SelectTypeahead.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectTypeahead.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Select,
   SelectOption,
diff --git a/packages/react-core/src/components/Select/examples/SelectTypeaheadCreatable.tsx b/packages/react-core/src/components/Select/examples/SelectTypeaheadCreatable.tsx
index 5855dc5e24c..47a79de6b6a 100644
--- a/packages/react-core/src/components/Select/examples/SelectTypeaheadCreatable.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectTypeaheadCreatable.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Select,
   SelectOption,
diff --git a/packages/react-core/src/components/Select/examples/SelectValidated.tsx b/packages/react-core/src/components/Select/examples/SelectValidated.tsx
index caad7417005..055a4666b35 100644
--- a/packages/react-core/src/components/Select/examples/SelectValidated.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectValidated.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Select,
   SelectOption,
@@ -45,7 +45,7 @@ export const SelectValidated: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Select
         id="single-select"
         isOpen={isOpen}
@@ -69,6 +69,6 @@ export const SelectValidated: React.FunctionComponent = () => {
           </HelperTextItem>
         </HelperText>
       )}
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Select/examples/SelectViewMore.tsx b/packages/react-core/src/components/Select/examples/SelectViewMore.tsx
index 8d10d070f1a..f1513b418c4 100644
--- a/packages/react-core/src/components/Select/examples/SelectViewMore.tsx
+++ b/packages/react-core/src/components/Select/examples/SelectViewMore.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Select, SelectOption, SelectList, MenuToggle, Spinner } from '@patternfly/react-core';
 
 export const SelectViewMore: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Sidebar/Sidebar.tsx b/packages/react-core/src/components/Sidebar/Sidebar.tsx
index eaa327fc2f7..f115b2d3892 100644
--- a/packages/react-core/src/components/Sidebar/Sidebar.tsx
+++ b/packages/react-core/src/components/Sidebar/Sidebar.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Sidebar/sidebar';
 
diff --git a/packages/react-core/src/components/Sidebar/SidebarContent.tsx b/packages/react-core/src/components/Sidebar/SidebarContent.tsx
index 6612cb9172f..4b0205c8939 100644
--- a/packages/react-core/src/components/Sidebar/SidebarContent.tsx
+++ b/packages/react-core/src/components/Sidebar/SidebarContent.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Sidebar/sidebar';
 
diff --git a/packages/react-core/src/components/Sidebar/SidebarPanel.tsx b/packages/react-core/src/components/Sidebar/SidebarPanel.tsx
index 794c1529158..25d67077cd3 100644
--- a/packages/react-core/src/components/Sidebar/SidebarPanel.tsx
+++ b/packages/react-core/src/components/Sidebar/SidebarPanel.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Sidebar/sidebar';
 import { formatBreakpointMods } from '../../helpers/util';
diff --git a/packages/react-core/src/components/Sidebar/__tests__/Sidebar.test.tsx b/packages/react-core/src/components/Sidebar/__tests__/Sidebar.test.tsx
index 88a2c71aa55..766f9535416 100644
--- a/packages/react-core/src/components/Sidebar/__tests__/Sidebar.test.tsx
+++ b/packages/react-core/src/components/Sidebar/__tests__/Sidebar.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Sidebar } from '../Sidebar';
 import styles from '@patternfly/react-styles/css/components/Sidebar/sidebar';
diff --git a/packages/react-core/src/components/Sidebar/__tests__/SidebarContent.test.tsx b/packages/react-core/src/components/Sidebar/__tests__/SidebarContent.test.tsx
index 6044bb6a344..919ed4eb806 100644
--- a/packages/react-core/src/components/Sidebar/__tests__/SidebarContent.test.tsx
+++ b/packages/react-core/src/components/Sidebar/__tests__/SidebarContent.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { SidebarContent } from '../SidebarContent';
 import styles from '@patternfly/react-styles/css/components/Sidebar/sidebar';
diff --git a/packages/react-core/src/components/Sidebar/__tests__/SidebarPanel.test.tsx b/packages/react-core/src/components/Sidebar/__tests__/SidebarPanel.test.tsx
index b4ea207c5df..a8fad4a71cb 100644
--- a/packages/react-core/src/components/Sidebar/__tests__/SidebarPanel.test.tsx
+++ b/packages/react-core/src/components/Sidebar/__tests__/SidebarPanel.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { SidebarPanel, SidebarPanelWidthType } from '../SidebarPanel';
 import styles from '@patternfly/react-styles/css/components/Sidebar/sidebar';
diff --git a/packages/react-core/src/components/Sidebar/examples/SidebarBasic.tsx b/packages/react-core/src/components/Sidebar/examples/SidebarBasic.tsx
index 4f1dd5477cd..3ea60f904f9 100644
--- a/packages/react-core/src/components/Sidebar/examples/SidebarBasic.tsx
+++ b/packages/react-core/src/components/Sidebar/examples/SidebarBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Sidebar, SidebarContent, SidebarPanel } from '@patternfly/react-core';
 
 export const SidebarBasic: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Sidebar/examples/SidebarBorder.tsx b/packages/react-core/src/components/Sidebar/examples/SidebarBorder.tsx
index 5a321cd0b3c..2f05e88ca13 100644
--- a/packages/react-core/src/components/Sidebar/examples/SidebarBorder.tsx
+++ b/packages/react-core/src/components/Sidebar/examples/SidebarBorder.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Sidebar, SidebarContent, SidebarPanel } from '@patternfly/react-core';
 
 export const SidebarBorder: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Sidebar/examples/SidebarPaddingContent.tsx b/packages/react-core/src/components/Sidebar/examples/SidebarPaddingContent.tsx
index 404509a458a..0f547d8bb44 100644
--- a/packages/react-core/src/components/Sidebar/examples/SidebarPaddingContent.tsx
+++ b/packages/react-core/src/components/Sidebar/examples/SidebarPaddingContent.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Sidebar, SidebarContent, SidebarPanel } from '@patternfly/react-core';
 
 export const SidebarPaddingContent: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Sidebar/examples/SidebarPaddingPanel.tsx b/packages/react-core/src/components/Sidebar/examples/SidebarPaddingPanel.tsx
index 131ac791fb8..965d83c6528 100644
--- a/packages/react-core/src/components/Sidebar/examples/SidebarPaddingPanel.tsx
+++ b/packages/react-core/src/components/Sidebar/examples/SidebarPaddingPanel.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Sidebar, SidebarContent, SidebarPanel } from '@patternfly/react-core';
 
 export const SidebarPaddingPanel: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Sidebar/examples/SidebarPanelRightGutter.tsx b/packages/react-core/src/components/Sidebar/examples/SidebarPanelRightGutter.tsx
index d7036a6ab2c..74b23d37212 100644
--- a/packages/react-core/src/components/Sidebar/examples/SidebarPanelRightGutter.tsx
+++ b/packages/react-core/src/components/Sidebar/examples/SidebarPanelRightGutter.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Sidebar, SidebarContent, SidebarPanel } from '@patternfly/react-core';
 
 export const SidebarPanelRightGutter: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Sidebar/examples/SidebarResponsivePanel.tsx b/packages/react-core/src/components/Sidebar/examples/SidebarResponsivePanel.tsx
index 1030d8564b0..9986bb27676 100644
--- a/packages/react-core/src/components/Sidebar/examples/SidebarResponsivePanel.tsx
+++ b/packages/react-core/src/components/Sidebar/examples/SidebarResponsivePanel.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Sidebar, SidebarContent, SidebarPanel } from '@patternfly/react-core';
 
 export const SidebarResponsivePanel: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Sidebar/examples/SidebarStack.tsx b/packages/react-core/src/components/Sidebar/examples/SidebarStack.tsx
index 9a6ddfa6e10..06341918e9e 100644
--- a/packages/react-core/src/components/Sidebar/examples/SidebarStack.tsx
+++ b/packages/react-core/src/components/Sidebar/examples/SidebarStack.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Sidebar, SidebarContent, SidebarPanel } from '@patternfly/react-core';
 
 export const SidebarStack: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Sidebar/examples/SidebarStaticPanel.tsx b/packages/react-core/src/components/Sidebar/examples/SidebarStaticPanel.tsx
index 202af282e76..6a3e193ac7f 100644
--- a/packages/react-core/src/components/Sidebar/examples/SidebarStaticPanel.tsx
+++ b/packages/react-core/src/components/Sidebar/examples/SidebarStaticPanel.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Sidebar, SidebarContent, SidebarPanel } from '@patternfly/react-core';
 
 export const SidebarStaticPanel: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Sidebar/examples/SidebarStickyPanel.tsx b/packages/react-core/src/components/Sidebar/examples/SidebarStickyPanel.tsx
index a6f4b5e24fd..b2558a39842 100644
--- a/packages/react-core/src/components/Sidebar/examples/SidebarStickyPanel.tsx
+++ b/packages/react-core/src/components/Sidebar/examples/SidebarStickyPanel.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Sidebar, SidebarContent, SidebarPanel } from '@patternfly/react-core';
 
 export const SidebarStickyPanel: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/SimpleList/SimpleList.tsx b/packages/react-core/src/components/SimpleList/SimpleList.tsx
index 1d84189c1a5..eb91b4df229 100644
--- a/packages/react-core/src/components/SimpleList/SimpleList.tsx
+++ b/packages/react-core/src/components/SimpleList/SimpleList.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Children, Component, createContext } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/SimpleList/simple-list';
 import { SimpleListGroup } from './SimpleListGroup';
@@ -34,9 +34,9 @@ interface SimpleListContextProps {
   isControlled: boolean;
 }
 
-export const SimpleListContext = React.createContext<Partial<SimpleListContextProps>>({});
+export const SimpleListContext = createContext<Partial<SimpleListContextProps>>({});
 
-class SimpleList extends React.Component<SimpleListProps, SimpleListState> {
+class SimpleList extends Component<SimpleListProps, SimpleListState> {
   static displayName = 'SimpleList';
   state = {
     currentRef: null as React.RefObject<HTMLButtonElement | null> | React.RefObject<HTMLAnchorElement | null>
@@ -63,7 +63,7 @@ class SimpleList extends React.Component<SimpleListProps, SimpleListState> {
 
     let isGrouped = false;
     if (children) {
-      isGrouped = (React.Children.toArray(children)[0] as React.ReactElement<any>).type === SimpleListGroup;
+      isGrouped = (Children.toArray(children)[0] as React.ReactElement<any>).type === SimpleListGroup;
     }
 
     return (
diff --git a/packages/react-core/src/components/SimpleList/SimpleListGroup.tsx b/packages/react-core/src/components/SimpleList/SimpleListGroup.tsx
index 2d94b7977e6..6c77c6173bb 100644
--- a/packages/react-core/src/components/SimpleList/SimpleListGroup.tsx
+++ b/packages/react-core/src/components/SimpleList/SimpleListGroup.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/SimpleList/simple-list';
 
diff --git a/packages/react-core/src/components/SimpleList/SimpleListItem.tsx b/packages/react-core/src/components/SimpleList/SimpleListItem.tsx
index d4e2b5af8f6..893d06e6f34 100644
--- a/packages/react-core/src/components/SimpleList/SimpleListItem.tsx
+++ b/packages/react-core/src/components/SimpleList/SimpleListItem.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, createRef } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/SimpleList/simple-list';
 import { SimpleListContext } from './SimpleList';
@@ -26,9 +26,9 @@ export interface SimpleListItemProps {
   href?: string;
 }
 
-class SimpleListItem extends React.Component<SimpleListItemProps> {
+class SimpleListItem extends Component<SimpleListItemProps> {
   static displayName = 'SimpleListItem';
-  ref = React.createRef<any>();
+  ref = createRef<any>();
   static defaultProps: SimpleListItemProps = {
     children: null,
     className: '',
diff --git a/packages/react-core/src/components/SimpleList/__tests__/Generated/SimpleListGroup.test.tsx b/packages/react-core/src/components/SimpleList/__tests__/Generated/SimpleListGroup.test.tsx
index 686d3c3cd59..a578562ad8d 100644
--- a/packages/react-core/src/components/SimpleList/__tests__/Generated/SimpleListGroup.test.tsx
+++ b/packages/react-core/src/components/SimpleList/__tests__/Generated/SimpleListGroup.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { SimpleListGroup } from '../../SimpleListGroup';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/SimpleList/__tests__/Generated/SimpleListItem.test.tsx b/packages/react-core/src/components/SimpleList/__tests__/Generated/SimpleListItem.test.tsx
index d701434bf6e..bbba674665c 100644
--- a/packages/react-core/src/components/SimpleList/__tests__/Generated/SimpleListItem.test.tsx
+++ b/packages/react-core/src/components/SimpleList/__tests__/Generated/SimpleListItem.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { SimpleListItem } from '../../SimpleListItem';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/SimpleList/__tests__/SimpleList.test.tsx b/packages/react-core/src/components/SimpleList/__tests__/SimpleList.test.tsx
index 0cd157e7ce2..2f0f5a28e2d 100644
--- a/packages/react-core/src/components/SimpleList/__tests__/SimpleList.test.tsx
+++ b/packages/react-core/src/components/SimpleList/__tests__/SimpleList.test.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-core/src/components/SimpleList/examples/SimpleListBasic.tsx b/packages/react-core/src/components/SimpleList/examples/SimpleListBasic.tsx
index f448e5ccc01..69a8944ba96 100644
--- a/packages/react-core/src/components/SimpleList/examples/SimpleListBasic.tsx
+++ b/packages/react-core/src/components/SimpleList/examples/SimpleListBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { SimpleList, SimpleListItem } from '@patternfly/react-core';
 
 export const SimpleListBasic: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/SimpleList/examples/SimpleListGrouped.tsx b/packages/react-core/src/components/SimpleList/examples/SimpleListGrouped.tsx
index 25e5f35d594..5ece9d3a7b4 100644
--- a/packages/react-core/src/components/SimpleList/examples/SimpleListGrouped.tsx
+++ b/packages/react-core/src/components/SimpleList/examples/SimpleListGrouped.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { SimpleList, SimpleListItem, SimpleListGroup } from '@patternfly/react-core';
 
 export const SimpleListGrouped: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/SimpleList/examples/SimpleListLinks.tsx b/packages/react-core/src/components/SimpleList/examples/SimpleListLinks.tsx
index 83ce0c9ecd5..156c056ac1f 100644
--- a/packages/react-core/src/components/SimpleList/examples/SimpleListLinks.tsx
+++ b/packages/react-core/src/components/SimpleList/examples/SimpleListLinks.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { SimpleList, SimpleListItem } from '@patternfly/react-core';
 
 export const SimpleListLinks: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/SimpleList/examples/SimpleListUncontrolled.tsx b/packages/react-core/src/components/SimpleList/examples/SimpleListUncontrolled.tsx
index a9b82ca8802..a80d99e21b7 100644
--- a/packages/react-core/src/components/SimpleList/examples/SimpleListUncontrolled.tsx
+++ b/packages/react-core/src/components/SimpleList/examples/SimpleListUncontrolled.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { SimpleList, SimpleListItem, SimpleListItemProps } from '@patternfly/react-core';
 
 export const SimpleListUncontrolled: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Skeleton/Skeleton.tsx b/packages/react-core/src/components/Skeleton/Skeleton.tsx
index 99e83da60b6..66adfd574a3 100644
--- a/packages/react-core/src/components/Skeleton/Skeleton.tsx
+++ b/packages/react-core/src/components/Skeleton/Skeleton.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Skeleton/skeleton';
 import { css } from '@patternfly/react-styles';
 import cssHeight from '@patternfly/react-tokens/dist/esm/c_skeleton_Height';
diff --git a/packages/react-core/src/components/Skeleton/__tests__/Skeleton.test.tsx b/packages/react-core/src/components/Skeleton/__tests__/Skeleton.test.tsx
index 9587d93e89e..a5e715e9748 100644
--- a/packages/react-core/src/components/Skeleton/__tests__/Skeleton.test.tsx
+++ b/packages/react-core/src/components/Skeleton/__tests__/Skeleton.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { Skeleton } from '../Skeleton';
 
diff --git a/packages/react-core/src/components/Skeleton/examples/Skeleton.md b/packages/react-core/src/components/Skeleton/examples/Skeleton.md
index c8db282240c..69854cb0cbc 100644
--- a/packages/react-core/src/components/Skeleton/examples/Skeleton.md
+++ b/packages/react-core/src/components/Skeleton/examples/Skeleton.md
@@ -5,6 +5,7 @@ cssPrefix: pf-v6-c-skeleton
 propComponents: ['Skeleton']
 ---
 
+import { Fragment } from 'react';
 import t_global_font_size_4xl from '@patternfly/react-tokens/dist/esm/t_global_font_size_4xl';
 import t_global_font_size_3xl from '@patternfly/react-tokens/dist/esm/t_global_font_size_3xl';
 import t_global_font_size_2xl from '@patternfly/react-tokens/dist/esm/t_global_font_size_2xl';
diff --git a/packages/react-core/src/components/Skeleton/examples/SkeletonDefault.tsx b/packages/react-core/src/components/Skeleton/examples/SkeletonDefault.tsx
index 47d75fa63b7..f3a1713bf34 100644
--- a/packages/react-core/src/components/Skeleton/examples/SkeletonDefault.tsx
+++ b/packages/react-core/src/components/Skeleton/examples/SkeletonDefault.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Skeleton } from '@patternfly/react-core';
 
 export const SkeletonDefault: React.FunctionComponent = () => <Skeleton screenreaderText="Loading contents" />;
diff --git a/packages/react-core/src/components/Skeleton/examples/SkeletonPercentageHeight.tsx b/packages/react-core/src/components/Skeleton/examples/SkeletonPercentageHeight.tsx
index 3f19887aa94..b0353264662 100644
--- a/packages/react-core/src/components/Skeleton/examples/SkeletonPercentageHeight.tsx
+++ b/packages/react-core/src/components/Skeleton/examples/SkeletonPercentageHeight.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Skeleton } from '@patternfly/react-core';
 
 export const SkeletonPercentageHeight: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Skeleton/examples/SkeletonPercentageWidth.tsx b/packages/react-core/src/components/Skeleton/examples/SkeletonPercentageWidth.tsx
index 39ca9ae7bd2..22eb411cadd 100644
--- a/packages/react-core/src/components/Skeleton/examples/SkeletonPercentageWidth.tsx
+++ b/packages/react-core/src/components/Skeleton/examples/SkeletonPercentageWidth.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Skeleton } from '@patternfly/react-core';
 
 export const SkeletonPercentageWidth: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Skeleton width="25%" screenreaderText="Loaded 25% of content" />
     <br />
     <Skeleton width="33%" screenreaderText="Loaded 33% of content" />
@@ -14,5 +14,5 @@ export const SkeletonPercentageWidth: React.FunctionComponent = () => (
     <Skeleton width="75%" screenreaderText="Loaded 75% of content" />
     <br />
     <Skeleton />
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Skeleton/examples/SkeletonShapes.tsx b/packages/react-core/src/components/Skeleton/examples/SkeletonShapes.tsx
index e94153ce482..06ab97da63f 100644
--- a/packages/react-core/src/components/Skeleton/examples/SkeletonShapes.tsx
+++ b/packages/react-core/src/components/Skeleton/examples/SkeletonShapes.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Skeleton } from '@patternfly/react-core';
 
 export const SkeletonShapes: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     Small circle
     <Skeleton shape="circle" width="15%" screenreaderText="Loading small circle contents" />
     <br />
@@ -35,5 +35,5 @@ export const SkeletonShapes: React.FunctionComponent = () => (
     <div style={{ height: '200px' }}>
       <Skeleton height="100%" screenreaderText="Loading large rectangle contents" />
     </div>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Skeleton/examples/SkeletonText.tsx b/packages/react-core/src/components/Skeleton/examples/SkeletonText.tsx
index ef98fd561dc..6070ff8325f 100644
--- a/packages/react-core/src/components/Skeleton/examples/SkeletonText.tsx
+++ b/packages/react-core/src/components/Skeleton/examples/SkeletonText.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Skeleton } from '@patternfly/react-core';
 /* eslint-disable camelcase */
 import t_global_font_size_4xl from '@patternfly/react-tokens/dist/esm/t_global_font_size_4xl';
@@ -10,7 +10,7 @@ import t_global_font_size_md from '@patternfly/react-tokens/dist/esm/t_global_fo
 import t_global_font_size_sm from '@patternfly/react-tokens/dist/esm/t_global_font_size_sm';
 
 export const SkeletonText: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     {t_global_font_size_4xl.name}
     <Skeleton fontSize="4xl" screenreaderText="Loading font size 4xl" />
     <br />
@@ -31,5 +31,5 @@ export const SkeletonText: React.FunctionComponent = () => (
     <br />
     {t_global_font_size_sm.name}
     <Skeleton fontSize="sm" screenreaderText="Loading font size sm" />
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/SkipToContent/SkipToContent.tsx b/packages/react-core/src/components/SkipToContent/SkipToContent.tsx
index 5f1ccea1669..a1e2fd703fa 100644
--- a/packages/react-core/src/components/SkipToContent/SkipToContent.tsx
+++ b/packages/react-core/src/components/SkipToContent/SkipToContent.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/SkipToContent/skip-to-content';
 import { css } from '@patternfly/react-styles';
 import { Button, ButtonVariant } from '../Button';
diff --git a/packages/react-core/src/components/SkipToContent/__tests__/SkipToContent.test.tsx b/packages/react-core/src/components/SkipToContent/__tests__/SkipToContent.test.tsx
index b60dd68265d..5874415fd7d 100644
--- a/packages/react-core/src/components/SkipToContent/__tests__/SkipToContent.test.tsx
+++ b/packages/react-core/src/components/SkipToContent/__tests__/SkipToContent.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { SkipToContent } from '../SkipToContent';
 
diff --git a/packages/react-core/src/components/SkipToContent/examples/SkipToContent.md b/packages/react-core/src/components/SkipToContent/examples/SkipToContent.md
index 0cfc2f27dd9..c7fc900d658 100644
--- a/packages/react-core/src/components/SkipToContent/examples/SkipToContent.md
+++ b/packages/react-core/src/components/SkipToContent/examples/SkipToContent.md
@@ -5,6 +5,8 @@ cssPrefix: pf-v6-c-skip-to-content
 propComponents: ['SkipToContent']
 ---
 
+import { Fragment } from 'react';
+
 ## Examples
 ### Basic
 ```ts isFullscreen file="./SkipToContentBasic.tsx"
diff --git a/packages/react-core/src/components/SkipToContent/examples/SkipToContentBasic.tsx b/packages/react-core/src/components/SkipToContent/examples/SkipToContentBasic.tsx
index 598f1946154..5d204ce3b0f 100644
--- a/packages/react-core/src/components/SkipToContent/examples/SkipToContentBasic.tsx
+++ b/packages/react-core/src/components/SkipToContent/examples/SkipToContentBasic.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Content, SkipToContent } from '@patternfly/react-core';
 
 export const SkipToContentBasic: React.FunctionComponent = () => {
@@ -13,7 +13,7 @@ export const SkipToContentBasic: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <SkipToContent onClick={handleClick} href={`#${mainContentId}`}>
         Skip to content
       </SkipToContent>
@@ -141,6 +141,6 @@ export const SkipToContentBasic: React.FunctionComponent = () => {
           </p>
         </Content>
       </div>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Slider/Slider.tsx b/packages/react-core/src/components/Slider/Slider.tsx
index ecdd157a126..946f61b80e5 100644
--- a/packages/react-core/src/components/Slider/Slider.tsx
+++ b/packages/react-core/src/components/Slider/Slider.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-import { useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/Slider/slider';
 import { css } from '@patternfly/react-styles';
 import { SliderStep } from './SliderStep';
@@ -117,23 +116,23 @@ export const Slider: React.FunctionComponent<SliderProps> = ({
   'aria-labelledby': ariaLabelledby,
   ...props
 }: SliderProps) => {
-  const sliderRailRef = React.useRef<HTMLDivElement>(undefined);
-  const thumbRef = React.useRef<HTMLDivElement>(undefined);
+  const sliderRailRef = useRef<HTMLDivElement>(undefined);
+  const thumbRef = useRef<HTMLDivElement>(undefined);
 
   const [localValue, setValue] = useState(value);
   const [localInputValue, setLocalInputValue] = useState(inputValue);
 
   let isRTL: boolean;
 
-  React.useEffect(() => {
+  useEffect(() => {
     isRTL = getLanguageDirection(sliderRailRef.current) === 'rtl';
   });
 
-  React.useEffect(() => {
+  useEffect(() => {
     setValue(value);
   }, [value]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     setLocalInputValue(inputValue);
   }, [inputValue]);
 
@@ -143,7 +142,7 @@ export const Slider: React.FunctionComponent<SliderProps> = ({
   // calculate style value percentage
   const stylePercent = ((localValue - min) * 100) / (max - min);
   const style = { [cssSliderValue.name]: `${stylePercent}%` } as React.CSSProperties;
-  const widthChars = React.useMemo(() => localInputValue.toString().length, [localInputValue]);
+  const widthChars = useMemo(() => localInputValue.toString().length, [localInputValue]);
   const inputStyle = { [cssFormControlWidthChars.name]: widthChars } as React.CSSProperties;
 
   const onChangeHandler = (_event: React.FormEvent<HTMLInputElement>, value: string) => {
@@ -303,8 +302,8 @@ export const Slider: React.FunctionComponent<SliderProps> = ({
     }
   };
 
-  const callbackThumbMove = React.useCallback(handleThumbMove, [min, max, customSteps, onChange]);
-  const callbackThumbUp = React.useCallback(handleThumbDragEnd, [min, max, customSteps, onChange]);
+  const callbackThumbMove = useCallback(handleThumbMove, [min, max, customSteps, onChange]);
+  const callbackThumbUp = useCallback(handleThumbDragEnd, [min, max, customSteps, onChange]);
 
   const handleThumbKeys = (e: React.KeyboardEvent) => {
     const key = e.key;
diff --git a/packages/react-core/src/components/Slider/SliderStep.tsx b/packages/react-core/src/components/Slider/SliderStep.tsx
index e05e5b6b4cf..5df389c3ee7 100644
--- a/packages/react-core/src/components/Slider/SliderStep.tsx
+++ b/packages/react-core/src/components/Slider/SliderStep.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Slider/slider';
 import { css } from '@patternfly/react-styles';
 import sliderStepInsetInlineStart from '@patternfly/react-tokens/dist/esm/c_slider__step_InsetInlineStart';
diff --git a/packages/react-core/src/components/Slider/__tests__/Slider.test.tsx b/packages/react-core/src/components/Slider/__tests__/Slider.test.tsx
index 1e613cb3cd4..7760c772faf 100644
--- a/packages/react-core/src/components/Slider/__tests__/Slider.test.tsx
+++ b/packages/react-core/src/components/Slider/__tests__/Slider.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Slider } from '../Slider';
 import { Button } from '../../Button';
diff --git a/packages/react-core/src/components/Slider/examples/SliderActions.tsx b/packages/react-core/src/components/Slider/examples/SliderActions.tsx
index f5df5ce1e24..6715965714e 100644
--- a/packages/react-core/src/components/Slider/examples/SliderActions.tsx
+++ b/packages/react-core/src/components/Slider/examples/SliderActions.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Slider, SliderOnChangeEvent, Button, Content } from '@patternfly/react-core';
 import MinusIcon from '@patternfly/react-icons/dist/esm/icons/minus-icon';
 import PlusIcon from '@patternfly/react-icons/dist/esm/icons/plus-icon';
diff --git a/packages/react-core/src/components/Slider/examples/SliderContinuous.tsx b/packages/react-core/src/components/Slider/examples/SliderContinuous.tsx
index 73269e632d1..1317bbc3078 100644
--- a/packages/react-core/src/components/Slider/examples/SliderContinuous.tsx
+++ b/packages/react-core/src/components/Slider/examples/SliderContinuous.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Checkbox, Slider, SliderOnChangeEvent, Content } from '@patternfly/react-core';
 
 export const SliderContinuous: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Slider/examples/SliderDisabled.tsx b/packages/react-core/src/components/Slider/examples/SliderDisabled.tsx
index 8656b95f6b9..48eff696133 100644
--- a/packages/react-core/src/components/Slider/examples/SliderDisabled.tsx
+++ b/packages/react-core/src/components/Slider/examples/SliderDisabled.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Slider, SliderOnChangeEvent, Content } from '@patternfly/react-core';
 
 export const SliderDisabled: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Slider/examples/SliderDiscrete.tsx b/packages/react-core/src/components/Slider/examples/SliderDiscrete.tsx
index 76349188614..d779134561c 100644
--- a/packages/react-core/src/components/Slider/examples/SliderDiscrete.tsx
+++ b/packages/react-core/src/components/Slider/examples/SliderDiscrete.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Slider, SliderOnChangeEvent, Content } from '@patternfly/react-core';
 
 export const SliderDiscrete: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Slider/examples/SliderThumbValueInput.tsx b/packages/react-core/src/components/Slider/examples/SliderThumbValueInput.tsx
index 8a76e453306..5775c83c33d 100644
--- a/packages/react-core/src/components/Slider/examples/SliderThumbValueInput.tsx
+++ b/packages/react-core/src/components/Slider/examples/SliderThumbValueInput.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Slider, SliderOnChangeEvent } from '@patternfly/react-core';
 
 export const SliderThumbValueInput: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Slider/examples/SliderValueInput.tsx b/packages/react-core/src/components/Slider/examples/SliderValueInput.tsx
index a1d4b3b2408..e077ac192ae 100644
--- a/packages/react-core/src/components/Slider/examples/SliderValueInput.tsx
+++ b/packages/react-core/src/components/Slider/examples/SliderValueInput.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Slider, SliderOnChangeEvent } from '@patternfly/react-core';
 
 export const SliderValueInput: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Spinner/Spinner.tsx b/packages/react-core/src/components/Spinner/Spinner.tsx
index c147badbc37..77e599773c0 100644
--- a/packages/react-core/src/components/Spinner/Spinner.tsx
+++ b/packages/react-core/src/components/Spinner/Spinner.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Spinner/spinner';
 import { css } from '@patternfly/react-styles';
 import cssDiameter from '@patternfly/react-tokens/dist/esm/c_spinner_diameter';
diff --git a/packages/react-core/src/components/Spinner/__tests__/Spinner.test.tsx b/packages/react-core/src/components/Spinner/__tests__/Spinner.test.tsx
index eb1402d7004..3b037f4e015 100644
--- a/packages/react-core/src/components/Spinner/__tests__/Spinner.test.tsx
+++ b/packages/react-core/src/components/Spinner/__tests__/Spinner.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { Spinner } from '../Spinner';
 
diff --git a/packages/react-core/src/components/Spinner/examples/Spinner.md b/packages/react-core/src/components/Spinner/examples/Spinner.md
index 85ef2221694..46d3117400b 100644
--- a/packages/react-core/src/components/Spinner/examples/Spinner.md
+++ b/packages/react-core/src/components/Spinner/examples/Spinner.md
@@ -5,6 +5,8 @@ cssPrefix: pf-v6-c-spinner
 propComponents: ['Spinner']
 ---
 
+import { Fragment } from 'react';
+
 ## Examples
 ### Basic
 ```ts file="./SpinnerBasic.tsx"
diff --git a/packages/react-core/src/components/Spinner/examples/SpinnerBasic.tsx b/packages/react-core/src/components/Spinner/examples/SpinnerBasic.tsx
index 4b39db564b4..dba5f2e21f0 100644
--- a/packages/react-core/src/components/Spinner/examples/SpinnerBasic.tsx
+++ b/packages/react-core/src/components/Spinner/examples/SpinnerBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Spinner } from '@patternfly/react-core';
 
 export const SpinnerBasic: React.FunctionComponent = () => <Spinner aria-label="Contents of the basic example" />;
diff --git a/packages/react-core/src/components/Spinner/examples/SpinnerCustomSize.tsx b/packages/react-core/src/components/Spinner/examples/SpinnerCustomSize.tsx
index 5ff0ee9cdfd..5c5fb8d007c 100644
--- a/packages/react-core/src/components/Spinner/examples/SpinnerCustomSize.tsx
+++ b/packages/react-core/src/components/Spinner/examples/SpinnerCustomSize.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Spinner } from '@patternfly/react-core';
 
 export const SpinnerCustomSize: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Spinner/examples/SpinnerInline.tsx b/packages/react-core/src/components/Spinner/examples/SpinnerInline.tsx
index 5f931d1b345..d8adcabdd5d 100644
--- a/packages/react-core/src/components/Spinner/examples/SpinnerInline.tsx
+++ b/packages/react-core/src/components/Spinner/examples/SpinnerInline.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Spinner, Content } from '@patternfly/react-core';
 
 export const SpinnerInline: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Content>
       <h1>
         Heading
@@ -23,5 +23,5 @@ export const SpinnerInline: React.FunctionComponent = () => (
         <Spinner isInline aria-label="Spinner in a small element" />
       </small>
     </Content>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Spinner/examples/SpinnerSizeVariations.tsx b/packages/react-core/src/components/Spinner/examples/SpinnerSizeVariations.tsx
index 2023139f46f..9b4b1c6c10a 100644
--- a/packages/react-core/src/components/Spinner/examples/SpinnerSizeVariations.tsx
+++ b/packages/react-core/src/components/Spinner/examples/SpinnerSizeVariations.tsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Spinner } from '@patternfly/react-core';
 
 export const SpinnerSizeVariations: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Spinner size="sm" aria-label="Contents of the small example" />
     <Spinner size="md" aria-label="Contents of the medium example" />
     <Spinner size="lg" aria-label="Contents of the large example" />
     <Spinner size="xl" aria-label="Contents of the extra large example" />
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Switch/Switch.tsx b/packages/react-core/src/components/Switch/Switch.tsx
index 280cf84b748..3f3307f3a35 100644
--- a/packages/react-core/src/components/Switch/Switch.tsx
+++ b/packages/react-core/src/components/Switch/Switch.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, Fragment } from 'react';
 import styles from '@patternfly/react-styles/css/components/Switch/switch';
 import { css } from '@patternfly/react-styles';
 import CheckIcon from '@patternfly/react-icons/dist/esm/icons/check-icon';
@@ -40,7 +40,7 @@ export interface SwitchProps
   ouiaSafe?: boolean;
 }
 
-class Switch extends React.Component<SwitchProps & OUIAProps, { ouiaStateId: string }> {
+class Switch extends Component<SwitchProps & OUIAProps, { ouiaStateId: string }> {
   static displayName = 'Switch';
   id: string;
 
@@ -111,7 +111,7 @@ class Switch extends React.Component<SwitchProps & OUIAProps, { ouiaStateId: str
           {...props}
         />
         {label !== undefined ? (
-          <React.Fragment>
+          <Fragment>
             <span className={css(styles.switchToggle)}>
               {hasCheckIcon && (
                 <span className={css(styles.switchToggleIcon)}>
@@ -126,7 +126,7 @@ class Switch extends React.Component<SwitchProps & OUIAProps, { ouiaStateId: str
             >
               {label}
             </span>
-          </React.Fragment>
+          </Fragment>
         ) : (
           <span className={css(styles.switchToggle)}>
             <div className={css(styles.switchToggleIcon)}>
diff --git a/packages/react-core/src/components/Switch/__tests__/Switch.test.tsx b/packages/react-core/src/components/Switch/__tests__/Switch.test.tsx
index 2be2a8a64aa..8e82f6c99b8 100644
--- a/packages/react-core/src/components/Switch/__tests__/Switch.test.tsx
+++ b/packages/react-core/src/components/Switch/__tests__/Switch.test.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-core/src/components/Switch/examples/Switch.md b/packages/react-core/src/components/Switch/examples/Switch.md
index 55b786a3735..25dcebb14f1 100644
--- a/packages/react-core/src/components/Switch/examples/Switch.md
+++ b/packages/react-core/src/components/Switch/examples/Switch.md
@@ -6,6 +6,8 @@ propComponents: ['Switch']
 ouia: true
 ---
 
+import { Fragment } from 'react';
+
 ## Examples
 
 To keep inline with accessibility guidelines, the label for a switch must never dynamically change. A dynamically changing label (such as one label for an "on" state and another label for an "off" state) can be confusing as the contexts for each label changes as the switch state does. This applies to both visible text labels as well as labels provided via `aria-label`.
diff --git a/packages/react-core/src/components/Switch/examples/SwitchBasic.tsx b/packages/react-core/src/components/Switch/examples/SwitchBasic.tsx
index 3afdc7f068f..f37979411f1 100644
--- a/packages/react-core/src/components/Switch/examples/SwitchBasic.tsx
+++ b/packages/react-core/src/components/Switch/examples/SwitchBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Switch } from '@patternfly/react-core';
 
 export const SwitchBasic: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Switch/examples/SwitchCheckedWithLabel.tsx b/packages/react-core/src/components/Switch/examples/SwitchCheckedWithLabel.tsx
index 1e30a031ad3..cb389e96d1c 100644
--- a/packages/react-core/src/components/Switch/examples/SwitchCheckedWithLabel.tsx
+++ b/packages/react-core/src/components/Switch/examples/SwitchCheckedWithLabel.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Switch } from '@patternfly/react-core';
 
 export const SwitchCheckedWithLabel: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Switch/examples/SwitchDisabled.tsx b/packages/react-core/src/components/Switch/examples/SwitchDisabled.tsx
index c628614f65a..153e1e10866 100644
--- a/packages/react-core/src/components/Switch/examples/SwitchDisabled.tsx
+++ b/packages/react-core/src/components/Switch/examples/SwitchDisabled.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Switch } from '@patternfly/react-core';
 
 export const SwitchDisabled: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Switch id="disabled-switch-on" label="Togglable option for disabled checked example" isChecked isDisabled />
     <br />
     <Switch
@@ -25,5 +25,5 @@ export const SwitchDisabled: React.FunctionComponent = () => (
       isChecked={false}
       isDisabled
     />
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Switch/examples/SwitchReversed.tsx b/packages/react-core/src/components/Switch/examples/SwitchReversed.tsx
index cb94a7a8652..de35db8e49a 100644
--- a/packages/react-core/src/components/Switch/examples/SwitchReversed.tsx
+++ b/packages/react-core/src/components/Switch/examples/SwitchReversed.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Switch } from '@patternfly/react-core';
 
 export const SwitchReversed: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Switch/examples/SwitchUncontrolled.tsx b/packages/react-core/src/components/Switch/examples/SwitchUncontrolled.tsx
index e72caf6f60c..06a25f4c667 100644
--- a/packages/react-core/src/components/Switch/examples/SwitchUncontrolled.tsx
+++ b/packages/react-core/src/components/Switch/examples/SwitchUncontrolled.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Switch } from '@patternfly/react-core';
 
 export const SwitchUncontrolled: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Switch
       id="uncontrolled-switch-no-label"
       aria-label="Togglable option for uncontrolled and no visible label example"
@@ -14,5 +14,5 @@ export const SwitchUncontrolled: React.FunctionComponent = () => (
       label="Togglable option for uncontrolled example"
       defaultChecked={false}
     />
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Switch/examples/SwitchWithoutLabel.tsx b/packages/react-core/src/components/Switch/examples/SwitchWithoutLabel.tsx
index 18a01776ca8..eb6268517de 100644
--- a/packages/react-core/src/components/Switch/examples/SwitchWithoutLabel.tsx
+++ b/packages/react-core/src/components/Switch/examples/SwitchWithoutLabel.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Switch } from '@patternfly/react-core';
 
 export const SwitchWithoutLabel: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Tabs/OverflowTab.tsx b/packages/react-core/src/components/Tabs/OverflowTab.tsx
index 858732ad316..b47a5a2d22a 100644
--- a/packages/react-core/src/components/Tabs/OverflowTab.tsx
+++ b/packages/react-core/src/components/Tabs/OverflowTab.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useContext, useEffect, useRef, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/Tabs/tabs';
 import { css } from '@patternfly/react-styles';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
@@ -38,13 +38,13 @@ export const OverflowTab: React.FunctionComponent<OverflowTabProps> = ({
   focusTimeoutDelay = 0,
   ...props
 }: OverflowTabProps) => {
-  const menuRef = React.useRef<HTMLDivElement>(undefined);
-  const overflowTabRef = React.useRef<HTMLButtonElement>(undefined);
-  const overflowLIRef = React.useRef<HTMLLIElement>(undefined);
+  const menuRef = useRef<HTMLDivElement>(undefined);
+  const overflowTabRef = useRef<HTMLButtonElement>(undefined);
+  const overflowLIRef = useRef<HTMLLIElement>(undefined);
 
-  const [isExpanded, setIsExpanded] = React.useState(false);
+  const [isExpanded, setIsExpanded] = useState(false);
 
-  const { localActiveKey, handleTabClick } = React.useContext(TabsContext);
+  const { localActiveKey, handleTabClick } = useContext(TabsContext);
 
   const closeMenu = () => {
     setIsExpanded(false);
@@ -66,7 +66,7 @@ export const OverflowTab: React.FunctionComponent<OverflowTabProps> = ({
     }
   };
 
-  React.useEffect(() => {
+  useEffect(() => {
     window.addEventListener('click', handleClick);
     window.addEventListener('keydown', handleMenuKeys);
 
@@ -138,7 +138,7 @@ export const OverflowTab: React.FunctionComponent<OverflowTabProps> = ({
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       {overflowTab}
       <Popper
         triggerRef={overflowTabRef}
@@ -149,7 +149,7 @@ export const OverflowTab: React.FunctionComponent<OverflowTabProps> = ({
         appendTo={overflowLIRef.current}
         zIndex={zIndex}
       />
-    </React.Fragment>
+    </Fragment>
   );
 };
 
diff --git a/packages/react-core/src/components/Tabs/Tab.tsx b/packages/react-core/src/components/Tabs/Tab.tsx
index 6712520f44d..76b4a21d02b 100644
--- a/packages/react-core/src/components/Tabs/Tab.tsx
+++ b/packages/react-core/src/components/Tabs/Tab.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useContext, forwardRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/Tabs/tabs';
 import { OUIAProps } from '../../helpers';
 import { TabButton } from './TabButton';
@@ -76,7 +76,7 @@ const TabBase: React.FunctionComponent<TabProps> = ({
     {}
   );
   const { mountOnEnter, localActiveKey, unmountOnExit, uniqueId, handleTabClick, handleTabClose } =
-    React.useContext(TabsContext);
+    useContext(TabsContext);
   let ariaControls = tabContentId ? `${tabContentId}` : `pf-tab-section-${eventKey}-${childId || uniqueId}`;
   if ((mountOnEnter || unmountOnExit) && eventKey !== localActiveKey) {
     ariaControls = undefined;
@@ -142,5 +142,5 @@ const TabBase: React.FunctionComponent<TabProps> = ({
   );
 };
 
-export const Tab = React.forwardRef((props: TabProps, ref: React.Ref<any>) => <TabBase innerRef={ref} {...props} />);
+export const Tab = forwardRef((props: TabProps, ref: React.Ref<any>) => <TabBase innerRef={ref} {...props} />);
 Tab.displayName = 'Tab';
diff --git a/packages/react-core/src/components/Tabs/TabAction.tsx b/packages/react-core/src/components/Tabs/TabAction.tsx
index d4f3cc8d203..4b8336c0a51 100644
--- a/packages/react-core/src/components/Tabs/TabAction.tsx
+++ b/packages/react-core/src/components/Tabs/TabAction.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Tabs/tabs';
 import { Button } from '../Button';
@@ -46,7 +46,7 @@ const TabActionBase: React.FunctionComponent<TabActionProps> = ({
   </span>
 );
 
-export const TabAction = React.forwardRef((props: TabActionProps, ref: React.Ref<HTMLElement>) => (
+export const TabAction = forwardRef((props: TabActionProps, ref: React.Ref<HTMLElement>) => (
   <TabActionBase {...props} innerRef={ref} />
 ));
 
diff --git a/packages/react-core/src/components/Tabs/TabButton.tsx b/packages/react-core/src/components/Tabs/TabButton.tsx
index 7756a4dbea2..48d62163c48 100644
--- a/packages/react-core/src/components/Tabs/TabButton.tsx
+++ b/packages/react-core/src/components/Tabs/TabButton.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { getOUIAProps, OUIAProps } from '../../helpers';
 
 export interface TabButtonProps extends Omit<React.HTMLProps<HTMLAnchorElement | HTMLButtonElement>, 'ref'>, OUIAProps {
diff --git a/packages/react-core/src/components/Tabs/TabContent.tsx b/packages/react-core/src/components/Tabs/TabContent.tsx
index 7645af08255..ec5827b0131 100644
--- a/packages/react-core/src/components/Tabs/TabContent.tsx
+++ b/packages/react-core/src/components/Tabs/TabContent.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/TabContent/tab-content';
 import { css } from '@patternfly/react-styles';
 import { getOUIAProps, OUIAProps } from '../../helpers';
@@ -86,6 +86,6 @@ const TabContentBase: React.FunctionComponent<TabContentProps> = ({
   return null;
 };
 
-export const TabContent = React.forwardRef((props: TabContentProps, ref: React.Ref<HTMLElement>) => (
+export const TabContent = forwardRef((props: TabContentProps, ref: React.Ref<HTMLElement>) => (
   <TabContentBase {...props} innerRef={ref} />
 ));
diff --git a/packages/react-core/src/components/Tabs/TabContentBody.tsx b/packages/react-core/src/components/Tabs/TabContentBody.tsx
index a973a30e849..bfa8c564da0 100644
--- a/packages/react-core/src/components/Tabs/TabContentBody.tsx
+++ b/packages/react-core/src/components/Tabs/TabContentBody.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/TabContent/tab-content';
 
diff --git a/packages/react-core/src/components/Tabs/TabTitleIcon.tsx b/packages/react-core/src/components/Tabs/TabTitleIcon.tsx
index d9f5503b5ad..dd8e1543fd8 100644
--- a/packages/react-core/src/components/Tabs/TabTitleIcon.tsx
+++ b/packages/react-core/src/components/Tabs/TabTitleIcon.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Tabs/tabs';
 
diff --git a/packages/react-core/src/components/Tabs/TabTitleText.tsx b/packages/react-core/src/components/Tabs/TabTitleText.tsx
index 7f1e1cb2ba2..a3a75038599 100644
--- a/packages/react-core/src/components/Tabs/TabTitleText.tsx
+++ b/packages/react-core/src/components/Tabs/TabTitleText.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Tabs/tabs';
 
diff --git a/packages/react-core/src/components/Tabs/Tabs.tsx b/packages/react-core/src/components/Tabs/Tabs.tsx
index 85adb9cde24..8ff2869eebe 100644
--- a/packages/react-core/src/components/Tabs/Tabs.tsx
+++ b/packages/react-core/src/components/Tabs/Tabs.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Children, Component, createRef, isValidElement } from 'react';
 import styles from '@patternfly/react-styles/css/components/Tabs/tabs';
 import { css } from '@patternfly/react-styles';
 import { PickOptional } from '../../helpers/typeUtils';
@@ -139,10 +139,10 @@ interface TabsState {
   overflowingTabCount: number;
 }
 
-class Tabs extends React.Component<TabsProps, TabsState> {
+class Tabs extends Component<TabsProps, TabsState> {
   static displayName = 'Tabs';
-  tabList = React.createRef<HTMLUListElement>();
-  leftScrollButtonRef = React.createRef<HTMLButtonElement>();
+  tabList = createRef<HTMLUListElement>();
+  leftScrollButtonRef = createRef<HTMLButtonElement>();
   private direction = 'ltr';
   constructor(props: TabsProps) {
     super(props);
@@ -211,8 +211,8 @@ class Tabs extends React.Component<TabsProps, TabsState> {
 
     // process any tab content sections outside of the component
     if (tabContentRef) {
-      React.Children.toArray(this.props.children)
-        .filter((child): child is TabElement => React.isValidElement(child))
+      Children.toArray(this.props.children)
+        .filter((child): child is TabElement => isValidElement(child))
         .filter(({ props }) => props.tabContentRef && props.tabContentRef.current)
         .forEach((child) => (child.props.tabContentRef.current.hidden = true));
       // most recently selected tabContent
@@ -359,7 +359,7 @@ class Tabs extends React.Component<TabsProps, TabsState> {
     if (
       prevProps.children &&
       children &&
-      React.Children.toArray(prevProps.children).length !== React.Children.toArray(children).length
+      Children.toArray(prevProps.children).length !== Children.toArray(children).length
     ) {
       this.handleScrollButtons();
     }
@@ -387,8 +387,8 @@ class Tabs extends React.Component<TabsProps, TabsState> {
       return null;
     }
 
-    const childrenHasTabWithActiveEventKey = React.Children.toArray(nextProps.children)
-      .filter((child): child is TabElement => React.isValidElement(child))
+    const childrenHasTabWithActiveEventKey = Children.toArray(nextProps.children)
+      .filter((child): child is TabElement => isValidElement(child))
       .some(({ props }) => props.eventKey === prevState.uncontrolledActiveKey);
 
     // if uncontrolledActiveKey is an existing eventKey of any Tab of nextProps.children --> don't update uncontrolledActiveKey
@@ -450,8 +450,8 @@ class Tabs extends React.Component<TabsProps, TabsState> {
       uncontrolledIsExpandedLocal,
       overflowingTabCount
     } = this.state;
-    const filteredChildren = React.Children.toArray(children)
-      .filter((child): child is TabElement => React.isValidElement(child))
+    const filteredChildren = Children.toArray(children)
+      .filter((child): child is TabElement => isValidElement(child))
       .filter(({ props }) => !props.isHidden);
 
     const filteredChildrenWithoutOverflow = filteredChildren.slice(0, filteredChildren.length - overflowingTabCount);
diff --git a/packages/react-core/src/components/Tabs/TabsContext.ts b/packages/react-core/src/components/Tabs/TabsContext.ts
index 018af907620..a0a6263bc7d 100644
--- a/packages/react-core/src/components/Tabs/TabsContext.ts
+++ b/packages/react-core/src/components/Tabs/TabsContext.ts
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { createContext } from 'react';
 
 export interface TabsContextProps {
   variant: 'default' | 'secondary';
@@ -18,7 +18,7 @@ export interface TabsContextProps {
   ) => void;
 }
 
-export const TabsContext = React.createContext<TabsContextProps>({
+export const TabsContext = createContext<TabsContextProps>({
   variant: 'default',
   mountOnEnter: false,
   unmountOnExit: false,
diff --git a/packages/react-core/src/components/Tabs/__tests__/Generated/TabContent.test.tsx b/packages/react-core/src/components/Tabs/__tests__/Generated/TabContent.test.tsx
index dd7c5421ae4..f016d580e6e 100644
--- a/packages/react-core/src/components/Tabs/__tests__/Generated/TabContent.test.tsx
+++ b/packages/react-core/src/components/Tabs/__tests__/Generated/TabContent.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { TabContent } from '../../TabContent';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Tabs/__tests__/OverflowTab.test.tsx b/packages/react-core/src/components/Tabs/__tests__/OverflowTab.test.tsx
index a304d9eb8b0..adc33aa66b2 100644
--- a/packages/react-core/src/components/Tabs/__tests__/OverflowTab.test.tsx
+++ b/packages/react-core/src/components/Tabs/__tests__/OverflowTab.test.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { StrictMode } from 'react';
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import userEvent from '@testing-library/user-event';
@@ -181,14 +181,14 @@ test('Renders tabs passed via overflowingTabs when expanded in strict mode', asy
 
   const consoleError = jest.spyOn(console, 'error');
   const { asFragment } = render(
-    <React.StrictMode>
+    <StrictMode>
       <OverflowTab
         overflowingTabs={[
           { title: 'Tab one', eventKey: 1 },
           { title: 'Tab two', eventKey: 2 }
         ]}
       />
-    </React.StrictMode>
+    </StrictMode>
   );
 
   await user.click(screen.getByRole('tab', { name: 'More' }));
diff --git a/packages/react-core/src/components/Tabs/__tests__/Tab.test.tsx b/packages/react-core/src/components/Tabs/__tests__/Tab.test.tsx
index 677811072be..2a7c1f4ff3e 100644
--- a/packages/react-core/src/components/Tabs/__tests__/Tab.test.tsx
+++ b/packages/react-core/src/components/Tabs/__tests__/Tab.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { Tab } from '../Tab';
 import { TabAction } from '../TabAction';
diff --git a/packages/react-core/src/components/Tabs/__tests__/TabButton.test.tsx b/packages/react-core/src/components/Tabs/__tests__/TabButton.test.tsx
index 83e9d09c33d..020dbc31c34 100644
--- a/packages/react-core/src/components/Tabs/__tests__/TabButton.test.tsx
+++ b/packages/react-core/src/components/Tabs/__tests__/TabButton.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { TabButton } from '../TabButton';
 
diff --git a/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx b/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx
index afe30bd7fbd..1e6307c1f5a 100644
--- a/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx
+++ b/packages/react-core/src/components/Tabs/__tests__/Tabs.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Tabs } from '../Tabs';
 import { Tab } from '../Tab';
diff --git a/packages/react-core/src/components/Tabs/examples/Tabs.md b/packages/react-core/src/components/Tabs/examples/Tabs.md
index 10ce5e5d582..a53344678e2 100644
--- a/packages/react-core/src/components/Tabs/examples/Tabs.md
+++ b/packages/react-core/src/components/Tabs/examples/Tabs.md
@@ -6,6 +6,7 @@ propComponents: ['Tabs', 'Tab', 'TabContent', 'TabTitleText', 'TabTitleIcon', 'h
 ouia: true
 ---
 
+import { Fragment } from 'react';
 import UsersIcon from '@patternfly/react-icons/dist/esm/icons/users-icon';
 import BoxIcon from '@patternfly/react-icons/dist/esm/icons/box-icon';
 import DatabaseIcon from '@patternfly/react-icons/dist/esm/icons/database-icon';
diff --git a/packages/react-core/src/components/Tabs/examples/TabsBoxSecondary.tsx b/packages/react-core/src/components/Tabs/examples/TabsBoxSecondary.tsx
index 7024a509d3b..9a943477d58 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsBoxSecondary.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsBoxSecondary.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText, Checkbox, Tooltip } from '@patternfly/react-core';
 
 export const TabsBoxSecondary: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Tabs/examples/TabsChildrenMounting.tsx b/packages/react-core/src/components/Tabs/examples/TabsChildrenMounting.tsx
index 23e189e63ca..a05eca357d5 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsChildrenMounting.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsChildrenMounting.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText } from '@patternfly/react-core';
 
 export const TabsChildrenMounting: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Tabs/examples/TabsContentWithBodyPadding.tsx b/packages/react-core/src/components/Tabs/examples/TabsContentWithBodyPadding.tsx
index 1271559f18c..9849d03daec 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsContentWithBodyPadding.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsContentWithBodyPadding.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Tabs, Tab, TabTitleText, TabContent, TabContentBody } from '@patternfly/react-core';
 
 export const TabContentWithBodyPadding: React.FunctionComponent = () => {
@@ -16,7 +16,7 @@ export const TabContentWithBodyPadding: React.FunctionComponent = () => {
   const contentRef3 = React.createRef<HTMLElement>();
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Tabs
         activeKey={activeTabKey}
         onSelect={handleTabClick}
@@ -53,6 +53,6 @@ export const TabContentWithBodyPadding: React.FunctionComponent = () => {
           <TabContentBody hasPadding> Tab 3 section with body and padding </TabContentBody>
         </TabContent>
       </div>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Tabs/examples/TabsDefault.tsx b/packages/react-core/src/components/Tabs/examples/TabsDefault.tsx
index 57a857e9cb6..505e3769dae 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsDefault.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsDefault.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText, Checkbox, Tooltip } from '@patternfly/react-core';
 
 export const TabsDefault: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Tabs/examples/TabsDefaultOverflow.tsx b/packages/react-core/src/components/Tabs/examples/TabsDefaultOverflow.tsx
index ea64496ec12..56b3dbd6bcc 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsDefaultOverflow.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsDefaultOverflow.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText, Checkbox } from '@patternfly/react-core';
 
 export const TabsDefaultOverflow: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Tabs/examples/TabsDynamic.tsx b/packages/react-core/src/components/Tabs/examples/TabsDynamic.tsx
index d9f9ccb29df..a62520f12ad 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsDynamic.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsDynamic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText } from '@patternfly/react-core';
 
 export const TabsDynamic: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Tabs/examples/TabsFilled.tsx b/packages/react-core/src/components/Tabs/examples/TabsFilled.tsx
index 5664c2ec89d..9838505c8f6 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsFilled.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsFilled.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText, Checkbox } from '@patternfly/react-core';
 
 export const TabsFilled: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Tabs/examples/TabsFilledWithIcons.tsx b/packages/react-core/src/components/Tabs/examples/TabsFilledWithIcons.tsx
index ca3982207bb..8c2edb68832 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsFilledWithIcons.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsFilledWithIcons.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText, TabTitleIcon, Checkbox } from '@patternfly/react-core';
 import UsersIcon from '@patternfly/react-icons/dist/esm/icons/users-icon';
 import BoxIcon from '@patternfly/react-icons/dist/esm/icons/box-icon';
diff --git a/packages/react-core/src/components/Tabs/examples/TabsHelp.tsx b/packages/react-core/src/components/Tabs/examples/TabsHelp.tsx
index 7ed588052bd..d6ee39810d3 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsHelp.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsHelp.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText, TabAction, Popover } from '@patternfly/react-core';
 import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon';
 
diff --git a/packages/react-core/src/components/Tabs/examples/TabsHelpAndClose.tsx b/packages/react-core/src/components/Tabs/examples/TabsHelpAndClose.tsx
index 7015fa6edac..342ed74febf 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsHelpAndClose.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsHelpAndClose.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText, Popover, TabAction } from '@patternfly/react-core';
 import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon';
 import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
diff --git a/packages/react-core/src/components/Tabs/examples/TabsHorizontalOverflow.tsx b/packages/react-core/src/components/Tabs/examples/TabsHorizontalOverflow.tsx
index f17cc76fc2f..7efdde72ac7 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsHorizontalOverflow.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsHorizontalOverflow.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText, Checkbox } from '@patternfly/react-core';
 
 export const TabsHorizontalOverflow: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Tabs/examples/TabsIconAndText.tsx b/packages/react-core/src/components/Tabs/examples/TabsIconAndText.tsx
index 6c0da805c7f..a2d26e0a842 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsIconAndText.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsIconAndText.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText, TabTitleIcon } from '@patternfly/react-core';
 import UsersIcon from '@patternfly/react-icons/dist/esm/icons/users-icon';
 import BoxIcon from '@patternfly/react-icons/dist/esm/icons/box-icon';
diff --git a/packages/react-core/src/components/Tabs/examples/TabsInset.tsx b/packages/react-core/src/components/Tabs/examples/TabsInset.tsx
index 9bf6ebe37bc..e2846ede5ca 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsInset.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsInset.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText, Checkbox } from '@patternfly/react-core';
 
 export const TabsInset: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Tabs/examples/TabsNav.tsx b/packages/react-core/src/components/Tabs/examples/TabsNav.tsx
index 42494ea94f0..7edf0f76105 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsNav.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsNav.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabsComponent, TabTitleText } from '@patternfly/react-core';
 
 export const TabsNav: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Tabs/examples/TabsNavSubtab.tsx b/packages/react-core/src/components/Tabs/examples/TabsNavSubtab.tsx
index c454a3b71dd..3023b900a13 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsNavSubtab.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsNavSubtab.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabsComponent, TabTitleText } from '@patternfly/react-core';
 
 export const TabsNavSubtab: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Tabs/examples/TabsPageInsets.tsx b/packages/react-core/src/components/Tabs/examples/TabsPageInsets.tsx
index 7e07102bf91..22b151bdac6 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsPageInsets.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsPageInsets.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText, Checkbox } from '@patternfly/react-core';
 
 export const TabsPageInsets: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Tabs/examples/TabsSeparateContent.tsx b/packages/react-core/src/components/Tabs/examples/TabsSeparateContent.tsx
index a07c3455636..fa8e6008f00 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsSeparateContent.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsSeparateContent.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Tabs, Tab, TabTitleText, TabContent } from '@patternfly/react-core';
 
 export const TabsSeparateContent: React.FunctionComponent = () => {
@@ -16,11 +16,11 @@ export const TabsSeparateContent: React.FunctionComponent = () => {
   const contentRef3 = React.createRef<HTMLElement>();
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Tabs
         activeKey={activeTabKey}
         onSelect={handleTabClick}
-        aria-label="Tabs in the seperate content example"
+        aria-label="Tabs in the separate content example"
         role="region"
       >
         <Tab
@@ -70,6 +70,6 @@ export const TabsSeparateContent: React.FunctionComponent = () => {
           Tab 3 section
         </TabContent>
       </div>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Tabs/examples/TabsSubtabs.tsx b/packages/react-core/src/components/Tabs/examples/TabsSubtabs.tsx
index 91587974355..855dfdafb0c 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsSubtabs.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsSubtabs.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText, Checkbox } from '@patternfly/react-core';
 
 export const TabsSubtabs: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Tabs/examples/TabsToggledSeparateContent.tsx b/packages/react-core/src/components/Tabs/examples/TabsToggledSeparateContent.tsx
index 80aaf1c72f9..6e6486ee628 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsToggledSeparateContent.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsToggledSeparateContent.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Tabs, Tab, TabContent, Button, Divider } from '@patternfly/react-core';
 
 export const TabsToggledSeparateContent: React.FunctionComponent = () => {
   const [activeTabKey, setActiveTabKey] = React.useState<string | number>(0);
-  const [isTab2Hidden, setisTab2Hidden] = React.useState<boolean>(false);
+  const [isTab2Hidden, setIsTab2Hidden] = React.useState<boolean>(false);
   // Toggle currently active tab
   const handleTabClick = (
     event: React.MouseEvent<any> | React.KeyboardEvent | MouseEvent,
@@ -17,8 +17,8 @@ export const TabsToggledSeparateContent: React.FunctionComponent = () => {
   const contentRef3 = React.createRef<HTMLElement>();
 
   return (
-    <React.Fragment>
-      <Button onClick={() => setisTab2Hidden(!isTab2Hidden)}>{isTab2Hidden ? 'Show' : 'Hide'} tab 2</Button>
+    <Fragment>
+      <Button onClick={() => setIsTab2Hidden(!isTab2Hidden)}>{isTab2Hidden ? 'Show' : 'Hide'} tab 2</Button>
       <Divider style={{ paddingTop: '1rem', paddingBottom: '1rem' }} />
       <Tabs
         activeKey={activeTabKey}
@@ -62,6 +62,6 @@ export const TabsToggledSeparateContent: React.FunctionComponent = () => {
           Tab 3 section
         </TabContent>
       </div>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Tabs/examples/TabsTooltipReactRef.tsx b/packages/react-core/src/components/Tabs/examples/TabsTooltipReactRef.tsx
index 6d50672b607..1e047acb78f 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsTooltipReactRef.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsTooltipReactRef.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText, Checkbox, Tooltip } from '@patternfly/react-core';
 
 export const TabsTooltipReactRef: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Tabs/examples/TabsUncontrolled.tsx b/packages/react-core/src/components/Tabs/examples/TabsUncontrolled.tsx
index 51fb4826278..030ca7d6e8f 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsUncontrolled.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsUncontrolled.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText, Tooltip } from '@patternfly/react-core';
 
 export const TabsUncontrolled: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Tabs/examples/TabsUnmountingInvisibleChildren.tsx b/packages/react-core/src/components/Tabs/examples/TabsUnmountingInvisibleChildren.tsx
index ed5b275043c..1e6f44d209a 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsUnmountingInvisibleChildren.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsUnmountingInvisibleChildren.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText } from '@patternfly/react-core';
 
 export const TabsUnmountingInvisibleChildren: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Tabs/examples/TabsVertical.tsx b/packages/react-core/src/components/Tabs/examples/TabsVertical.tsx
index c3a10757987..d1206b0d99f 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsVertical.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsVertical.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText, Checkbox, Tooltip } from '@patternfly/react-core';
 
 export const TabsVertical: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Tabs/examples/TabsVerticalExpandable.tsx b/packages/react-core/src/components/Tabs/examples/TabsVerticalExpandable.tsx
index e36136af900..a49845199e7 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsVerticalExpandable.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsVerticalExpandable.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText } from '@patternfly/react-core';
 
 export const TabsVerticalExpandable: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Tabs/examples/TabsVerticalExpandableUncontrolled.tsx b/packages/react-core/src/components/Tabs/examples/TabsVerticalExpandableUncontrolled.tsx
index ac01f6f7dc3..3671988e8b3 100644
--- a/packages/react-core/src/components/Tabs/examples/TabsVerticalExpandableUncontrolled.tsx
+++ b/packages/react-core/src/components/Tabs/examples/TabsVerticalExpandableUncontrolled.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tabs, Tab, TabTitleText } from '@patternfly/react-core';
 export const TabsVerticalExpandableUncontrolled: React.FunctionComponent = () => {
   const [activeTabKey, setActiveTabKey] = React.useState<string | number>(0);
diff --git a/packages/react-core/src/components/TextArea/TextArea.tsx b/packages/react-core/src/components/TextArea/TextArea.tsx
index e3c2c275984..267e67728af 100644
--- a/packages/react-core/src/components/TextArea/TextArea.tsx
+++ b/packages/react-core/src/components/TextArea/TextArea.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-import { HTMLProps } from 'react';
+import { Component, HTMLProps, createRef, forwardRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/FormControl/form-control';
 import { css } from '@patternfly/react-styles';
 import { capitalize, ValidatedOptions, canUseDOM } from '../../helpers';
@@ -45,10 +44,10 @@ export interface TextAreaProps extends Omit<HTMLProps<HTMLTextAreaElement>, 'onC
   innerRef?: React.RefObject<any>;
 }
 
-class TextAreaBase extends React.Component<TextAreaProps> {
+class TextAreaBase extends Component<TextAreaProps> {
   static displayName = 'TextArea';
   static defaultProps: TextAreaProps = {
-    innerRef: React.createRef<HTMLTextAreaElement>(),
+    innerRef: createRef<HTMLTextAreaElement>(),
     className: '',
     isRequired: false,
     isDisabled: false,
@@ -57,7 +56,7 @@ class TextAreaBase extends React.Component<TextAreaProps> {
     'aria-label': null as string
   };
 
-  inputRef = React.createRef<HTMLTextAreaElement>();
+  inputRef = createRef<HTMLTextAreaElement>();
 
   private setAutoHeight = (field: HTMLTextAreaElement) => {
     const parent = field.parentElement;
@@ -160,7 +159,7 @@ class TextAreaBase extends React.Component<TextAreaProps> {
   }
 }
 
-export const TextArea = React.forwardRef((props: TextAreaProps, ref: React.Ref<HTMLTextAreaElement>) => (
+export const TextArea = forwardRef((props: TextAreaProps, ref: React.Ref<HTMLTextAreaElement>) => (
   <TextAreaBase {...props} innerRef={ref as React.MutableRefObject<any>} />
 ));
 TextArea.displayName = 'TextArea';
diff --git a/packages/react-core/src/components/TextArea/__tests__/TextArea.test.tsx b/packages/react-core/src/components/TextArea/__tests__/TextArea.test.tsx
index 3a9225b4d9b..6ce25c255f6 100644
--- a/packages/react-core/src/components/TextArea/__tests__/TextArea.test.tsx
+++ b/packages/react-core/src/components/TextArea/__tests__/TextArea.test.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { createRef } from 'react';
 import '@testing-library/jest-dom';
 
 import { render, screen } from '@testing-library/react';
@@ -149,7 +149,7 @@ test('Does not throw console error when aria-label is given but no id', () => {
 });
 
 test('TextArea can be accessed via passed ref', () => {
-  const testRef: React.RefObject<HTMLTextAreaElement | null> = React.createRef();
+  const testRef: React.RefObject<HTMLTextAreaElement | null> = createRef();
   render(<TextArea ref={testRef} />);
   global.scrollTo = jest.fn();
   testRef.current?.focus();
diff --git a/packages/react-core/src/components/TextArea/examples/TextArea.md b/packages/react-core/src/components/TextArea/examples/TextArea.md
index 188c332a260..9136eb2dff1 100644
--- a/packages/react-core/src/components/TextArea/examples/TextArea.md
+++ b/packages/react-core/src/components/TextArea/examples/TextArea.md
@@ -6,6 +6,8 @@ cssPrefix: pf-v6-c-form-control
 propComponents: ['TextArea']
 ---
 
+import { Fragment } from 'react';
+
 ## Examples
 
 ### Basic
diff --git a/packages/react-core/src/components/TextArea/examples/TextAreaAutoResizing.tsx b/packages/react-core/src/components/TextArea/examples/TextAreaAutoResizing.tsx
index 57dbb03917c..819d5b80a51 100644
--- a/packages/react-core/src/components/TextArea/examples/TextAreaAutoResizing.tsx
+++ b/packages/react-core/src/components/TextArea/examples/TextAreaAutoResizing.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TextArea } from '@patternfly/react-core';
 
 export const TextAreaAutoResizing: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TextArea/examples/TextAreaBasic.tsx b/packages/react-core/src/components/TextArea/examples/TextAreaBasic.tsx
index c3b6a50f3fb..c078a48e15c 100644
--- a/packages/react-core/src/components/TextArea/examples/TextAreaBasic.tsx
+++ b/packages/react-core/src/components/TextArea/examples/TextAreaBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TextArea } from '@patternfly/react-core';
 
 export const TextAreaBasic: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TextArea/examples/TextAreaDisabled.tsx b/packages/react-core/src/components/TextArea/examples/TextAreaDisabled.tsx
index cb5b455a4b0..bf6e7f3bbe4 100644
--- a/packages/react-core/src/components/TextArea/examples/TextAreaDisabled.tsx
+++ b/packages/react-core/src/components/TextArea/examples/TextAreaDisabled.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TextArea } from '@patternfly/react-core';
 
 export const TextAreaDisabled: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/TextArea/examples/TextAreaHorizontallyResizable.tsx b/packages/react-core/src/components/TextArea/examples/TextAreaHorizontallyResizable.tsx
index d71ac9b48f2..a4dcac2e96d 100644
--- a/packages/react-core/src/components/TextArea/examples/TextAreaHorizontallyResizable.tsx
+++ b/packages/react-core/src/components/TextArea/examples/TextAreaHorizontallyResizable.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TextArea } from '@patternfly/react-core';
 
 export const TextAreaHorizontallyResizable: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TextArea/examples/TextAreaInvalid.tsx b/packages/react-core/src/components/TextArea/examples/TextAreaInvalid.tsx
index d9b761fa6c2..e84e001e26a 100644
--- a/packages/react-core/src/components/TextArea/examples/TextAreaInvalid.tsx
+++ b/packages/react-core/src/components/TextArea/examples/TextAreaInvalid.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TextArea } from '@patternfly/react-core';
 
 export const TextAreaInvalid: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TextArea/examples/TextAreaReadOnly.tsx b/packages/react-core/src/components/TextArea/examples/TextAreaReadOnly.tsx
index 2592f74eb4f..85ca49cb923 100644
--- a/packages/react-core/src/components/TextArea/examples/TextAreaReadOnly.tsx
+++ b/packages/react-core/src/components/TextArea/examples/TextAreaReadOnly.tsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Checkbox, TextArea } from '@patternfly/react-core';
 
 export const TextAreaReadOnly: React.FunctionComponent = () => {
   const [isPlainChecked, setIsPlainChecked] = React.useState(false);
 
   return (
-    <React.Fragment>
+    <Fragment>
       <div style={{ marginBottom: '12px' }}>
         <Checkbox
           id="isPlain"
@@ -20,6 +20,6 @@ export const TextAreaReadOnly: React.FunctionComponent = () => {
         value="read only text area example"
         readOnlyVariant={isPlainChecked ? 'plain' : 'default'}
       />
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/TextArea/examples/TextAreaResizableNone.tsx b/packages/react-core/src/components/TextArea/examples/TextAreaResizableNone.tsx
index bdc5abe7965..ad4be355a2c 100644
--- a/packages/react-core/src/components/TextArea/examples/TextAreaResizableNone.tsx
+++ b/packages/react-core/src/components/TextArea/examples/TextAreaResizableNone.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TextArea } from '@patternfly/react-core';
 
 export const TextAreaResizeNone: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TextArea/examples/TextAreaUncontrolled.tsx b/packages/react-core/src/components/TextArea/examples/TextAreaUncontrolled.tsx
index f2a75725e2f..8ec21dfc6d3 100644
--- a/packages/react-core/src/components/TextArea/examples/TextAreaUncontrolled.tsx
+++ b/packages/react-core/src/components/TextArea/examples/TextAreaUncontrolled.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TextArea } from '@patternfly/react-core';
 
 export const TextAreaUncontrolled: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/TextArea/examples/TextAreaValidated.tsx b/packages/react-core/src/components/TextArea/examples/TextAreaValidated.tsx
index 5714bbbf4a8..bfb19a7160a 100644
--- a/packages/react-core/src/components/TextArea/examples/TextAreaValidated.tsx
+++ b/packages/react-core/src/components/TextArea/examples/TextAreaValidated.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Form, FormGroup, FormHelperText, HelperText, HelperTextItem, TextArea } from '@patternfly/react-core';
 
 export const TextAreaValidated: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TextArea/examples/TextAreaVerticallyResizable.tsx b/packages/react-core/src/components/TextArea/examples/TextAreaVerticallyResizable.tsx
index 7ceda9bbff1..c7720dc95c7 100644
--- a/packages/react-core/src/components/TextArea/examples/TextAreaVerticallyResizable.tsx
+++ b/packages/react-core/src/components/TextArea/examples/TextAreaVerticallyResizable.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TextArea } from '@patternfly/react-core';
 
 export const VerticalResizeTextArea: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TextInput/TextInput.tsx b/packages/react-core/src/components/TextInput/TextInput.tsx
index 282928b5c07..4eea7d4ab41 100644
--- a/packages/react-core/src/components/TextInput/TextInput.tsx
+++ b/packages/react-core/src/components/TextInput/TextInput.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { createRef, Component, forwardRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/FormControl/form-control';
 import { css } from '@patternfly/react-styles';
 import { ValidatedOptions } from '../../helpers/constants';
@@ -96,8 +96,7 @@ interface TextInputState {
   ouiaStateId: string;
 }
 
-// eslint-disable-next-line patternfly-react/no-anonymous-functions
-export class TextInputBase extends React.Component<TextInputProps, TextInputState> {
+export class TextInputBase extends Component<TextInputProps, TextInputState> {
   static displayName = 'TextInputBase';
   static defaultProps: TextInputProps = {
     'aria-label': null,
@@ -111,7 +110,7 @@ export class TextInputBase extends React.Component<TextInputProps, TextInputStat
     onChange: (): any => undefined,
     ouiaSafe: true
   };
-  inputRef = React.createRef<HTMLInputElement>();
+  inputRef = createRef<HTMLInputElement>();
   observer: any = () => {};
 
   constructor(props: TextInputProps) {
@@ -250,7 +249,7 @@ export class TextInputBase extends React.Component<TextInputProps, TextInputStat
     typeof value === 'string' ? value.replace(/\n/g, ' ') : value;
 }
 
-export const TextInput = React.forwardRef((props: TextInputProps, ref: React.Ref<HTMLInputElement>) => (
+export const TextInput = forwardRef((props: TextInputProps, ref: React.Ref<HTMLInputElement>) => (
   <TextInputBase {...props} innerRef={ref as React.MutableRefObject<any>} />
 ));
 TextInput.displayName = 'TextInput';
diff --git a/packages/react-core/src/components/TextInput/__tests__/TextInput.test.tsx b/packages/react-core/src/components/TextInput/__tests__/TextInput.test.tsx
index 90a8e8441de..a364a95a34f 100644
--- a/packages/react-core/src/components/TextInput/__tests__/TextInput.test.tsx
+++ b/packages/react-core/src/components/TextInput/__tests__/TextInput.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-core/src/components/TextInput/examples/TextInputBasic.tsx b/packages/react-core/src/components/TextInput/examples/TextInputBasic.tsx
index 6ea790d3a93..f3e9eec015f 100644
--- a/packages/react-core/src/components/TextInput/examples/TextInputBasic.tsx
+++ b/packages/react-core/src/components/TextInput/examples/TextInputBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TextInput } from '@patternfly/react-core';
 
 export const TextInputBasic: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TextInput/examples/TextInputCustomIcon.tsx b/packages/react-core/src/components/TextInput/examples/TextInputCustomIcon.tsx
index 12d2061721d..66895d47264 100644
--- a/packages/react-core/src/components/TextInput/examples/TextInputCustomIcon.tsx
+++ b/packages/react-core/src/components/TextInput/examples/TextInputCustomIcon.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TextInput } from '@patternfly/react-core';
 import CalendarIcon from '@patternfly/react-icons/dist/esm/icons/calendar-icon';
 import ClockIcon from '@patternfly/react-icons/dist/esm/icons/clock-icon';
diff --git a/packages/react-core/src/components/TextInput/examples/TextInputCustomIconInvalid.tsx b/packages/react-core/src/components/TextInput/examples/TextInputCustomIconInvalid.tsx
index 86fbdfaf741..cffdcf00f75 100644
--- a/packages/react-core/src/components/TextInput/examples/TextInputCustomIconInvalid.tsx
+++ b/packages/react-core/src/components/TextInput/examples/TextInputCustomIconInvalid.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TextInput, ValidatedOptions } from '@patternfly/react-core';
 import CalendarIcon from '@patternfly/react-icons/dist/esm/icons/calendar-icon';
 
diff --git a/packages/react-core/src/components/TextInput/examples/TextInputDisabled.tsx b/packages/react-core/src/components/TextInput/examples/TextInputDisabled.tsx
index 52580a22062..fadbdf4ea43 100644
--- a/packages/react-core/src/components/TextInput/examples/TextInputDisabled.tsx
+++ b/packages/react-core/src/components/TextInput/examples/TextInputDisabled.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TextInput } from '@patternfly/react-core';
 
 export const TextInputBasic: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/TextInput/examples/TextInputInvalid.tsx b/packages/react-core/src/components/TextInput/examples/TextInputInvalid.tsx
index f30e8495013..4d7ad494e45 100644
--- a/packages/react-core/src/components/TextInput/examples/TextInputInvalid.tsx
+++ b/packages/react-core/src/components/TextInput/examples/TextInputInvalid.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TextInput, ValidatedOptions } from '@patternfly/react-core';
 
 export const TextInputInvalid: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TextInput/examples/TextInputReadOnly.tsx b/packages/react-core/src/components/TextInput/examples/TextInputReadOnly.tsx
index 461f200f482..752ebcc9d31 100644
--- a/packages/react-core/src/components/TextInput/examples/TextInputReadOnly.tsx
+++ b/packages/react-core/src/components/TextInput/examples/TextInputReadOnly.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Checkbox, TextInput } from '@patternfly/react-core';
 
 export const TextInputReadOnly: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TextInput/examples/TextInputSelectUsingRef.tsx b/packages/react-core/src/components/TextInput/examples/TextInputSelectUsingRef.tsx
index 3bc8ae757a4..33189279f09 100644
--- a/packages/react-core/src/components/TextInput/examples/TextInputSelectUsingRef.tsx
+++ b/packages/react-core/src/components/TextInput/examples/TextInputSelectUsingRef.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TextInput } from '@patternfly/react-core';
 
 export const TextInputSelectUsingRef: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TextInput/examples/TextInputStartTruncated.tsx b/packages/react-core/src/components/TextInput/examples/TextInputStartTruncated.tsx
index fad11295028..9324bf981e8 100644
--- a/packages/react-core/src/components/TextInput/examples/TextInputStartTruncated.tsx
+++ b/packages/react-core/src/components/TextInput/examples/TextInputStartTruncated.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TextInput } from '@patternfly/react-core';
 
 export const StartTruncatedTextInput: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TextInputGroup/TextInputGroup.tsx b/packages/react-core/src/components/TextInputGroup/TextInputGroup.tsx
index 13fab93e0fc..4201b876ba0 100644
--- a/packages/react-core/src/components/TextInputGroup/TextInputGroup.tsx
+++ b/packages/react-core/src/components/TextInputGroup/TextInputGroup.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { createContext, useRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/TextInputGroup/text-input-group';
 import { css } from '@patternfly/react-styles';
 
@@ -17,7 +17,7 @@ export interface TextInputGroupProps extends React.HTMLProps<HTMLDivElement> {
   innerRef?: React.RefObject<any>;
 }
 
-export const TextInputGroupContext = React.createContext<Partial<TextInputGroupProps>>({
+export const TextInputGroupContext = createContext<Partial<TextInputGroupProps>>({
   isDisabled: false
 });
 
@@ -30,7 +30,7 @@ export const TextInputGroup: React.FunctionComponent<TextInputGroupProps> = ({
   innerRef,
   ...props
 }: TextInputGroupProps) => {
-  const ref = React.useRef(null);
+  const ref = useRef(null);
   const textInputGroupRef = innerRef || ref;
 
   return (
diff --git a/packages/react-core/src/components/TextInputGroup/TextInputGroupIcon.tsx b/packages/react-core/src/components/TextInputGroup/TextInputGroupIcon.tsx
index aeed6e0ca75..96afea07333 100644
--- a/packages/react-core/src/components/TextInputGroup/TextInputGroupIcon.tsx
+++ b/packages/react-core/src/components/TextInputGroup/TextInputGroupIcon.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/TextInputGroup/text-input-group';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/TextInputGroup/TextInputGroupMain.tsx b/packages/react-core/src/components/TextInputGroup/TextInputGroupMain.tsx
index d60ee210849..80e3ec17de6 100644
--- a/packages/react-core/src/components/TextInputGroup/TextInputGroupMain.tsx
+++ b/packages/react-core/src/components/TextInputGroup/TextInputGroupMain.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef, useContext, useRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/TextInputGroup/text-input-group';
 import { css } from '@patternfly/react-styles';
 import { TextInputGroupContext } from './TextInputGroup';
@@ -83,8 +83,8 @@ const TextInputGroupMainBase: React.FunctionComponent<TextInputGroupMainProps> =
   inputProps,
   ...props
 }: TextInputGroupMainProps) => {
-  const { isDisabled, validated } = React.useContext(TextInputGroupContext);
-  const ref = React.useRef(null);
+  const { isDisabled, validated } = useContext(TextInputGroupContext);
+  const ref = useRef(null);
   const textInputGroupInputInputRef = innerRef || ref;
   const StatusIcon = statusIcons[validated === ValidatedOptions.error ? 'danger' : validated];
 
@@ -132,10 +132,8 @@ const TextInputGroupMainBase: React.FunctionComponent<TextInputGroupMainProps> =
   );
 };
 
-export const TextInputGroupMain = React.forwardRef(
-  (props: TextInputGroupMainProps, ref: React.Ref<HTMLInputElement>) => (
-    <TextInputGroupMainBase innerRef={ref as React.MutableRefObject<any>} {...props} />
-  )
-);
+export const TextInputGroupMain = forwardRef((props: TextInputGroupMainProps, ref: React.Ref<HTMLInputElement>) => (
+  <TextInputGroupMainBase innerRef={ref as React.MutableRefObject<any>} {...props} />
+));
 
 TextInputGroupMain.displayName = 'TextInputGroupMain';
diff --git a/packages/react-core/src/components/TextInputGroup/TextInputGroupUtilities.tsx b/packages/react-core/src/components/TextInputGroup/TextInputGroupUtilities.tsx
index 124dea20391..673189498e1 100644
--- a/packages/react-core/src/components/TextInputGroup/TextInputGroupUtilities.tsx
+++ b/packages/react-core/src/components/TextInputGroup/TextInputGroupUtilities.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/TextInputGroup/text-input-group';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/TextInputGroup/__tests__/TextInputGroup.test.tsx b/packages/react-core/src/components/TextInputGroup/__tests__/TextInputGroup.test.tsx
index f4c06d3e72c..7cc494827fb 100644
--- a/packages/react-core/src/components/TextInputGroup/__tests__/TextInputGroup.test.tsx
+++ b/packages/react-core/src/components/TextInputGroup/__tests__/TextInputGroup.test.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useContext } from 'react';
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import styles from '@patternfly/react-styles/css/components/TextInputGroup/text-input-group';
@@ -74,7 +74,7 @@ describe('TextInputGroup', () => {
 
   it('passes isDisabled=false to children via a context when isDisabled prop is not passed', () => {
     const TestComponent: React.FunctionComponent = () => {
-      const context = React.useContext(TextInputGroupContext);
+      const context = useContext(TextInputGroupContext);
 
       return <button disabled={context.isDisabled} />;
     };
@@ -92,7 +92,7 @@ describe('TextInputGroup', () => {
 
   it('passes isDisabled=true to children via a context when isDisabled prop is passed', () => {
     const TestComponent: React.FunctionComponent = () => {
-      const context = React.useContext(TextInputGroupContext);
+      const context = useContext(TextInputGroupContext);
 
       return <button disabled={context.isDisabled} />;
     };
diff --git a/packages/react-core/src/components/TextInputGroup/__tests__/TextInputGroupMain.test.tsx b/packages/react-core/src/components/TextInputGroup/__tests__/TextInputGroupMain.test.tsx
index 98a235f9d7d..3251d7d93bf 100644
--- a/packages/react-core/src/components/TextInputGroup/__tests__/TextInputGroupMain.test.tsx
+++ b/packages/react-core/src/components/TextInputGroup/__tests__/TextInputGroupMain.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import '@testing-library/jest-dom';
diff --git a/packages/react-core/src/components/TextInputGroup/__tests__/TextInputGroupUtilities.test.tsx b/packages/react-core/src/components/TextInputGroup/__tests__/TextInputGroupUtilities.test.tsx
index 4b94e6eeb68..f0376c307e3 100644
--- a/packages/react-core/src/components/TextInputGroup/__tests__/TextInputGroupUtilities.test.tsx
+++ b/packages/react-core/src/components/TextInputGroup/__tests__/TextInputGroupUtilities.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import styles from '@patternfly/react-styles/css/components/TextInputGroup/text-input-group';
diff --git a/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupBasic.tsx b/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupBasic.tsx
index 098ebe4eda3..40a8a2b3482 100644
--- a/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupBasic.tsx
+++ b/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TextInputGroup, TextInputGroupMain } from '@patternfly/react-core';
 
 export const TextInputGroupBasic: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupDisabled.tsx b/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupDisabled.tsx
index e9f49256b40..5a08de51276 100644
--- a/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupDisabled.tsx
+++ b/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupDisabled.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TextInputGroup, TextInputGroupMain } from '@patternfly/react-core';
 
 export const TextInputGroupDisabled: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupFilters.tsx b/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupFilters.tsx
index 64840139143..4bce1eea8c0 100644
--- a/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupFilters.tsx
+++ b/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupFilters.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   TextInputGroup,
   TextInputGroupMain,
diff --git a/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupUtilitiesAndIcon.tsx b/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupUtilitiesAndIcon.tsx
index 1611a45a87a..81b940f3117 100644
--- a/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupUtilitiesAndIcon.tsx
+++ b/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupUtilitiesAndIcon.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TextInputGroup, TextInputGroupMain, TextInputGroupUtilities, Button } from '@patternfly/react-core';
 import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
 import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
diff --git a/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupWithStatus.tsx b/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupWithStatus.tsx
index 9e8ee8c1a17..1aec1990168 100644
--- a/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupWithStatus.tsx
+++ b/packages/react-core/src/components/TextInputGroup/examples/TextInputGroupWithStatus.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   TextInputGroup,
   TextInputGroupMain,
diff --git a/packages/react-core/src/components/TimePicker/TimePicker.tsx b/packages/react-core/src/components/TimePicker/TimePicker.tsx
index 523f4dd0285..b6feafe0361 100644
--- a/packages/react-core/src/components/TimePicker/TimePicker.tsx
+++ b/packages/react-core/src/components/TimePicker/TimePicker.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, createRef } from 'react';
 import { css } from '@patternfly/react-styles';
 import datePickerStyles from '@patternfly/react-styles/css/components/DatePicker/date-picker';
 import menuStyles from '@patternfly/react-styles/css/components/Menu/menu';
@@ -39,7 +39,7 @@ export interface TimePickerProps
   time?: string | Date;
   /** Error message to display when the time is provided in an invalid format. */
   invalidFormatErrorMessage?: string;
-  /** Error message to display when the time provided is not within the minTime/maxTime constriants */
+  /** Error message to display when the time provided is not within the minTime/maxTime constraints */
   invalidMinMaxErrorMessage?: string;
   /** True if the time is 24 hour time. False if the time is 12 hour time */
   is24Hour?: boolean;
@@ -95,12 +95,12 @@ interface TimePickerState {
   maxTimeState: string;
 }
 
-class TimePicker extends React.Component<TimePickerProps, TimePickerState> {
+class TimePicker extends Component<TimePickerProps, TimePickerState> {
   static displayName = 'TimePicker';
-  private baseComponentRef = React.createRef<any>();
-  private toggleRef = React.createRef<HTMLDivElement>();
-  private inputRef = React.createRef<HTMLInputElement>();
-  private menuRef = React.createRef<HTMLDivElement>();
+  private baseComponentRef = createRef<any>();
+  private toggleRef = createRef<HTMLDivElement>();
+  private inputRef = createRef<HTMLInputElement>();
+  private menuRef = createRef<HTMLDivElement>();
 
   static defaultProps = {
     className: '',
@@ -260,7 +260,7 @@ class TimePicker extends React.Component<TimePickerProps, TimePickerState> {
     });
   };
 
-  // fixes issue where menutAppendTo="inline" results in the menu item that should be scrolled to being out of view; this will select the menu item that comes before the intended one, causing that before-item to be placed out of view instead
+  // fixes issue where menuAppendTo="inline" results in the menu item that should be scrolled to being out of view; this will select the menu item that comes before the intended one, causing that before-item to be placed out of view instead
   getIndexToScroll = (index: number) => {
     if (this.props.menuAppendTo === 'inline') {
       return index > 0 ? index - 1 : 0;
diff --git a/packages/react-core/src/components/TimePicker/__tests__/TimePicker.test.tsx b/packages/react-core/src/components/TimePicker/__tests__/TimePicker.test.tsx
index 014df1a8f06..725a645a84e 100644
--- a/packages/react-core/src/components/TimePicker/__tests__/TimePicker.test.tsx
+++ b/packages/react-core/src/components/TimePicker/__tests__/TimePicker.test.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-
+import { StrictMode } from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
@@ -11,9 +10,9 @@ describe('TimePicker', () => {
 
     const consoleError = jest.spyOn(console, 'error');
     render(
-      <React.StrictMode>
+      <StrictMode>
         <TimePicker value={'00:00'} validateTime={validateTime} aria-label="time picker" />
-      </React.StrictMode>
+      </StrictMode>
     );
 
     expect(consoleError).not.toHaveBeenCalled();
diff --git a/packages/react-core/src/components/TimePicker/examples/TimePickerBasic12Hour.tsx b/packages/react-core/src/components/TimePicker/examples/TimePickerBasic12Hour.tsx
index cca47536518..c7f619bdd49 100644
--- a/packages/react-core/src/components/TimePicker/examples/TimePickerBasic12Hour.tsx
+++ b/packages/react-core/src/components/TimePicker/examples/TimePickerBasic12Hour.tsx
@@ -1,5 +1,4 @@
 /* eslint-disable no-console */
-import React from 'react';
 import { TimePicker } from '@patternfly/react-core';
 
 export const TimePickerBasic12Hour: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TimePicker/examples/TimePickerBasic24Hour.tsx b/packages/react-core/src/components/TimePicker/examples/TimePickerBasic24Hour.tsx
index 71cdd0ecca9..fd94d7efabf 100644
--- a/packages/react-core/src/components/TimePicker/examples/TimePickerBasic24Hour.tsx
+++ b/packages/react-core/src/components/TimePicker/examples/TimePickerBasic24Hour.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TimePicker } from '@patternfly/react-core';
 
 export const TimePickerBasic24Hour: React.FunctionComponent = () => <TimePicker time="2020-10-14T18:06:02Z" is24Hour />;
diff --git a/packages/react-core/src/components/TimePicker/examples/TimePickerBasic24HoursWithSeconds.tsx b/packages/react-core/src/components/TimePicker/examples/TimePickerBasic24HoursWithSeconds.tsx
index b66e60ad756..eb51fa47984 100644
--- a/packages/react-core/src/components/TimePicker/examples/TimePickerBasic24HoursWithSeconds.tsx
+++ b/packages/react-core/src/components/TimePicker/examples/TimePickerBasic24HoursWithSeconds.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TimePicker } from '@patternfly/react-core';
 
 export const TimePickerBasic24HourWithSeconds: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/TimePicker/examples/TimePickerCustomDelimiter.tsx b/packages/react-core/src/components/TimePicker/examples/TimePickerCustomDelimiter.tsx
index 7e63f129433..bb3604f96ac 100644
--- a/packages/react-core/src/components/TimePicker/examples/TimePickerCustomDelimiter.tsx
+++ b/packages/react-core/src/components/TimePicker/examples/TimePickerCustomDelimiter.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TimePicker } from '@patternfly/react-core';
 
 export const TimePickerCustomDelimiter: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/TimePicker/examples/TimePickerMinMaxTimes.tsx b/packages/react-core/src/components/TimePicker/examples/TimePickerMinMaxTimes.tsx
index b08f6ceb0ab..02b550e6e40 100644
--- a/packages/react-core/src/components/TimePicker/examples/TimePickerMinMaxTimes.tsx
+++ b/packages/react-core/src/components/TimePicker/examples/TimePickerMinMaxTimes.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TimePicker } from '@patternfly/react-core';
 
 export const TimePickerMinMaxTimes: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/TimePicker/examples/TimePickerWithSeconds.tsx b/packages/react-core/src/components/TimePicker/examples/TimePickerWithSeconds.tsx
index 918eabd8963..c5051bfd489 100644
--- a/packages/react-core/src/components/TimePicker/examples/TimePickerWithSeconds.tsx
+++ b/packages/react-core/src/components/TimePicker/examples/TimePickerWithSeconds.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TimePicker } from '@patternfly/react-core';
 
 export const TimePickerWithSeconds: React.FunctionComponent = () => <TimePicker time="3:35:20 PM" includeSeconds />;
diff --git a/packages/react-core/src/components/Timestamp/Timestamp.tsx b/packages/react-core/src/components/Timestamp/Timestamp.tsx
index 4d87b15fb5a..ef456f35c2c 100644
--- a/packages/react-core/src/components/Timestamp/Timestamp.tsx
+++ b/packages/react-core/src/components/Timestamp/Timestamp.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useEffect, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/Timestamp/timestamp';
 import { css } from '@patternfly/react-styles';
 import { Tooltip } from '../Tooltip';
@@ -93,7 +93,7 @@ export const Timestamp: React.FunctionComponent<TimestampProps> = ({
   tooltip,
   ...props
 }: TimestampProps) => {
-  const [date, setDate] = React.useState(() => {
+  const [date, setDate] = useState(() => {
     const initDate = new Date(dateProp);
     if (isValidDate(initDate)) {
       return initDate;
@@ -102,7 +102,7 @@ export const Timestamp: React.FunctionComponent<TimestampProps> = ({
     return new Date();
   });
 
-  React.useEffect(() => {
+  useEffect(() => {
     const dateFromProp = new Date(dateProp);
     if (isValidDate(dateFromProp) && dateFromProp.toString() !== new Date(date).toString()) {
       setDate(dateFromProp);
diff --git a/packages/react-core/src/components/Timestamp/__tests__/Timestamp.test.tsx b/packages/react-core/src/components/Timestamp/__tests__/Timestamp.test.tsx
index ac3189b7638..c52e411ad3f 100644
--- a/packages/react-core/src/components/Timestamp/__tests__/Timestamp.test.tsx
+++ b/packages/react-core/src/components/Timestamp/__tests__/Timestamp.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen, getDefaultNormalizer } from '@testing-library/react';
 import { Timestamp, TimestampFormat, TimestampTooltipVariant } from '../Timestamp';
 import styles from '@patternfly/react-styles/css/components/Timestamp/timestamp';
diff --git a/packages/react-core/src/components/Timestamp/examples/TimestampBasicFormats.tsx b/packages/react-core/src/components/Timestamp/examples/TimestampBasicFormats.tsx
index 695d5666115..c009cb986ee 100644
--- a/packages/react-core/src/components/Timestamp/examples/TimestampBasicFormats.tsx
+++ b/packages/react-core/src/components/Timestamp/examples/TimestampBasicFormats.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Timestamp, TimestampFormat } from '@patternfly/react-core';
 
 export const TimestampBasicFormats: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Timestamp/examples/TimestampCustomContent.tsx b/packages/react-core/src/components/Timestamp/examples/TimestampCustomContent.tsx
index 9bc1acc5363..c3d6e61e108 100644
--- a/packages/react-core/src/components/Timestamp/examples/TimestampCustomContent.tsx
+++ b/packages/react-core/src/components/Timestamp/examples/TimestampCustomContent.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Timestamp, TimestampFormat, TimestampTooltipVariant } from '@patternfly/react-core';
 
 export const TimestampCustomContent: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Timestamp/examples/TimestampCustomFormat.tsx b/packages/react-core/src/components/Timestamp/examples/TimestampCustomFormat.tsx
index 01ad9316924..8ec27edfed3 100644
--- a/packages/react-core/src/components/Timestamp/examples/TimestampCustomFormat.tsx
+++ b/packages/react-core/src/components/Timestamp/examples/TimestampCustomFormat.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Timestamp } from '@patternfly/react-core';
 
 export const TimestampCustomFormat: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Timestamp/examples/TimestampCustomTooltip.tsx b/packages/react-core/src/components/Timestamp/examples/TimestampCustomTooltip.tsx
index 43ddfc57662..17c730e4cf9 100644
--- a/packages/react-core/src/components/Timestamp/examples/TimestampCustomTooltip.tsx
+++ b/packages/react-core/src/components/Timestamp/examples/TimestampCustomTooltip.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Timestamp, TimestampTooltipVariant } from '@patternfly/react-core';
 
 export const TimestampCustomTooltip: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Timestamp/examples/TimestampDefault.tsx b/packages/react-core/src/components/Timestamp/examples/TimestampDefault.tsx
index 96a21fa14d6..2285536e1c1 100644
--- a/packages/react-core/src/components/Timestamp/examples/TimestampDefault.tsx
+++ b/packages/react-core/src/components/Timestamp/examples/TimestampDefault.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Timestamp } from '@patternfly/react-core';
 
 export const TimestampDefault: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Timestamp/examples/TimestampDefaultTooltip.tsx b/packages/react-core/src/components/Timestamp/examples/TimestampDefaultTooltip.tsx
index 2dad0d988c3..e90e4404da9 100644
--- a/packages/react-core/src/components/Timestamp/examples/TimestampDefaultTooltip.tsx
+++ b/packages/react-core/src/components/Timestamp/examples/TimestampDefaultTooltip.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Timestamp, TimestampTooltipVariant } from '@patternfly/react-core';
 
 export const TimestampDefaultTooltip: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Title/Title.tsx b/packages/react-core/src/components/Title/Title.tsx
index 4548cdf9484..3770d552746 100644
--- a/packages/react-core/src/components/Title/Title.tsx
+++ b/packages/react-core/src/components/Title/Title.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Title/title';
 import { useOUIAProps, OUIAProps } from '../../helpers';
diff --git a/packages/react-core/src/components/Title/__tests__/Title.test.tsx b/packages/react-core/src/components/Title/__tests__/Title.test.tsx
index bdddf8ecb9e..6aa1b9ae40c 100644
--- a/packages/react-core/src/components/Title/__tests__/Title.test.tsx
+++ b/packages/react-core/src/components/Title/__tests__/Title.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Title } from '../Title';
 import styles from '@patternfly/react-styles/css/components/Title/title';
diff --git a/packages/react-core/src/components/Title/examples/Title.md b/packages/react-core/src/components/Title/examples/Title.md
index 0b6f96339be..96ef4b72ddd 100644
--- a/packages/react-core/src/components/Title/examples/Title.md
+++ b/packages/react-core/src/components/Title/examples/Title.md
@@ -5,6 +5,8 @@ cssPrefix: pf-v6-c-title
 propComponents: ['Title']
 ---
 
+import { Fragment } from 'react';
+
 ## Examples
 ### Default Sizes
 ```ts file="./TitleDefaultSizes.tsx"
diff --git a/packages/react-core/src/components/Title/examples/TitleCustomSizes.tsx b/packages/react-core/src/components/Title/examples/TitleCustomSizes.tsx
index 324c802b6d4..d8d5e158b8a 100644
--- a/packages/react-core/src/components/Title/examples/TitleCustomSizes.tsx
+++ b/packages/react-core/src/components/Title/examples/TitleCustomSizes.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Title, TitleSizes } from '@patternfly/react-core';
 
 export const TitleCustomSizes: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Title headingLevel="h1" size={TitleSizes['4xl']}>
       4xl title
     </Title>
@@ -21,5 +21,5 @@ export const TitleCustomSizes: React.FunctionComponent = () => (
     <Title headingLevel="h6" size="md">
       md title
     </Title>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Title/examples/TitleDefaultSizes.tsx b/packages/react-core/src/components/Title/examples/TitleDefaultSizes.tsx
index c1d22d172e3..e3b2bfb95e4 100644
--- a/packages/react-core/src/components/Title/examples/TitleDefaultSizes.tsx
+++ b/packages/react-core/src/components/Title/examples/TitleDefaultSizes.tsx
@@ -1,13 +1,13 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Title } from '@patternfly/react-core';
 
 export const TitleDefaultSizes: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <Title headingLevel="h1">H1-styled title</Title>
     <Title headingLevel="h2">H2-styled title</Title>
     <Title headingLevel="h3">H3-styled title</Title>
     <Title headingLevel="h4">H4-styled title</Title>
     <Title headingLevel="h5">H5-styled title</Title>
     <Title headingLevel="h6">H6-styled title</Title>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/ToggleGroup/ToggleGroup.tsx b/packages/react-core/src/components/ToggleGroup/ToggleGroup.tsx
index bf3eddc257c..fb60482d201 100644
--- a/packages/react-core/src/components/ToggleGroup/ToggleGroup.tsx
+++ b/packages/react-core/src/components/ToggleGroup/ToggleGroup.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Children, cloneElement, isValidElement } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/ToggleGroup/toggle-group';
 import { ToggleGroupItem, ToggleGroupItemProps } from './ToggleGroupItem';
@@ -24,10 +24,10 @@ export const ToggleGroup: React.FunctionComponent<ToggleGroupProps> = ({
   'aria-label': ariaLabel,
   ...props
 }: ToggleGroupProps) => {
-  const toggleGroupItemList = React.Children.map(children, (child) =>
-    !(React.isValidElement(child) && child.type === ToggleGroupItem)
+  const toggleGroupItemList = Children.map(children, (child) =>
+    !(isValidElement(child) && child.type === ToggleGroupItem)
       ? child
-      : React.cloneElement<ToggleGroupItemProps>(child, areAllGroupsDisabled ? { isDisabled: true } : {})
+      : cloneElement<ToggleGroupItemProps>(child, areAllGroupsDisabled ? { isDisabled: true } : {})
   );
 
   return (
diff --git a/packages/react-core/src/components/ToggleGroup/ToggleGroupItem.tsx b/packages/react-core/src/components/ToggleGroup/ToggleGroupItem.tsx
index 81e00ff5d23..aa399390f1d 100644
--- a/packages/react-core/src/components/ToggleGroup/ToggleGroupItem.tsx
+++ b/packages/react-core/src/components/ToggleGroup/ToggleGroupItem.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/ToggleGroup/toggle-group';
 import { ToggleGroupItemVariant, ToggleGroupItemElement } from './ToggleGroupItemElement';
diff --git a/packages/react-core/src/components/ToggleGroup/ToggleGroupItemElement.tsx b/packages/react-core/src/components/ToggleGroup/ToggleGroupItemElement.tsx
index 0a616bcc357..dbd26dd156e 100644
--- a/packages/react-core/src/components/ToggleGroup/ToggleGroupItemElement.tsx
+++ b/packages/react-core/src/components/ToggleGroup/ToggleGroupItemElement.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/ToggleGroup/toggle-group';
 
diff --git a/packages/react-core/src/components/ToggleGroup/__tests__/ToggleGroup.test.tsx b/packages/react-core/src/components/ToggleGroup/__tests__/ToggleGroup.test.tsx
index 6739c3ca122..c0559379f35 100644
--- a/packages/react-core/src/components/ToggleGroup/__tests__/ToggleGroup.test.tsx
+++ b/packages/react-core/src/components/ToggleGroup/__tests__/ToggleGroup.test.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-core/src/components/ToggleGroup/__tests__/ToggleGroupItemElement.test.tsx b/packages/react-core/src/components/ToggleGroup/__tests__/ToggleGroupItemElement.test.tsx
index 8210bc423fc..73d79219629 100644
--- a/packages/react-core/src/components/ToggleGroup/__tests__/ToggleGroupItemElement.test.tsx
+++ b/packages/react-core/src/components/ToggleGroup/__tests__/ToggleGroupItemElement.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ToggleGroupItemElement, ToggleGroupItemVariant } from '../ToggleGroupItemElement';
 
diff --git a/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupCompact.tsx b/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupCompact.tsx
index cd0edabec8b..0431cda7a9f 100644
--- a/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupCompact.tsx
+++ b/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupCompact.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ToggleGroup, ToggleGroupItem } from '@patternfly/react-core';
 
 export const ToggleGroupCompact: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupDefaultMultiple.tsx b/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupDefaultMultiple.tsx
index c256c9eb82b..627ef581123 100644
--- a/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupDefaultMultiple.tsx
+++ b/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupDefaultMultiple.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ToggleGroup, ToggleGroupItem, Button, Stack, StackItem } from '@patternfly/react-core';
 
 export const ToggleGroupDefaultMultiple: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupDefaultSingle.tsx b/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupDefaultSingle.tsx
index fbdd22313c9..a0dc0b5f151 100644
--- a/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupDefaultSingle.tsx
+++ b/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupDefaultSingle.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ToggleGroup, ToggleGroupItem } from '@patternfly/react-core';
 
 export const ToggleGroupDefaultSingle: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupIcon.tsx b/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupIcon.tsx
index 559f9320071..6d503a7428f 100644
--- a/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupIcon.tsx
+++ b/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupIcon.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ToggleGroup, ToggleGroupItem } from '@patternfly/react-core';
 import UndoIcon from '@patternfly/react-icons/dist/esm/icons/undo-icon';
 import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon';
diff --git a/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupTextIcon.tsx b/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupTextIcon.tsx
index 147290697c9..73f5749d8da 100644
--- a/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupTextIcon.tsx
+++ b/packages/react-core/src/components/ToggleGroup/examples/ToggleGroupTextIcon.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ToggleGroup, ToggleGroupItem } from '@patternfly/react-core';
 import UndoIcon from '@patternfly/react-icons/dist/esm/icons/undo-icon';
 import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon';
diff --git a/packages/react-core/src/components/Toolbar/Toolbar.tsx b/packages/react-core/src/components/Toolbar/Toolbar.tsx
index dd014ca1ec4..c07aa64f5f3 100644
--- a/packages/react-core/src/components/Toolbar/Toolbar.tsx
+++ b/packages/react-core/src/components/Toolbar/Toolbar.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, createRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/Toolbar/toolbar';
 import { GenerateId } from '../../helpers/GenerateId/GenerateId';
 import { css } from '@patternfly/react-styles';
@@ -74,9 +74,9 @@ interface FilterInfo {
   [key: string]: number;
 }
 
-class Toolbar extends React.Component<ToolbarProps, ToolbarState> {
+class Toolbar extends Component<ToolbarProps, ToolbarState> {
   static displayName = 'Toolbar';
-  labelGroupContentRef = React.createRef<HTMLDivElement>();
+  labelGroupContentRef = createRef<HTMLDivElement>();
   staticFilterInfo = {};
   state = {
     isManagedToggleExpanded: false,
diff --git a/packages/react-core/src/components/Toolbar/ToolbarContent.tsx b/packages/react-core/src/components/Toolbar/ToolbarContent.tsx
index 7c98951712c..2f4839219fd 100644
--- a/packages/react-core/src/components/Toolbar/ToolbarContent.tsx
+++ b/packages/react-core/src/components/Toolbar/ToolbarContent.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, createRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/Toolbar/toolbar';
 import { css } from '@patternfly/react-styles';
 import { ToolbarContentContext, ToolbarContext } from './ToolbarUtils';
@@ -32,10 +32,10 @@ export interface ToolbarContentProps extends React.HTMLProps<HTMLDivElement> {
   toolbarId?: string;
 }
 
-class ToolbarContent extends React.Component<ToolbarContentProps> {
+class ToolbarContent extends Component<ToolbarContentProps> {
   static displayName = 'ToolbarContent';
-  private expandableContentRef = React.createRef<HTMLDivElement>();
-  private labelContainerRef = React.createRef<HTMLDivElement>();
+  private expandableContentRef = createRef<HTMLDivElement>();
+  private labelContainerRef = createRef<HTMLDivElement>();
   private static currentId = 0;
 
   static defaultProps: ToolbarContentProps = {
diff --git a/packages/react-core/src/components/Toolbar/ToolbarExpandIconWrapper.tsx b/packages/react-core/src/components/Toolbar/ToolbarExpandIconWrapper.tsx
index c54ceb2ba15..8fc144bfeec 100644
--- a/packages/react-core/src/components/Toolbar/ToolbarExpandIconWrapper.tsx
+++ b/packages/react-core/src/components/Toolbar/ToolbarExpandIconWrapper.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Toolbar/toolbar';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Toolbar/ToolbarExpandableContent.tsx b/packages/react-core/src/components/Toolbar/ToolbarExpandableContent.tsx
index f2398e9d0af..c4a35bce492 100644
--- a/packages/react-core/src/components/Toolbar/ToolbarExpandableContent.tsx
+++ b/packages/react-core/src/components/Toolbar/ToolbarExpandableContent.tsx
@@ -1,8 +1,7 @@
-import * as React from 'react';
+import { Component, RefObject } from 'react';
 import styles from '@patternfly/react-styles/css/components/Toolbar/toolbar';
 import { css } from '@patternfly/react-styles';
 
-import { RefObject } from 'react';
 import { ToolbarGroup } from './ToolbarGroup';
 import { ToolbarItem } from './ToolbarItem';
 import { Button } from '../Button';
@@ -26,7 +25,7 @@ export interface ToolbarExpandableContentProps extends React.HTMLProps<HTMLDivEl
   showClearFiltersButton: boolean;
 }
 
-class ToolbarExpandableContent extends React.Component<ToolbarExpandableContentProps> {
+class ToolbarExpandableContent extends Component<ToolbarExpandableContentProps> {
   static displayName = 'ToolbarExpandableContent';
   static contextType = ToolbarContext;
   context!: React.ContextType<typeof ToolbarContext>;
diff --git a/packages/react-core/src/components/Toolbar/ToolbarFilter.tsx b/packages/react-core/src/components/Toolbar/ToolbarFilter.tsx
index cf5c5a94354..7284e853426 100644
--- a/packages/react-core/src/components/Toolbar/ToolbarFilter.tsx
+++ b/packages/react-core/src/components/Toolbar/ToolbarFilter.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, Fragment } from 'react';
 import * as ReactDOM from 'react-dom';
 import { ToolbarItem, ToolbarItemProps } from './ToolbarItem';
 import { ToolbarContentContext, ToolbarContext } from './ToolbarUtils';
@@ -30,7 +30,7 @@ export interface ToolbarFilterProps extends ToolbarItemProps {
   deleteLabel?: (category: string | ToolbarLabelGroup, label: ToolbarLabel | string) => void;
   /** Customizable "Show Less" text string for the label group */
   labelGroupExpandedText?: string;
-  /** Customizeable template string for the label group. Use variable "${remaining}" for the overflow label count. */
+  /** Customizable template string for the label group. Use variable "${remaining}" for the overflow label count. */
   labelGroupCollapsedText?: string;
   /** Content to be rendered inside the data toolbar item associated with the label group */
   children: React.ReactNode;
@@ -46,7 +46,7 @@ interface ToolbarFilterState {
   isMounted: boolean;
 }
 
-class ToolbarFilter extends React.Component<ToolbarFilterProps, ToolbarFilterState> {
+class ToolbarFilter extends Component<ToolbarFilterProps, ToolbarFilterState> {
   static displayName = 'ToolbarFilter';
   static contextType = ToolbarContext;
   context!: React.ContextType<typeof ToolbarContext>;
@@ -131,24 +131,24 @@ class ToolbarFilter extends React.Component<ToolbarFilterProps, ToolbarFilterSta
 
     if (!_isExpanded && this.state.isMounted) {
       return (
-        <React.Fragment>
+        <Fragment>
           {showToolbarItem && <ToolbarItem {...props}>{children}</ToolbarItem>}
           {labelGroupContentRef?.current?.firstElementChild !== null &&
             ReactDOM.createPortal(labelGroup, labelGroupContentRef.current.firstElementChild)}
-        </React.Fragment>
+        </Fragment>
       );
     }
 
     return (
       <ToolbarContentContext.Consumer>
         {({ labelContainerRef }) => (
-          <React.Fragment>
+          <Fragment>
             {showToolbarItem && <ToolbarItem {...props}>{children}</ToolbarItem>}
             {labelContainerRef.current && ReactDOM.createPortal(labelGroup, labelContainerRef.current)}
             {expandableLabelContainerRef &&
               expandableLabelContainerRef.current &&
               ReactDOM.createPortal(labelGroup, expandableLabelContainerRef.current)}
-          </React.Fragment>
+          </Fragment>
         )}
       </ToolbarContentContext.Consumer>
     );
diff --git a/packages/react-core/src/components/Toolbar/ToolbarGroup.tsx b/packages/react-core/src/components/Toolbar/ToolbarGroup.tsx
index 970f6741e2c..ca5454a888b 100644
--- a/packages/react-core/src/components/Toolbar/ToolbarGroup.tsx
+++ b/packages/react-core/src/components/Toolbar/ToolbarGroup.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, forwardRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/Toolbar/toolbar';
 import { css } from '@patternfly/react-styles';
 import { formatBreakpointMods, toCamel } from '../../helpers/util';
@@ -165,7 +165,7 @@ export interface ToolbarGroupProps extends Omit<React.HTMLProps<HTMLDivElement>,
   innerRef?: React.RefObject<any>;
 }
 
-class ToolbarGroupWithRef extends React.Component<ToolbarGroupProps> {
+class ToolbarGroupWithRef extends Component<ToolbarGroupProps> {
   render() {
     const {
       visibility,
@@ -223,6 +223,6 @@ class ToolbarGroupWithRef extends React.Component<ToolbarGroupProps> {
   }
 }
 
-export const ToolbarGroup = React.forwardRef((props: ToolbarGroupProps, ref: any) => (
+export const ToolbarGroup = forwardRef((props: ToolbarGroupProps, ref: any) => (
   <ToolbarGroupWithRef {...props} innerRef={ref} />
 ));
diff --git a/packages/react-core/src/components/Toolbar/ToolbarItem.tsx b/packages/react-core/src/components/Toolbar/ToolbarItem.tsx
index 47c23d21131..315df000323 100644
--- a/packages/react-core/src/components/Toolbar/ToolbarItem.tsx
+++ b/packages/react-core/src/components/Toolbar/ToolbarItem.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Toolbar/toolbar';
 import { css } from '@patternfly/react-styles';
 import { formatBreakpointMods, toCamel } from '../../helpers/util';
diff --git a/packages/react-core/src/components/Toolbar/ToolbarLabelGroupContent.tsx b/packages/react-core/src/components/Toolbar/ToolbarLabelGroupContent.tsx
index d4df42263ac..6a729aee4f0 100644
--- a/packages/react-core/src/components/Toolbar/ToolbarLabelGroupContent.tsx
+++ b/packages/react-core/src/components/Toolbar/ToolbarLabelGroupContent.tsx
@@ -1,9 +1,8 @@
-import * as React from 'react';
+import { Component, RefObject } from 'react';
 import styles from '@patternfly/react-styles/css/components/Toolbar/toolbar';
 import { css } from '@patternfly/react-styles';
 import { canUseDOM } from '../../helpers/util';
 
-import { RefObject } from 'react';
 import { ToolbarItem } from './ToolbarItem';
 import { Button } from '../Button';
 import { ToolbarGroup } from './ToolbarGroup';
@@ -33,7 +32,7 @@ export interface ToolbarLabelGroupContentProps extends React.HTMLProps<HTMLDivEl
   customLabelGroupContent?: React.ReactNode;
 }
 
-class ToolbarLabelGroupContent extends React.Component<ToolbarLabelGroupContentProps> {
+class ToolbarLabelGroupContent extends Component<ToolbarLabelGroupContentProps> {
   static displayName = 'ToolbarLabelGroupContent';
   static defaultProps: PickOptional<ToolbarLabelGroupContentProps> = {
     clearFiltersButtonText: 'Clear all filters',
diff --git a/packages/react-core/src/components/Toolbar/ToolbarToggleGroup.tsx b/packages/react-core/src/components/Toolbar/ToolbarToggleGroup.tsx
index 7f508ac4d44..408434a654c 100644
--- a/packages/react-core/src/components/Toolbar/ToolbarToggleGroup.tsx
+++ b/packages/react-core/src/components/Toolbar/ToolbarToggleGroup.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, createRef } from 'react';
 import * as ReactDOM from 'react-dom';
 import styles from '@patternfly/react-styles/css/components/Toolbar/toolbar';
 import { css } from '@patternfly/react-styles';
@@ -151,10 +151,10 @@ export interface ToolbarToggleGroupProps extends ToolbarGroupProps {
   clearFiltersButtonText?: string;
 }
 
-class ToolbarToggleGroup extends React.Component<ToolbarToggleGroupProps> {
+class ToolbarToggleGroup extends Component<ToolbarToggleGroupProps> {
   static displayName = 'ToolbarToggleGroup';
-  toggleRef = React.createRef<HTMLButtonElement>();
-  expandableContentRef = React.createRef<HTMLDivElement>();
+  toggleRef = createRef<HTMLButtonElement>();
+  expandableContentRef = createRef<HTMLDivElement>();
 
   isContentPopup = () => {
     const viewportSize = canUseDOM ? window.innerWidth : 1200;
diff --git a/packages/react-core/src/components/Toolbar/ToolbarUtils.tsx b/packages/react-core/src/components/Toolbar/ToolbarUtils.tsx
index 134936e4419..fbddb1ee6cd 100644
--- a/packages/react-core/src/components/Toolbar/ToolbarUtils.tsx
+++ b/packages/react-core/src/components/Toolbar/ToolbarUtils.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-import { RefObject } from 'react';
+import { createContext, RefObject } from 'react';
 import globalBreakpointMd from '@patternfly/react-tokens/dist/esm/t_global_breakpoint_md';
 import globalBreakpointLg from '@patternfly/react-tokens/dist/esm/t_global_breakpoint_lg';
 import globalBreakpointXl from '@patternfly/react-tokens/dist/esm/t_global_breakpoint_xl';
@@ -18,7 +17,7 @@ export interface ToolbarContextProps {
   customLabelGroupContent?: React.ReactNode;
 }
 
-export const ToolbarContext = React.createContext<ToolbarContextProps>({
+export const ToolbarContext = createContext<ToolbarContextProps>({
   isExpanded: false,
   toggleIsExpanded: () => {},
   labelGroupContentRef: null,
@@ -37,7 +36,7 @@ interface ToolbarContentContextProps {
   showClearFiltersButton?: boolean;
 }
 
-export const ToolbarContentContext = React.createContext<ToolbarContentContextProps>({
+export const ToolbarContentContext = createContext<ToolbarContentContextProps>({
   expandableContentRef: null,
   expandableContentId: '',
   labelContainerRef: null,
diff --git a/packages/react-core/src/components/Toolbar/__tests__/Generated/ToolbarChipGroupContent.test.tsx b/packages/react-core/src/components/Toolbar/__tests__/Generated/ToolbarChipGroupContent.test.tsx
index 658104759bc..04a56d51811 100644
--- a/packages/react-core/src/components/Toolbar/__tests__/Generated/ToolbarChipGroupContent.test.tsx
+++ b/packages/react-core/src/components/Toolbar/__tests__/Generated/ToolbarChipGroupContent.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ToolbarLabelGroupContent } from '../../ToolbarLabelGroupContent';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Toolbar/__tests__/Generated/ToolbarContent.test.tsx b/packages/react-core/src/components/Toolbar/__tests__/Generated/ToolbarContent.test.tsx
index 1d8c3c163b9..9bd11a3d959 100644
--- a/packages/react-core/src/components/Toolbar/__tests__/Generated/ToolbarContent.test.tsx
+++ b/packages/react-core/src/components/Toolbar/__tests__/Generated/ToolbarContent.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ToolbarContent } from '../../ToolbarContent';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Toolbar/__tests__/Generated/ToolbarExpandableContent.test.tsx b/packages/react-core/src/components/Toolbar/__tests__/Generated/ToolbarExpandableContent.test.tsx
index 9494c4122db..8716eff002e 100644
--- a/packages/react-core/src/components/Toolbar/__tests__/Generated/ToolbarExpandableContent.test.tsx
+++ b/packages/react-core/src/components/Toolbar/__tests__/Generated/ToolbarExpandableContent.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ToolbarExpandableContent } from '../../ToolbarExpandableContent';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Toolbar/__tests__/Generated/ToolbarGroup.test.tsx b/packages/react-core/src/components/Toolbar/__tests__/Generated/ToolbarGroup.test.tsx
index 5487852075a..934a65c195c 100644
--- a/packages/react-core/src/components/Toolbar/__tests__/Generated/ToolbarGroup.test.tsx
+++ b/packages/react-core/src/components/Toolbar/__tests__/Generated/ToolbarGroup.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ToolbarGroup } from '../../ToolbarGroup';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/components/Toolbar/__tests__/Toolbar.test.tsx b/packages/react-core/src/components/Toolbar/__tests__/Toolbar.test.tsx
index 9469231b17e..9d5f3ca2cfa 100644
--- a/packages/react-core/src/components/Toolbar/__tests__/Toolbar.test.tsx
+++ b/packages/react-core/src/components/Toolbar/__tests__/Toolbar.test.tsx
@@ -1,5 +1,4 @@
-import React from 'react';
-
+import { Fragment } from 'react';
 import { render, screen } from '@testing-library/react';
 
 import { ToolbarToggleGroup } from '../ToolbarToggleGroup';
@@ -18,12 +17,12 @@ jest.mock('../../../helpers/GenerateId/GenerateId');
 describe('Toolbar', () => {
   it('should render inset', () => {
     const items = (
-      <React.Fragment>
+      <Fragment>
         <ToolbarItem>Test</ToolbarItem>
         <ToolbarItem>Test 2</ToolbarItem>
         <ToolbarItem variant="separator" />
         <ToolbarItem>Test 3 </ToolbarItem>
-      </React.Fragment>
+      </Fragment>
     );
 
     const { asFragment } = render(
@@ -45,8 +44,8 @@ describe('Toolbar', () => {
 
   it('should render with custom label content', () => {
     const items = (
-      <React.Fragment>
-        <ToolbarToggleGroup toggleIcon={<React.Fragment />} breakpoint="xl">
+      <Fragment>
+        <ToolbarToggleGroup toggleIcon={<Fragment />} breakpoint="xl">
           <ToolbarGroup variant="filter-group">
             <ToolbarFilter
               labels={['New', 'Pending']}
@@ -58,11 +57,11 @@ describe('Toolbar', () => {
             </ToolbarFilter>
           </ToolbarGroup>
         </ToolbarToggleGroup>
-      </React.Fragment>
+      </Fragment>
     );
 
     const customLabelGroupContent = (
-      <React.Fragment>
+      <Fragment>
         <ToolbarItem>
           <Button variant="link" onClick={() => {}} isInline>
             Save filters
@@ -73,7 +72,7 @@ describe('Toolbar', () => {
             Clear all filters
           </Button>
         </ToolbarItem>
-      </React.Fragment>
+      </Fragment>
     );
 
     const { asFragment } = render(
@@ -94,12 +93,12 @@ describe('Toolbar', () => {
 
   it('Renders with class ${styles.modifiers.noBackground} when colorVariant="no-background"', () => {
     const items = (
-      <React.Fragment>
+      <Fragment>
         <ToolbarItem>Test</ToolbarItem>
         <ToolbarItem>Test 2</ToolbarItem>
         <ToolbarItem variant="separator" />
         <ToolbarItem>Test 3 </ToolbarItem>
-      </React.Fragment>
+      </Fragment>
     );
 
     render(
@@ -113,12 +112,12 @@ describe('Toolbar', () => {
 
   it('Renders with class ${styles.modifiers.primary} when colorVariant="primary"', () => {
     const items = (
-      <React.Fragment>
+      <Fragment>
         <ToolbarItem>Test</ToolbarItem>
         <ToolbarItem>Test 2</ToolbarItem>
         <ToolbarItem variant="separator" />
         <ToolbarItem>Test 3 </ToolbarItem>
-      </React.Fragment>
+      </Fragment>
     );
 
     render(
@@ -132,12 +131,12 @@ describe('Toolbar', () => {
 
   it('Renders with class ${styles.modifiers.secondary} when colorVariant="secondary"', () => {
     const items = (
-      <React.Fragment>
+      <Fragment>
         <ToolbarItem>Test</ToolbarItem>
         <ToolbarItem>Test 2</ToolbarItem>
         <ToolbarItem variant="separator" />
         <ToolbarItem>Test 3 </ToolbarItem>
-      </React.Fragment>
+      </Fragment>
     );
 
     render(
diff --git a/packages/react-core/src/components/Toolbar/__tests__/ToolbarGroup.test.tsx b/packages/react-core/src/components/Toolbar/__tests__/ToolbarGroup.test.tsx
index b6c467f1503..f278800d97a 100644
--- a/packages/react-core/src/components/Toolbar/__tests__/ToolbarGroup.test.tsx
+++ b/packages/react-core/src/components/Toolbar/__tests__/ToolbarGroup.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { ToolbarGroup } from '../ToolbarGroup';
 
diff --git a/packages/react-core/src/components/Toolbar/__tests__/ToolbarItem.test.tsx b/packages/react-core/src/components/Toolbar/__tests__/ToolbarItem.test.tsx
index 8e5e2f494ea..707ba5920c8 100644
--- a/packages/react-core/src/components/Toolbar/__tests__/ToolbarItem.test.tsx
+++ b/packages/react-core/src/components/Toolbar/__tests__/ToolbarItem.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { ToolbarItem } from '../ToolbarItem';
 
diff --git a/packages/react-core/src/components/Toolbar/__tests__/ToolbarToggleGroup.test.tsx b/packages/react-core/src/components/Toolbar/__tests__/ToolbarToggleGroup.test.tsx
index 91aa6e4b217..da837642654 100644
--- a/packages/react-core/src/components/Toolbar/__tests__/ToolbarToggleGroup.test.tsx
+++ b/packages/react-core/src/components/Toolbar/__tests__/ToolbarToggleGroup.test.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { render } from '@testing-library/react';
 import { ToolbarToggleGroup } from '../ToolbarToggleGroup';
 import { Toolbar } from '../Toolbar';
@@ -10,11 +10,11 @@ describe('ToolbarToggleGroup', () => {
     global.console = { error: myMock } as any;
 
     const items = (
-      <React.Fragment>
+      <Fragment>
         <ToolbarToggleGroup breakpoint={undefined as 'xl'} toggleIcon={null}>
           test
         </ToolbarToggleGroup>
-      </React.Fragment>
+      </Fragment>
     );
 
     render(
diff --git a/packages/react-core/src/components/Toolbar/examples/Toolbar.md b/packages/react-core/src/components/Toolbar/examples/Toolbar.md
index c855d8485e7..9e1840ed83d 100644
--- a/packages/react-core/src/components/Toolbar/examples/Toolbar.md
+++ b/packages/react-core/src/components/Toolbar/examples/Toolbar.md
@@ -5,6 +5,8 @@ propComponents: ['Toolbar', 'ToolbarContent', 'ToolbarGroup', 'ToolbarItem', 'To
 section: components
 ---
 
+import { Fragment } from 'react';
+
 import EditIcon from '@patternfly/react-icons/dist/esm/icons/edit-icon';
 import CloneIcon from '@patternfly/react-icons/dist/esm/icons/clone-icon';
 import SyncIcon from '@patternfly/react-icons/dist/esm/icons/sync-icon';
diff --git a/packages/react-core/src/components/Toolbar/examples/ToolbarColorVariant.tsx b/packages/react-core/src/components/Toolbar/examples/ToolbarColorVariant.tsx
index c2115a9d928..ff25c79e820 100644
--- a/packages/react-core/src/components/Toolbar/examples/ToolbarColorVariant.tsx
+++ b/packages/react-core/src/components/Toolbar/examples/ToolbarColorVariant.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Toolbar, ToolbarItem, ToolbarContent, Button, SearchInput } from '@patternfly/react-core';
 
 export const ToolbarColorVariant: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     No background
     <Toolbar id="toolbar-color-variant-no-background" colorVariant={'no-background'}>
       <ToolbarContent>
@@ -48,5 +48,5 @@ export const ToolbarColorVariant: React.FunctionComponent = () => (
         </ToolbarItem>
       </ToolbarContent>
     </Toolbar>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/components/Toolbar/examples/ToolbarComponentManagedToggleGroups.tsx b/packages/react-core/src/components/Toolbar/examples/ToolbarComponentManagedToggleGroups.tsx
index 4e7c735743e..936d8ec3c95 100644
--- a/packages/react-core/src/components/Toolbar/examples/ToolbarComponentManagedToggleGroups.tsx
+++ b/packages/react-core/src/components/Toolbar/examples/ToolbarComponentManagedToggleGroups.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   MenuToggle,
   MenuToggleElement,
@@ -47,7 +47,7 @@ export const ToolbarComponentManagedToggleGroup: React.FunctionComponent = () =>
   };
 
   const toggleGroupItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarItem>
         <SearchInput
           aria-label="Component toggle groups example search input"
@@ -120,7 +120,7 @@ export const ToolbarComponentManagedToggleGroup: React.FunctionComponent = () =>
           </Select>
         </ToolbarItem>
       </ToolbarGroup>
-    </React.Fragment>
+    </Fragment>
   );
 
   const items = (
diff --git a/packages/react-core/src/components/Toolbar/examples/ToolbarConsumerManagedToggleGroups.tsx b/packages/react-core/src/components/Toolbar/examples/ToolbarConsumerManagedToggleGroups.tsx
index 1e5b6eccbeb..2ac65257d8f 100644
--- a/packages/react-core/src/components/Toolbar/examples/ToolbarConsumerManagedToggleGroups.tsx
+++ b/packages/react-core/src/components/Toolbar/examples/ToolbarConsumerManagedToggleGroups.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   MenuToggle,
   MenuToggleElement,
@@ -52,7 +52,7 @@ export const ToolbarConsumerManagedToggleGroup: React.FunctionComponent = () =>
   };
 
   const toggleGroupItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarItem>
         <SearchInput
           aria-label="Consumer toggle groups example search input"
@@ -125,7 +125,7 @@ export const ToolbarConsumerManagedToggleGroup: React.FunctionComponent = () =>
           </Select>
         </ToolbarItem>
       </ToolbarGroup>
-    </React.Fragment>
+    </Fragment>
   );
 
   const items = (
diff --git a/packages/react-core/src/components/Toolbar/examples/ToolbarCustomLabelGroupContent.tsx b/packages/react-core/src/components/Toolbar/examples/ToolbarCustomLabelGroupContent.tsx
index b56b4527a98..489a0f07fbc 100644
--- a/packages/react-core/src/components/Toolbar/examples/ToolbarCustomLabelGroupContent.tsx
+++ b/packages/react-core/src/components/Toolbar/examples/ToolbarCustomLabelGroupContent.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Toolbar,
   ToolbarItem,
@@ -97,7 +97,7 @@ export const ToolbarCustomLabelGroupContent: React.FunctionComponent = () => {
   );
 
   const toggleGroupItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarGroup variant="filter-group">
         <ToolbarFilter
           labels={filters.status}
@@ -164,11 +164,11 @@ export const ToolbarCustomLabelGroupContent: React.FunctionComponent = () => {
           </Select>
         </ToolbarFilter>
       </ToolbarGroup>
-    </React.Fragment>
+    </Fragment>
   );
 
   const toolbarItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarToggleGroup toggleIcon={<FilterIcon />} breakpoint="xl">
         {toggleGroupItems}
       </ToolbarToggleGroup>
@@ -183,11 +183,11 @@ export const ToolbarCustomLabelGroupContent: React.FunctionComponent = () => {
           <Button variant="plain" aria-label="sync" icon={<SyncIcon />} />
         </ToolbarItem>
       </ToolbarGroup>
-    </React.Fragment>
+    </Fragment>
   );
 
   const customLabelGroupContent = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarItem>
         <Button variant="link" onClick={() => {}} isInline>
           Save filters
@@ -198,7 +198,7 @@ export const ToolbarCustomLabelGroupContent: React.FunctionComponent = () => {
           Clear all filters
         </Button>
       </ToolbarItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
diff --git a/packages/react-core/src/components/Toolbar/examples/ToolbarGroupSpacers.tsx b/packages/react-core/src/components/Toolbar/examples/ToolbarGroupSpacers.tsx
index e32bc246a0f..dc413856b0f 100644
--- a/packages/react-core/src/components/Toolbar/examples/ToolbarGroupSpacers.tsx
+++ b/packages/react-core/src/components/Toolbar/examples/ToolbarGroupSpacers.tsx
@@ -1,10 +1,10 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Toolbar, ToolbarItem, ToolbarGroup, ToolbarContent } from '@patternfly/react-core';
 import { Button } from '@patternfly/react-core';
 
 export const ToolbarGroupSpacers: React.FunctionComponent = () => {
   const groupGapItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarGroup>
         <ToolbarItem>
           <Button variant="secondary">Default Gap</Button>
@@ -40,11 +40,11 @@ export const ToolbarGroupSpacers: React.FunctionComponent = () => {
           <Button variant="secondary">Extra Large Gap</Button>
         </ToolbarItem>
       </ToolbarGroup>
-    </React.Fragment>
+    </Fragment>
   );
 
   const groupColumnGapItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarGroup columnGap={{ default: 'columnGapNone' }}>
         <ToolbarItem>
           <Button variant="secondary">No Column Gap</Button>
@@ -71,11 +71,11 @@ export const ToolbarGroupSpacers: React.FunctionComponent = () => {
           <Button variant="secondary">Extra Large Column Gap</Button>
         </ToolbarItem>
       </ToolbarGroup>
-    </React.Fragment>
+    </Fragment>
   );
 
   const groupRowGapItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarGroup className="pf-m-wrap" rowGap={{ default: 'rowGapNone' }}>
         <ToolbarItem>
           <Button variant="secondary">No Row Gap</Button>
@@ -156,7 +156,7 @@ export const ToolbarGroupSpacers: React.FunctionComponent = () => {
           <Button variant="secondary">Extra Large Row Gap</Button>
         </ToolbarItem>
       </ToolbarGroup>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
diff --git a/packages/react-core/src/components/Toolbar/examples/ToolbarGroups.tsx b/packages/react-core/src/components/Toolbar/examples/ToolbarGroups.tsx
index bc442d09e5e..3a97df002ef 100644
--- a/packages/react-core/src/components/Toolbar/examples/ToolbarGroups.tsx
+++ b/packages/react-core/src/components/Toolbar/examples/ToolbarGroups.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Button,
   MenuToggle,
@@ -57,7 +57,7 @@ export const ToolbarGroups: React.FunctionComponent = () => {
   };
 
   const filterGroupItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarItem>
         <Select
           toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
@@ -148,11 +148,11 @@ export const ToolbarGroups: React.FunctionComponent = () => {
           </SelectList>
         </Select>
       </ToolbarItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   const iconButtonGroupItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarItem>
         <Button variant="plain" aria-label="edit" icon={<EditIcon />} />
       </ToolbarItem>
@@ -162,11 +162,11 @@ export const ToolbarGroups: React.FunctionComponent = () => {
       <ToolbarItem>
         <Button variant="plain" aria-label="sync" icon={<SyncIcon />} />
       </ToolbarItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   const buttonGroupItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarItem>
         <Button variant="primary">Action</Button>
       </ToolbarItem>
@@ -176,15 +176,15 @@ export const ToolbarGroups: React.FunctionComponent = () => {
       <ToolbarItem>
         <Button variant="tertiary">Tertiary</Button>
       </ToolbarItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   const items = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarGroup variant="filter-group">{filterGroupItems}</ToolbarGroup>
       <ToolbarGroup variant="action-group-plain">{iconButtonGroupItems}</ToolbarGroup>
       <ToolbarGroup variant="action-group">{buttonGroupItems}</ToolbarGroup>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
diff --git a/packages/react-core/src/components/Toolbar/examples/ToolbarInsets.tsx b/packages/react-core/src/components/Toolbar/examples/ToolbarInsets.tsx
index 905213486d6..f5c210e43ac 100644
--- a/packages/react-core/src/components/Toolbar/examples/ToolbarInsets.tsx
+++ b/packages/react-core/src/components/Toolbar/examples/ToolbarInsets.tsx
@@ -1,10 +1,10 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Toolbar, ToolbarItem, ToolbarGroup, ToolbarContent } from '@patternfly/react-core';
 import { Button } from '@patternfly/react-core';
 
 export const ToolbarInsets: React.FunctionComponent = () => {
   const items = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarGroup variant="action-group">
         <ToolbarItem>
           <Button variant="secondary">Action</Button>
@@ -37,7 +37,7 @@ export const ToolbarInsets: React.FunctionComponent = () => {
           <Button variant="secondary">Action</Button>
         </ToolbarItem>
       </ToolbarGroup>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
diff --git a/packages/react-core/src/components/Toolbar/examples/ToolbarItemSpacers.tsx b/packages/react-core/src/components/Toolbar/examples/ToolbarItemSpacers.tsx
index cd711951aa3..8ac72d23389 100644
--- a/packages/react-core/src/components/Toolbar/examples/ToolbarItemSpacers.tsx
+++ b/packages/react-core/src/components/Toolbar/examples/ToolbarItemSpacers.tsx
@@ -1,10 +1,10 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Toolbar, ToolbarItem, ToolbarGroup, ToolbarContent } from '@patternfly/react-core';
 import { Button } from '@patternfly/react-core';
 
 export const ToolbarItemSpacers: React.FunctionComponent = () => {
   const itemGapItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarGroup className="pf-m-wrap">
         <ToolbarItem gap={{ default: 'gapNone' }}>
           <Button variant="secondary">No Gap</Button>
@@ -21,11 +21,11 @@ export const ToolbarItemSpacers: React.FunctionComponent = () => {
           <Button variant="secondary">Extra Large Gap</Button>
         </ToolbarItem>
       </ToolbarGroup>
-    </React.Fragment>
+    </Fragment>
   );
 
   const itemColumnGapItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarGroup className="pf-m-wrap">
         <ToolbarItem columnGap={{ default: 'columnGapNone' }}>
           <Button variant="secondary">No Column Gap</Button>
@@ -42,11 +42,11 @@ export const ToolbarItemSpacers: React.FunctionComponent = () => {
           <Button variant="secondary">Extra Large Column Gap</Button>
         </ToolbarItem>
       </ToolbarGroup>
-    </React.Fragment>
+    </Fragment>
   );
 
   const itemRowGapItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarGroup>
         <ToolbarItem className="pf-m-wrap" rowGap={{ default: 'rowGapNone' }}>
           <Button variant="secondary">No Row Gap</Button>
@@ -63,7 +63,7 @@ export const ToolbarItemSpacers: React.FunctionComponent = () => {
           <Button variant="secondary">Extra Large Row Gap</Button>
         </ToolbarItem>
       </ToolbarGroup>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
diff --git a/packages/react-core/src/components/Toolbar/examples/ToolbarItems.tsx b/packages/react-core/src/components/Toolbar/examples/ToolbarItems.tsx
index de83577ccd6..6d5ce0171c7 100644
--- a/packages/react-core/src/components/Toolbar/examples/ToolbarItems.tsx
+++ b/packages/react-core/src/components/Toolbar/examples/ToolbarItems.tsx
@@ -1,10 +1,10 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Toolbar, ToolbarItem, ToolbarContent } from '@patternfly/react-core';
 import { Button, SearchInput } from '@patternfly/react-core';
 
 export const ToolbarItems: React.FunctionComponent = () => {
   const items = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarItem>
         <SearchInput aria-label="Items example search input" />
       </ToolbarItem>
@@ -15,7 +15,7 @@ export const ToolbarItems: React.FunctionComponent = () => {
       <ToolbarItem>
         <Button variant="primary">Action</Button>
       </ToolbarItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
diff --git a/packages/react-core/src/components/Toolbar/examples/ToolbarStacked.tsx b/packages/react-core/src/components/Toolbar/examples/ToolbarStacked.tsx
index 9675fdefe9a..524c4efaffa 100644
--- a/packages/react-core/src/components/Toolbar/examples/ToolbarStacked.tsx
+++ b/packages/react-core/src/components/Toolbar/examples/ToolbarStacked.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Button,
   ButtonVariant,
@@ -128,7 +128,7 @@ export const ToolbarStacked: React.FunctionComponent = () => {
   );
 
   const toggleGroupItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarItem variant="label" id="stacked-example-resource-select">
         Resource
       </ToolbarItem>
@@ -196,11 +196,11 @@ export const ToolbarStacked: React.FunctionComponent = () => {
           </SelectList>
         </Select>
       </ToolbarItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   const firstRowItems = (
-    <React.Fragment>
+    <Fragment>
       <Toolbar>
         <ToolbarContent>
           <ToolbarToggleGroup variant="label-group" toggleIcon={<FilterIcon />} breakpoint="lg">
@@ -241,11 +241,11 @@ export const ToolbarStacked: React.FunctionComponent = () => {
           </ToolbarItem>
         </ToolbarContent>
       </Toolbar>
-    </React.Fragment>
+    </Fragment>
   );
 
   const secondRowItems = (
-    <React.Fragment>
+    <Fragment>
       <Toolbar>
         <ToolbarContent>
           <ToolbarItem>
@@ -284,14 +284,14 @@ export const ToolbarStacked: React.FunctionComponent = () => {
           </ToolbarItem>
         </ToolbarContent>
       </Toolbar>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       {firstRowItems}
       <Divider />
       {secondRowItems}
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Toolbar/examples/ToolbarSticky.tsx b/packages/react-core/src/components/Toolbar/examples/ToolbarSticky.tsx
index 37979549db4..7a1d665c14a 100644
--- a/packages/react-core/src/components/Toolbar/examples/ToolbarSticky.tsx
+++ b/packages/react-core/src/components/Toolbar/examples/ToolbarSticky.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Toolbar, ToolbarItem, ToolbarContent, SearchInput, Checkbox } from '@patternfly/react-core';
 
 export const ToolbarSticky: React.FunctionComponent = () => {
@@ -8,7 +8,7 @@ export const ToolbarSticky: React.FunctionComponent = () => {
   const numbers = showEvenOnly ? array.filter((number) => number % 2 === 0) : array;
 
   return (
-    <React.Fragment>
+    <Fragment>
       <div style={{ overflowY: 'scroll', height: '200px' }}>
         <Toolbar id="toolbar-sticky" inset={{ default: 'insetNone' }} isSticky={isSticky}>
           <ToolbarContent>
@@ -37,6 +37,6 @@ export const ToolbarSticky: React.FunctionComponent = () => {
         onChange={(_event, checked) => setIsSticky(checked)}
         id="isStickyCheckbox"
       />
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/Toolbar/examples/ToolbarWithFilters.tsx b/packages/react-core/src/components/Toolbar/examples/ToolbarWithFilters.tsx
index a9a609c6a1d..20a576c2642 100644
--- a/packages/react-core/src/components/Toolbar/examples/ToolbarWithFilters.tsx
+++ b/packages/react-core/src/components/Toolbar/examples/ToolbarWithFilters.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Button,
   Dropdown,
@@ -124,7 +124,7 @@ export const ToolbarWithFilters: React.FunctionComponent = () => {
   );
 
   const toggleGroupItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarItem>
         <SearchInput
           aria-label="With filters example search input"
@@ -200,11 +200,11 @@ export const ToolbarWithFilters: React.FunctionComponent = () => {
           </Select>
         </ToolbarFilter>
       </ToolbarGroup>
-    </React.Fragment>
+    </Fragment>
   );
 
   const toolbarItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarToggleGroup toggleIcon={<FilterIcon />} breakpoint="xl">
         {toggleGroupItems}
       </ToolbarToggleGroup>
@@ -251,7 +251,7 @@ export const ToolbarWithFilters: React.FunctionComponent = () => {
           </DropdownList>
         </Dropdown>
       </ToolbarItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
diff --git a/packages/react-core/src/components/Tooltip/Tooltip.tsx b/packages/react-core/src/components/Tooltip/Tooltip.tsx
index 948e4975998..9ac67968892 100644
--- a/packages/react-core/src/components/Tooltip/Tooltip.tsx
+++ b/packages/react-core/src/components/Tooltip/Tooltip.tsx
@@ -1,11 +1,10 @@
-import * as React from 'react';
+import { cloneElement, ReactElement, createRef, useEffect, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/Tooltip/tooltip';
 import { css } from '@patternfly/react-styles';
 import { TooltipContent } from './TooltipContent';
 import { TooltipArrow } from './TooltipArrow';
 import { KeyTypes } from '../../helpers/constants';
 import tooltipMaxWidth from '@patternfly/react-tokens/dist/esm/c_tooltip_MaxWidth';
-import { ReactElement } from 'react';
 import { Popper } from '../../helpers/Popper/Popper';
 
 export enum TooltipPosition {
@@ -172,8 +171,8 @@ export const Tooltip: React.FunctionComponent<TooltipProps> = ({
   const triggerOnFocus = trigger.includes('focus');
   const triggerOnClick = trigger.includes('click');
   const triggerManually = trigger === 'manual';
-  const [visible, setVisible] = React.useState(false);
-  const popperRef = React.createRef<HTMLDivElement>();
+  const [visible, setVisible] = useState(false);
+  const popperRef = createRef<HTMLDivElement>();
 
   const onDocumentKeyDown = (event: KeyboardEvent) => {
     if (!triggerManually) {
@@ -191,7 +190,7 @@ export const Tooltip: React.FunctionComponent<TooltipProps> = ({
       }
     }
   };
-  React.useEffect(() => {
+  useEffect(() => {
     if (isVisible) {
       show();
     } else {
@@ -261,9 +260,9 @@ export const Tooltip: React.FunctionComponent<TooltipProps> = ({
 
   const addAriaToTrigger = () => {
     if (aria === 'describedby' && children && children.props && !children.props['aria-describedby']) {
-      return React.cloneElement(children, { 'aria-describedby': id });
+      return cloneElement(children, { 'aria-describedby': id });
     } else if (aria === 'labelledby' && children.props && !children.props['aria-labelledby']) {
-      return React.cloneElement(children, { 'aria-labelledby': id });
+      return cloneElement(children, { 'aria-labelledby': id });
     }
     return children;
   };
diff --git a/packages/react-core/src/components/Tooltip/TooltipArrow.tsx b/packages/react-core/src/components/Tooltip/TooltipArrow.tsx
index f5407b1fd06..b907aa5648e 100644
--- a/packages/react-core/src/components/Tooltip/TooltipArrow.tsx
+++ b/packages/react-core/src/components/Tooltip/TooltipArrow.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Tooltip/tooltip';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Tooltip/TooltipContent.tsx b/packages/react-core/src/components/Tooltip/TooltipContent.tsx
index 3eb261ed847..f9edb6a31b9 100644
--- a/packages/react-core/src/components/Tooltip/TooltipContent.tsx
+++ b/packages/react-core/src/components/Tooltip/TooltipContent.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Tooltip/tooltip';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Tooltip/__tests__/Tooltip.test.tsx b/packages/react-core/src/components/Tooltip/__tests__/Tooltip.test.tsx
index 353064ec557..797b33c9194 100644
--- a/packages/react-core/src/components/Tooltip/__tests__/Tooltip.test.tsx
+++ b/packages/react-core/src/components/Tooltip/__tests__/Tooltip.test.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { createRef, useState } from 'react';
 import { render, screen } from '@testing-library/react';
 import { Tooltip } from '../Tooltip';
 import userEvent from '@testing-library/user-event';
@@ -28,7 +28,7 @@ test('Renders with aria-live of off by default when triggerRef is not passed', a
 });
 
 test('Renders with aria-live of polite by default when triggerRef is passed', async () => {
-  const triggerRef = React.createRef();
+  const triggerRef = createRef();
   render(<Tooltip triggerRef={triggerRef} isVisible content="Test content" />);
 
   const tooltip = await screen.findByRole('tooltip');
@@ -95,7 +95,7 @@ test('Does not call onTooltipHidden before tooltip is hidden', async () => {
   const user = userEvent.setup();
 
   const TooltipCallback = () => {
-    const [isVisible, setIsVisible] = React.useState(false);
+    const [isVisible, setIsVisible] = useState(false);
 
     return (
       <Tooltip trigger="manual" isVisible={isVisible} onTooltipHidden={onTooltipHiddenMock} content="Test content">
@@ -115,7 +115,7 @@ test.skip('Calls onTooltipHidden when tooltip is hidden', async () => {
   const user = userEvent.setup();
 
   const TooltipCallback = () => {
-    const [isVisible, setIsVisible] = React.useState(true);
+    const [isVisible, setIsVisible] = useState(true);
 
     return (
       <Tooltip trigger="manual" isVisible={isVisible} onTooltipHidden={onTooltipHiddenMock} content="Test content">
diff --git a/packages/react-core/src/components/Tooltip/__tests__/TooltipArrow.test.tsx b/packages/react-core/src/components/Tooltip/__tests__/TooltipArrow.test.tsx
index b41ac03c839..407eaae993d 100644
--- a/packages/react-core/src/components/Tooltip/__tests__/TooltipArrow.test.tsx
+++ b/packages/react-core/src/components/Tooltip/__tests__/TooltipArrow.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { TooltipArrow } from '../TooltipArrow';
 import styles from '@patternfly/react-styles/css/components/Tooltip/tooltip';
diff --git a/packages/react-core/src/components/Tooltip/__tests__/TooltipContent.test.tsx b/packages/react-core/src/components/Tooltip/__tests__/TooltipContent.test.tsx
index c67cb9995e2..811bce8e89d 100644
--- a/packages/react-core/src/components/Tooltip/__tests__/TooltipContent.test.tsx
+++ b/packages/react-core/src/components/Tooltip/__tests__/TooltipContent.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { TooltipContent } from '../TooltipContent';
 import styles from '@patternfly/react-styles/css/components/Tooltip/tooltip';
diff --git a/packages/react-core/src/components/Tooltip/examples/TooltipBasic.tsx b/packages/react-core/src/components/Tooltip/examples/TooltipBasic.tsx
index 47b9ef478b2..0d29e7eb84a 100644
--- a/packages/react-core/src/components/Tooltip/examples/TooltipBasic.tsx
+++ b/packages/react-core/src/components/Tooltip/examples/TooltipBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button, Tooltip } from '@patternfly/react-core';
 
 export const TooltipBasic: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Tooltip/examples/TooltipIcon.tsx b/packages/react-core/src/components/Tooltip/examples/TooltipIcon.tsx
index 3a907029f3f..ede0dccf879 100644
--- a/packages/react-core/src/components/Tooltip/examples/TooltipIcon.tsx
+++ b/packages/react-core/src/components/Tooltip/examples/TooltipIcon.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tooltip, Button } from '@patternfly/react-core';
 import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon';
 
diff --git a/packages/react-core/src/components/Tooltip/examples/TooltipOptions.tsx b/packages/react-core/src/components/Tooltip/examples/TooltipOptions.tsx
index 38a6804dbf4..6bd86729af6 100644
--- a/packages/react-core/src/components/Tooltip/examples/TooltipOptions.tsx
+++ b/packages/react-core/src/components/Tooltip/examples/TooltipOptions.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   Tooltip,
diff --git a/packages/react-core/src/components/Tooltip/examples/TooltipReactRef.tsx b/packages/react-core/src/components/Tooltip/examples/TooltipReactRef.tsx
index 35312d2236a..6c5704ef970 100644
--- a/packages/react-core/src/components/Tooltip/examples/TooltipReactRef.tsx
+++ b/packages/react-core/src/components/Tooltip/examples/TooltipReactRef.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tooltip } from '@patternfly/react-core';
 
 export const TooltipReactRef: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Tooltip/examples/TooltipSelectorRef.tsx b/packages/react-core/src/components/Tooltip/examples/TooltipSelectorRef.tsx
index 335426f4ada..37129932241 100644
--- a/packages/react-core/src/components/Tooltip/examples/TooltipSelectorRef.tsx
+++ b/packages/react-core/src/components/Tooltip/examples/TooltipSelectorRef.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tooltip } from '@patternfly/react-core';
 
 export const TooltipSelectorRef: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/TreeView/TreeView.tsx b/packages/react-core/src/components/TreeView/TreeView.tsx
index cda428f5826..4c3dc13412b 100644
--- a/packages/react-core/src/components/TreeView/TreeView.tsx
+++ b/packages/react-core/src/components/TreeView/TreeView.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { TreeViewList } from './TreeViewList';
 import { TreeViewCheckProps, TreeViewListItem } from './TreeViewListItem';
 import { TreeViewRoot } from './TreeViewRoot';
diff --git a/packages/react-core/src/components/TreeView/TreeViewList.tsx b/packages/react-core/src/components/TreeView/TreeViewList.tsx
index a7b7d165a25..0b5b4a1e467 100644
--- a/packages/react-core/src/components/TreeView/TreeViewList.tsx
+++ b/packages/react-core/src/components/TreeView/TreeViewList.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Fragment } from 'react';
 import { css } from '@patternfly/react-styles';
 import { Divider } from '../Divider';
 import styles from '@patternfly/react-styles/css/components/TreeView/tree-view';
@@ -36,10 +36,10 @@ export const TreeViewList: React.FunctionComponent<TreeViewListProps> = ({
 }: TreeViewListProps) => (
   <>
     {toolbar && (
-      <React.Fragment>
+      <Fragment>
         {toolbar}
         <Divider />
-      </React.Fragment>
+      </Fragment>
     )}
     <ul
       className={css(`${styles.treeView}__list`)}
diff --git a/packages/react-core/src/components/TreeView/TreeViewListItem.tsx b/packages/react-core/src/components/TreeView/TreeViewListItem.tsx
index 9f6e500b060..cf957aa7d2e 100644
--- a/packages/react-core/src/components/TreeView/TreeViewListItem.tsx
+++ b/packages/react-core/src/components/TreeView/TreeViewListItem.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import { memo, useState, useEffect } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/TreeView/tree-view';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
@@ -254,7 +254,7 @@ const TreeViewListItemBase: React.FunctionComponent<TreeViewListItemProps> = ({
   );
 };
 
-export const TreeViewListItem = React.memo(TreeViewListItemBase, (prevProps, nextProps) => {
+export const TreeViewListItem = memo(TreeViewListItemBase, (prevProps, nextProps) => {
   if (!nextProps.useMemo) {
     return false;
   }
diff --git a/packages/react-core/src/components/TreeView/TreeViewRoot.tsx b/packages/react-core/src/components/TreeView/TreeViewRoot.tsx
index 3a69dda3cb1..5142a40858d 100644
--- a/packages/react-core/src/components/TreeView/TreeViewRoot.tsx
+++ b/packages/react-core/src/components/TreeView/TreeViewRoot.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, createRef } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/TreeView/tree-view';
 import { canUseDOM } from '../../helpers/util';
@@ -20,9 +20,9 @@ export interface TreeViewRootProps {
   hasSelectableNodes?: boolean;
 }
 
-class TreeViewRoot extends React.Component<TreeViewRootProps> {
+class TreeViewRoot extends Component<TreeViewRootProps> {
   displayName = 'TreeViewRoot';
-  private treeRef = React.createRef<HTMLDivElement>();
+  private treeRef = createRef<HTMLDivElement>();
 
   componentDidMount() {
     if (canUseDOM) {
diff --git a/packages/react-core/src/components/TreeView/TreeViewSearch.tsx b/packages/react-core/src/components/TreeView/TreeViewSearch.tsx
index a0bbfe06fa4..e9c16e1baf7 100644
--- a/packages/react-core/src/components/TreeView/TreeViewSearch.tsx
+++ b/packages/react-core/src/components/TreeView/TreeViewSearch.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/TreeView/tree-view';
 import formStyles from '@patternfly/react-styles/css/components/FormControl/form-control';
diff --git a/packages/react-core/src/components/TreeView/__tests__/TreeView.test.tsx b/packages/react-core/src/components/TreeView/__tests__/TreeView.test.tsx
index cfdb202370f..b3d758ef5a7 100644
--- a/packages/react-core/src/components/TreeView/__tests__/TreeView.test.tsx
+++ b/packages/react-core/src/components/TreeView/__tests__/TreeView.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { TreeView } from '../TreeView';
diff --git a/packages/react-core/src/components/TreeView/__tests__/TreeViewList.test.tsx b/packages/react-core/src/components/TreeView/__tests__/TreeViewList.test.tsx
index 496d8cc6b08..423b596b9a7 100644
--- a/packages/react-core/src/components/TreeView/__tests__/TreeViewList.test.tsx
+++ b/packages/react-core/src/components/TreeView/__tests__/TreeViewList.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { TreeViewList } from '../TreeViewList';
 import styles from '@patternfly/react-styles/css/components/TreeView/tree-view';
diff --git a/packages/react-core/src/components/TreeView/__tests__/TreeViewListItem.test.tsx b/packages/react-core/src/components/TreeView/__tests__/TreeViewListItem.test.tsx
index fc83677eaec..e7f6a75b0db 100644
--- a/packages/react-core/src/components/TreeView/__tests__/TreeViewListItem.test.tsx
+++ b/packages/react-core/src/components/TreeView/__tests__/TreeViewListItem.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { TreeViewListItem } from '../TreeViewListItem';
 import { TreeView } from '../TreeView';
diff --git a/packages/react-core/src/components/TreeView/__tests__/TreeViewRoot.test.tsx b/packages/react-core/src/components/TreeView/__tests__/TreeViewRoot.test.tsx
index 097bf3d77fa..69b6503e1bd 100644
--- a/packages/react-core/src/components/TreeView/__tests__/TreeViewRoot.test.tsx
+++ b/packages/react-core/src/components/TreeView/__tests__/TreeViewRoot.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { TreeViewRoot } from '../TreeViewRoot';
 import styles from '@patternfly/react-styles/css/components/TreeView/tree-view';
diff --git a/packages/react-core/src/components/TreeView/__tests__/TreeViewSearch.test.tsx b/packages/react-core/src/components/TreeView/__tests__/TreeViewSearch.test.tsx
index 049a4d49a4c..b77bc2cf564 100644
--- a/packages/react-core/src/components/TreeView/__tests__/TreeViewSearch.test.tsx
+++ b/packages/react-core/src/components/TreeView/__tests__/TreeViewSearch.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { TreeViewSearch } from '../TreeViewSearch';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/react-core/src/components/TreeView/examples/TreeView.md b/packages/react-core/src/components/TreeView/examples/TreeView.md
index 6533239135c..705f4cf1ea5 100644
--- a/packages/react-core/src/components/TreeView/examples/TreeView.md
+++ b/packages/react-core/src/components/TreeView/examples/TreeView.md
@@ -5,6 +5,7 @@ cssPrefix: pf-v6-c-tree-view
 propComponents: ['TreeView', 'TreeViewDataItem', 'TreeViewSearch']
 ---
 
+import { Fragment } from 'react';
 import { FolderIcon, FolderOpenIcon, EllipsisVIcon, ClipboardIcon, HamburgerIcon, GitlabIcon, GithubIcon, GoogleIcon } from '@patternfly/react-icons';
 
 ## Examples
diff --git a/packages/react-core/src/components/TreeView/examples/TreeViewCompact.tsx b/packages/react-core/src/components/TreeView/examples/TreeViewCompact.tsx
index 4ecf59c8ee9..90e103431c4 100644
--- a/packages/react-core/src/components/TreeView/examples/TreeViewCompact.tsx
+++ b/packages/react-core/src/components/TreeView/examples/TreeViewCompact.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TreeView, TreeViewDataItem } from '@patternfly/react-core';
 
 export const TreeViewCompact: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TreeView/examples/TreeViewCompactNoBackground.tsx b/packages/react-core/src/components/TreeView/examples/TreeViewCompactNoBackground.tsx
index ade9f637d0d..d9542c53f5f 100644
--- a/packages/react-core/src/components/TreeView/examples/TreeViewCompactNoBackground.tsx
+++ b/packages/react-core/src/components/TreeView/examples/TreeViewCompactNoBackground.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TreeView, TreeViewDataItem } from '@patternfly/react-core';
 
 export const TreeViewCompactNoBackground: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TreeView/examples/TreeViewGuides.tsx b/packages/react-core/src/components/TreeView/examples/TreeViewGuides.tsx
index 9843e5185d2..5b90b438cd3 100644
--- a/packages/react-core/src/components/TreeView/examples/TreeViewGuides.tsx
+++ b/packages/react-core/src/components/TreeView/examples/TreeViewGuides.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TreeView, TreeViewDataItem } from '@patternfly/react-core';
 
 export const GuidesTreeView: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TreeView/examples/TreeViewMultiselectable.tsx b/packages/react-core/src/components/TreeView/examples/TreeViewMultiselectable.tsx
index 30bab155b99..f11a4080efb 100644
--- a/packages/react-core/src/components/TreeView/examples/TreeViewMultiselectable.tsx
+++ b/packages/react-core/src/components/TreeView/examples/TreeViewMultiselectable.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TreeView, TreeViewDataItem } from '@patternfly/react-core';
 
 export const TreeViewMultiselectable: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TreeView/examples/TreeViewSelectionExpansion.tsx b/packages/react-core/src/components/TreeView/examples/TreeViewSelectionExpansion.tsx
index 90d6262affa..cc74ec3b8f5 100644
--- a/packages/react-core/src/components/TreeView/examples/TreeViewSelectionExpansion.tsx
+++ b/packages/react-core/src/components/TreeView/examples/TreeViewSelectionExpansion.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TreeView, TreeViewDataItem } from '@patternfly/react-core';
 
 export const TreeViewSelectableNodes: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TreeView/examples/TreeViewSingleSelectable.tsx b/packages/react-core/src/components/TreeView/examples/TreeViewSingleSelectable.tsx
index 0e092e08275..657a5f769e5 100644
--- a/packages/react-core/src/components/TreeView/examples/TreeViewSingleSelectable.tsx
+++ b/packages/react-core/src/components/TreeView/examples/TreeViewSingleSelectable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { TreeView, Button, TreeViewDataItem } from '@patternfly/react-core';
 
 export const TreeViewSingleSelectable: React.FunctionComponent = () => {
@@ -76,7 +76,7 @@ export const TreeViewSingleSelectable: React.FunctionComponent = () => {
     }
   ];
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="link" onClick={onToggle}>
         {allExpanded && 'Collapse all'}
         {!allExpanded && 'Expand all'}
@@ -88,6 +88,6 @@ export const TreeViewSingleSelectable: React.FunctionComponent = () => {
         onSelect={onSelect}
         allExpanded={allExpanded}
       />
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/TreeView/examples/TreeViewWithActionItems.tsx b/packages/react-core/src/components/TreeView/examples/TreeViewWithActionItems.tsx
index 3af7cd34f18..4d502305bc6 100644
--- a/packages/react-core/src/components/TreeView/examples/TreeViewWithActionItems.tsx
+++ b/packages/react-core/src/components/TreeView/examples/TreeViewWithActionItems.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   TreeView,
   Button,
diff --git a/packages/react-core/src/components/TreeView/examples/TreeViewWithBadges.tsx b/packages/react-core/src/components/TreeView/examples/TreeViewWithBadges.tsx
index b5ed09b6e76..22f1fbbec82 100644
--- a/packages/react-core/src/components/TreeView/examples/TreeViewWithBadges.tsx
+++ b/packages/react-core/src/components/TreeView/examples/TreeViewWithBadges.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TreeView, TreeViewDataItem } from '@patternfly/react-core';
 
 export const TreeViewBadges: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TreeView/examples/TreeViewWithCheckboxes.tsx b/packages/react-core/src/components/TreeView/examples/TreeViewWithCheckboxes.tsx
index 1207e3051d1..1264b77708e 100644
--- a/packages/react-core/src/components/TreeView/examples/TreeViewWithCheckboxes.tsx
+++ b/packages/react-core/src/components/TreeView/examples/TreeViewWithCheckboxes.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TreeView, TreeViewDataItem } from '@patternfly/react-core';
 
 export const TreeViewWithCheckboxes: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TreeView/examples/TreeViewWithCustomBadges.tsx b/packages/react-core/src/components/TreeView/examples/TreeViewWithCustomBadges.tsx
index 2ed0f8b4522..3c355b4a9a5 100644
--- a/packages/react-core/src/components/TreeView/examples/TreeViewWithCustomBadges.tsx
+++ b/packages/react-core/src/components/TreeView/examples/TreeViewWithCustomBadges.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TreeView, TreeViewDataItem } from '@patternfly/react-core';
 
 export const TreeViewCustomBadges: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/TreeView/examples/TreeViewWithIconPerItem.tsx b/packages/react-core/src/components/TreeView/examples/TreeViewWithIconPerItem.tsx
index b8938cd4fe3..d56b0248111 100644
--- a/packages/react-core/src/components/TreeView/examples/TreeViewWithIconPerItem.tsx
+++ b/packages/react-core/src/components/TreeView/examples/TreeViewWithIconPerItem.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TreeView, TreeViewDataItem } from '@patternfly/react-core';
 import GitlabIcon from '@patternfly/react-icons/dist/esm/icons/gitlab-icon';
 import GithubIcon from '@patternfly/react-icons/dist/esm/icons/github-icon';
diff --git a/packages/react-core/src/components/TreeView/examples/TreeViewWithIcons.tsx b/packages/react-core/src/components/TreeView/examples/TreeViewWithIcons.tsx
index 3f1c5f45f14..f1f9a55df68 100644
--- a/packages/react-core/src/components/TreeView/examples/TreeViewWithIcons.tsx
+++ b/packages/react-core/src/components/TreeView/examples/TreeViewWithIcons.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { TreeView, TreeViewDataItem } from '@patternfly/react-core';
 import FolderIcon from '@patternfly/react-icons/dist/esm/icons/folder-icon';
 import FolderOpenIcon from '@patternfly/react-icons/dist/esm/icons/folder-open-icon';
diff --git a/packages/react-core/src/components/TreeView/examples/TreeViewWithMemoization.tsx b/packages/react-core/src/components/TreeView/examples/TreeViewWithMemoization.tsx
index afe0c78e308..37327d088fd 100644
--- a/packages/react-core/src/components/TreeView/examples/TreeViewWithMemoization.tsx
+++ b/packages/react-core/src/components/TreeView/examples/TreeViewWithMemoization.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { TreeView, Button, TreeViewDataItem } from '@patternfly/react-core';
 
 export const TreeViewWithMemoization: React.FunctionComponent = () => {
@@ -61,12 +61,12 @@ export const TreeViewWithMemoization: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="link" onClick={onToggle}>
         {allExpanded && 'Collapse all'}
         {!allExpanded && 'Expand all'}
       </Button>
       {tree}
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/components/TreeView/examples/TreeViewWithSearch.tsx b/packages/react-core/src/components/TreeView/examples/TreeViewWithSearch.tsx
index 095d957098d..2862dd56f57 100644
--- a/packages/react-core/src/components/TreeView/examples/TreeViewWithSearch.tsx
+++ b/packages/react-core/src/components/TreeView/examples/TreeViewWithSearch.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Toolbar,
   ToolbarContent,
diff --git a/packages/react-core/src/components/Truncate/Truncate.tsx b/packages/react-core/src/components/Truncate/Truncate.tsx
index a52fdfbc519..b6d6ae5b031 100644
--- a/packages/react-core/src/components/Truncate/Truncate.tsx
+++ b/packages/react-core/src/components/Truncate/Truncate.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Fragment, useEffect, useRef, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/Truncate/truncate';
 import { css } from '@patternfly/react-styles';
 import { Tooltip, TooltipPosition } from '../Tooltip';
@@ -54,13 +54,13 @@ export const Truncate: React.FunctionComponent<TruncateProps> = ({
   content,
   ...props
 }: TruncateProps) => {
-  const [isTruncated, setIsTruncated] = React.useState(true);
-  const [parentElement, setParentElement] = React.useState<HTMLElement>(null);
-  const [textElement, setTextElement] = React.useState<HTMLElement>(null);
+  const [isTruncated, setIsTruncated] = useState(true);
+  const [parentElement, setParentElement] = useState<HTMLElement>(null);
+  const [textElement, setTextElement] = useState<HTMLElement>(null);
 
-  const textRef = React.useRef<HTMLElement>(null);
-  const subParentRef = React.useRef<HTMLDivElement>(null);
-  const observer = React.useRef(null);
+  const textRef = useRef<HTMLElement>(null);
+  const subParentRef = useRef<HTMLDivElement>(null);
+  const observer = useRef(null);
 
   const getActualWidth = (element: Element) => {
     const computedStyle = getComputedStyle(element);
@@ -80,7 +80,7 @@ export const Truncate: React.FunctionComponent<TruncateProps> = ({
     return (firstTextWidth / firstTextLength) * trailingNumChars + firstTextWidth;
   };
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (textRef && textRef.current && !textElement) {
       setTextElement(textRef.current);
     }
@@ -90,7 +90,7 @@ export const Truncate: React.FunctionComponent<TruncateProps> = ({
     }
   }, [textRef, subParentRef, textElement, parentElement]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (textElement && parentElement && !observer.current) {
       const totalTextWidth = calculateTotalTextWidth(textElement, trailingNumChars, content);
       const textWidth = position === 'middle' ? totalTextWidth : textElement.scrollWidth;
@@ -113,23 +113,23 @@ export const Truncate: React.FunctionComponent<TruncateProps> = ({
       {(position === TruncatePosition.end || position === TruncatePosition.start) && (
         <span ref={textRef} className={truncateStyles[position]}>
           {content}
-          {position === TruncatePosition.start && <React.Fragment>&lrm;</React.Fragment>}
+          {position === TruncatePosition.start && <Fragment>&lrm;</Fragment>}
         </span>
       )}
       {position === TruncatePosition.middle && content.length - trailingNumChars > minWidthCharacters && (
-        <React.Fragment>
+        <Fragment>
           <span ref={textRef} className={styles.truncateStart}>
             {sliceContent(content, trailingNumChars)[0]}
           </span>
           <span className={styles.truncateEnd}>{sliceContent(content, trailingNumChars)[1]}</span>
-        </React.Fragment>
+        </Fragment>
       )}
       {position === TruncatePosition.middle && content.length - trailingNumChars <= minWidthCharacters && (
-        <React.Fragment>
+        <Fragment>
           <span ref={textRef} className={styles.truncateStart}>
             {content}
           </span>
-        </React.Fragment>
+        </Fragment>
       )}
     </span>
   );
diff --git a/packages/react-core/src/components/Truncate/__tests__/Truncate.test.tsx b/packages/react-core/src/components/Truncate/__tests__/Truncate.test.tsx
index 010b1f0da9b..3a075f96a03 100644
--- a/packages/react-core/src/components/Truncate/__tests__/Truncate.test.tsx
+++ b/packages/react-core/src/components/Truncate/__tests__/Truncate.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Truncate } from '../Truncate';
 import styles from '@patternfly/react-styles/css/components/Truncate/truncate';
diff --git a/packages/react-core/src/components/Truncate/examples/Truncate.md b/packages/react-core/src/components/Truncate/examples/Truncate.md
index 3778ca95484..6b8006bf26d 100644
--- a/packages/react-core/src/components/Truncate/examples/Truncate.md
+++ b/packages/react-core/src/components/Truncate/examples/Truncate.md
@@ -11,7 +11,6 @@ import './TruncateExamples.css';
 
 ### Default
 ```js
-import React from 'react';
 import { Truncate } from '@patternfly/react-core';
 
 <div className="truncate-example-resize">
@@ -23,7 +22,6 @@ import { Truncate } from '@patternfly/react-core';
 
 ### Middle
 ```js
-import React from 'react';
 import { Truncate } from '@patternfly/react-core';
 
 <div className="truncate-example-resize">
@@ -37,7 +35,6 @@ import { Truncate } from '@patternfly/react-core';
 
 ### Start
 ```js
-import React from 'react';
 import { Truncate } from '@patternfly/react-core';
 
 <div className="truncate-example-resize">
@@ -50,7 +47,6 @@ import { Truncate } from '@patternfly/react-core';
 
 ### Default with tooltip at the bottom
 ```js
-import React from 'react';
 import { Truncate } from '@patternfly/react-core';
 
 <div className="truncate-example-resize">
diff --git a/packages/react-core/src/components/Wizard/Wizard.tsx b/packages/react-core/src/components/Wizard/Wizard.tsx
index b2408306676..cefa9a22f65 100644
--- a/packages/react-core/src/components/Wizard/Wizard.tsx
+++ b/packages/react-core/src/components/Wizard/Wizard.tsx
@@ -1,5 +1,4 @@
-import React from 'react';
-
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Wizard/wizard';
 import wizardHeightToken from '@patternfly/react-tokens/dist/esm/c_wizard_Height';
@@ -80,20 +79,20 @@ export const Wizard = ({
   shouldFocusContent = true,
   ...wrapperProps
 }: WizardProps) => {
-  const [activeStepIndex, setActiveStepIndex] = React.useState(startIndex);
+  const [activeStepIndex, setActiveStepIndex] = useState(startIndex);
   const initialSteps = buildSteps(children);
-  const firstStepRef = React.useRef(initialSteps[startIndex - 1]);
-  const wrapperRef = React.useRef(null);
+  const firstStepRef = useRef(initialSteps[startIndex - 1]);
+  const wrapperRef = useRef(null);
 
   // When the startIndex maps to a parent step, focus on the first sub-step
-  React.useEffect(() => {
+  useEffect(() => {
     if (isWizardParentStep(firstStepRef.current)) {
       setActiveStepIndex(startIndex + 1);
     }
   }, [startIndex]);
 
   // When the number of steps changes and pushes activeStepIndex out of bounds, reset back to startIndex
-  React.useEffect(() => {
+  useEffect(() => {
     if (activeStepIndex > initialSteps.length) {
       setActiveStepIndex(startIndex);
     }
@@ -208,9 +207,9 @@ const WizardInternal = ({
   isProgressive
 }: Pick<WizardProps, 'nav' | 'navAriaLabel' | 'isVisitRequired' | 'isProgressive'>) => {
   const { activeStep, steps, footer, goToStepByIndex } = useWizardContext();
-  const [isNavExpanded, setIsNavExpanded] = React.useState(false);
+  const [isNavExpanded, setIsNavExpanded] = useState(false);
 
-  const wizardNav = React.useMemo(() => {
+  const wizardNav = useMemo(() => {
     if (isCustomWizardNav(nav)) {
       return typeof nav === 'function' ? nav(isNavExpanded, steps, activeStep, goToStepByIndex) : nav;
     }
diff --git a/packages/react-core/src/components/Wizard/WizardBody.tsx b/packages/react-core/src/components/Wizard/WizardBody.tsx
index b0c3e9153ad..82731c9efb8 100644
--- a/packages/react-core/src/components/Wizard/WizardBody.tsx
+++ b/packages/react-core/src/components/Wizard/WizardBody.tsx
@@ -1,5 +1,4 @@
-import React from 'react';
-
+import { useContext, useEffect, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/Wizard/wizard';
 import { css } from '@patternfly/react-styles';
 import { WizardContext } from './WizardContext';
@@ -38,13 +37,13 @@ export const WizardBody = ({
   component = 'div',
   ...props
 }: WizardBodyProps) => {
-  const [hasScrollbar, setHasScrollbar] = React.useState(false);
-  const [previousWidth, setPreviousWidth] = React.useState<number | undefined>(undefined);
+  const [hasScrollbar, setHasScrollbar] = useState(false);
+  const [previousWidth, setPreviousWidth] = useState<number | undefined>(undefined);
   const WrapperComponent = component;
-  const { activeStep, shouldFocusContent, mainWrapperRef } = React.useContext(WizardContext);
+  const { activeStep, shouldFocusContent, mainWrapperRef } = useContext(WizardContext);
   const defaultAriaLabel = ariaLabel || `${activeStep?.name} content`;
 
-  React.useEffect(() => {
+  useEffect(() => {
     const resize = () => {
       if (mainWrapperRef?.current) {
         const { offsetWidth, offsetHeight, scrollHeight } = mainWrapperRef.current;
diff --git a/packages/react-core/src/components/Wizard/WizardContext.tsx b/packages/react-core/src/components/Wizard/WizardContext.tsx
index c5d5aae220b..54973455b6d 100644
--- a/packages/react-core/src/components/Wizard/WizardContext.tsx
+++ b/packages/react-core/src/components/Wizard/WizardContext.tsx
@@ -1,5 +1,4 @@
-import React from 'react';
-
+import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { isCustomWizardFooter, isWizardSubStep, WizardStepType, WizardFooterType } from './types';
 import { WizardFooter, WizardFooterProps } from './WizardFooter';
 
@@ -36,7 +35,7 @@ export interface WizardContextProps {
   mainWrapperRef: React.RefObject<HTMLElement | null>;
 }
 
-export const WizardContext = React.createContext({} as WizardContextProps);
+export const WizardContext = createContext({} as WizardContextProps);
 
 export interface WizardContextProviderProps {
   steps: WizardStepType[];
@@ -71,11 +70,11 @@ export const WizardContextProvider: React.FunctionComponent<WizardContextProvide
   shouldFocusContent,
   mainWrapperRef
 }) => {
-  const [currentSteps, setCurrentSteps] = React.useState<WizardStepType[]>(initialSteps);
-  const [currentFooter, setCurrentFooter] = React.useState<WizardFooterType>();
+  const [currentSteps, setCurrentSteps] = useState<WizardStepType[]>(initialSteps);
+  const [currentFooter, setCurrentFooter] = useState<WizardFooterType>();
 
   // Callback to update steps if the overall step number changes
-  React.useEffect(() => {
+  useEffect(() => {
     if (currentSteps.length !== initialSteps.length) {
       const newSteps = initialSteps.map((newStep) => {
         const currentStepMatch = currentSteps.find((step) => step.id === newStep.id);
@@ -90,7 +89,7 @@ export const WizardContextProvider: React.FunctionComponent<WizardContextProvide
   }, [currentSteps, initialSteps]);
 
   // Combined initial and current state steps
-  const steps = React.useMemo(
+  const steps = useMemo(
     () =>
       currentSteps.map((currentStepProps, index) => ({
         ...currentStepProps,
@@ -99,16 +98,13 @@ export const WizardContextProvider: React.FunctionComponent<WizardContextProvide
     [initialSteps, currentSteps]
   );
 
-  const activeStep = React.useMemo(
-    () => steps.find((step) => step.index === activeStepIndex),
-    [activeStepIndex, steps]
-  );
+  const activeStep = useMemo(() => steps.find((step) => step.index === activeStepIndex), [activeStepIndex, steps]);
 
-  const close = React.useCallback(() => onClose?.(null), [onClose]);
-  const goToNextStep = React.useCallback(() => onNext(null, steps), [onNext, steps]);
-  const goToPrevStep = React.useCallback(() => onBack(null, steps), [onBack, steps]);
+  const close = useCallback(() => onClose?.(null), [onClose]);
+  const goToNextStep = useCallback(() => onNext(null, steps), [onNext, steps]);
+  const goToPrevStep = useCallback(() => onBack(null, steps), [onBack, steps]);
 
-  const footer = React.useMemo(() => {
+  const footer = useMemo(() => {
     const wizardFooter = activeStep?.footer || currentFooter || initialFooter;
 
     if (isCustomWizardFooter(wizardFooter)) {
@@ -131,9 +127,9 @@ export const WizardContextProvider: React.FunctionComponent<WizardContextProvide
     );
   }, [currentFooter, initialFooter, activeStep, goToNextStep, goToPrevStep, close]);
 
-  const getStep = React.useCallback((stepId: string | number) => steps.find((step) => step.id === stepId), [steps]);
+  const getStep = useCallback((stepId: string | number) => steps.find((step) => step.id === stepId), [steps]);
 
-  const setStep = React.useCallback(
+  const setStep = useCallback(
     (step: Pick<WizardStepType, 'id'> & Partial<WizardStepType>) =>
       setCurrentSteps((prevSteps) =>
         prevSteps.map((prevStep) => {
@@ -158,12 +154,9 @@ export const WizardContextProvider: React.FunctionComponent<WizardContextProvide
         goToNextStep,
         goToPrevStep,
         setFooter: setCurrentFooter,
-        goToStepById: React.useCallback((id) => goToStepById(steps, id), [goToStepById, steps]),
-        goToStepByName: React.useCallback((name) => goToStepByName(steps, name), [goToStepByName, steps]),
-        goToStepByIndex: React.useCallback(
-          (index: number) => goToStepByIndex(null, steps, index),
-          [goToStepByIndex, steps]
-        ),
+        goToStepById: useCallback((id) => goToStepById(steps, id), [goToStepById, steps]),
+        goToStepByName: useCallback((name) => goToStepByName(steps, name), [goToStepByName, steps]),
+        goToStepByIndex: useCallback((index: number) => goToStepByIndex(null, steps, index), [goToStepByIndex, steps]),
         shouldFocusContent,
         mainWrapperRef
       }}
@@ -175,4 +168,4 @@ export const WizardContextProvider: React.FunctionComponent<WizardContextProvide
 
 WizardContextProvider.displayName = 'WizardContextProvider';
 
-export const useWizardContext = () => React.useContext(WizardContext);
+export const useWizardContext = () => useContext(WizardContext);
diff --git a/packages/react-core/src/components/Wizard/WizardFooter.tsx b/packages/react-core/src/components/Wizard/WizardFooter.tsx
index fb914c001bd..745118aab5b 100644
--- a/packages/react-core/src/components/Wizard/WizardFooter.tsx
+++ b/packages/react-core/src/components/Wizard/WizardFooter.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Wizard/wizard';
 
diff --git a/packages/react-core/src/components/Wizard/WizardHeader.tsx b/packages/react-core/src/components/Wizard/WizardHeader.tsx
index 74a6194e486..4747174c784 100644
--- a/packages/react-core/src/components/Wizard/WizardHeader.tsx
+++ b/packages/react-core/src/components/Wizard/WizardHeader.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Wizard/wizard';
 import { css } from '@patternfly/react-styles';
 import { Button } from '../Button';
diff --git a/packages/react-core/src/components/Wizard/WizardNav.tsx b/packages/react-core/src/components/Wizard/WizardNav.tsx
index e22b0aaeda9..a5296943c87 100644
--- a/packages/react-core/src/components/Wizard/WizardNav.tsx
+++ b/packages/react-core/src/components/Wizard/WizardNav.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Wizard/wizard';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/components/Wizard/WizardNavInternal.tsx b/packages/react-core/src/components/Wizard/WizardNavInternal.tsx
index 67095f99392..475f6ea0f4a 100644
--- a/packages/react-core/src/components/Wizard/WizardNavInternal.tsx
+++ b/packages/react-core/src/components/Wizard/WizardNavInternal.tsx
@@ -1,5 +1,4 @@
-import React from 'react';
-
+import { Children, Fragment, isValidElement } from 'react';
 import { isCustomWizardNavItem, isWizardBasicStep, isWizardParentStep } from './types';
 import { WizardProps } from './Wizard';
 import { useWizardContext } from './WizardContext';
@@ -40,9 +39,9 @@ export const WizardNavInternal = ({
         const hasVisitedNextStep = steps.some((step) => step.index > stepIndex + 1 && step.isVisited);
         const isStepDisabled = step.isDisabled || (isVisitRequired && !step.isVisited && !hasVisitedNextStep);
         const customStepNavItem = isCustomWizardNavItem(step.navItem) && (
-          <React.Fragment key={step.id}>
+          <Fragment key={step.id}>
             {typeof step.navItem === 'function' ? step.navItem(step, activeStep, steps, goToStepByIndex) : step.navItem}
-          </React.Fragment>
+          </Fragment>
         );
 
         if (isWizardParentStep(step) && !step.isHidden) {
@@ -55,11 +54,11 @@ export const WizardNavInternal = ({
             const isSubStepDisabled =
               subStep.isDisabled || (isVisitRequired && !subStep.isVisited && !hasVisitedNextStep);
             const customSubStepNavItem = isCustomWizardNavItem(subStep.navItem) && (
-              <React.Fragment key={subStep.id}>
+              <Fragment key={subStep.id}>
                 {typeof subStep.navItem === 'function'
                   ? subStep.navItem(subStep, activeStep, steps, goToStepByIndex)
                   : subStep.navItem}
-              </React.Fragment>
+              </Fragment>
             );
 
             // Don't render the sub-step navigation item if the hidden property is enabled
@@ -96,8 +95,8 @@ export const WizardNavInternal = ({
               );
             }
           });
-          const hasEnabledChildren = React.Children.toArray(subNavItems).some(
-            (child) => React.isValidElement(child) && !child.props.isDisabled
+          const hasEnabledChildren = Children.toArray(subNavItems).some(
+            (child) => isValidElement(child) && !child.props.isDisabled
           );
 
           if (!isProgressive || (isProgressive && step.index <= activeStep.index)) {
diff --git a/packages/react-core/src/components/Wizard/WizardNavItem.tsx b/packages/react-core/src/components/Wizard/WizardNavItem.tsx
index a31e8f3c1d1..7dfd4584994 100644
--- a/packages/react-core/src/components/Wizard/WizardNavItem.tsx
+++ b/packages/react-core/src/components/Wizard/WizardNavItem.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-
+import { useEffect, useState } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Wizard/wizard';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
@@ -62,10 +61,10 @@ export const WizardNavItem = ({
   className,
   ...props
 }: WizardNavItemProps) => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
+  const [isExpanded, setIsExpanded] = useState(false);
   const ouiaProps = useOUIAProps(WizardNavItem.displayName, ouiaId, ouiaSafe);
 
-  React.useEffect(() => {
+  useEffect(() => {
     setIsExpanded(isCurrent);
   }, [isCurrent]);
 
diff --git a/packages/react-core/src/components/Wizard/WizardStep.tsx b/packages/react-core/src/components/Wizard/WizardStep.tsx
index 6b71895cd35..bc0ead2a6c3 100644
--- a/packages/react-core/src/components/Wizard/WizardStep.tsx
+++ b/packages/react-core/src/components/Wizard/WizardStep.tsx
@@ -1,5 +1,4 @@
-import React from 'react';
-
+import { useEffect } from 'react';
 import { isWizardParentStep, WizardNavItemType } from './types';
 import { WizardBodyProps } from './WizardBody';
 import { useWizardContext } from './WizardContext';
@@ -26,7 +25,7 @@ export interface WizardStepProps {
   isHidden?: boolean;
   /** Replaces the step's navigation item or its properties. */
   navItem?: WizardNavItemType;
-  /** Replaces the step's footer. The step's footer takes precedance over the wizard's footer. */
+  /** Replaces the step's footer. The step's footer takes precedence over the wizard's footer. */
   footer?: React.ReactElement<any> | Partial<WizardFooterProps>;
   /** Used to determine icon next to the step's navigation item */
   status?: 'default' | 'error' | 'success';
@@ -40,7 +39,7 @@ export const WizardStep = ({ children, steps: _subSteps, ...props }: WizardStepP
   const isParentStep = isWizardParentStep(activeStep);
 
   // Update step in context when props change or when the step is active has yet to be marked as visited.
-  React.useEffect(() => {
+  useEffect(() => {
     setStep({
       id,
       name,
diff --git a/packages/react-core/src/components/Wizard/WizardToggle.tsx b/packages/react-core/src/components/Wizard/WizardToggle.tsx
index 65180330078..0792241b8a7 100644
--- a/packages/react-core/src/components/Wizard/WizardToggle.tsx
+++ b/packages/react-core/src/components/Wizard/WizardToggle.tsx
@@ -1,5 +1,4 @@
-import React from 'react';
-
+import { Fragment, useCallback, useEffect } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Wizard/wizard';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
@@ -49,7 +48,7 @@ export const WizardToggle = ({
   const wizardToggleIndex = nonSubSteps.indexOf(parentStep || activeStep) + 1;
   const isActiveStepStatus = activeStep.status;
 
-  const handleKeyClicks = React.useCallback(
+  const handleKeyClicks = useCallback(
     (event: KeyboardEvent): void => {
       if (isNavExpanded && event.key === KeyTypes.Escape) {
         toggleNavExpanded?.(event);
@@ -59,7 +58,7 @@ export const WizardToggle = ({
   );
 
   // Open/close collapsable navigation on keydown event
-  React.useEffect(() => {
+  useEffect(() => {
     const target = typeof document !== 'undefined' ? document.body : null;
     target?.addEventListener('keydown', handleKeyClicks, false);
 
@@ -73,13 +72,13 @@ export const WizardToggle = ({
     const { children, body, ...propsWithoutChildren } = props;
 
     return (
-      <React.Fragment key={step.id}>
+      <Fragment key={step.id}>
         {activeStep?.id === step.id && <WizardBody {...body}>{children}</WizardBody>}
 
         <div key={step.id} style={{ display: 'none' }}>
           <WizardStep {...propsWithoutChildren} />
         </div>
-      </React.Fragment>
+      </Fragment>
     );
   });
 
diff --git a/packages/react-core/src/components/Wizard/__tests__/Wizard.test.tsx b/packages/react-core/src/components/Wizard/__tests__/Wizard.test.tsx
index 7e4ea7205a4..49780e335bd 100644
--- a/packages/react-core/src/components/Wizard/__tests__/Wizard.test.tsx
+++ b/packages/react-core/src/components/Wizard/__tests__/Wizard.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-core/src/components/Wizard/__tests__/WizardBody.test.tsx b/packages/react-core/src/components/Wizard/__tests__/WizardBody.test.tsx
index 8f8fdf0acee..bb3ce1197ac 100644
--- a/packages/react-core/src/components/Wizard/__tests__/WizardBody.test.tsx
+++ b/packages/react-core/src/components/Wizard/__tests__/WizardBody.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { WizardBody } from '../WizardBody';
 
diff --git a/packages/react-core/src/components/Wizard/__tests__/WizardFooter.test.tsx b/packages/react-core/src/components/Wizard/__tests__/WizardFooter.test.tsx
index fe72b340ada..505bf03b09a 100644
--- a/packages/react-core/src/components/Wizard/__tests__/WizardFooter.test.tsx
+++ b/packages/react-core/src/components/Wizard/__tests__/WizardFooter.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
@@ -86,7 +84,7 @@ test('uses activeStep footer properties when specified', () => {
   expect(screen.queryByRole('button', { name: 'Back' })).toBeNull();
 });
 
-test(`activeStep footer properties take precendence over WizardFooter's`, () => {
+test(`activeStep footer properties take precedence over WizardFooter's`, () => {
   render(
     <WizardFooter
       {...defaultProps}
diff --git a/packages/react-core/src/components/Wizard/__tests__/WizardHeader.test.tsx b/packages/react-core/src/components/Wizard/__tests__/WizardHeader.test.tsx
index e52866c7dff..04a7f65b3e5 100644
--- a/packages/react-core/src/components/Wizard/__tests__/WizardHeader.test.tsx
+++ b/packages/react-core/src/components/Wizard/__tests__/WizardHeader.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import { WizardHeader } from '../WizardHeader';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/react-core/src/components/Wizard/__tests__/WizardNav.test.tsx b/packages/react-core/src/components/Wizard/__tests__/WizardNav.test.tsx
index 47fad694f81..c81614ca4af 100644
--- a/packages/react-core/src/components/Wizard/__tests__/WizardNav.test.tsx
+++ b/packages/react-core/src/components/Wizard/__tests__/WizardNav.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import { WizardNav } from '../WizardNav';
 import styles from '@patternfly/react-styles/css/components/Wizard/wizard';
diff --git a/packages/react-core/src/components/Wizard/__tests__/WizardNavItem.test.tsx b/packages/react-core/src/components/Wizard/__tests__/WizardNavItem.test.tsx
index 25f2a0add8c..b80db9bb689 100644
--- a/packages/react-core/src/components/Wizard/__tests__/WizardNavItem.test.tsx
+++ b/packages/react-core/src/components/Wizard/__tests__/WizardNavItem.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import { WizardNavItem } from '../WizardNavItem';
 import styles from '@patternfly/react-styles/css/components/Wizard/wizard';
diff --git a/packages/react-core/src/components/Wizard/__tests__/WizardStep.test.tsx b/packages/react-core/src/components/Wizard/__tests__/WizardStep.test.tsx
index 2bda2b25472..ca68cfba932 100644
--- a/packages/react-core/src/components/Wizard/__tests__/WizardStep.test.tsx
+++ b/packages/react-core/src/components/Wizard/__tests__/WizardStep.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 
 import { WizardStep, WizardStepProps } from '../WizardStep';
diff --git a/packages/react-core/src/components/Wizard/__tests__/WizardToggle.test.tsx b/packages/react-core/src/components/Wizard/__tests__/WizardToggle.test.tsx
index e87d4003aab..7aec8f67772 100644
--- a/packages/react-core/src/components/Wizard/__tests__/WizardToggle.test.tsx
+++ b/packages/react-core/src/components/Wizard/__tests__/WizardToggle.test.tsx
@@ -1,5 +1,4 @@
-import React from 'react';
-
+import { useState } from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
@@ -96,7 +95,7 @@ test('unsets expanded properties when using the Escape key', async () => {
 });
 
 const WizardToggleExpand = (props) => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
+  const [isExpanded, setIsExpanded] = useState(false);
 
   return (
     <WizardToggle
diff --git a/packages/react-core/src/components/Wizard/__tests__/utils.test.tsx b/packages/react-core/src/components/Wizard/__tests__/utils.test.tsx
index 511c3a77154..c0d3f84c40a 100644
--- a/packages/react-core/src/components/Wizard/__tests__/utils.test.tsx
+++ b/packages/react-core/src/components/Wizard/__tests__/utils.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { WizardParentStep, WizardSubStep } from '../types';
 import { buildSteps } from '../utils';
 import { WizardStep } from '../WizardStep';
diff --git a/packages/react-core/src/components/Wizard/examples/WizardBasic.tsx b/packages/react-core/src/components/Wizard/examples/WizardBasic.tsx
index 7f07ab68fed..1b8fd0ed211 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardBasic.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Wizard, WizardStep } from '@patternfly/react-core';
 
 export const WizardBasic: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Wizard/examples/WizardBasicDisabledSteps.tsx b/packages/react-core/src/components/Wizard/examples/WizardBasicDisabledSteps.tsx
index 4f870ac50a8..c6d5944d9ee 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardBasicDisabledSteps.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardBasicDisabledSteps.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Wizard, WizardStep } from '@patternfly/react-core';
 
 export const WizardBasicDisabledSteps: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Wizard/examples/WizardCustomNav.tsx b/packages/react-core/src/components/Wizard/examples/WizardCustomNav.tsx
index 5035d230e59..78aab8420c9 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardCustomNav.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardCustomNav.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Wizard,
   WizardStep,
diff --git a/packages/react-core/src/components/Wizard/examples/WizardEnabledOnFormValidation.tsx b/packages/react-core/src/components/Wizard/examples/WizardEnabledOnFormValidation.tsx
index c37628cb079..61cee4fad07 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardEnabledOnFormValidation.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardEnabledOnFormValidation.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import {
   Form,
   FormGroup,
diff --git a/packages/react-core/src/components/Wizard/examples/WizardExpandableSteps.tsx b/packages/react-core/src/components/Wizard/examples/WizardExpandableSteps.tsx
index 035e121d22c..0806e951e95 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardExpandableSteps.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardExpandableSteps.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Wizard, WizardStep } from '@patternfly/react-core';
 
 export const WizardExpandableSteps: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Wizard/examples/WizardFocusOnNextBack.tsx b/packages/react-core/src/components/Wizard/examples/WizardFocusOnNextBack.tsx
index 8f037a1df37..40ea40ad848 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardFocusOnNextBack.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardFocusOnNextBack.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Wizard, WizardStep } from '@patternfly/react-core';
 
 export const WizardFocusOnNextBack: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Wizard/examples/WizardGetCurrentStep.tsx b/packages/react-core/src/components/Wizard/examples/WizardGetCurrentStep.tsx
index af1eabb013f..a91079b1d6c 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardGetCurrentStep.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardGetCurrentStep.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   DescriptionList,
   DescriptionListGroup,
diff --git a/packages/react-core/src/components/Wizard/examples/WizardProgressiveSteps.tsx b/packages/react-core/src/components/Wizard/examples/WizardProgressiveSteps.tsx
index e5c3d9674cd..53d439c924f 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardProgressiveSteps.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardProgressiveSteps.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Wizard, WizardStep } from '@patternfly/react-core';
 
 export const WizardProgressiveSteps: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Wizard/examples/WizardStepDrawerContent.tsx b/packages/react-core/src/components/Wizard/examples/WizardStepDrawerContent.tsx
index f5af92de24d..5253101ab8a 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardStepDrawerContent.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardStepDrawerContent.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import {
   Drawer,
   DrawerContent,
diff --git a/packages/react-core/src/components/Wizard/examples/WizardStepStatus.tsx b/packages/react-core/src/components/Wizard/examples/WizardStepStatus.tsx
index 8f68189a0a8..846a720fd28 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardStepStatus.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardStepStatus.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { Radio, Wizard, WizardStep } from '@patternfly/react-core';
 
 interface SomeContextProps {
diff --git a/packages/react-core/src/components/Wizard/examples/WizardStepVisitRequired.tsx b/packages/react-core/src/components/Wizard/examples/WizardStepVisitRequired.tsx
index 2f5a1f2cfac..66144d09c98 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardStepVisitRequired.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardStepVisitRequired.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Wizard, WizardStep } from '@patternfly/react-core';
 
 export const WizardStepVisitRequired: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Wizard/examples/WizardToggleStepVisibility.tsx b/packages/react-core/src/components/Wizard/examples/WizardToggleStepVisibility.tsx
index 6fb7a3605fe..9572544aa71 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardToggleStepVisibility.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardToggleStepVisibility.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { Checkbox, Wizard, WizardStep } from '@patternfly/react-core';
 
 interface SomeContextProps {
diff --git a/packages/react-core/src/components/Wizard/examples/WizardValidateOnButtonPress.tsx b/packages/react-core/src/components/Wizard/examples/WizardValidateOnButtonPress.tsx
index afd5a2f8ce5..2d4d98ae67e 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardValidateOnButtonPress.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardValidateOnButtonPress.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import {
   Button,
   ActionList,
diff --git a/packages/react-core/src/components/Wizard/examples/WizardWithCustomFooter.tsx b/packages/react-core/src/components/Wizard/examples/WizardWithCustomFooter.tsx
index 8b941bfa863..87e2ddd1173 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardWithCustomFooter.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardWithCustomFooter.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import {
   ActionList,
   ActionListGroup,
diff --git a/packages/react-core/src/components/Wizard/examples/WizardWithCustomNav.tsx b/packages/react-core/src/components/Wizard/examples/WizardWithCustomNav.tsx
index 5035d230e59..78aab8420c9 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardWithCustomNav.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardWithCustomNav.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Wizard,
   WizardStep,
diff --git a/packages/react-core/src/components/Wizard/examples/WizardWithCustomNavItem.tsx b/packages/react-core/src/components/Wizard/examples/WizardWithCustomNavItem.tsx
index 6721ed798c2..e68b0d8b80a 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardWithCustomNavItem.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardWithCustomNavItem.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Wizard, WizardStep } from '@patternfly/react-core';
 
 export const WizardWithCustomNavItem: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Wizard/examples/WizardWithHeader.tsx b/packages/react-core/src/components/Wizard/examples/WizardWithHeader.tsx
index 0a85b62bbc3..4267b6a004c 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardWithHeader.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardWithHeader.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Wizard, WizardHeader, WizardStep } from '@patternfly/react-core';
 
 export const WizardWithHeader: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/components/Wizard/examples/WizardWithNavAnchors.tsx b/packages/react-core/src/components/Wizard/examples/WizardWithNavAnchors.tsx
index c12d771d073..1d3fc890624 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardWithNavAnchors.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardWithNavAnchors.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { Button, Wizard, WizardStep } from '@patternfly/react-core';
 import ExternalLinkAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon';
 import SlackHashIcon from '@patternfly/react-icons/dist/esm/icons/slack-hash-icon';
diff --git a/packages/react-core/src/components/Wizard/examples/WizardWithSubmitProgress.tsx b/packages/react-core/src/components/Wizard/examples/WizardWithSubmitProgress.tsx
index a3cf9224a66..0afda3649e5 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardWithSubmitProgress.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardWithSubmitProgress.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   EmptyState,
   EmptyStateFooter,
diff --git a/packages/react-core/src/components/Wizard/examples/WizardWithinModal.tsx b/packages/react-core/src/components/Wizard/examples/WizardWithinModal.tsx
index fcccc015852..6857ce5f2e1 100644
--- a/packages/react-core/src/components/Wizard/examples/WizardWithinModal.tsx
+++ b/packages/react-core/src/components/Wizard/examples/WizardWithinModal.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button, Modal, ModalVariant, Wizard, WizardHeader, WizardStep } from '@patternfly/react-core';
 
 export const WizardWithinModal: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/components/Wizard/hooks/__tests__/useWizardFooter.test.tsx b/packages/react-core/src/components/Wizard/hooks/__tests__/useWizardFooter.test.tsx
index e6df70d193d..0fd3f323e8d 100644
--- a/packages/react-core/src/components/Wizard/hooks/__tests__/useWizardFooter.test.tsx
+++ b/packages/react-core/src/components/Wizard/hooks/__tests__/useWizardFooter.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { renderHook } from '@testing-library/react';
 
 import { useWizardFooter } from '../useWizardFooter';
diff --git a/packages/react-core/src/components/Wizard/hooks/useWizardFooter.tsx b/packages/react-core/src/components/Wizard/hooks/useWizardFooter.tsx
index 9c2bb5b1e6d..d7ad96097ee 100644
--- a/packages/react-core/src/components/Wizard/hooks/useWizardFooter.tsx
+++ b/packages/react-core/src/components/Wizard/hooks/useWizardFooter.tsx
@@ -1,5 +1,4 @@
-import React from 'react';
-
+import { useEffect } from 'react';
 import { useWizardContext } from '../WizardContext';
 import { WizardFooterProps } from '../WizardFooter';
 
@@ -14,7 +13,7 @@ export const useWizardFooter = (
 ) => {
   const { activeStep, setFooter } = useWizardContext();
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (footer && (!stepId || activeStep?.id === stepId)) {
       setFooter(footer);
 
diff --git a/packages/react-core/src/components/Wizard/types.tsx b/packages/react-core/src/components/Wizard/types.tsx
index e5e08e2ef88..77ba6c57512 100644
--- a/packages/react-core/src/components/Wizard/types.tsx
+++ b/packages/react-core/src/components/Wizard/types.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { isValidElement } from 'react';
 import { WizardNavProps, WizardNavItemProps, WizardFooterProps } from '.';
 import { ButtonProps } from '../Button';
 
@@ -20,7 +20,7 @@ export interface WizardBasicStep {
   component?: React.ReactElement<any>;
   /** Replaces the step's navigation item or its properties. */
   navItem?: WizardNavItemType;
-  /** Replaces the step's footer. The step's footer takes precedance over the wizard's footer. */
+  /** Replaces the step's footer. The step's footer takes precedence over the wizard's footer. */
   footer?: React.ReactElement<any> | Partial<WizardFooterProps>;
   /** Used to determine icon next to the step's navItem */
   status?: 'default' | 'error' | 'success';
@@ -87,19 +87,19 @@ export type CustomWizardFooterFunction = (
 ) => React.ReactElement<WizardFooterProps>;
 
 export function isCustomWizardNav(nav: WizardNavType): nav is CustomWizardNavFunction | React.ReactElement<any> {
-  return typeof nav === 'function' || React.isValidElement(nav);
+  return typeof nav === 'function' || isValidElement(nav);
 }
 
 export function isCustomWizardNavItem(
   navItem: WizardNavItemType
 ): navItem is CustomWizardNavItemFunction | React.ReactElement<any> {
-  return typeof navItem === 'function' || React.isValidElement(navItem);
+  return typeof navItem === 'function' || isValidElement(navItem);
 }
 
 export function isCustomWizardFooter(
   footer: WizardFooterType
 ): footer is CustomWizardFooterFunction | React.ReactElement<any> {
-  return typeof footer === 'function' || React.isValidElement(footer);
+  return typeof footer === 'function' || isValidElement(footer);
 }
 
 export function isWizardBasicStep(step: WizardStepType): step is WizardBasicStep {
diff --git a/packages/react-core/src/components/Wizard/utils.ts b/packages/react-core/src/components/Wizard/utils.ts
index 541b6b9eecd..36239da1efd 100644
--- a/packages/react-core/src/components/Wizard/utils.ts
+++ b/packages/react-core/src/components/Wizard/utils.ts
@@ -1,5 +1,4 @@
-import React from 'react';
-
+import { Children, isValidElement } from 'react';
 import { isWizardParentStep, isWizardSubStep, WizardStepType } from './types';
 import { WizardStep, WizardStepProps } from './WizardStep';
 
@@ -9,7 +8,7 @@ import { WizardStep, WizardStepProps } from './WizardStep';
  * @returns WizardStepType[]
  */
 export const buildSteps = (children: React.ReactNode) =>
-  React.Children.toArray(children).reduce((acc: WizardStepType[], child: React.ReactNode, index: number) => {
+  Children.toArray(children).reduce((acc: WizardStepType[], child: React.ReactNode, index: number) => {
     if (isWizardStep(child)) {
       const { props: childProps } = child;
       const { steps: childStepComponents, id } = childProps;
@@ -48,7 +47,7 @@ export const buildSteps = (children: React.ReactNode) =>
 export function isWizardStep(
   child: any | React.ReactElement<WizardStepProps>
 ): child is React.ReactElement<WizardStepProps> {
-  return React.isValidElement(child) && (child as React.ReactElement<WizardStepProps>).type === WizardStep;
+  return isValidElement(child) && (child as React.ReactElement<WizardStepProps>).type === WizardStep;
 }
 
 // Omit "children" and "steps" when building steps for the Wizard's context
diff --git a/packages/react-core/src/demos/Banner.md b/packages/react-core/src/demos/Banner.md
index 72bde0d55e8..7bf37f2dbef 100644
--- a/packages/react-core/src/demos/Banner.md
+++ b/packages/react-core/src/demos/Banner.md
@@ -2,7 +2,7 @@
 id: Banner
 section: components
 ---
-
+import { Fragment } from 'react';
 import { css } from '@patternfly/react-styles';
 import display from '@patternfly/react-styles/css/utilities/Display/display';
 import { DashboardWrapper } from '@patternfly/react-core/dist/js/demos/DashboardWrapper';
@@ -12,7 +12,7 @@ import { DashboardWrapper } from '@patternfly/react-core/dist/js/demos/Dashboard
 ### Basic sticky banner
 
 ```js isFullscreen
-import React from 'react';
+import { Fragment } from 'react';
 import { Banner, Card, CardBody, Flex, Gallery, GalleryItem, PageSection, Content } from '@patternfly/react-core';
 
 import { DashboardWrapper } from '@patternfly/react-core/dist/js/demos/DashboardWrapper';
@@ -37,7 +37,7 @@ class BannerDemo extends React.Component {
       </Banner>
     );
     return (
-      <React.Fragment>
+      <Fragment>
         <DashboardWrapper banner={banner} breadcrumb={null}>
           <PageSection>
             <Content>
@@ -60,7 +60,7 @@ class BannerDemo extends React.Component {
             </Gallery>
           </PageSection>
         </DashboardWrapper>
-      </React.Fragment>
+      </Fragment>
     );
   }
 }
@@ -69,7 +69,7 @@ class BannerDemo extends React.Component {
 ### Top and bottom banner
 
 ```js isFullscreen
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Banner,
   Card,
@@ -88,7 +88,7 @@ import display from '@patternfly/react-styles/css/utilities/Display/display';
 class BannerDemo extends React.Component {
   render() {
     return (
-      <React.Fragment>
+      <Fragment>
         <Flex
           direction={{ default: 'column' }}
           flexWrap={{ default: 'nowrap' }}
@@ -151,7 +151,7 @@ class BannerDemo extends React.Component {
             </Banner>
           </FlexItem>
         </Flex>
-      </React.Fragment>
+      </Fragment>
     );
   }
 }
diff --git a/packages/react-core/src/demos/Button.md b/packages/react-core/src/demos/Button.md
index 67e155fc32d..4e3634a184a 100644
--- a/packages/react-core/src/demos/Button.md
+++ b/packages/react-core/src/demos/Button.md
@@ -14,7 +14,6 @@ The following demo shows the intended flow for a button that visually indicates
 Please note that only the button can be interacted with in this example. The username and password input fields cannot be edited as the focus is on the button behavior. 
 
 ```ts
-import React from 'react';
 import { Form, FormGroup, ActionGroup, TextInput, Button } from '@patternfly/react-core';
 import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
 
diff --git a/packages/react-core/src/demos/CardDemos.md b/packages/react-core/src/demos/CardDemos.md
index cd7eae207c0..fb981256415 100644
--- a/packages/react-core/src/demos/CardDemos.md
+++ b/packages/react-core/src/demos/CardDemos.md
@@ -2,7 +2,7 @@
 id: Card
 section: components
 ---
-
+import { Fragment, useState } from 'react';
 import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
 import InfoCircleIcon from '@patternfly/react-icons/dist/js/icons/info-circle-icon';
 import ArrowRightIcon from '@patternfly/react-icons/dist/js/icons/arrow-right-icon';
diff --git a/packages/react-core/src/demos/CardView/CardView.md b/packages/react-core/src/demos/CardView/CardView.md
index b8ad36a2be5..42d0121f6cc 100644
--- a/packages/react-core/src/demos/CardView/CardView.md
+++ b/packages/react-core/src/demos/CardView/CardView.md
@@ -3,6 +3,7 @@ id: Card view
 section: patterns
 ---
 
+import { Fragment, useState } from 'react';
 import TrashIcon from '@patternfly/react-icons/dist/esm/icons/trash-icon';
 import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
 import pfIcon from '../assets/pf-logo-small.svg';
diff --git a/packages/react-core/src/demos/CardView/examples/CardView.tsx b/packages/react-core/src/demos/CardView/examples/CardView.tsx
index 19ae57c2b83..d28cf150a52 100644
--- a/packages/react-core/src/demos/CardView/examples/CardView.tsx
+++ b/packages/react-core/src/demos/CardView/examples/CardView.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import {
   Badge,
   Bullseye,
@@ -53,17 +53,17 @@ import { data } from '@patternfly/react-core/src/demos/CardView/examples/CardVie
 export const CardViewBasic: React.FunctionComponent = () => {
   const totalItemCount = 10;
 
-  const [cardData, setCardData] = React.useState(data);
-  const [isChecked, setIsChecked] = React.useState(false);
-  const [selectedItems, setSelectedItems] = React.useState<number[]>([]);
-  const [areAllSelected, setAreAllSelected] = React.useState<boolean>(false);
-  const [splitButtonDropdownIsOpen, setSplitButtonDropdownIsOpen] = React.useState(false);
-  const [isLowerToolbarDropdownOpen, setIsLowerToolbarDropdownOpen] = React.useState(false);
-  const [isLowerToolbarKebabDropdownOpen, setIsLowerToolbarKebabDropdownOpen] = React.useState(false);
-  const [page, setPage] = React.useState(1);
-  const [perPage, setPerPage] = React.useState(10);
-  const [filters, setFilters] = React.useState<Record<string, string[]>>({ products: [] });
-  const [state, setState] = React.useState({});
+  const [cardData, setCardData] = useState(data);
+  const [isChecked, setIsChecked] = useState(false);
+  const [selectedItems, setSelectedItems] = useState<number[]>([]);
+  const [areAllSelected, setAreAllSelected] = useState<boolean>(false);
+  const [splitButtonDropdownIsOpen, setSplitButtonDropdownIsOpen] = useState(false);
+  const [isLowerToolbarDropdownOpen, setIsLowerToolbarDropdownOpen] = useState(false);
+  const [isLowerToolbarKebabDropdownOpen, setIsLowerToolbarKebabDropdownOpen] = useState(false);
+  const [page, setPage] = useState(1);
+  const [perPage, setPerPage] = useState(10);
+  const [filters, setFilters] = useState<Record<string, string[]>>({ products: [] });
+  const [state, setState] = useState({});
 
   interface ProductType {
     id: number;
@@ -409,7 +409,7 @@ export const CardViewBasic: React.FunctionComponent = () => {
   ];
 
   const toolbarItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarItem>{buildSelectDropdown()}</ToolbarItem>
       <ToolbarItem>{buildFilterDropdown()}</ToolbarItem>
       <ToolbarItem>
@@ -441,7 +441,7 @@ export const CardViewBasic: React.FunctionComponent = () => {
       <ToolbarItem variant="pagination" align={{ default: 'alignEnd' }}>
         {renderPagination()}
       </ToolbarItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   const icons = {
@@ -463,7 +463,7 @@ export const CardViewBasic: React.FunctionComponent = () => {
       : cardData.slice((page - 1) * perPage, perPage === 1 ? page * perPage : page * perPage - 1);
 
   return (
-    <React.Fragment>
+    <Fragment>
       <DashboardWrapper mainContainerId="main-content-card-view-default-nav" breadcrumb={null}>
         <PageSection>
           <Content>
@@ -557,6 +557,6 @@ export const CardViewBasic: React.FunctionComponent = () => {
           />
         </PageSection>
       </DashboardWrapper>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/CustomMenus/examples/ActionsMenuDemo.tsx b/packages/react-core/src/demos/CustomMenus/examples/ActionsMenuDemo.tsx
index 16c6963185a..5a020ccf17a 100644
--- a/packages/react-core/src/demos/CustomMenus/examples/ActionsMenuDemo.tsx
+++ b/packages/react-core/src/demos/CustomMenus/examples/ActionsMenuDemo.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { MenuToggle, MenuItemAction, Select, SelectGroup, SelectList, SelectOption } from '@patternfly/react-core';
 import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon';
 import ClipboardIcon from '@patternfly/react-icons/dist/esm/icons/clipboard-icon';
diff --git a/packages/react-core/src/demos/CustomMenus/examples/ApplicationLauncherDemo.tsx b/packages/react-core/src/demos/CustomMenus/examples/ApplicationLauncherDemo.tsx
index 30d838d2861..71d533d5c40 100644
--- a/packages/react-core/src/demos/CustomMenus/examples/ApplicationLauncherDemo.tsx
+++ b/packages/react-core/src/demos/CustomMenus/examples/ApplicationLauncherDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   MenuToggle,
   MenuSearch,
@@ -230,12 +230,12 @@ export const ApplicationLauncherDemo: React.FunctionComponent = () => {
       </MenuSearch>
       <Divider />
       {filteredFavorites.length > 0 && (
-        <React.Fragment>
+        <Fragment>
           <DropdownGroup key="favorites-group" label="Favorites">
             <DropdownList>{filteredFavorites}</DropdownList>
           </DropdownGroup>
           <Divider key="favorites-divider" />
-        </React.Fragment>
+        </Fragment>
       )}
       {filteredItems}
     </Dropdown>
diff --git a/packages/react-core/src/demos/CustomMenus/examples/ContextSelectorDemo.tsx b/packages/react-core/src/demos/CustomMenus/examples/ContextSelectorDemo.tsx
index 842760503a5..8507d1ec6a7 100644
--- a/packages/react-core/src/demos/CustomMenus/examples/ContextSelectorDemo.tsx
+++ b/packages/react-core/src/demos/CustomMenus/examples/ContextSelectorDemo.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   MenuToggle,
   MenuFooter,
diff --git a/packages/react-core/src/demos/CustomMenus/examples/DateSelectDemo.tsx b/packages/react-core/src/demos/CustomMenus/examples/DateSelectDemo.tsx
index fcc9e34ac04..2e231a5d809 100644
--- a/packages/react-core/src/demos/CustomMenus/examples/DateSelectDemo.tsx
+++ b/packages/react-core/src/demos/CustomMenus/examples/DateSelectDemo.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { MenuToggle, Select, SelectList, SelectOption, Timestamp } from '@patternfly/react-core';
 
 export const DateSelectDemo: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/demos/CustomMenus/examples/DrilldownMenuDemo.tsx b/packages/react-core/src/demos/CustomMenus/examples/DrilldownMenuDemo.tsx
index 1cce713e4cb..692e8c5dcee 100644
--- a/packages/react-core/src/demos/CustomMenus/examples/DrilldownMenuDemo.tsx
+++ b/packages/react-core/src/demos/CustomMenus/examples/DrilldownMenuDemo.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   MenuToggle,
   Menu,
diff --git a/packages/react-core/src/demos/CustomMenus/examples/FavoritesDemo.tsx b/packages/react-core/src/demos/CustomMenus/examples/FavoritesDemo.tsx
index 08f7ed10283..36c06464163 100644
--- a/packages/react-core/src/demos/CustomMenus/examples/FavoritesDemo.tsx
+++ b/packages/react-core/src/demos/CustomMenus/examples/FavoritesDemo.tsx
@@ -1,10 +1,10 @@
-import React, { type JSX } from 'react';
+import { type JSX, Fragment, useEffect, useRef, useState } from 'react';
 import { MenuToggle, Divider, Dropdown, DropdownGroup, DropdownList, DropdownItem } from '@patternfly/react-core';
 
 export const FavoritesDemo: React.FunctionComponent = () => {
-  const [isOpen, setIsOpen] = React.useState<boolean>(false);
-  const [favorites, setFavorites] = React.useState<string[]>([]);
-  const menuRef = React.useRef<HTMLDivElement>(null);
+  const [isOpen, setIsOpen] = useState<boolean>(false);
+  const [favorites, setFavorites] = useState<string[]>([]);
+  const menuRef = useRef<HTMLDivElement>(null);
 
   const onToggleClick = () => {
     setIsOpen(!isOpen);
@@ -72,7 +72,7 @@ export const FavoritesDemo: React.FunctionComponent = () => {
     return favorites;
   };
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (favorites.length === 0) {
       const firstElement = menuRef?.current?.querySelector('li > button:not(:disabled)');
       firstElement && (firstElement as HTMLElement).focus();
@@ -106,12 +106,12 @@ export const FavoritesDemo: React.FunctionComponent = () => {
       onSelect={(_ev, value) => console.log('selected', value)}
     >
       {favorites.length > 0 && (
-        <React.Fragment>
+        <Fragment>
           <DropdownGroup key="favorites-group" label="Favorites">
             <DropdownList>{createFavorites(favorites)}</DropdownList>
           </DropdownGroup>
           <Divider key="favorites-divider" />
-        </React.Fragment>
+        </Fragment>
       )}
       {menuItems}
     </Dropdown>
diff --git a/packages/react-core/src/demos/CustomMenus/examples/FlyoutDemo.tsx b/packages/react-core/src/demos/CustomMenus/examples/FlyoutDemo.tsx
index 37a59e9107e..4f2835c2d1c 100644
--- a/packages/react-core/src/demos/CustomMenus/examples/FlyoutDemo.tsx
+++ b/packages/react-core/src/demos/CustomMenus/examples/FlyoutDemo.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { MenuToggle, Menu, MenuContent, MenuList, MenuItem, MenuContainer } from '@patternfly/react-core';
 
 /* eslint-disable no-console */
diff --git a/packages/react-core/src/demos/CustomMenus/examples/InlineSearchFilterMenuDemo.tsx b/packages/react-core/src/demos/CustomMenus/examples/InlineSearchFilterMenuDemo.tsx
index d82a923848e..2e7c8d22ddf 100644
--- a/packages/react-core/src/demos/CustomMenus/examples/InlineSearchFilterMenuDemo.tsx
+++ b/packages/react-core/src/demos/CustomMenus/examples/InlineSearchFilterMenuDemo.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Menu,
   MenuList,
diff --git a/packages/react-core/src/demos/CustomMenus/examples/OptionsMenuDemo.tsx b/packages/react-core/src/demos/CustomMenus/examples/OptionsMenuDemo.tsx
index a5bfd3f6900..c1a98935e91 100644
--- a/packages/react-core/src/demos/CustomMenus/examples/OptionsMenuDemo.tsx
+++ b/packages/react-core/src/demos/CustomMenus/examples/OptionsMenuDemo.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { MenuToggle, Divider, Select, SelectList, SelectOption, SelectGroup } from '@patternfly/react-core';
 
 export const OptionsMenuDemo: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/demos/CustomMenus/examples/TreeViewMenuDemo.tsx b/packages/react-core/src/demos/CustomMenus/examples/TreeViewMenuDemo.tsx
index 60f0290e899..b27009be367 100644
--- a/packages/react-core/src/demos/CustomMenus/examples/TreeViewMenuDemo.tsx
+++ b/packages/react-core/src/demos/CustomMenus/examples/TreeViewMenuDemo.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   MenuToggle,
   Panel,
diff --git a/packages/react-core/src/demos/DashboardHeader.tsx b/packages/react-core/src/demos/DashboardHeader.tsx
index 5afb260755b..0be0b556bb0 100644
--- a/packages/react-core/src/demos/DashboardHeader.tsx
+++ b/packages/react-core/src/demos/DashboardHeader.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import {
   Avatar,
   Button,
diff --git a/packages/react-core/src/demos/DashboardWrapper.tsx b/packages/react-core/src/demos/DashboardWrapper.tsx
index bfc9c34c74b..ef9e822eaad 100644
--- a/packages/react-core/src/demos/DashboardWrapper.tsx
+++ b/packages/react-core/src/demos/DashboardWrapper.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import {
   Breadcrumb,
   BreadcrumbItem,
diff --git a/packages/react-core/src/demos/DataList/examples/DataListActionable.tsx b/packages/react-core/src/demos/DataList/examples/DataListActionable.tsx
index 7702748c5e5..64c4b338a07 100644
--- a/packages/react-core/src/demos/DataList/examples/DataListActionable.tsx
+++ b/packages/react-core/src/demos/DataList/examples/DataListActionable.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   Content,
diff --git a/packages/react-core/src/demos/DataList/examples/DataListBasic.tsx b/packages/react-core/src/demos/DataList/examples/DataListBasic.tsx
index 4f1884464d0..cd9cf0594e8 100644
--- a/packages/react-core/src/demos/DataList/examples/DataListBasic.tsx
+++ b/packages/react-core/src/demos/DataList/examples/DataListBasic.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Button,
   Content,
@@ -34,7 +34,7 @@ export const DataListBasic: React.FunctionComponent = () => {
   const renderPagination = () => <Pagination itemCount={5} page={1} variant="top" isCompact />;
 
   const toolbarItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarItem variant="bulk-select">
         <MenuToggle
           aria-label="Select cards"
@@ -63,11 +63,11 @@ export const DataListBasic: React.FunctionComponent = () => {
       <ToolbarItem variant="pagination" align={{ default: 'alignEnd' }}>
         {renderPagination()}
       </ToolbarItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <DashboardWrapper mainContainerId="main-content-datalist-view-default-nav" breadcrumb={null}>
         <PageSection>
           <Content>
@@ -302,6 +302,6 @@ export const DataListBasic: React.FunctionComponent = () => {
           </DataList>
         </PageSection>
       </DashboardWrapper>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/DataList/examples/DataListExpandableControlInToolbar.tsx b/packages/react-core/src/demos/DataList/examples/DataListExpandableControlInToolbar.tsx
index 6681f87feb1..ba15f83f179 100644
--- a/packages/react-core/src/demos/DataList/examples/DataListExpandableControlInToolbar.tsx
+++ b/packages/react-core/src/demos/DataList/examples/DataListExpandableControlInToolbar.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Button,
   Content,
@@ -74,7 +74,7 @@ export const DataListExpandableControlInToolbar: React.FunctionComponent = () =>
   };
 
   const renderToolbar = () => (
-    <React.Fragment>
+    <Fragment>
       <Toolbar>
         <ToolbarContent>
           <ToolbarGroup>
@@ -115,7 +115,7 @@ export const DataListExpandableControlInToolbar: React.FunctionComponent = () =>
           </ToolbarGroup>
         </ToolbarContent>
       </Toolbar>
-    </React.Fragment>
+    </Fragment>
   );
 
   const toggle = (id: string) => {
@@ -131,7 +131,7 @@ export const DataListExpandableControlInToolbar: React.FunctionComponent = () =>
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <DashboardWrapper mainContainerId="main-content-datalist-view-default-nav" breadcrumb={null}>
         <PageSection>
           <Content>
@@ -373,6 +373,6 @@ export const DataListExpandableControlInToolbar: React.FunctionComponent = () =>
           </DataList>
         </PageSection>
       </DashboardWrapper>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/DataList/examples/DataListStaticBottomPagination.tsx b/packages/react-core/src/demos/DataList/examples/DataListStaticBottomPagination.tsx
index 7c8bfd23335..1a1bcbec5f0 100644
--- a/packages/react-core/src/demos/DataList/examples/DataListStaticBottomPagination.tsx
+++ b/packages/react-core/src/demos/DataList/examples/DataListStaticBottomPagination.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Button,
   Content,
@@ -77,7 +77,7 @@ export const DataListStaticBottomPagination: React.FunctionComponent = () => {
   );
 
   const toolbarItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarItem>
         <MenuToggle
           aria-label="Select data list items"
@@ -108,7 +108,7 @@ export const DataListStaticBottomPagination: React.FunctionComponent = () => {
       <ToolbarItem variant="pagination" align={{ default: 'alignEnd' }}>
         {renderPagination(PaginationVariant.top, true, false, false)}
       </ToolbarItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
diff --git a/packages/react-core/src/demos/DatePicker/DatePicker.md b/packages/react-core/src/demos/DatePicker/DatePicker.md
index 70806dad901..990b2086684 100644
--- a/packages/react-core/src/demos/DatePicker/DatePicker.md
+++ b/packages/react-core/src/demos/DatePicker/DatePicker.md
@@ -4,6 +4,7 @@ section: components
 subsection: date-and-time
 ---
 
+import { Fragment, useRef, useState } from 'react';
 import { Modal as ModalDeprecated, ModalVariant as ModalVariantDeprecated } from '@patternfly/react-core/deprecated';
 
 ## Demos
diff --git a/packages/react-core/src/demos/DatePicker/examples/DateTimePickerInModal.tsx b/packages/react-core/src/demos/DatePicker/examples/DateTimePickerInModal.tsx
index 92677b7e2ff..0d73d4182c0 100644
--- a/packages/react-core/src/demos/DatePicker/examples/DateTimePickerInModal.tsx
+++ b/packages/react-core/src/demos/DatePicker/examples/DateTimePickerInModal.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useRef, useState } from 'react';
 import {
   DatePicker,
   Button,
@@ -13,9 +13,9 @@ import {
 } from '@patternfly/react-core';
 
 export const SimpleModal = () => {
-  const [isModalOpen, setIsModalOpen] = React.useState(false);
-  const [isTimePickerOpen, setIsTimePickerOpen] = React.useState(false);
-  const dateRef = React.useRef(null);
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const [isTimePickerOpen, setIsTimePickerOpen] = useState(false);
+  const dateRef = useRef(null);
 
   const handleModalToggle = (_event: KeyboardEvent | React.MouseEvent) => {
     setIsModalOpen(!isModalOpen);
@@ -32,7 +32,7 @@ export const SimpleModal = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Launch modal
       </Button>
@@ -67,6 +67,6 @@ export const SimpleModal = () => {
           </Button>
         </ModalFooter>
       </Modal>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/DescriptionList/examples/DescriptionListBasic.tsx b/packages/react-core/src/demos/DescriptionList/examples/DescriptionListBasic.tsx
index 0c502dfceeb..994b520a86f 100644
--- a/packages/react-core/src/demos/DescriptionList/examples/DescriptionListBasic.tsx
+++ b/packages/react-core/src/demos/DescriptionList/examples/DescriptionListBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   DescriptionList,
   DescriptionListTerm,
diff --git a/packages/react-core/src/demos/DescriptionList/examples/DescriptionListInDrawer.tsx b/packages/react-core/src/demos/DescriptionList/examples/DescriptionListInDrawer.tsx
index 3495dfad96b..8ed5d3ac6b5 100644
--- a/packages/react-core/src/demos/DescriptionList/examples/DescriptionListInDrawer.tsx
+++ b/packages/react-core/src/demos/DescriptionList/examples/DescriptionListInDrawer.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Gallery,
   Content,
diff --git a/packages/react-core/src/demos/ExpandableSection/examples/ExpandableTextDemo.tsx b/packages/react-core/src/demos/ExpandableSection/examples/ExpandableTextDemo.tsx
index 2187e9fe1a1..85a5cf1a3d7 100644
--- a/packages/react-core/src/demos/ExpandableSection/examples/ExpandableTextDemo.tsx
+++ b/packages/react-core/src/demos/ExpandableSection/examples/ExpandableTextDemo.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ExpandableSection, ExpandableSectionVariant, Truncate } from '@patternfly/react-core';
 
 export const ExpandableTextDemo: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/demos/Filters/FilterDemos.md b/packages/react-core/src/demos/Filters/FilterDemos.md
index baa70a8c47c..1b882d7da62 100644
--- a/packages/react-core/src/demos/Filters/FilterDemos.md
+++ b/packages/react-core/src/demos/Filters/FilterDemos.md
@@ -3,6 +3,7 @@ id: Filters
 section: patterns
 ---
 
+import { Fragment } from 'react';
 import {
 Popper,
 SearchInput,
diff --git a/packages/react-core/src/demos/Filters/examples/FilterAttributeSearch.tsx b/packages/react-core/src/demos/Filters/examples/FilterAttributeSearch.tsx
index 31bb74e19a3..9245ca36b94 100644
--- a/packages/react-core/src/demos/Filters/examples/FilterAttributeSearch.tsx
+++ b/packages/react-core/src/demos/Filters/examples/FilterAttributeSearch.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   SearchInput,
   Toolbar,
@@ -640,7 +640,7 @@ export const FilterAttributeSearch: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       {toolbar}
       <Table aria-label="Selectable table">
         <Thead>
@@ -695,6 +695,6 @@ export const FilterAttributeSearch: React.FunctionComponent = () => {
           )}
         </Tbody>
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/Filters/examples/FilterCheckboxSelect.tsx b/packages/react-core/src/demos/Filters/examples/FilterCheckboxSelect.tsx
index 3e60193153f..021714d4efa 100644
--- a/packages/react-core/src/demos/Filters/examples/FilterCheckboxSelect.tsx
+++ b/packages/react-core/src/demos/Filters/examples/FilterCheckboxSelect.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Menu,
   MenuContent,
@@ -370,7 +370,7 @@ export const FilterCheckboxSelect: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       {toolbar}
       <Table aria-label="Selectable table">
         <Thead>
@@ -417,6 +417,6 @@ export const FilterCheckboxSelect: React.FunctionComponent = () => {
           ))}
         </Tbody>
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/Filters/examples/FilterFaceted.tsx b/packages/react-core/src/demos/Filters/examples/FilterFaceted.tsx
index 6d016db0a72..712112a67ce 100644
--- a/packages/react-core/src/demos/Filters/examples/FilterFaceted.tsx
+++ b/packages/react-core/src/demos/Filters/examples/FilterFaceted.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Toolbar,
   ToolbarContent,
@@ -457,7 +457,7 @@ export const FilterFaceted: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       {toolbar}
       <Table aria-label="Selectable table">
         <Thead>
@@ -512,6 +512,6 @@ export const FilterFaceted: React.FunctionComponent = () => {
           )}
         </Tbody>
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/Filters/examples/FilterMixedSelectGroup.tsx b/packages/react-core/src/demos/Filters/examples/FilterMixedSelectGroup.tsx
index 8bc3f5033d3..1ac0d5a859c 100644
--- a/packages/react-core/src/demos/Filters/examples/FilterMixedSelectGroup.tsx
+++ b/packages/react-core/src/demos/Filters/examples/FilterMixedSelectGroup.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Toolbar,
   ToolbarContent,
@@ -507,7 +507,7 @@ export const FilterMixedSelectGroup: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       {toolbar}
       <Table aria-label="Selectable table">
         <Thead>
@@ -562,6 +562,6 @@ export const FilterMixedSelectGroup: React.FunctionComponent = () => {
           )}
         </Tbody>
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/Filters/examples/FilterSameSelectGroup.tsx b/packages/react-core/src/demos/Filters/examples/FilterSameSelectGroup.tsx
index 94cf3a740e5..df56da4a35e 100644
--- a/packages/react-core/src/demos/Filters/examples/FilterSameSelectGroup.tsx
+++ b/packages/react-core/src/demos/Filters/examples/FilterSameSelectGroup.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Toolbar,
   ToolbarContent,
@@ -480,7 +480,7 @@ export const FilterSameSelectGroup: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       {toolbar}
       <Table aria-label="Selectable table">
         <Thead>
@@ -535,6 +535,6 @@ export const FilterSameSelectGroup: React.FunctionComponent = () => {
           )}
         </Tbody>
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/Filters/examples/FilterSearchInput.tsx b/packages/react-core/src/demos/Filters/examples/FilterSearchInput.tsx
index e1c567d1426..bc075d1f47e 100644
--- a/packages/react-core/src/demos/Filters/examples/FilterSearchInput.tsx
+++ b/packages/react-core/src/demos/Filters/examples/FilterSearchInput.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   SearchInput,
   Toolbar,
@@ -288,7 +288,7 @@ export const FilterSearchInput: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       {toolbar}
       <Table aria-label="Selectable table">
         <Thead>
@@ -343,6 +343,6 @@ export const FilterSearchInput: React.FunctionComponent = () => {
           )}
         </Tbody>
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/Filters/examples/FilterSingleSelect.tsx b/packages/react-core/src/demos/Filters/examples/FilterSingleSelect.tsx
index ef8544bc584..ce84e4c8c47 100644
--- a/packages/react-core/src/demos/Filters/examples/FilterSingleSelect.tsx
+++ b/packages/react-core/src/demos/Filters/examples/FilterSingleSelect.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Menu,
   MenuContent,
@@ -355,7 +355,7 @@ export const FilterSingleSelect: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       {toolbar}
       <Table aria-label="Selectable table">
         <Thead>
@@ -402,6 +402,6 @@ export const FilterSingleSelect: React.FunctionComponent = () => {
           ))}
         </Tbody>
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/JumpLinks.md b/packages/react-core/src/demos/JumpLinks.md
index f861d488a4a..60255b256d1 100644
--- a/packages/react-core/src/demos/JumpLinks.md
+++ b/packages/react-core/src/demos/JumpLinks.md
@@ -21,7 +21,6 @@ JumpLinks has a scrollspy built-in to make your implementation easier. When impl
 This demo expands on the previous to show the JumpLinks in a vertical layout with subsections. It scrolls the [Page](/components/page)'s `mainContainerId` with an `offset` calculated based on the height of the masthead and the nav list when it appears above the content. The headings are given a tab index to allow the jump links to focus on them.
 
 ```js isFullscreen
-import React from 'react';
 import {
   PageSection,
   JumpLinks,
diff --git a/packages/react-core/src/demos/NotificationDrawer/examples/NotificationDrawerBasic.tsx b/packages/react-core/src/demos/NotificationDrawer/examples/NotificationDrawerBasic.tsx
index 8adff23c7ab..bc9843fe35a 100644
--- a/packages/react-core/src/demos/NotificationDrawer/examples/NotificationDrawerBasic.tsx
+++ b/packages/react-core/src/demos/NotificationDrawer/examples/NotificationDrawerBasic.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Avatar,
   Brand,
@@ -524,7 +524,7 @@ export const NotificationDrawerBasic: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Page
         masthead={masthead}
         sidebar={Sidebar}
@@ -549,6 +549,6 @@ export const NotificationDrawerBasic: React.FunctionComponent = () => {
         </PageSection>
         <PageSection>Panel section content</PageSection>
       </Page>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/NotificationDrawer/examples/NotificationDrawerGrouped.tsx b/packages/react-core/src/demos/NotificationDrawer/examples/NotificationDrawerGrouped.tsx
index 73b11b4440d..3f6a64fe35b 100644
--- a/packages/react-core/src/demos/NotificationDrawer/examples/NotificationDrawerGrouped.tsx
+++ b/packages/react-core/src/demos/NotificationDrawer/examples/NotificationDrawerGrouped.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Avatar,
   Brand,
@@ -759,7 +759,7 @@ export const NotificationDrawerGrouped: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Page
         masthead={masthead}
         sidebar={Sidebar}
@@ -784,6 +784,6 @@ export const NotificationDrawerGrouped: React.FunctionComponent = () => {
         </PageSection>
         <PageSection>Panel section content</PageSection>
       </Page>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/PasswordGenerator.md b/packages/react-core/src/demos/PasswordGenerator.md
index 0325213c7de..7f850499797 100644
--- a/packages/react-core/src/demos/PasswordGenerator.md
+++ b/packages/react-core/src/demos/PasswordGenerator.md
@@ -12,7 +12,6 @@ import EyeSlashIcon from '@patternfly/react-icons/dist/esm/icons/eye-slash-icon'
 ### Provide a generated password
 
 ```ts
-import React from 'react';
 import {
   InputGroup,
   InputGroupItem,
diff --git a/packages/react-core/src/demos/ProgressDemo.md b/packages/react-core/src/demos/ProgressDemo.md
index 076d8ccdf77..ee82845d395 100644
--- a/packages/react-core/src/demos/ProgressDemo.md
+++ b/packages/react-core/src/demos/ProgressDemo.md
@@ -10,7 +10,6 @@ import accessibilityStyles from '@patternfly/react-styles/css/utilities/Accessib
 ### Basic
 
 ```js
-import React from 'react';
 import { Progress, Button, Stack, StackItem } from '@patternfly/react-core';
 import accessibilityStyles from '@patternfly/react-styles/css/utilities/Accessibility/accessibility';
 
@@ -49,7 +48,6 @@ ProgressStepperDemo = () => {
 Sometimes a progress bar should only show increases to progress state. In this case, before the next value is set it should be checked against the current progress. The `Decrease progress` button attempts to set a lower progress value, simulating an update to a progress state that isn't desired, but won't change the progress state due to this check.
 
 ```js
-import React from 'react';
 import { Progress, Button, Stack, StackItem } from '@patternfly/react-core';
 
 ProgressStepperDemo = () => {
diff --git a/packages/react-core/src/demos/ProgressStepperDemo.md b/packages/react-core/src/demos/ProgressStepperDemo.md
index bf8c8a616af..e157c0bdaaa 100644
--- a/packages/react-core/src/demos/ProgressStepperDemo.md
+++ b/packages/react-core/src/demos/ProgressStepperDemo.md
@@ -10,7 +10,6 @@ import accessibilityStyles from '@patternfly/react-styles/css/utilities/Accessib
 ### Basic
 
 ```js
-import React from 'react';
 import { ProgressStepper, ProgressStep, Button, Stack, StackItem } from '@patternfly/react-core';
 import accessibilityStyles from '@patternfly/react-styles/css/utilities/Accessibility/accessibility';
 
diff --git a/packages/react-core/src/demos/RTL/examples/PaginatedTable.jsx b/packages/react-core/src/demos/RTL/examples/PaginatedTable.jsx
index ba609bb43df..208b6a642e7 100644
--- a/packages/react-core/src/demos/RTL/examples/PaginatedTable.jsx
+++ b/packages/react-core/src/demos/RTL/examples/PaginatedTable.jsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import {
   Avatar,
   Brand,
diff --git a/packages/react-core/src/demos/RTL/examples/PaginatedTable.tsx b/packages/react-core/src/demos/RTL/examples/PaginatedTable.tsx
index 77249aff6cc..77b658e0fb9 100644
--- a/packages/react-core/src/demos/RTL/examples/PaginatedTable.tsx
+++ b/packages/react-core/src/demos/RTL/examples/PaginatedTable.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-
+import { Fragment, useEffect, useState } from 'react';
 import {
   Avatar,
   Brand,
@@ -70,9 +69,9 @@ interface Translation {
 }
 
 export const PaginatedTableAction: React.FunctionComponent = () => {
-  const [translation, setTranslation] = React.useState<Translation>(translationsEn);
-  const [page, setPage] = React.useState<number>(1);
-  const [perPage, setPerPage] = React.useState<number>(10);
+  const [translation, setTranslation] = useState<Translation>(translationsEn);
+  const [page, setPage] = useState<number>(1);
+  const [perPage, setPerPage] = useState<number>(10);
 
   const columns = [
     translation.table.columns.servers,
@@ -120,9 +119,9 @@ export const PaginatedTableAction: React.FunctionComponent = () => {
   };
 
   const rows = createRows();
-  const [managedRows, setManagedRows] = React.useState(rows);
-  const [paginatedRows, setPaginatedRows] = React.useState<Row[]>(rows.slice(0, 10));
-  const [isDirRTL, setIsDirRTL] = React.useState<boolean>(false);
+  const [managedRows, setManagedRows] = useState(rows);
+  const [paginatedRows, setPaginatedRows] = useState<Row[]>(rows.slice(0, 10));
+  const [isDirRTL, setIsDirRTL] = useState<boolean>(false);
 
   const capitalize = (input: string) => input[0].toUpperCase() + input.substring(1);
 
@@ -131,13 +130,13 @@ export const PaginatedTableAction: React.FunctionComponent = () => {
     setTranslation((prevTranslation: string) => (prevTranslation === translationsEn ? translationsHe : translationsEn));
   };
 
-  React.useEffect(() => {
+  useEffect(() => {
     const newRows = createRows();
     setManagedRows(newRows);
     setPaginatedRows(newRows.slice((page - 1) * perPage, page * perPage));
   }, [translation]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     const html = document.querySelector('html');
     html.dir = isDirRTL ? 'rtl' : 'ltr';
   }, [isDirRTL]);
@@ -252,7 +251,7 @@ export const PaginatedTableAction: React.FunctionComponent = () => {
   };
 
   const toolbarItems = (
-    <React.Fragment>
+    <Fragment>
       <Toolbar id="rtl-paginated-table">
         <ToolbarContent>
           <ToolbarItem>
@@ -272,7 +271,7 @@ export const PaginatedTableAction: React.FunctionComponent = () => {
           <ToolbarItem variant="pagination">{renderPagination(PaginationVariant.top)}</ToolbarItem>
         </ToolbarContent>
       </Toolbar>
-    </React.Fragment>
+    </Fragment>
   );
 
   const pageNav = (
@@ -303,9 +302,9 @@ export const PaginatedTableAction: React.FunctionComponent = () => {
     </PageSidebar>
   );
 
-  const [isDropdownOpen, setIsDropdownOpen] = React.useState<boolean>(false);
-  const [isKebabDropdownOpen, setIsKebabDropdownOpen] = React.useState<boolean>(false);
-  const [isFullKebabDropdownOpen, setIsFullKebabDropdownOpen] = React.useState<boolean>(false);
+  const [isDropdownOpen, setIsDropdownOpen] = useState<boolean>(false);
+  const [isKebabDropdownOpen, setIsKebabDropdownOpen] = useState<boolean>(false);
+  const [isFullKebabDropdownOpen, setIsFullKebabDropdownOpen] = useState<boolean>(false);
 
   const kebabDropdownItems = (
     <>
@@ -459,7 +458,7 @@ export const PaginatedTableAction: React.FunctionComponent = () => {
   const breadcrumbItemsLength = Object.keys(breadcrumbItems).length;
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Page sidebar={sidebar} masthead={masthead} isManagedSidebar>
         <PageBreadcrumb>
           <Breadcrumb aria-label={translation.breadcrumbs.ariaLabel || undefined}>
@@ -526,6 +525,6 @@ export const PaginatedTableAction: React.FunctionComponent = () => {
           </Card>
         </PageSection>
       </Page>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/SearchInput/SearchInput.md b/packages/react-core/src/demos/SearchInput/SearchInput.md
index ddd2233ec55..e3cc48b1ac9 100644
--- a/packages/react-core/src/demos/SearchInput/SearchInput.md
+++ b/packages/react-core/src/demos/SearchInput/SearchInput.md
@@ -32,7 +32,6 @@ This demo handles building the advanced search form using the composable Menu, a
 It also demonstrates wiring up the appropriate keyboard interactions, focus management, and general event handling.
 
 ```js
-import React from 'react';
 import { Menu, MenuContent, MenuItem, MenuList, Popper, SearchInput } from '@patternfly/react-core';
 
 import { words } from './words.js';
@@ -207,7 +206,6 @@ keyboard interactions, focus management, and general event handling.
 Note: This demo and its handling of 'date within' and a date picker is modeled after the gmail advanced search form.
 
 ```js
-import React from 'react';
 import {
   ActionGroup,
   Button,
diff --git a/packages/react-core/src/demos/Tabs.md b/packages/react-core/src/demos/Tabs.md
index 569f487c831..160e445fb42 100644
--- a/packages/react-core/src/demos/Tabs.md
+++ b/packages/react-core/src/demos/Tabs.md
@@ -21,7 +21,6 @@ import { DashboardWrapper } from '@patternfly/react-core/dist/js/demos/Dashboard
 ### Open tabs
 
 ```js isFullscreen
-import React from 'react';
 import {
   PageSection,
   PageBreadcrumb,
@@ -211,7 +210,6 @@ TabsOpenDemo = () => {
 ### Open tabs with secondary tabs
 
 ```js isFullscreen
-import React from 'react';
 import {
   PageSection,
   PageBreadcrumb,
diff --git a/packages/react-core/src/demos/examples/AlertGroup/AlertGroupToastWithNotificationDrawer.tsx b/packages/react-core/src/demos/examples/AlertGroup/AlertGroupToastWithNotificationDrawer.tsx
index 5a9023e7e47..820807c6b31 100644
--- a/packages/react-core/src/demos/examples/AlertGroup/AlertGroupToastWithNotificationDrawer.tsx
+++ b/packages/react-core/src/demos/examples/AlertGroup/AlertGroupToastWithNotificationDrawer.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import {
   Button,
   EmptyState,
@@ -48,12 +48,12 @@ export const AlertGroupToastWithNotificationDrawer: React.FunctionComponent = ()
   const maxAlerts = 100;
   const alertTimeout = 8000;
 
-  const [isDrawerExpanded, setDrawerExpanded] = React.useState(false);
-  const [openDropdownKey, setOpenDropdownKey] = React.useState<React.Key | null>(null);
-  const [overflowMessage, setOverflowMessage] = React.useState<string>('');
-  const [maxDisplayed, setMaxDisplayed] = React.useState(maxDisplayedAlerts);
-  const [alerts, setAlerts] = React.useState<React.ReactElement<AlertProps>[]>([]);
-  const [notifications, setNotifications] = React.useState<NotificationProps[]>([]);
+  const [isDrawerExpanded, setDrawerExpanded] = useState(false);
+  const [openDropdownKey, setOpenDropdownKey] = useState<React.Key | null>(null);
+  const [overflowMessage, setOverflowMessage] = useState<string>('');
+  const [maxDisplayed, setMaxDisplayed] = useState(maxDisplayedAlerts);
+  const [alerts, setAlerts] = useState<React.ReactElement<AlertProps>[]>([]);
+  const [notifications, setNotifications] = useState<NotificationProps[]>([]);
 
   useEffect(() => {
     setOverflowMessage(buildOverflowMessage());
@@ -358,7 +358,7 @@ export const AlertGroupToastWithNotificationDrawer: React.FunctionComponent = ()
           onChange={onMaxDisplayedAlertsChange}
           onPlus={onMaxDisplayedAlertsPlus}
           inputName="input"
-          inputAriaLabel="max diplayed alerts number input"
+          inputAriaLabel="max displayed alerts number input"
           minusBtnAriaLabel="minus"
           plusBtnAriaLabel="plus"
           style={{ margin: '12px 0' }}
diff --git a/packages/react-core/src/demos/examples/BackToTop/BackToTopNameDemo.tsx b/packages/react-core/src/demos/examples/BackToTop/BackToTopNameDemo.tsx
index 8cb535a575f..3f79e35f544 100644
--- a/packages/react-core/src/demos/examples/BackToTop/BackToTopNameDemo.tsx
+++ b/packages/react-core/src/demos/examples/BackToTop/BackToTopNameDemo.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { useState } from 'react';
 import { BackToTop, Card, CardBody, Content, Gallery, GalleryItem, PageSection, Switch } from '@patternfly/react-core';
 import { DashboardWrapper } from '@patternfly/react-core/dist/js/demos/DashboardWrapper';
 
 export const Name = () => {
-  const [isAlwaysVisible, setIsAlwaysVisible] = React.useState(false);
+  const [isAlwaysVisible, setIsAlwaysVisible] = useState(false);
 
   const handleChange = (_event, isChecked) => {
     setIsAlwaysVisible(isChecked);
diff --git a/packages/react-core/src/demos/examples/Card/CardAggregateStatus.tsx b/packages/react-core/src/demos/examples/Card/CardAggregateStatus.tsx
index 0120164fcfa..27e7f399814 100644
--- a/packages/react-core/src/demos/examples/Card/CardAggregateStatus.tsx
+++ b/packages/react-core/src/demos/examples/Card/CardAggregateStatus.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-import * as React from 'react';
+import { Fragment, type JSX } from 'react';
 import {
   Card,
   CardBody,
@@ -18,8 +18,6 @@ import ExclamationCircleIcon from '@patternfly/react-icons/dist/js/icons/exclama
 import ExclamationTriangleIcon from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon';
 import l_gallery_GridTemplateColumns_min from '@patternfly/react-tokens/dist/esm/l_gallery_GridTemplateColumns_min';
 
-import type { JSX } from 'react';
-
 interface ContentType {
   icon?: React.ReactNode;
   count?: number;
@@ -234,7 +232,7 @@ export const CardAggregateStatus: React.FunctionComponent = () => {
       return (
         <Flex display={{ default: 'inlineFlex' }}>
           {content.map(({ icon, count }, index: number) => (
-            <React.Fragment key={index}>
+            <Fragment key={index}>
               <Flex spaceItems={{ default: 'spaceItemsSm' }}>
                 <FlexItem>{icon}</FlexItem>
                 <FlexItem>
@@ -249,7 +247,7 @@ export const CardAggregateStatus: React.FunctionComponent = () => {
                   }}
                 />
               )}
-            </React.Fragment>
+            </Fragment>
           ))}
         </Flex>
       );
diff --git a/packages/react-core/src/demos/examples/Card/CardDetails.tsx b/packages/react-core/src/demos/examples/Card/CardDetails.tsx
index 414f5a2bc46..e8e0b75d9b8 100644
--- a/packages/react-core/src/demos/examples/Card/CardDetails.tsx
+++ b/packages/react-core/src/demos/examples/Card/CardDetails.tsx
@@ -1,5 +1,4 @@
 /* eslint-disable camelcase */
-import React from 'react';
 import {
   Card,
   CardTitle,
diff --git a/packages/react-core/src/demos/examples/Card/CardEventsView.tsx b/packages/react-core/src/demos/examples/Card/CardEventsView.tsx
index 795c3cc7c44..bc7507b58ab 100644
--- a/packages/react-core/src/demos/examples/Card/CardEventsView.tsx
+++ b/packages/react-core/src/demos/examples/Card/CardEventsView.tsx
@@ -1,5 +1,5 @@
+import { Fragment } from 'react';
 /* eslint-disable camelcase */
-import React from 'react';
 import {
   Card,
   CardHeader,
@@ -57,7 +57,7 @@ export const CardEventsView: React.FunctionComponent = () => {
     </Select>
   );
   return (
-    <React.Fragment>
+    <Fragment>
       <b>Note:</b> Custom CSS is used in this demo to align the card title and select toggle text to{' '}
       <code>baseline</code> alignment.
       <br />
@@ -156,6 +156,6 @@ export const CardEventsView: React.FunctionComponent = () => {
           </CardFooter>
         </Card>
       </Gallery>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/examples/Card/CardHorizontalGrid.tsx b/packages/react-core/src/demos/examples/Card/CardHorizontalGrid.tsx
index cc72e1e7c79..3104c575dff 100644
--- a/packages/react-core/src/demos/examples/Card/CardHorizontalGrid.tsx
+++ b/packages/react-core/src/demos/examples/Card/CardHorizontalGrid.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Card,
   CardHeader,
diff --git a/packages/react-core/src/demos/examples/Card/CardHorizontalSplit.tsx b/packages/react-core/src/demos/examples/Card/CardHorizontalSplit.tsx
index 23496e5ecf5..d4e73f776be 100644
--- a/packages/react-core/src/demos/examples/Card/CardHorizontalSplit.tsx
+++ b/packages/react-core/src/demos/examples/Card/CardHorizontalSplit.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Card, CardTitle, CardBody, CardFooter, Grid, GridItem, Button } from '@patternfly/react-core';
 
 export const CardHorizontalSplitDemo: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/demos/examples/Card/CardLogView.tsx b/packages/react-core/src/demos/examples/Card/CardLogView.tsx
index 84aa9f78445..67d327fb9a4 100644
--- a/packages/react-core/src/demos/examples/Card/CardLogView.tsx
+++ b/packages/react-core/src/demos/examples/Card/CardLogView.tsx
@@ -1,5 +1,5 @@
+import { Fragment } from 'react';
 /* eslint-disable camelcase */
-import React from 'react';
 import {
   Card,
   CardHeader,
@@ -56,7 +56,7 @@ export const CardLogView: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <b>Note:</b> Custom CSS is used in this demo to align the card title and select toggle text to{' '}
       <code>baseline</code> alignment.
       <br />
@@ -113,6 +113,6 @@ export const CardLogView: React.FunctionComponent = () => {
           </CardFooter>
         </Card>
       </Gallery>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/examples/Card/CardNested.tsx b/packages/react-core/src/demos/examples/Card/CardNested.tsx
index f4d213a77ea..a4f67d9e748 100644
--- a/packages/react-core/src/demos/examples/Card/CardNested.tsx
+++ b/packages/react-core/src/demos/examples/Card/CardNested.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Card,
   CardHeader,
diff --git a/packages/react-core/src/demos/examples/Card/CardStatus.tsx b/packages/react-core/src/demos/examples/Card/CardStatus.tsx
index 4b6d59d73d8..9535877cf19 100644
--- a/packages/react-core/src/demos/examples/Card/CardStatus.tsx
+++ b/packages/react-core/src/demos/examples/Card/CardStatus.tsx
@@ -1,5 +1,4 @@
 /* eslint-disable camelcase */
-import * as React from 'react';
 import {
   Alert,
   Card,
diff --git a/packages/react-core/src/demos/examples/Card/CardStatusTabbed.tsx b/packages/react-core/src/demos/examples/Card/CardStatusTabbed.tsx
index ecfc04d9c78..5b8ed3fe328 100644
--- a/packages/react-core/src/demos/examples/Card/CardStatusTabbed.tsx
+++ b/packages/react-core/src/demos/examples/Card/CardStatusTabbed.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import {
   Card,
   CardBody,
diff --git a/packages/react-core/src/demos/examples/Card/CardTrendDemo1.tsx b/packages/react-core/src/demos/examples/Card/CardTrendDemo1.tsx
index dcaee1a9e97..0447a1bf42b 100644
--- a/packages/react-core/src/demos/examples/Card/CardTrendDemo1.tsx
+++ b/packages/react-core/src/demos/examples/Card/CardTrendDemo1.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import {
   Card,
   CardTitle,
@@ -18,7 +18,7 @@ import {
 import { ChartArea, ChartGroup, ChartVoronoiContainer } from '@patternfly/react-charts/victory';
 
 export const CardTrendDemo1: React.FunctionComponent = () => {
-  const [isOpen, setIsOpen] = React.useState(false);
+  const [isOpen, setIsOpen] = useState(false);
 
   const selectItems = (
     <SelectList>
@@ -50,7 +50,7 @@ export const CardTrendDemo1: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <b>Note:</b> Custom CSS is used in this demo to align the card title and select toggle text to{' '}
       <code>baseline</code> alignment.
       <br />
@@ -100,6 +100,6 @@ export const CardTrendDemo1: React.FunctionComponent = () => {
           </Card>
         </GalleryItem>
       </Gallery>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/examples/Card/CardTrendDemo2.tsx b/packages/react-core/src/demos/examples/Card/CardTrendDemo2.tsx
index 160dacc007d..193dc51725a 100644
--- a/packages/react-core/src/demos/examples/Card/CardTrendDemo2.tsx
+++ b/packages/react-core/src/demos/examples/Card/CardTrendDemo2.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Card,
   CardTitle,
diff --git a/packages/react-core/src/demos/examples/Card/CardUtilizationDemo1.tsx b/packages/react-core/src/demos/examples/Card/CardUtilizationDemo1.tsx
index 13efe081dd1..55d65064d2b 100644
--- a/packages/react-core/src/demos/examples/Card/CardUtilizationDemo1.tsx
+++ b/packages/react-core/src/demos/examples/Card/CardUtilizationDemo1.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Card,
   CardTitle,
diff --git a/packages/react-core/src/demos/examples/Card/CardUtilizationDemo2.tsx b/packages/react-core/src/demos/examples/Card/CardUtilizationDemo2.tsx
index ff89b835f40..3064f034ef3 100644
--- a/packages/react-core/src/demos/examples/Card/CardUtilizationDemo2.tsx
+++ b/packages/react-core/src/demos/examples/Card/CardUtilizationDemo2.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Card,
   CardTitle,
diff --git a/packages/react-core/src/demos/examples/Card/CardUtilizationDemo3.tsx b/packages/react-core/src/demos/examples/Card/CardUtilizationDemo3.tsx
index f72af6de055..5577df2e51e 100644
--- a/packages/react-core/src/demos/examples/Card/CardUtilizationDemo3.tsx
+++ b/packages/react-core/src/demos/examples/Card/CardUtilizationDemo3.tsx
@@ -1,5 +1,5 @@
+import { Fragment, useState } from 'react';
 /* eslint-disable camelcase */
-import React from 'react';
 import {
   Card,
   CardTitle,
@@ -27,7 +27,7 @@ import chart_color_red_orange_400 from '@patternfly/react-tokens/dist/esm/chart_
 import flex from '@patternfly/react-styles/css/utilities/Flex/flex';
 
 export const CardUtilizationDemo3: React.FunctionComponent = () => {
-  const [isOpen, setIsOpen] = React.useState(false);
+  const [isOpen, setIsOpen] = useState(false);
 
   const selectItems = (
     <SelectList>
@@ -59,7 +59,7 @@ export const CardUtilizationDemo3: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <b>Note:</b> Custom CSS is used in this demo to align the card title and select toggle text to{' '}
       <code>baseline</code> alignment.
       <br />
@@ -171,6 +171,6 @@ export const CardUtilizationDemo3: React.FunctionComponent = () => {
           </Card>
         </GalleryItem>
       </Gallery>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/examples/Card/CardUtilizationDemo4.tsx b/packages/react-core/src/demos/examples/Card/CardUtilizationDemo4.tsx
index f3d01ac5a95..6f28856eb41 100644
--- a/packages/react-core/src/demos/examples/Card/CardUtilizationDemo4.tsx
+++ b/packages/react-core/src/demos/examples/Card/CardUtilizationDemo4.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Card, CardTitle, CardBody, CardFooter, Title, Gallery, GalleryItem } from '@patternfly/react-core';
 import { ChartDonutThreshold, ChartDonutUtilization } from '@patternfly/react-charts/victory';
 
diff --git a/packages/react-core/src/demos/examples/Card/CardWithAccordion.tsx b/packages/react-core/src/demos/examples/Card/CardWithAccordion.tsx
index f7a2cd653b1..9d0a9058f1c 100644
--- a/packages/react-core/src/demos/examples/Card/CardWithAccordion.tsx
+++ b/packages/react-core/src/demos/examples/Card/CardWithAccordion.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Card,
   CardTitle,
diff --git a/packages/react-core/src/demos/examples/DateTimePicker/DateTimePicker.tsx b/packages/react-core/src/demos/examples/DateTimePicker/DateTimePicker.tsx
index ef7952a4c97..ef3dac71b23 100644
--- a/packages/react-core/src/demos/examples/DateTimePicker/DateTimePicker.tsx
+++ b/packages/react-core/src/demos/examples/DateTimePicker/DateTimePicker.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   CalendarMonth,
   InputGroup,
diff --git a/packages/react-core/src/demos/examples/HelperText/HelperTextDynamic.tsx b/packages/react-core/src/demos/examples/HelperText/HelperTextDynamic.tsx
index 9b7489d8b5d..4784660a5d0 100644
--- a/packages/react-core/src/demos/examples/HelperText/HelperTextDynamic.tsx
+++ b/packages/react-core/src/demos/examples/HelperText/HelperTextDynamic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Form, FormGroup, FormHelperText, TextInput, HelperText, HelperTextItem } from '@patternfly/react-core';
 
 export const HelperTextDynamic: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/demos/examples/HelperText/HelperTextStatic.tsx b/packages/react-core/src/demos/examples/HelperText/HelperTextStatic.tsx
index b3ad325fcf9..350e1513a2a 100644
--- a/packages/react-core/src/demos/examples/HelperText/HelperTextStatic.tsx
+++ b/packages/react-core/src/demos/examples/HelperText/HelperTextStatic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Form, FormGroup, FormHelperText, TextInput, HelperText, HelperTextItem } from '@patternfly/react-core';
 
 export const HelperTextStaticText: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/demos/examples/HelperText/HelperTextStaticTextDynamicVariant.tsx b/packages/react-core/src/demos/examples/HelperText/HelperTextStaticTextDynamicVariant.tsx
index 084534ead40..a244299ad22 100644
--- a/packages/react-core/src/demos/examples/HelperText/HelperTextStaticTextDynamicVariant.tsx
+++ b/packages/react-core/src/demos/examples/HelperText/HelperTextStaticTextDynamicVariant.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Form, FormGroup, FormHelperText, TextInput, HelperText, HelperTextItem } from '@patternfly/react-core';
 
 export const HelperTextStaticTextDynamicVariant: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/demos/examples/JumpLinks/JumpLinksWithDrawer.js b/packages/react-core/src/demos/examples/JumpLinks/JumpLinksWithDrawer.js
index e2f8c07d4dc..0f79c33dcec 100644
--- a/packages/react-core/src/demos/examples/JumpLinks/JumpLinksWithDrawer.js
+++ b/packages/react-core/src/demos/examples/JumpLinks/JumpLinksWithDrawer.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useContext, useRef, useState } from 'react';
 import {
   Button,
   Content,
@@ -21,7 +21,7 @@ import {
 import { DashboardWrapper } from '@patternfly/react-core/dist/js/demos/DashboardWrapper';
 
 const JumpLinksWrapper = ({ headings }) => {
-  const { drawerContentRef } = React.useContext(DrawerContext);
+  const { drawerContentRef } = useContext(DrawerContext);
 
   return (
     <JumpLinks
@@ -43,8 +43,8 @@ const JumpLinksWrapper = ({ headings }) => {
 export const JumpLinksWithDrawer = () => {
   const headings = ['First', 'Second', 'Third', 'Fourth', 'Fifth'];
 
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const drawerRef = React.useRef(undefined);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const drawerRef = useRef(undefined);
 
   const onCloseClick = () => {
     setIsExpanded(false);
diff --git a/packages/react-core/src/demos/examples/Masthead/MastheadWithHorizontalNav.tsx b/packages/react-core/src/demos/examples/Masthead/MastheadWithHorizontalNav.tsx
index dba15f8c43a..3c44e13ee93 100644
--- a/packages/react-core/src/demos/examples/Masthead/MastheadWithHorizontalNav.tsx
+++ b/packages/react-core/src/demos/examples/Masthead/MastheadWithHorizontalNav.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Avatar,
   Brand,
diff --git a/packages/react-core/src/demos/examples/Masthead/MastheadWithUtilitiesAndUserDropdownMenu.tsx b/packages/react-core/src/demos/examples/Masthead/MastheadWithUtilitiesAndUserDropdownMenu.tsx
index 795d4aedf39..849a3ac4b5b 100644
--- a/packages/react-core/src/demos/examples/Masthead/MastheadWithUtilitiesAndUserDropdownMenu.tsx
+++ b/packages/react-core/src/demos/examples/Masthead/MastheadWithUtilitiesAndUserDropdownMenu.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Avatar,
   Brand,
@@ -337,12 +337,12 @@ export const MastheadWithUtilitiesAndUserDropdownMenu: React.FunctionComponent =
       <Divider />
       <MenuContent>
         {filteredFavorites.length > 0 && (
-          <React.Fragment>
+          <Fragment>
             <MenuGroup key="favorites-group" label="Favorites">
               <MenuList>{filteredFavorites}</MenuList>
             </MenuGroup>
             <Divider key="favorites-divider" />
-          </React.Fragment>
+          </Fragment>
         )}
         {filteredItems}
       </MenuContent>
diff --git a/packages/react-core/src/demos/examples/MultipleFileUpload/MultipleFileUploadRejectedFile.tsx b/packages/react-core/src/demos/examples/MultipleFileUpload/MultipleFileUploadRejectedFile.tsx
index f774ddabd3d..87a1a6593bb 100644
--- a/packages/react-core/src/demos/examples/MultipleFileUpload/MultipleFileUploadRejectedFile.tsx
+++ b/packages/react-core/src/demos/examples/MultipleFileUpload/MultipleFileUploadRejectedFile.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { FileRejection } from 'react-dropzone';
 import {
   MultipleFileUpload,
diff --git a/packages/react-core/src/demos/examples/Nav/NavDefault.tsx b/packages/react-core/src/demos/examples/Nav/NavDefault.tsx
index 35cde779564..5817f9e1bff 100644
--- a/packages/react-core/src/demos/examples/Nav/NavDefault.tsx
+++ b/packages/react-core/src/demos/examples/Nav/NavDefault.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   Card,
   CardBody,
@@ -18,7 +18,7 @@ import { DashboardBreadcrumb } from '@patternfly/react-core/dist/js/demos/Dashbo
 import { DashboardHeader } from '@patternfly/react-core/dist/js/demos/DashboardHeader';
 
 export const NavDefault: React.FunctionComponent = () => {
-  const [activeItem, setActiveItem] = React.useState<number | string>(0);
+  const [activeItem, setActiveItem] = useState<number | string>(0);
 
   const onNavSelect = (
     _event: React.FormEvent<HTMLInputElement>,
diff --git a/packages/react-core/src/demos/examples/Nav/NavDrilldown.tsx b/packages/react-core/src/demos/examples/Nav/NavDrilldown.tsx
index 42983af19b4..842d3a94f2f 100644
--- a/packages/react-core/src/demos/examples/Nav/NavDrilldown.tsx
+++ b/packages/react-core/src/demos/examples/Nav/NavDrilldown.tsx
@@ -1,4 +1,4 @@
-import React, { type JSX } from 'react';
+import { type JSX, useState } from 'react';
 
 import {
   Page,
@@ -65,10 +65,10 @@ const subMenuOne: JSX.Element = (
 );
 
 export const NavDrilldown: React.FunctionComponent = () => {
-  const [menuDrilledIn, setMenuDrilledIn] = React.useState<string[]>([]);
-  const [drilldownPath, setDrilldownPath] = React.useState<string[]>([]);
-  const [menuHeights, setMenuHeights] = React.useState<MenuHeights>({});
-  const [activeMenuId, setActiveMenuId] = React.useState('rootMenu');
+  const [menuDrilledIn, setMenuDrilledIn] = useState<string[]>([]);
+  const [drilldownPath, setDrilldownPath] = useState<string[]>([]);
+  const [menuHeights, setMenuHeights] = useState<MenuHeights>({});
+  const [activeMenuId, setActiveMenuId] = useState('rootMenu');
   const navLayer = getNavLayer(activeMenuId);
 
   const onDrillIn = (
diff --git a/packages/react-core/src/demos/examples/Nav/NavExpandable.tsx b/packages/react-core/src/demos/examples/Nav/NavExpandable.tsx
index 115323bf352..995ae65a193 100644
--- a/packages/react-core/src/demos/examples/Nav/NavExpandable.tsx
+++ b/packages/react-core/src/demos/examples/Nav/NavExpandable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Card,
   CardBody,
@@ -101,7 +101,7 @@ export const NavExpandableDemo: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Page
         masthead={<DashboardHeader />}
         sidebar={Sidebar}
@@ -131,6 +131,6 @@ export const NavExpandableDemo: React.FunctionComponent = () => {
           </Gallery>
         </PageSection>
       </Page>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/examples/Nav/NavFlyout.tsx b/packages/react-core/src/demos/examples/Nav/NavFlyout.tsx
index 2cc9a4e3ccf..6280c123a41 100644
--- a/packages/react-core/src/demos/examples/Nav/NavFlyout.tsx
+++ b/packages/react-core/src/demos/examples/Nav/NavFlyout.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Avatar,
   Brand,
diff --git a/packages/react-core/src/demos/examples/Nav/NavGrouped.tsx b/packages/react-core/src/demos/examples/Nav/NavGrouped.tsx
index 6dc4bec101c..5dbcb4b6f68 100644
--- a/packages/react-core/src/demos/examples/Nav/NavGrouped.tsx
+++ b/packages/react-core/src/demos/examples/Nav/NavGrouped.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Content,
   Nav,
diff --git a/packages/react-core/src/demos/examples/Nav/NavHorizontal.tsx b/packages/react-core/src/demos/examples/Nav/NavHorizontal.tsx
index 94539521c26..fa33c705104 100644
--- a/packages/react-core/src/demos/examples/Nav/NavHorizontal.tsx
+++ b/packages/react-core/src/demos/examples/Nav/NavHorizontal.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Avatar,
   Brand,
@@ -222,7 +222,7 @@ export const NavHorizontal: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Page
         masthead={masthead}
         skipToContent={PageSkipToContent}
@@ -250,6 +250,6 @@ export const NavHorizontal: React.FunctionComponent = () => {
           </Gallery>
         </PageSection>
       </Page>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/examples/Nav/NavHorizontalWithSubnav.tsx b/packages/react-core/src/demos/examples/Nav/NavHorizontalWithSubnav.tsx
index 026b7322c6b..7dc2be2087f 100644
--- a/packages/react-core/src/demos/examples/Nav/NavHorizontalWithSubnav.tsx
+++ b/packages/react-core/src/demos/examples/Nav/NavHorizontalWithSubnav.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Avatar,
   Brand,
@@ -276,7 +276,7 @@ export const NavHorizontalWithSubnav: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Page masthead={masthead} skipToContent={PageSkipToContent} mainContainerId={pageId}>
         <PageSection type={PageSectionTypes.subNav} isWidthLimited>
           {SubNav}
@@ -305,6 +305,6 @@ export const NavHorizontalWithSubnav: React.FunctionComponent = () => {
           </Gallery>
         </PageSection>
       </Page>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/examples/Nav/NavManual.tsx b/packages/react-core/src/demos/examples/Nav/NavManual.tsx
index ec1a229c498..4168a592c6a 100644
--- a/packages/react-core/src/demos/examples/Nav/NavManual.tsx
+++ b/packages/react-core/src/demos/examples/Nav/NavManual.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Avatar,
   Brand,
@@ -252,7 +252,7 @@ export const NavManual: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Page
         masthead={masthead}
         sidebar={Sidebar}
@@ -281,6 +281,6 @@ export const NavManual: React.FunctionComponent = () => {
           </Gallery>
         </PageSection>
       </Page>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/examples/Nav/NavWithSubnav.tsx b/packages/react-core/src/demos/examples/Nav/NavWithSubnav.tsx
index a16ff3f045a..fd986b91398 100644
--- a/packages/react-core/src/demos/examples/Nav/NavWithSubnav.tsx
+++ b/packages/react-core/src/demos/examples/Nav/NavWithSubnav.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Card,
   CardBody,
@@ -114,7 +114,7 @@ export const NavWithSubnav: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Page
         masthead={<DashboardHeader />}
         sidebar={Sidebar}
@@ -149,6 +149,6 @@ export const NavWithSubnav: React.FunctionComponent = () => {
           </Gallery>
         </PageSection>
       </Page>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/examples/Page/PageContextSelector.tsx b/packages/react-core/src/demos/examples/Page/PageContextSelector.tsx
index 3b965d643ac..4476f067db4 100644
--- a/packages/react-core/src/demos/examples/Page/PageContextSelector.tsx
+++ b/packages/react-core/src/demos/examples/Page/PageContextSelector.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Avatar,
   Brand,
diff --git a/packages/react-core/src/demos/examples/Page/PageStickySectionBreadcrumb.tsx b/packages/react-core/src/demos/examples/Page/PageStickySectionBreadcrumb.tsx
index fd1dadef7ba..c835d384d5e 100644
--- a/packages/react-core/src/demos/examples/Page/PageStickySectionBreadcrumb.tsx
+++ b/packages/react-core/src/demos/examples/Page/PageStickySectionBreadcrumb.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Avatar,
   Brand,
diff --git a/packages/react-core/src/demos/examples/Page/PageStickySectionGroup.tsx b/packages/react-core/src/demos/examples/Page/PageStickySectionGroup.tsx
index e2c705be50f..e48f5b63b7d 100644
--- a/packages/react-core/src/demos/examples/Page/PageStickySectionGroup.tsx
+++ b/packages/react-core/src/demos/examples/Page/PageStickySectionGroup.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   Avatar,
   Brand,
@@ -54,10 +54,10 @@ interface NavOnSelectProps {
 }
 
 export const PageStickySectionGroup: React.FunctionComponent = () => {
-  const [isDropdownOpen, setIsDropdownOpen] = React.useState(false);
-  const [isKebabDropdownOpen, setIsKebabDropdownOpen] = React.useState(false);
-  const [isFullKebabDropdownOpen, setIsFullKebabDropdownOpen] = React.useState(false);
-  const [activeItem, setActiveItem] = React.useState(1);
+  const [isDropdownOpen, setIsDropdownOpen] = useState(false);
+  const [isKebabDropdownOpen, setIsKebabDropdownOpen] = useState(false);
+  const [isFullKebabDropdownOpen, setIsFullKebabDropdownOpen] = useState(false);
+  const [activeItem, setActiveItem] = useState(1);
 
   const onNavSelect = (_event: React.FormEvent<HTMLInputElement>, selectedItem: NavOnSelectProps) => {
     typeof selectedItem.itemId === 'number' && setActiveItem(selectedItem.itemId);
diff --git a/packages/react-core/src/demos/examples/Page/PageStickySectionGroupAlternate.tsx b/packages/react-core/src/demos/examples/Page/PageStickySectionGroupAlternate.tsx
index c380ae232c9..bbfb7eb7c74 100644
--- a/packages/react-core/src/demos/examples/Page/PageStickySectionGroupAlternate.tsx
+++ b/packages/react-core/src/demos/examples/Page/PageStickySectionGroupAlternate.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Avatar,
   Brand,
diff --git a/packages/react-core/src/demos/examples/PasswordStrength/PasswordStrengthDemo.tsx b/packages/react-core/src/demos/examples/PasswordStrength/PasswordStrengthDemo.tsx
index 5df9b9d4cc0..f67c816cb2d 100644
--- a/packages/react-core/src/demos/examples/PasswordStrength/PasswordStrengthDemo.tsx
+++ b/packages/react-core/src/demos/examples/PasswordStrength/PasswordStrengthDemo.tsx
@@ -1,4 +1,4 @@
-import React, { JSX } from 'react';
+import { type JSX, useState } from 'react';
 import { Form, FormGroup, FormHelperText, HelperText, HelperTextItem, TextInput } from '@patternfly/react-core';
 import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
 import ExclamationTriangleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon';
@@ -12,11 +12,11 @@ export const PasswordStrengthDemo: React.FunctionComponent = () => {
     text: string;
   }
 
-  const [password, setPassword] = React.useState('');
-  const [ruleLength, setRuleLength] = React.useState<HelperTextItemVariant>('indeterminate');
-  const [ruleContent, setRuleContent] = React.useState<HelperTextItemVariant>('indeterminate');
-  const [ruleCharacters, setRuleCharacters] = React.useState<HelperTextItemVariant>('indeterminate');
-  const [passStrength, setPassStrength] = React.useState<PassStrength>({
+  const [password, setPassword] = useState('');
+  const [ruleLength, setRuleLength] = useState<HelperTextItemVariant>('indeterminate');
+  const [ruleContent, setRuleContent] = useState<HelperTextItemVariant>('indeterminate');
+  const [ruleCharacters, setRuleCharacters] = useState<HelperTextItemVariant>('indeterminate');
+  const [passStrength, setPassStrength] = useState<PassStrength>({
     variant: 'error',
     icon: <ExclamationCircleIcon />,
     text: 'Weak'
diff --git a/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailCardView.tsx b/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailCardView.tsx
index 0fc2bee1e11..e503158f882 100644
--- a/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailCardView.tsx
+++ b/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailCardView.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Badge,
   Button,
@@ -446,7 +446,7 @@ export const PrimaryDetailCardView: React.FunctionComponent = () => {
     </>
   );
   const toolbarItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarItem>{buildSelectDropdown()}</ToolbarItem>
       <ToolbarItem>{buildFilterDropdown()}</ToolbarItem>
       <ToolbarItem>
@@ -477,7 +477,7 @@ export const PrimaryDetailCardView: React.FunctionComponent = () => {
       <ToolbarItem variant="pagination" align={{ default: 'alignEnd' }}>
         {renderPagination()}
       </ToolbarItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   const filtered =
diff --git a/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailContentPadding.tsx b/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailContentPadding.tsx
index db8e133396e..d990b6a30fc 100644
--- a/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailContentPadding.tsx
+++ b/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailContentPadding.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Button,
   ButtonVariant,
@@ -208,7 +208,7 @@ export const PrimaryDetailContentPadding: React.FunctionComponent = () => {
   );
 
   const drawerContent = (
-    <React.Fragment>
+    <Fragment>
       <Toolbar id="content-padding-data-toolbar">
         <ToolbarContent>{ToolbarItems}</ToolbarContent>
       </Toolbar>
@@ -412,7 +412,7 @@ export const PrimaryDetailContentPadding: React.FunctionComponent = () => {
           </DataListItemRow>
         </DataListItem>
       </DataList>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
diff --git a/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailDataListInCard.tsx b/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailDataListInCard.tsx
index 5bd10d19704..38c1eb3e0c1 100644
--- a/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailDataListInCard.tsx
+++ b/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailDataListInCard.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Card,
   Content,
@@ -88,7 +88,7 @@ export const PrimaryDetailDataListInCard: React.FunctionComponent = () => {
   );
 
   const drawerContent = (
-    <React.Fragment>
+    <Fragment>
       <Toolbar id="data-list-data-toolbar">
         <ToolbarContent>
           <ToolbarItem>
@@ -176,7 +176,7 @@ export const PrimaryDetailDataListInCard: React.FunctionComponent = () => {
           </DataListItemRow>
         </DataListItem>
       </DataList>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
diff --git a/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailFullPage.tsx b/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailFullPage.tsx
index d732f222a62..8254b7855f2 100644
--- a/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailFullPage.tsx
+++ b/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailFullPage.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Button,
   ButtonVariant,
@@ -208,7 +208,7 @@ export const PrimaryDetailFullPage: React.FunctionComponent = () => {
   );
 
   const drawerContent = (
-    <React.Fragment>
+    <Fragment>
       <Toolbar id="full-page-data-toolbar">
         <ToolbarContent>{ToolbarItems}</ToolbarContent>
       </Toolbar>
@@ -412,7 +412,7 @@ export const PrimaryDetailFullPage: React.FunctionComponent = () => {
           </DataListItemRow>
         </DataListItem>
       </DataList>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
diff --git a/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailInlineModifier.tsx b/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailInlineModifier.tsx
index f12a64d5e65..4692819ba03 100644
--- a/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailInlineModifier.tsx
+++ b/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailInlineModifier.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Button,
   ButtonVariant,
@@ -208,7 +208,7 @@ export const PrimaryDetailInlineModifier: React.FunctionComponent = () => {
   );
 
   const drawerContent = (
-    <React.Fragment>
+    <Fragment>
       <Toolbar id="inline-modifier-data-toolbar">
         <ToolbarContent>{ToolbarItems}</ToolbarContent>
       </Toolbar>
@@ -412,7 +412,7 @@ export const PrimaryDetailInlineModifier: React.FunctionComponent = () => {
           </DataListItemRow>
         </DataListItem>
       </DataList>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
diff --git a/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailSimpleListInCard.tsx b/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailSimpleListInCard.tsx
index ac261b3e4e2..aa715574334 100644
--- a/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailSimpleListInCard.tsx
+++ b/packages/react-core/src/demos/examples/PrimaryDetail/PrimaryDetailSimpleListInCard.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Card,
   Content,
@@ -67,7 +67,7 @@ export const PrimaryDetailSimpleListInCard: React.FunctionComponent = () => {
   );
 
   const drawerContent = (
-    <React.Fragment>
+    <Fragment>
       <SimpleList onSelect={onSelectListItem}>
         <SimpleListGroup title="Section 1" id="simple-list-section-1">
           <SimpleListItem key="item1" isActive>
@@ -85,7 +85,7 @@ export const PrimaryDetailSimpleListInCard: React.FunctionComponent = () => {
           <SimpleListItem key="item9">List item 9</SimpleListItem>
         </SimpleListGroup>
       </SimpleList>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
diff --git a/packages/react-core/src/demos/examples/Skeleton/SkeletonCard.tsx b/packages/react-core/src/demos/examples/Skeleton/SkeletonCard.tsx
index c068ed38a52..f7d64761450 100644
--- a/packages/react-core/src/demos/examples/Skeleton/SkeletonCard.tsx
+++ b/packages/react-core/src/demos/examples/Skeleton/SkeletonCard.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Gallery, Flex, PageSection, Content, Card, CardBody, Skeleton } from '@patternfly/react-core';
 import { DashboardWrapper } from '@patternfly/react-core/src/demos/DashboardWrapper';
 
diff --git a/packages/react-core/src/demos/examples/Tabs/ModalTabs.tsx b/packages/react-core/src/demos/examples/Tabs/ModalTabs.tsx
index edad91ff1c8..639dd113db4 100644
--- a/packages/react-core/src/demos/examples/Tabs/ModalTabs.tsx
+++ b/packages/react-core/src/demos/examples/Tabs/ModalTabs.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { DashboardWrapper } from '@patternfly/react-core/dist/js/demos/DashboardWrapper';
 import {
   PageSection,
@@ -71,7 +71,7 @@ export const ModalTabs: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <DashboardWrapper mainContainerId="main-content-card-view-default-nav">
         <PageSection>
           <Content>
@@ -148,6 +148,6 @@ export const ModalTabs: React.FunctionComponent = () => {
           </ModalBody>
         </Modal>
       )}
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/examples/Tabs/NestedTabs.tsx b/packages/react-core/src/demos/examples/Tabs/NestedTabs.tsx
index ddd23281278..03cb03ec4da 100644
--- a/packages/react-core/src/demos/examples/Tabs/NestedTabs.tsx
+++ b/packages/react-core/src/demos/examples/Tabs/NestedTabs.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Card,
   CardHeader,
diff --git a/packages/react-core/src/demos/examples/Tabs/NestedUnindentedTabs.tsx b/packages/react-core/src/demos/examples/Tabs/NestedUnindentedTabs.tsx
index 3e8845cd972..e55decfd910 100644
--- a/packages/react-core/src/demos/examples/Tabs/NestedUnindentedTabs.tsx
+++ b/packages/react-core/src/demos/examples/Tabs/NestedUnindentedTabs.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Card,
   CardHeader,
diff --git a/packages/react-core/src/demos/examples/Tabs/TabsAndTable.tsx b/packages/react-core/src/demos/examples/Tabs/TabsAndTable.tsx
index aef87386188..68f21736711 100644
--- a/packages/react-core/src/demos/examples/Tabs/TabsAndTable.tsx
+++ b/packages/react-core/src/demos/examples/Tabs/TabsAndTable.tsx
@@ -1,5 +1,5 @@
+import { Fragment } from 'react';
 /* eslint-disable no-console */
-import React from 'react';
 import {
   Button,
   Divider,
@@ -384,7 +384,7 @@ export const TablesAndTabs = () => {
 
   return (
     <DashboardWrapper>
-      <React.Fragment>
+      <Fragment>
         <PageSection>
           <Title headingLevel="h1" size="2xl">
             Nodes
@@ -395,7 +395,7 @@ export const TablesAndTabs = () => {
           <Divider />
           {tabContent}
         </PageSection>
-      </React.Fragment>
+      </Fragment>
     </DashboardWrapper>
   );
 };
diff --git a/packages/react-core/src/demos/examples/TextInputGroup/AttributeValueFiltering.tsx b/packages/react-core/src/demos/examples/TextInputGroup/AttributeValueFiltering.tsx
index 29bc136a2a9..22d80727c85 100644
--- a/packages/react-core/src/demos/examples/TextInputGroup/AttributeValueFiltering.tsx
+++ b/packages/react-core/src/demos/examples/TextInputGroup/AttributeValueFiltering.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   TextInputGroup,
   TextInputGroupMain,
diff --git a/packages/react-core/src/demos/examples/TextInputGroup/AutoCompleteSearch.tsx b/packages/react-core/src/demos/examples/TextInputGroup/AutoCompleteSearch.tsx
index f1eeececea2..f3618a4da54 100644
--- a/packages/react-core/src/demos/examples/TextInputGroup/AutoCompleteSearch.tsx
+++ b/packages/react-core/src/demos/examples/TextInputGroup/AutoCompleteSearch.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   TextInputGroup,
   TextInputGroupMain,
diff --git a/packages/react-core/src/demos/examples/Toolbar/ConsoleLogViewerToolbar.tsx b/packages/react-core/src/demos/examples/Toolbar/ConsoleLogViewerToolbar.tsx
index 3007c02050a..16452705c10 100644
--- a/packages/react-core/src/demos/examples/Toolbar/ConsoleLogViewerToolbar.tsx
+++ b/packages/react-core/src/demos/examples/Toolbar/ConsoleLogViewerToolbar.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Badge,
   Button,
@@ -247,10 +247,10 @@ export const ConsoleLogViewerToolbar: React.FC = () => {
       return 'Select';
     }
     return (
-      <React.Fragment>
+      <Fragment>
         <Badge>{firstOptions[containerSelected].type}</Badge>
         {showText && ` ${containerSelected}`}
-      </React.Fragment>
+      </Fragment>
     );
   };
 
@@ -271,7 +271,7 @@ export const ConsoleLogViewerToolbar: React.FC = () => {
   );
 
   const leftAlignedItemsDesktop = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarItem visibility={{ default: 'hidden', '2xl': 'visible' }}>
         <Select
           role="menu"
@@ -319,11 +319,11 @@ export const ConsoleLogViewerToolbar: React.FC = () => {
           {isPaused ? ` Resume Log` : ` Pause Log`}
         </Button>
       </ToolbarItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   const leftAlignedItemsMobile = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarItem visibility={{ default: 'visible', '2xl': 'hidden' }}>
         <Tooltip position="top" content={<div>Select container</div>}>
           <Select
@@ -375,18 +375,18 @@ export const ConsoleLogViewerToolbar: React.FC = () => {
           />
         </Tooltip>
       </ToolbarItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   const leftAlignedItems = (
-    <React.Fragment>
+    <Fragment>
       {leftAlignedItemsDesktop}
       {leftAlignedItemsMobile}
-    </React.Fragment>
+    </Fragment>
   );
 
   const rightAlignedItemsDesktop = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarItem visibility={{ default: 'hidden', '2xl': 'visible' }}>
         <Dropdown
           isOpen={externalExpanded}
@@ -415,11 +415,11 @@ export const ConsoleLogViewerToolbar: React.FC = () => {
           <DropdownList>{downloadDropdownItems}</DropdownList>
         </Dropdown>
       </ToolbarItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   const rightAlignedItemsMobile = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarItem visibility={{ default: 'visible', '2xl': 'hidden' }}>
         <Tooltip position="top" content={<div>External logs</div>}>
           <Dropdown
@@ -461,11 +461,11 @@ export const ConsoleLogViewerToolbar: React.FC = () => {
           </Dropdown>
         </Tooltip>
       </ToolbarItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   const rightAlignedItems = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarItem>{LogsSearchInput}</ToolbarItem>
       {rightAlignedItemsDesktop}
       {rightAlignedItemsMobile}
@@ -474,14 +474,14 @@ export const ConsoleLogViewerToolbar: React.FC = () => {
           <Button variant="plain" aria-label="expand" icon={<ExpandIcon />} />
         </Tooltip>
       </ToolbarItem>
-    </React.Fragment>
+    </Fragment>
   );
 
   const items = (
-    <React.Fragment>
+    <Fragment>
       <ToolbarGroup align={{ default: 'alignStart' }}>{leftAlignedItems}</ToolbarGroup>
       <ToolbarGroup align={{ default: 'alignEnd' }}>{rightAlignedItems}</ToolbarGroup>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
diff --git a/packages/react-core/src/demos/examples/Wizard/InModal.tsx b/packages/react-core/src/demos/examples/Wizard/InModal.tsx
index 7b2eb9a09d0..a5ebe5291e4 100644
--- a/packages/react-core/src/demos/examples/Wizard/InModal.tsx
+++ b/packages/react-core/src/demos/examples/Wizard/InModal.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Card,
   CardBody,
diff --git a/packages/react-core/src/demos/examples/Wizard/InModalWithDrawer.tsx b/packages/react-core/src/demos/examples/Wizard/InModalWithDrawer.tsx
index 85fc45c5ed8..d1eb8bb205e 100644
--- a/packages/react-core/src/demos/examples/Wizard/InModalWithDrawer.tsx
+++ b/packages/react-core/src/demos/examples/Wizard/InModalWithDrawer.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   Drawer,
diff --git a/packages/react-core/src/demos/examples/Wizard/InModalWithDrawerInformationalStep.tsx b/packages/react-core/src/demos/examples/Wizard/InModalWithDrawerInformationalStep.tsx
index 66b8e040c4e..782d13286d8 100644
--- a/packages/react-core/src/demos/examples/Wizard/InModalWithDrawerInformationalStep.tsx
+++ b/packages/react-core/src/demos/examples/Wizard/InModalWithDrawerInformationalStep.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Button,
   Content,
diff --git a/packages/react-core/src/demos/examples/Wizard/InPage.tsx b/packages/react-core/src/demos/examples/Wizard/InPage.tsx
index ec742fad672..5c6c10a0d54 100644
--- a/packages/react-core/src/demos/examples/Wizard/InPage.tsx
+++ b/packages/react-core/src/demos/examples/Wizard/InPage.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { PageSection, PageSectionTypes, Wizard, WizardStep } from '@patternfly/react-core';
 import { DashboardWrapper } from '@patternfly/react-core/src/demos/DashboardWrapper';
 
 export const WizardFullPage: React.FunctionComponent = () => (
-  <React.Fragment>
+  <Fragment>
     <DashboardWrapper hasPageTemplateTitle>
       <PageSection hasBodyWrapper={false} type={PageSectionTypes.wizard}>
         <Wizard>
@@ -31,5 +31,5 @@ export const WizardFullPage: React.FunctionComponent = () => (
         </Wizard>
       </PageSection>
     </DashboardWrapper>
-  </React.Fragment>
+  </Fragment>
 );
diff --git a/packages/react-core/src/demos/examples/Wizard/InPageWithDrawer.tsx b/packages/react-core/src/demos/examples/Wizard/InPageWithDrawer.tsx
index 876fe1b095e..d0139cb7623 100644
--- a/packages/react-core/src/demos/examples/Wizard/InPageWithDrawer.tsx
+++ b/packages/react-core/src/demos/examples/Wizard/InPageWithDrawer.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Brand,
   Breadcrumb,
@@ -164,7 +164,7 @@ export const WizardFullPageWithDrawerDemo: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Page
         masthead={masthead}
         sidebar={Sidebar}
@@ -210,6 +210,6 @@ export const WizardFullPageWithDrawerDemo: React.FunctionComponent = () => {
           </Wizard>
         </PageSection>
       </Page>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/demos/examples/Wizard/InPageWithDrawerInformationalStep.tsx b/packages/react-core/src/demos/examples/Wizard/InPageWithDrawerInformationalStep.tsx
index 5ed703019bc..045c2698c67 100644
--- a/packages/react-core/src/demos/examples/Wizard/InPageWithDrawerInformationalStep.tsx
+++ b/packages/react-core/src/demos/examples/Wizard/InPageWithDrawerInformationalStep.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Brand,
   Breadcrumb,
@@ -168,7 +168,7 @@ export const WizardFullPageWithDrawerInfoStepDemo: React.FunctionComponent = ()
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Page
         masthead={masthead}
         sidebar={Sidebar}
@@ -214,6 +214,6 @@ export const WizardFullPageWithDrawerInfoStepDemo: React.FunctionComponent = ()
           </Wizard>
         </PageSection>
       </Page>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Chip/Chip.tsx b/packages/react-core/src/deprecated/components/Chip/Chip.tsx
index 15a6aaebb16..ec23b753d39 100644
--- a/packages/react-core/src/deprecated/components/Chip/Chip.tsx
+++ b/packages/react-core/src/deprecated/components/Chip/Chip.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, Fragment } from 'react';
 import { TooltipPosition } from '../../../components/Tooltip';
 import { Label, LabelProps } from '../../../components/Label';
 import { getOUIAProps, OUIAProps, getDefaultOUIAId } from '../../../helpers';
@@ -43,7 +43,7 @@ export interface ChipProps extends LabelProps, OUIAProps {
   ouiaId?: number | string;
 }
 
-class Chip extends React.Component<ChipProps> {
+class Chip extends Component<ChipProps> {
   static displayName = 'Chip';
   constructor(props: ChipProps) {
     super(props);
@@ -95,7 +95,7 @@ class Chip extends React.Component<ChipProps> {
         {...props}
       >
         {children}
-        {badge && <React.Fragment> {badge}</React.Fragment>}
+        {badge && <Fragment> {badge}</Fragment>}
       </Label>
     );
   }
diff --git a/packages/react-core/src/deprecated/components/Chip/ChipGroup.tsx b/packages/react-core/src/deprecated/components/Chip/ChipGroup.tsx
index 6eb7a31b114..d482256d3fa 100644
--- a/packages/react-core/src/deprecated/components/Chip/ChipGroup.tsx
+++ b/packages/react-core/src/deprecated/components/Chip/ChipGroup.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 import { LabelGroup, LabelGroupProps } from '../../../components/Label';
 import { TooltipPosition } from '../../../components/Tooltip';
 import { getOUIAProps, OUIAProps } from '../../../helpers';
@@ -12,7 +12,7 @@ export interface ChipGroupProps extends Omit<LabelGroupProps, 'ref'>, OUIAProps
   defaultIsOpen?: boolean;
   /** Customizable "Show Less" text string */
   expandedText?: string;
-  /** Customizeable template string. Use variable "${remaining}" for the overflow chip count. */
+  /** Customizable template string. Use variable "${remaining}" for the overflow chip count. */
   collapsedText?: string;
   /** Category name text for the chip group category.  If this prop is supplied the chip group with have a label and category styling applied */
   categoryName?: string;
@@ -48,7 +48,7 @@ export interface ChipGroupProps extends Omit<LabelGroupProps, 'ref'>, OUIAProps
   ouiaId?: number | string;
 }
 
-class ChipGroup extends React.Component<ChipGroupProps> {
+class ChipGroup extends Component<ChipGroupProps> {
   static displayName = 'ChipGroup';
   constructor(props: ChipGroupProps) {
     super(props);
diff --git a/packages/react-core/src/deprecated/components/Chip/__tests__/Chip.test.tsx b/packages/react-core/src/deprecated/components/Chip/__tests__/Chip.test.tsx
index 0c506734591..c53d32efaaa 100644
--- a/packages/react-core/src/deprecated/components/Chip/__tests__/Chip.test.tsx
+++ b/packages/react-core/src/deprecated/components/Chip/__tests__/Chip.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { Chip } from '../Chip';
diff --git a/packages/react-core/src/deprecated/components/Chip/__tests__/ChipGroup.test.tsx b/packages/react-core/src/deprecated/components/Chip/__tests__/ChipGroup.test.tsx
index 7525ad86313..76748589209 100644
--- a/packages/react-core/src/deprecated/components/Chip/__tests__/ChipGroup.test.tsx
+++ b/packages/react-core/src/deprecated/components/Chip/__tests__/ChipGroup.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-core/src/deprecated/components/Chip/examples/Chip.md b/packages/react-core/src/deprecated/components/Chip/examples/Chip.md
index cdc89ba1724..a511c2bba36 100644
--- a/packages/react-core/src/deprecated/components/Chip/examples/Chip.md
+++ b/packages/react-core/src/deprecated/components/Chip/examples/Chip.md
@@ -7,6 +7,8 @@ ouia: true
 deprecated: true
 ---
 
+import { Fragment } from 'react';
+
 ## Examples
 
 ### Chip variants
diff --git a/packages/react-core/src/deprecated/components/Chip/examples/ChipDefault.tsx b/packages/react-core/src/deprecated/components/Chip/examples/ChipDefault.tsx
index 66023f9ce35..825fe3700c3 100644
--- a/packages/react-core/src/deprecated/components/Chip/examples/ChipDefault.tsx
+++ b/packages/react-core/src/deprecated/components/Chip/examples/ChipDefault.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Badge } from '@patternfly/react-core';
 import { Chip } from '@patternfly/react-core/deprecated';
 
@@ -29,25 +29,25 @@ export const ChipDefault: React.FunctionComponent = () => {
 
   const { chip, longchip, badgechip, readonlychip, overflowchip } = chips;
   return (
-    <React.Fragment>
+    <Fragment>
       {chip && (
-        <React.Fragment>
+        <Fragment>
           <Chip key="chip1" onClick={() => deleteItem('chip')}>
             {chip.name}
           </Chip>
           <br /> <br />
-        </React.Fragment>
+        </Fragment>
       )}
       {longchip && (
-        <React.Fragment>
+        <Fragment>
           <Chip key="chip2" onClick={() => deleteItem('longchip')}>
             {longchip.name}
           </Chip>
           <br /> <br />
-        </React.Fragment>
+        </Fragment>
       )}
       {badgechip && (
-        <React.Fragment>
+        <Fragment>
           <Chip
             key="chip3"
             onClick={() => deleteItem('badgechip')}
@@ -56,7 +56,7 @@ export const ChipDefault: React.FunctionComponent = () => {
             {badgechip.name}
           </Chip>
           <br /> <br />
-        </React.Fragment>
+        </Fragment>
       )}
       <Chip key="chip4" onClick={() => deleteItem('readonlychip')} isReadOnly>
         {readonlychip.name}
@@ -67,6 +67,6 @@ export const ChipDefault: React.FunctionComponent = () => {
           {overflowchip.name}
         </Chip>
       )}
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Chip/examples/ChipGroupInline.tsx b/packages/react-core/src/deprecated/components/Chip/examples/ChipGroupInline.tsx
index 145b4a3d082..8686b598ce5 100644
--- a/packages/react-core/src/deprecated/components/Chip/examples/ChipGroupInline.tsx
+++ b/packages/react-core/src/deprecated/components/Chip/examples/ChipGroupInline.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Chip, ChipGroup } from '@patternfly/react-core/deprecated';
 
 export const ChipGroupInline: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/deprecated/components/Chip/examples/ChipGroupRemovableCategories.tsx b/packages/react-core/src/deprecated/components/Chip/examples/ChipGroupRemovableCategories.tsx
index 46d599783f8..7182a91b08a 100644
--- a/packages/react-core/src/deprecated/components/Chip/examples/ChipGroupRemovableCategories.tsx
+++ b/packages/react-core/src/deprecated/components/Chip/examples/ChipGroupRemovableCategories.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Chip, ChipGroup } from '@patternfly/react-core/deprecated';
 
 export const ChipGroupRemovableCategories: React.FunctionComponent = () => {
@@ -25,7 +25,7 @@ export const ChipGroupRemovableCategories: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <ChipGroup categoryName="Category one" isClosable onClick={() => deleteCategory(chipGroup1)}>
         {chipGroup1.map((currentChip) => (
           <Chip key={currentChip} onClick={() => deleteItem(currentChip, chipGroup1)}>
@@ -41,6 +41,6 @@ export const ChipGroupRemovableCategories: React.FunctionComponent = () => {
           </Chip>
         ))}
       </ChipGroup>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Chip/examples/ChipGroupWithCategories.tsx b/packages/react-core/src/deprecated/components/Chip/examples/ChipGroupWithCategories.tsx
index d3171593eea..f217a86c195 100644
--- a/packages/react-core/src/deprecated/components/Chip/examples/ChipGroupWithCategories.tsx
+++ b/packages/react-core/src/deprecated/components/Chip/examples/ChipGroupWithCategories.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Chip, ChipGroup } from '@patternfly/react-core/deprecated';
 
 export const ChipGroupWithCategories: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/deprecated/components/DragDrop/DragDrop.tsx b/packages/react-core/src/deprecated/components/DragDrop/DragDrop.tsx
index 11b7ececd9e..aa6ec69bf84 100644
--- a/packages/react-core/src/deprecated/components/DragDrop/DragDrop.tsx
+++ b/packages/react-core/src/deprecated/components/DragDrop/DragDrop.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-
+import { createContext } from 'react';
 export interface DraggableItemPosition {
   /** Parent droppableId */
   droppableId: string;
@@ -7,7 +6,7 @@ export interface DraggableItemPosition {
   index: number;
 }
 
-export const DragDropContext = React.createContext({
+export const DragDropContext = createContext({
   onDrag: (_source: DraggableItemPosition) => true as boolean,
   onDragMove: (_source: DraggableItemPosition, _dest?: DraggableItemPosition) => {},
   onDrop: (_source: DraggableItemPosition, _dest?: DraggableItemPosition) => false as boolean
diff --git a/packages/react-core/src/deprecated/components/DragDrop/Draggable.tsx b/packages/react-core/src/deprecated/components/DragDrop/Draggable.tsx
index 47542c59eaf..9fc4d7a9384 100644
--- a/packages/react-core/src/deprecated/components/DragDrop/Draggable.tsx
+++ b/packages/react-core/src/deprecated/components/DragDrop/Draggable.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement, Fragment, useContext, useState } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DragDrop/drag-drop';
 import { DroppableContext } from './DroppableContext';
@@ -85,12 +85,12 @@ export const Draggable: React.FunctionComponent<DraggableProps> = ({
   ...props
 }: DraggableProps) => {
   /* eslint-disable prefer-const */
-  let [style, setStyle] = React.useState(styleProp);
+  let [style, setStyle] = useState(styleProp);
   /* eslint-enable prefer-const */
-  const [isDragging, setIsDragging] = React.useState(false);
-  const [isValidDrag, setIsValidDrag] = React.useState(true);
-  const { zone, droppableId } = React.useContext(DroppableContext);
-  const { onDrag, onDragMove, onDrop } = React.useContext(DragDropContext);
+  const [isDragging, setIsDragging] = useState(false);
+  const [isValidDrag, setIsValidDrag] = useState(true);
+  const { zone, droppableId } = useContext(DroppableContext);
+  const { onDrag, onDragMove, onDrop } = useContext(DragDropContext);
   // Some state is better just to leave as vars passed around between various callbacks
   // You can only drag around one item at a time anyways...
   let startX = 0;
@@ -312,7 +312,7 @@ export const Draggable: React.FunctionComponent<DraggableProps> = ({
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       {/* Leave behind blank spot per-design */}
       {isDragging && (
         <div draggable {...props} style={{ ...styleProp, visibility: 'hidden' }}>
@@ -320,11 +320,11 @@ export const Draggable: React.FunctionComponent<DraggableProps> = ({
         </div>
       )}
       {hasNoWrapper ? (
-        React.cloneElement(children as React.ReactElement<any>, childProps)
+        cloneElement(children as React.ReactElement<any>, childProps)
       ) : (
         <div {...childProps}>{children}</div>
       )}
-    </React.Fragment>
+    </Fragment>
   );
 };
 Draggable.displayName = 'Draggable';
diff --git a/packages/react-core/src/deprecated/components/DragDrop/Droppable.tsx b/packages/react-core/src/deprecated/components/DragDrop/Droppable.tsx
index 531872fad61..3ae5b455bf0 100644
--- a/packages/react-core/src/deprecated/components/DragDrop/Droppable.tsx
+++ b/packages/react-core/src/deprecated/components/DragDrop/Droppable.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Children, cloneElement } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DragDrop/drag-drop';
 import { DroppableContext } from './DroppableContext';
@@ -29,7 +29,7 @@ export const Droppable: React.FunctionComponent<DroppableProps> = ({
     'data-pf-droppableid': droppableId,
     // if has no wrapper is set, don't overwrite children className with the className prop
     className:
-      hasNoWrapper && React.Children.count(children) === 1
+      hasNoWrapper && Children.count(children) === 1
         ? css(styles.droppable, className, (children as React.ReactElement<any>).props.className)
         : css(styles.droppable, className),
     ...props
@@ -38,7 +38,7 @@ export const Droppable: React.FunctionComponent<DroppableProps> = ({
   return (
     <DroppableContext.Provider value={{ zone, droppableId }}>
       {hasNoWrapper ? (
-        React.cloneElement(children as React.ReactElement<any>, childProps)
+        cloneElement(children as React.ReactElement<any>, childProps)
       ) : (
         <div {...childProps}>{children}</div>
       )}
diff --git a/packages/react-core/src/deprecated/components/DragDrop/DroppableContext.ts b/packages/react-core/src/deprecated/components/DragDrop/DroppableContext.ts
index 888cb4fc66f..5dccfba9056 100644
--- a/packages/react-core/src/deprecated/components/DragDrop/DroppableContext.ts
+++ b/packages/react-core/src/deprecated/components/DragDrop/DroppableContext.ts
@@ -1,6 +1,6 @@
-import * as React from 'react';
+import { createContext } from 'react';
 
-export const DroppableContext = React.createContext({
+export const DroppableContext = createContext({
   zone: 'defaultDroppableZone',
   droppableId: 'defaultDroppableId'
 });
diff --git a/packages/react-core/src/deprecated/components/DragDrop/__tests__/DragDrop.test.tsx b/packages/react-core/src/deprecated/components/DragDrop/__tests__/DragDrop.test.tsx
index f14dbe8d3a8..732ce13f1ba 100644
--- a/packages/react-core/src/deprecated/components/DragDrop/__tests__/DragDrop.test.tsx
+++ b/packages/react-core/src/deprecated/components/DragDrop/__tests__/DragDrop.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { DragDrop, Draggable, Droppable } from '../';
 
diff --git a/packages/react-core/src/deprecated/components/DragDrop/examples/DragDrop.md b/packages/react-core/src/deprecated/components/DragDrop/examples/DragDrop.md
index b7a0abd5f6c..959d3d4a8bf 100644
--- a/packages/react-core/src/deprecated/components/DragDrop/examples/DragDrop.md
+++ b/packages/react-core/src/deprecated/components/DragDrop/examples/DragDrop.md
@@ -9,7 +9,6 @@ deprecated: true
 You can use the `<DragDrop>` component to move items in or between lists. The `<DragDrop>` component should contain `<Droppable>` components which contain `<Draggable>` components.
 
 ```ts noLive
-import React from 'react';
 import { DragDrop, Draggable, Droppable } from '@patternfly/react-core/deprecated';
 
 const DragDropCodeSample: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/deprecated/components/DragDrop/examples/DragDropBasic.tsx b/packages/react-core/src/deprecated/components/DragDrop/examples/DragDropBasic.tsx
index 7a19414d120..03ae6e88996 100644
--- a/packages/react-core/src/deprecated/components/DragDrop/examples/DragDropBasic.tsx
+++ b/packages/react-core/src/deprecated/components/DragDrop/examples/DragDropBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { DragDrop, Draggable, Droppable } from '@patternfly/react-core/deprecated';
 
 interface ItemType {
diff --git a/packages/react-core/src/deprecated/components/DragDrop/examples/DragDropMultipleLists.tsx b/packages/react-core/src/deprecated/components/DragDrop/examples/DragDropMultipleLists.tsx
index 8ccac141374..2afff695f32 100644
--- a/packages/react-core/src/deprecated/components/DragDrop/examples/DragDropMultipleLists.tsx
+++ b/packages/react-core/src/deprecated/components/DragDrop/examples/DragDropMultipleLists.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Flex } from '@patternfly/react-core';
 import { DragDrop, Draggable, Droppable } from '@patternfly/react-core/deprecated';
 
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelector.tsx b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelector.tsx
index a73616c7bbe..6cb684e78ed 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelector.tsx
+++ b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelector.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, createRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/DualListSelector/dual-list-selector';
 import { css } from '@patternfly/react-styles';
 import AngleDoubleLeftIcon from '@patternfly/react-icons/dist/esm/icons/angle-double-left-icon';
@@ -134,12 +134,12 @@ interface DualListSelectorState {
   chosenTreeFilteredOptions: string[];
 }
 
-class DualListSelector extends React.Component<DualListSelectorProps, DualListSelectorState> {
+class DualListSelector extends Component<DualListSelectorProps, DualListSelectorState> {
   static displayName = 'DualListSelector';
-  private addAllButtonRef = React.createRef<HTMLButtonElement>();
-  private addSelectedButtonRef = React.createRef<HTMLButtonElement>();
-  private removeSelectedButtonRef = React.createRef<HTMLButtonElement>();
-  private removeAllButtonRef = React.createRef<HTMLButtonElement>();
+  private addAllButtonRef = createRef<HTMLButtonElement>();
+  private addSelectedButtonRef = createRef<HTMLButtonElement>();
+  private removeSelectedButtonRef = createRef<HTMLButtonElement>();
+  private removeAllButtonRef = createRef<HTMLButtonElement>();
   static defaultProps: PickOptional<DualListSelectorProps> = {
     children: '',
     availableOptions: [],
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorContext.ts b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorContext.ts
index 27b1ed1eff2..d7647742b8a 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorContext.ts
+++ b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorContext.ts
@@ -1,10 +1,10 @@
-import * as React from 'react';
+import { createContext } from 'react';
 
-export const DualListSelectorContext = React.createContext<{
+export const DualListSelectorContext = createContext<{
   isTree?: boolean;
 }>({ isTree: false });
 
-export const DualListSelectorListContext = React.createContext<{
+export const DualListSelectorListContext = createContext<{
   setFocusedOption?: (id: string) => void;
   isTree?: boolean;
   ariaLabelledBy?: string;
@@ -17,6 +17,6 @@ export const DualListSelectorListContext = React.createContext<{
   isDisabled?: boolean;
 }>({});
 
-export const DualListSelectorPaneContext = React.createContext<{
+export const DualListSelectorPaneContext = createContext<{
   isChosen: boolean;
 }>({ isChosen: false });
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorControl.tsx b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorControl.tsx
index 9a6750e458e..07d91cbec83 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorControl.tsx
+++ b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorControl.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef, useRef } from 'react';
 import { css } from '@patternfly/react-styles';
 import { Button, ButtonVariant } from '../../../components/Button';
 import { Tooltip } from '../../../components/Tooltip';
@@ -38,7 +38,7 @@ export const DualListSelectorControlBase: React.FunctionComponent<DualListSelect
   tooltipProps = {} as any,
   ...props
 }: DualListSelectorControlProps) => {
-  const privateRef = React.useRef(null);
+  const privateRef = useRef(null);
   const ref = innerRef || privateRef;
   return (
     <div className={css(styles.dualListSelectorControlsItem, className)} {...props}>
@@ -59,7 +59,7 @@ export const DualListSelectorControlBase: React.FunctionComponent<DualListSelect
 };
 DualListSelectorControlBase.displayName = 'DualListSelectorControlBase';
 
-export const DualListSelectorControl = React.forwardRef((props: DualListSelectorControlProps, ref: React.Ref<any>) => (
+export const DualListSelectorControl = forwardRef((props: DualListSelectorControlProps, ref: React.Ref<any>) => (
   <DualListSelectorControlBase innerRef={ref} {...props} />
 ));
 
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorControlsWrapper.tsx b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorControlsWrapper.tsx
index 64a00794289..f70443b8ed3 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorControlsWrapper.tsx
+++ b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorControlsWrapper.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef, useEffect, useRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/DualListSelector/dual-list-selector';
 import { css } from '@patternfly/react-styles';
 import { handleArrows } from '../../../helpers';
@@ -23,7 +23,7 @@ export const DualListSelectorControlsWrapperBase: React.FunctionComponent<DualLi
   'aria-label': ariaLabel = 'Controls for moving options between lists',
   ...props
 }: DualListSelectorControlsWrapperProps) => {
-  const ref = React.useRef(null);
+  const ref = useRef(null);
   const wrapperRef = innerRef || ref;
   // Adds keyboard navigation to the dynamically built dual list selector controls. Works when controls are dynamically built
   // as well as when they are passed in via children.
@@ -55,7 +55,7 @@ export const DualListSelectorControlsWrapperBase: React.FunctionComponent<DualLi
     );
   };
 
-  React.useEffect(() => {
+  useEffect(() => {
     window.addEventListener('keydown', handleKeys);
     return () => {
       window.removeEventListener('keydown', handleKeys);
@@ -77,7 +77,7 @@ export const DualListSelectorControlsWrapperBase: React.FunctionComponent<DualLi
 
 DualListSelectorControlsWrapperBase.displayName = 'DualListSelectorControlsWrapperBase';
 
-export const DualListSelectorControlsWrapper = React.forwardRef(
+export const DualListSelectorControlsWrapper = forwardRef(
   (props: DualListSelectorControlsWrapperProps, ref: React.Ref<HTMLDivElement>) => (
     <DualListSelectorControlsWrapperBase innerRef={ref as React.MutableRefObject<any>} role="group" {...props} />
   )
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorList.tsx b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorList.tsx
index cc0224eef1f..56cf840b99a 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorList.tsx
+++ b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorList.tsx
@@ -1,7 +1,7 @@
+import { useContext } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DualListSelector/dual-list-selector';
 import { DualListSelectorListItem } from './DualListSelectorListItem';
-import * as React from 'react';
 import { DualListSelectorListContext } from './DualListSelectorContext';
 
 /** Acts as the container for DualListSelectorListItem sub-components. */
@@ -26,7 +26,7 @@ export const DualListSelectorList: React.FunctionComponent<DualListSelectorListP
     onOptionSelect,
     options,
     isDisabled
-  } = React.useContext(DualListSelectorListContext);
+  } = useContext(DualListSelectorListContext);
 
   // only called when options are passed via options prop
   const onOptionClick = (e: React.MouseEvent | React.ChangeEvent | React.KeyboardEvent, index: number, id: string) => {
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorListItem.tsx b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorListItem.tsx
index ca044c3106d..14bab84296d 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorListItem.tsx
+++ b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorListItem.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef, useContext, useRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/DualListSelector/dual-list-selector';
 import { css } from '@patternfly/react-styles';
 import { getUniqueId } from '../../../helpers';
@@ -25,7 +25,7 @@ export interface DualListSelectorListItemProps extends React.HTMLProps<HTMLLIEle
   orderIndex?: number;
   /** @hide Forwarded ref */
   innerRef?: React.RefObject<HTMLLIElement | null>;
-  /** Flag indicating this item is draggable for reordring */
+  /** Flag indicating this item is draggable for reordering */
   isDraggable?: boolean;
   /** Accessible label for the draggable button on draggable list items */
   draggableButtonAriaLabel?: string;
@@ -47,9 +47,9 @@ export const DualListSelectorListItemBase: React.FunctionComponent<DualListSelec
   draggableButtonAriaLabel = 'Reorder option',
   ...props
 }: DualListSelectorListItemProps) => {
-  const privateRef = React.useRef<HTMLLIElement>(null);
+  const privateRef = useRef<HTMLLIElement>(null);
   const ref = innerRef || privateRef;
-  const { setFocusedOption } = React.useContext(DualListSelectorListContext);
+  const { setFocusedOption } = useContext(DualListSelectorListContext);
 
   return (
     <li
@@ -99,7 +99,7 @@ export const DualListSelectorListItemBase: React.FunctionComponent<DualListSelec
 };
 DualListSelectorListItemBase.displayName = 'DualListSelectorListItemBase';
 
-export const DualListSelectorListItem = React.forwardRef(
+export const DualListSelectorListItem = forwardRef(
   (props: DualListSelectorListItemProps, ref: React.Ref<HTMLLIElement>) => (
     <DualListSelectorListItemBase innerRef={ref as React.MutableRefObject<any>} {...props} />
   )
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorListWrapper.tsx b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorListWrapper.tsx
index 242f97f441e..b54e6d43ba5 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorListWrapper.tsx
+++ b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorListWrapper.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef, useContext, useEffect, useRef, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/DualListSelector/dual-list-selector';
 import { css } from '@patternfly/react-styles';
 import { getUniqueId, handleArrows } from '../../../helpers';
@@ -41,10 +41,10 @@ export const DualListSelectorListWrapperBase: React.FunctionComponent<DualListSe
   isDisabled = false,
   ...props
 }: DualListSelectorListWrapperProps) => {
-  const [focusedOption, setFocusedOption] = React.useState('');
-  const ref = React.useRef(null);
+  const [focusedOption, setFocusedOption] = useState('');
+  const ref = useRef(null);
   const menuRef = innerRef || ref;
-  const { isTree } = React.useContext(DualListSelectorContext);
+  const { isTree } = useContext(DualListSelectorContext);
 
   // sets up keyboard focus handling for the dual list selector menu child of the pane. This keyboard
   // handling is applied whether the pane is dynamically built or passed via the children prop.
@@ -89,7 +89,7 @@ export const DualListSelectorListWrapperBase: React.FunctionComponent<DualListSe
     );
   };
 
-  React.useEffect(() => {
+  useEffect(() => {
     window.addEventListener('keydown', handleKeys);
     return () => {
       window.removeEventListener('keydown', handleKeys);
@@ -119,7 +119,7 @@ export const DualListSelectorListWrapperBase: React.FunctionComponent<DualListSe
 };
 DualListSelectorListWrapperBase.displayName = 'DualListSelectorListWrapperBase';
 
-export const DualListSelectorListWrapper = React.forwardRef(
+export const DualListSelectorListWrapper = forwardRef(
   (props: DualListSelectorListWrapperProps, ref: React.Ref<HTMLDivElement>) => (
     <DualListSelectorListWrapperBase innerRef={ref as React.MutableRefObject<any>} {...props} />
   )
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorPane.tsx b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorPane.tsx
index e9a0e2999e7..27691390593 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorPane.tsx
+++ b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorPane.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useContext, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/DualListSelector/dual-list-selector';
 import { css } from '@patternfly/react-styles';
 import { DualListSelectorTree, DualListSelectorTreeItemData } from './DualListSelectorTree';
@@ -93,8 +93,8 @@ export const DualListSelectorPane: React.FunctionComponent<DualListSelectorPaneP
   listMinHeight,
   ...props
 }: DualListSelectorPaneProps) => {
-  const [input, setInput] = React.useState('');
-  const { isTree } = React.useContext(DualListSelectorContext);
+  const [input, setInput] = useState('');
+  const { isTree } = useContext(DualListSelectorContext);
 
   // only called when search input is dynamically built
   const onChange = (e: React.FormEvent<HTMLInputElement>, newValue: string) => {
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorTree.tsx b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorTree.tsx
index a151d625050..7a6ef2143db 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorTree.tsx
+++ b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorTree.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/DualListSelector/dual-list-selector';
 import { DualListSelectorTreeItem } from './DualListSelectorTreeItem';
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorTreeItem.tsx b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorTreeItem.tsx
index 1f8c23214b8..6fc70ed0804 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorTreeItem.tsx
+++ b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorTreeItem.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { memo, useContext, useEffect, useRef, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/DualListSelector/dual-list-selector';
 import { css } from '@patternfly/react-styles';
 import { DualListSelectorTreeItemData } from './DualListSelectorTree';
@@ -57,11 +57,11 @@ const DualListSelectorTreeItemBase: React.FunctionComponent<DualListSelectorTree
   useMemo,
   ...props
 }: DualListSelectorTreeItemProps) => {
-  const ref = React.useRef(null);
-  const [isExpanded, setIsExpanded] = React.useState(defaultExpanded || false);
-  const { setFocusedOption } = React.useContext(DualListSelectorListContext);
+  const ref = useRef(null);
+  const [isExpanded, setIsExpanded] = useState(defaultExpanded || false);
+  const { setFocusedOption } = useContext(DualListSelectorListContext);
 
-  React.useEffect(() => {
+  useEffect(() => {
     setIsExpanded(defaultExpanded);
   }, [defaultExpanded]);
 
@@ -161,7 +161,7 @@ const DualListSelectorTreeItemBase: React.FunctionComponent<DualListSelectorTree
   );
 };
 
-export const DualListSelectorTreeItem = React.memo(DualListSelectorTreeItemBase, (prevProps, nextProps) => {
+export const DualListSelectorTreeItem = memo(DualListSelectorTreeItemBase, (prevProps, nextProps) => {
   if (!nextProps.useMemo) {
     return false;
   }
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/__tests__/DualListSelector.test.tsx b/packages/react-core/src/deprecated/components/DualListSelector/__tests__/DualListSelector.test.tsx
index 0bf84200bf7..93b692d77ee 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/__tests__/DualListSelector.test.tsx
+++ b/packages/react-core/src/deprecated/components/DualListSelector/__tests__/DualListSelector.test.tsx
@@ -1,7 +1,5 @@
 import { render } from '@testing-library/react';
 import { DualListSelector } from '../DualListSelector';
-import React from 'react';
-
 describe('DualListSelector', () => {
   test('basic', () => {
     const { asFragment } = render(<DualListSelector availableOptions={['Option 1', 'Option 2']} id="firstTest" />);
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelector.md b/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelector.md
index a341efc8a24..cf7adf4d608 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelector.md
+++ b/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelector.md
@@ -15,6 +15,7 @@ propComponents:
   ]
 deprecated: true
 ---
+import { Fragment, useMemo, useState } from 'react';
 
 import {
 DragDrop,
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorBasic.tsx b/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorBasic.tsx
index c253a7d0a1d..e6b87e555c8 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorBasic.tsx
+++ b/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorBasic.tsx
@@ -1,14 +1,14 @@
-import React from 'react';
+import { useState } from 'react';
 import { DualListSelector as DLSDeprecated } from '@patternfly/react-core/deprecated';
 
 export const DualListSelectorBasic: React.FunctionComponent = () => {
-  const [availableOptions, setAvailableOptions] = React.useState<React.ReactNode[]>([
+  const [availableOptions, setAvailableOptions] = useState<React.ReactNode[]>([
     'Option 1',
     'Option 2',
     'Option 3',
     'Option 4'
   ]);
-  const [chosenOptions, setChosenOptions] = React.useState<React.ReactNode[]>([]);
+  const [chosenOptions, setChosenOptions] = useState<React.ReactNode[]>([]);
 
   const onListChange = (
     event: React.MouseEvent<HTMLElement>,
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorBasicSearch.tsx b/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorBasicSearch.tsx
index 1ae0e33ef71..f331ece3340 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorBasicSearch.tsx
+++ b/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorBasicSearch.tsx
@@ -1,14 +1,14 @@
-import React from 'react';
+import { useState } from 'react';
 import { DualListSelector as DLSDeprecated } from '@patternfly/react-core/deprecated';
 
 export const DualListSelectorBasicSearch: React.FunctionComponent = () => {
-  const [availableOptions, setAvailableOptions] = React.useState<React.ReactNode[]>([
+  const [availableOptions, setAvailableOptions] = useState<React.ReactNode[]>([
     'Option 1',
     'Option 2',
     'Option 3',
     'Option 4'
   ]);
-  const [chosenOptions, setChosenOptions] = React.useState<React.ReactNode[]>([]);
+  const [chosenOptions, setChosenOptions] = useState<React.ReactNode[]>([]);
 
   const onListChange = (
     event: React.MouseEvent<HTMLElement>,
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorBasicTooltips.tsx b/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorBasicTooltips.tsx
index 6bf32db13bf..71798e2055e 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorBasicTooltips.tsx
+++ b/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorBasicTooltips.tsx
@@ -1,14 +1,14 @@
-import React from 'react';
+import { useState } from 'react';
 import { DualListSelector as DLSDeprecated } from '@patternfly/react-core/deprecated';
 
 export const DualListSelectorBasicTooltips: React.FunctionComponent = () => {
-  const [availableOptions, setAvailableOptions] = React.useState<React.ReactNode[]>([
+  const [availableOptions, setAvailableOptions] = useState<React.ReactNode[]>([
     'Option 1',
     'Option 2',
     'Option 3',
     'Option 4'
   ]);
-  const [chosenOptions, setChosenOptions] = React.useState<React.ReactNode[]>([]);
+  const [chosenOptions, setChosenOptions] = useState<React.ReactNode[]>([]);
 
   const onListChange = (
     event: React.MouseEvent<HTMLElement>,
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorComplexOptionsActions.tsx b/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorComplexOptionsActions.tsx
index ca0132da5ba..03074c54c40 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorComplexOptionsActions.tsx
+++ b/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorComplexOptionsActions.tsx
@@ -1,17 +1,17 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { Button, ButtonVariant, Checkbox } from '@patternfly/react-core';
 import { DualListSelector as DLSDeprecated } from '@patternfly/react-core/deprecated';
 import PficonSortCommonAscIcon from '@patternfly/react-icons/dist/esm/icons/pficon-sort-common-asc-icon';
 
 export const DualListSelectorComplexOptionsActions: React.FunctionComponent = () => {
-  const [availableOptions, setAvailableOptions] = React.useState<React.ReactNode[]>([
+  const [availableOptions, setAvailableOptions] = useState<React.ReactNode[]>([
     <span key="option1">Option 1</span>,
     <span key="option3">Option 3</span>,
     <span key="option4">Option 4</span>,
     <span key="option2">Option 2</span>
   ]);
-  const [chosenOptions, setChosenOptions] = React.useState<React.ReactNode[]>([]);
-  const [isDisabled, setIsDisabled] = React.useState(false);
+  const [chosenOptions, setChosenOptions] = useState<React.ReactNode[]>([]);
+  const [isDisabled, setIsDisabled] = useState(false);
 
   const onListChange = (newAvailableOptions: React.ReactNode[], newChosenOptions: React.ReactNode[]) => {
     setAvailableOptions(newAvailableOptions);
@@ -63,7 +63,7 @@ export const DualListSelectorComplexOptionsActions: React.FunctionComponent = ()
   ];
 
   return (
-    <React.Fragment>
+    <Fragment>
       <DLSDeprecated
         isSearchable
         availableOptions={availableOptions}
@@ -86,6 +86,6 @@ export const DualListSelectorComplexOptionsActions: React.FunctionComponent = ()
         isChecked={isDisabled}
         onChange={() => setIsDisabled(!isDisabled)}
       />
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorComposable.tsx b/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorComposable.tsx
index 649bd3719c7..e1522f90d40 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorComposable.tsx
+++ b/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorComposable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   Button,
   ButtonVariant,
@@ -31,7 +31,7 @@ interface Option {
 }
 
 export const DualListSelectorComposable: React.FunctionComponent = () => {
-  const [availableOptions, setAvailableOptions] = React.useState<Option[]>([
+  const [availableOptions, setAvailableOptions] = useState<Option[]>([
     { text: 'Apple', selected: false, isVisible: true },
     { text: 'Banana', selected: false, isVisible: true },
     { text: 'Pineapple', selected: false, isVisible: true },
@@ -40,9 +40,9 @@ export const DualListSelectorComposable: React.FunctionComponent = () => {
     { text: 'Peach', selected: false, isVisible: true },
     { text: 'Strawberry', selected: false, isVisible: true }
   ]);
-  const [chosenOptions, setChosenOptions] = React.useState<Option[]>([]);
-  const [availableFilter, setAvailableFilter] = React.useState('');
-  const [chosenFilter, setChosenFilter] = React.useState('');
+  const [chosenOptions, setChosenOptions] = useState<Option[]>([]);
+  const [availableFilter, setAvailableFilter] = useState('');
+  const [chosenFilter, setChosenFilter] = useState('');
 
   // callback for moving selected options between lists
   const moveSelected = (fromAvailable: boolean) => {
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorComposableDragDrop.tsx b/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorComposableDragDrop.tsx
index b7d00dd4702..4867da8f8b0 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorComposableDragDrop.tsx
+++ b/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorComposableDragDrop.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   DragDrop,
   Draggable,
@@ -17,13 +17,13 @@ import AngleDoubleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-d
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
 
 export const DualListSelectorComposableDragDrop: React.FunctionComponent = () => {
-  const [ignoreNextOptionSelect, setIgnoreNextOptionSelect] = React.useState(false);
-  const [availableOptions, setAvailableOptions] = React.useState([
+  const [ignoreNextOptionSelect, setIgnoreNextOptionSelect] = useState(false);
+  const [availableOptions, setAvailableOptions] = useState([
     { text: 'Apple', selected: false, isVisible: true },
     { text: 'Banana', selected: false, isVisible: true },
     { text: 'Pineapple', selected: false, isVisible: true }
   ]);
-  const [chosenOptions, setChosenOptions] = React.useState([
+  const [chosenOptions, setChosenOptions] = useState([
     { text: 'Orange', selected: false, isVisible: true },
     { text: 'Grape', selected: false, isVisible: true },
     { text: 'Peach', selected: false, isVisible: true },
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorComposableTree.tsx b/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorComposableTree.tsx
index 238ce17db1d..e55c076ee81 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorComposableTree.tsx
+++ b/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorComposableTree.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useMemo, useState } from 'react';
 import {
   SearchInput,
   Button,
@@ -34,10 +34,10 @@ interface ExampleProps {
 }
 
 export const DualListSelectorComposableTree: React.FunctionComponent<ExampleProps> = ({ data }: ExampleProps) => {
-  const [checkedLeafIds, setCheckedLeafIds] = React.useState<string[]>([]);
-  const [chosenLeafIds, setChosenLeafIds] = React.useState<string[]>(['beans', 'beef', 'chicken', 'tofu']);
-  const [chosenFilter, setChosenFilter] = React.useState<string>('');
-  const [availableFilter, setAvailableFilter] = React.useState<string>('');
+  const [checkedLeafIds, setCheckedLeafIds] = useState<string[]>([]);
+  const [chosenLeafIds, setChosenLeafIds] = useState<string[]>(['beans', 'beef', 'chicken', 'tofu']);
+  const [chosenFilter, setChosenFilter] = useState<string>('');
+  const [availableFilter, setAvailableFilter] = useState<string>('');
   let hiddenChosen: string[] = [];
   let hiddenAvailable: string[] = [];
 
@@ -84,7 +84,7 @@ export const DualListSelectorComposableTree: React.FunctionComponent<ExampleProp
   };
 
   // Builds a map of child leaf nodes by node id - memoized so that it only rebuilds the list if the data changes.
-  const { memoizedLeavesById, memoizedAllLeaves, memoizedNodeText } = React.useMemo(() => {
+  const { memoizedLeavesById, memoizedAllLeaves, memoizedNodeText } = useMemo(() => {
     let leavesById = {};
     let allLeaves: string[] = [];
     let nodeTexts = {};
diff --git a/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorTreeExample.tsx b/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorTreeExample.tsx
index 587dcbe3a41..8940b1efb3f 100644
--- a/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorTreeExample.tsx
+++ b/packages/react-core/src/deprecated/components/DualListSelector/examples/DualListSelectorTreeExample.tsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   DualListSelector as DLSDeprecated,
   DualListSelectorTreeItemData as DLSTreeItemDataDeprecated
 } from '@patternfly/react-core/deprecated';
 
 export const DualListSelectorTreeExample: React.FunctionComponent = () => {
-  const [availableOptions, setAvailableOptions] = React.useState<DLSTreeItemDataDeprecated[]>([
+  const [availableOptions, setAvailableOptions] = useState<DLSTreeItemDataDeprecated[]>([
     {
       id: 'F1',
       text: 'Folder 1',
@@ -41,7 +41,7 @@ export const DualListSelectorTreeExample: React.FunctionComponent = () => {
     }
   ]);
 
-  const [chosenOptions, setChosenOptions] = React.useState<DLSTreeItemDataDeprecated[]>([
+  const [chosenOptions, setChosenOptions] = useState<DLSTreeItemDataDeprecated[]>([
     {
       id: 'CF1',
       text: 'Chosen Folder 1',
diff --git a/packages/react-core/src/deprecated/components/Modal/Modal.tsx b/packages/react-core/src/deprecated/components/Modal/Modal.tsx
index a1082c77d2e..530232e4659 100644
--- a/packages/react-core/src/deprecated/components/Modal/Modal.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/Modal.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 import * as ReactDOM from 'react-dom';
 import { canUseDOM, KeyTypes, PickOptional } from '../../../helpers';
 import { css } from '@patternfly/react-styles';
@@ -95,7 +95,7 @@ interface ModalState {
   ouiaStateId: string;
 }
 
-class Modal extends React.Component<ModalProps, ModalState> {
+class Modal extends Component<ModalProps, ModalState> {
   static displayName = 'Modal';
   static currentId = 0;
   boxId = '';
diff --git a/packages/react-core/src/deprecated/components/Modal/ModalBox.tsx b/packages/react-core/src/deprecated/components/Modal/ModalBox.tsx
index 8f9158876d0..05ca660243b 100644
--- a/packages/react-core/src/deprecated/components/Modal/ModalBox.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/ModalBox.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/ModalBox/modal-box';
 import topSpacer from '@patternfly/react-tokens/dist/esm/c_modal_box_m_align_top_spacer';
diff --git a/packages/react-core/src/deprecated/components/Modal/ModalBoxBody.tsx b/packages/react-core/src/deprecated/components/Modal/ModalBoxBody.tsx
index 7d59486d287..ba2e8e6785d 100644
--- a/packages/react-core/src/deprecated/components/Modal/ModalBoxBody.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/ModalBoxBody.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/ModalBox/modal-box';
 
diff --git a/packages/react-core/src/deprecated/components/Modal/ModalBoxCloseButton.tsx b/packages/react-core/src/deprecated/components/Modal/ModalBoxCloseButton.tsx
index 4830a6f833b..dff2ff4807c 100644
--- a/packages/react-core/src/deprecated/components/Modal/ModalBoxCloseButton.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/ModalBoxCloseButton.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/ModalBox/modal-box';
 import { Button } from '../../../components/Button';
diff --git a/packages/react-core/src/deprecated/components/Modal/ModalBoxDescription.tsx b/packages/react-core/src/deprecated/components/Modal/ModalBoxDescription.tsx
index 1ce6385e88c..d82260e50d6 100644
--- a/packages/react-core/src/deprecated/components/Modal/ModalBoxDescription.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/ModalBoxDescription.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/ModalBox/modal-box';
 
diff --git a/packages/react-core/src/deprecated/components/Modal/ModalBoxFooter.tsx b/packages/react-core/src/deprecated/components/Modal/ModalBoxFooter.tsx
index bf0724ecf2a..c31cbf5a28f 100644
--- a/packages/react-core/src/deprecated/components/Modal/ModalBoxFooter.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/ModalBoxFooter.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/ModalBox/modal-box';
 
diff --git a/packages/react-core/src/deprecated/components/Modal/ModalBoxHeader.tsx b/packages/react-core/src/deprecated/components/Modal/ModalBoxHeader.tsx
index 4bf0c88ad51..5ecca83c986 100644
--- a/packages/react-core/src/deprecated/components/Modal/ModalBoxHeader.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/ModalBoxHeader.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Fragment } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/ModalBox/modal-box';
 
@@ -19,10 +19,10 @@ export const ModalBoxHeader: React.FunctionComponent<ModalBoxHeaderProps> = ({
 }: ModalBoxHeaderProps) => (
   <header className={css(styles.modalBoxHeader, help && styles.modifiers.help, className)} {...props}>
     {help && (
-      <React.Fragment>
+      <Fragment>
         <div className={css(styles.modalBoxHeaderMain)}>{children}</div>
         <div className={`${styles.modalBoxHeader}-help`}>{help}</div>
-      </React.Fragment>
+      </Fragment>
     )}
     {!help && children}
   </header>
diff --git a/packages/react-core/src/deprecated/components/Modal/ModalBoxTitle.tsx b/packages/react-core/src/deprecated/components/Modal/ModalBoxTitle.tsx
index ccb286514ee..acfa69c808c 100644
--- a/packages/react-core/src/deprecated/components/Modal/ModalBoxTitle.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/ModalBoxTitle.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useRef, useState } from 'react';
 import modalStyles from '@patternfly/react-styles/css/components/ModalBox/modal-box';
 import { css } from '@patternfly/react-styles';
 import { capitalize } from '../../../helpers';
@@ -35,8 +35,8 @@ export const ModalBoxTitle: React.FunctionComponent<ModalBoxTitleProps> = ({
   titleLabel = '',
   ...props
 }: ModalBoxTitleProps) => {
-  const [hasTooltip, setHasTooltip] = React.useState(false);
-  const h1 = React.useRef<HTMLHeadingElement>(null);
+  const [hasTooltip, setHasTooltip] = useState(false);
+  const h1 = useRef<HTMLHeadingElement>(null);
   const label = titleLabel || (isVariantIcon(titleIconVariant) ? `${capitalize(titleIconVariant)} alert:` : titleLabel);
   const variantIcons = {
     success: <CheckCircleIcon />,
diff --git a/packages/react-core/src/deprecated/components/Modal/ModalContent.tsx b/packages/react-core/src/deprecated/components/Modal/ModalContent.tsx
index 6d5fc982c4b..0c8106f5c16 100644
--- a/packages/react-core/src/deprecated/components/Modal/ModalContent.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/ModalContent.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { FocusTrap } from '../../../helpers';
 import modalStyles from '@patternfly/react-styles/css/components/ModalBox/modal-box';
 import bullsEyeStyles from '@patternfly/react-styles/css/layouts/Bullseye/bullseye';
diff --git a/packages/react-core/src/deprecated/components/Modal/__tests__/Modal.test.tsx b/packages/react-core/src/deprecated/components/Modal/__tests__/Modal.test.tsx
index 32c2543c40b..ef6b8d7c310 100644
--- a/packages/react-core/src/deprecated/components/Modal/__tests__/Modal.test.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/__tests__/Modal.test.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react';
-
+import { useState } from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import '@testing-library/jest-dom';
@@ -23,8 +22,8 @@ const props = {
 const target = document.createElement('div');
 
 const ModalWithSiblings = () => {
-  const [isOpen, setIsOpen] = React.useState(true);
-  const [isModalMounted, setIsModalMounted] = React.useState(true);
+  const [isOpen, setIsOpen] = useState(true);
+  const [isModalMounted, setIsModalMounted] = useState(true);
   const modalProps = { ...props, isOpen, appendTo: target, onClose: () => setIsOpen(false) };
 
   return (
@@ -41,8 +40,8 @@ const ModalWithSiblings = () => {
 };
 
 const ModalWithAdjacentModal = () => {
-  const [isOpen, setIsOpen] = React.useState(true);
-  const [isModalMounted, setIsModalMounted] = React.useState(true);
+  const [isOpen, setIsOpen] = useState(true);
+  const [isModalMounted, setIsModalMounted] = useState(true);
   const modalProps = { ...props, isOpen, appendTo: target, onClose: () => setIsOpen(false) };
 
   return (
diff --git a/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBox.test.tsx b/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBox.test.tsx
index 9a8f8b24cad..47037db6eb1 100644
--- a/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBox.test.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBox.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 
 import { ModalBox } from '../ModalBox';
diff --git a/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxBody.test.tsx b/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxBody.test.tsx
index bffadf1a38f..43607e6b098 100644
--- a/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxBody.test.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxBody.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 
 import { ModalBoxBody } from '../ModalBoxBody';
diff --git a/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxCloseButton.test.tsx b/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxCloseButton.test.tsx
index 13339dfd28f..1e482bc7f73 100644
--- a/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxCloseButton.test.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxCloseButton.test.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxDescription.test.tsx b/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxDescription.test.tsx
index 8aca48ac935..ba2ba864a69 100644
--- a/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxDescription.test.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxDescription.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ModalBoxDescription } from '../ModalBoxDescription';
 
diff --git a/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxFooter.test.tsx b/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxFooter.test.tsx
index bf94f92dbf6..d22d79b75aa 100644
--- a/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxFooter.test.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxFooter.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { ModalBoxFooter } from '../ModalBoxFooter';
 
diff --git a/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxHeader.test.tsx b/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxHeader.test.tsx
index 943230d05cb..36dba4c00a2 100644
--- a/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxHeader.test.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxHeader.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 
 import { ModalBoxHeader } from '../ModalBoxHeader';
diff --git a/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxTitle.test.tsx b/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxTitle.test.tsx
index 84e7c3f1e20..6f39af25378 100644
--- a/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxTitle.test.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/__tests__/ModalBoxTitle.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 
 import { ModalBoxTitle } from '../ModalBoxTitle';
diff --git a/packages/react-core/src/deprecated/components/Modal/__tests__/ModalContent.test.tsx b/packages/react-core/src/deprecated/components/Modal/__tests__/ModalContent.test.tsx
index c7d4b0fac95..550d1efedeb 100644
--- a/packages/react-core/src/deprecated/components/Modal/__tests__/ModalContent.test.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/__tests__/ModalContent.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 
 import { ModalContent } from '../ModalContent';
diff --git a/packages/react-core/src/deprecated/components/Modal/examples/Modal.md b/packages/react-core/src/deprecated/components/Modal/examples/Modal.md
index b39b82211d4..b90af56b0be 100644
--- a/packages/react-core/src/deprecated/components/Modal/examples/Modal.md
+++ b/packages/react-core/src/deprecated/components/Modal/examples/Modal.md
@@ -7,6 +7,8 @@ ouia: true
 deprecated: true
 ---
 
+import { Fragment } from 'react';
+
 import { Modal as ModalDeprecated, ModalVariant as ModalVariantDeprecated } from '@patternfly/react-core/deprecated';
 import WarningTriangleIcon from '@patternfly/react-icons/dist/esm/icons/warning-triangle-icon';
 import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon';
diff --git a/packages/react-core/src/deprecated/components/Modal/examples/ModalBasic.tsx b/packages/react-core/src/deprecated/components/Modal/examples/ModalBasic.tsx
index 8e7b5298bfe..cb776b84c00 100644
--- a/packages/react-core/src/deprecated/components/Modal/examples/ModalBasic.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/examples/ModalBasic.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button } from '@patternfly/react-core';
 import { Modal as ModalDeprecated } from '@patternfly/react-core/deprecated';
 
@@ -10,7 +10,7 @@ export const ModalBasic: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle} ouiaId="ShowBasicModal">
         Show basic modal
       </Button>
@@ -34,6 +34,6 @@ export const ModalBasic: React.FunctionComponent = () => {
         pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
         laborum.
       </ModalDeprecated>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Modal/examples/ModalCustomFocus.tsx b/packages/react-core/src/deprecated/components/Modal/examples/ModalCustomFocus.tsx
index 7ca938b1fcd..8756ef23d92 100644
--- a/packages/react-core/src/deprecated/components/Modal/examples/ModalCustomFocus.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/examples/ModalCustomFocus.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button } from '@patternfly/react-core';
 import { Modal as ModalDeprecated } from '@patternfly/react-core/deprecated';
 
@@ -10,7 +10,7 @@ export const ModalCustomFocus: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle} ouiaId="ShowBasicModal">
         Show modal with custom focus
       </Button>
@@ -34,6 +34,6 @@ export const ModalCustomFocus: React.FunctionComponent = () => {
         pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
         laborum.
       </ModalDeprecated>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Modal/examples/ModalCustomHeaderFooter.tsx b/packages/react-core/src/deprecated/components/Modal/examples/ModalCustomHeaderFooter.tsx
index 74f01924750..916bf2e9220 100644
--- a/packages/react-core/src/deprecated/components/Modal/examples/ModalCustomHeaderFooter.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/examples/ModalCustomHeaderFooter.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button, Title, TitleSizes } from '@patternfly/react-core';
 import { Modal as ModalDeprecated, ModalVariant as ModalVariantDeprecated } from '@patternfly/react-core/deprecated';
 import WarningTriangleIcon from '@patternfly/react-icons/dist/esm/icons/warning-triangle-icon';
@@ -12,12 +12,12 @@ export const ModalCustomHeaderFooter: React.FunctionComponent = () => {
   };
 
   const header = (
-    <React.Fragment>
+    <Fragment>
       <Title id="modal-custom-header-label" headingLevel="h1" size={TitleSizes['2xl']}>
         Custom header/footer modal
       </Title>
       <p className={spacing.ptSm}>Allows for custom content in the header and/or footer by passing components.</p>
-    </React.Fragment>
+    </Fragment>
   );
 
   const footer = (
@@ -28,7 +28,7 @@ export const ModalCustomHeaderFooter: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show custom header/footer modal
       </Button>
@@ -53,6 +53,6 @@ export const ModalCustomHeaderFooter: React.FunctionComponent = () => {
         pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
         laborum.
       </ModalDeprecated>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Modal/examples/ModalCustomTitleIcon.tsx b/packages/react-core/src/deprecated/components/Modal/examples/ModalCustomTitleIcon.tsx
index a01edd93e4f..5c22e027ce1 100644
--- a/packages/react-core/src/deprecated/components/Modal/examples/ModalCustomTitleIcon.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/examples/ModalCustomTitleIcon.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button } from '@patternfly/react-core';
 import { Modal as ModalDeprecated } from '@patternfly/react-core/deprecated';
 import BullhornIcon from '@patternfly/react-icons/dist/esm/icons/bullhorn-icon';
@@ -11,7 +11,7 @@ export const ModalCustomTitleIcon: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show custom title icon modal
       </Button>
@@ -42,6 +42,6 @@ export const ModalCustomTitleIcon: React.FunctionComponent = () => {
         pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
         laborum.
       </ModalDeprecated>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Modal/examples/ModalCustomWidth.tsx b/packages/react-core/src/deprecated/components/Modal/examples/ModalCustomWidth.tsx
index 18458649f7c..6b3d499e84d 100644
--- a/packages/react-core/src/deprecated/components/Modal/examples/ModalCustomWidth.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/examples/ModalCustomWidth.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button } from '@patternfly/react-core';
 import { Modal as ModalDeprecated } from '@patternfly/react-core/deprecated';
 
@@ -10,7 +10,7 @@ export const ModalCustomWidth: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show custom width modal
       </Button>
@@ -34,6 +34,6 @@ export const ModalCustomWidth: React.FunctionComponent = () => {
         pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
         laborum.
       </ModalDeprecated>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Modal/examples/ModalLarge.tsx b/packages/react-core/src/deprecated/components/Modal/examples/ModalLarge.tsx
index cf004f977cd..3fc59893a8b 100644
--- a/packages/react-core/src/deprecated/components/Modal/examples/ModalLarge.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/examples/ModalLarge.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button } from '@patternfly/react-core';
 import { Modal as ModalDeprecated, ModalVariant as ModalVariantDeprecated } from '@patternfly/react-core/deprecated';
 
@@ -10,7 +10,7 @@ export const ModalLarge: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show large modal
       </Button>
@@ -34,6 +34,6 @@ export const ModalLarge: React.FunctionComponent = () => {
         pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
         laborum.
       </ModalDeprecated>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Modal/examples/ModalMedium.tsx b/packages/react-core/src/deprecated/components/Modal/examples/ModalMedium.tsx
index d19cd26bf22..8e797093b64 100644
--- a/packages/react-core/src/deprecated/components/Modal/examples/ModalMedium.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/examples/ModalMedium.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button } from '@patternfly/react-core';
 import { Modal as ModalDeprecated, ModalVariant as ModalVariantDeprecated } from '@patternfly/react-core/deprecated';
 
@@ -10,7 +10,7 @@ export const ModalMedium: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show medium modal
       </Button>
@@ -34,6 +34,6 @@ export const ModalMedium: React.FunctionComponent = () => {
         pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
         laborum.
       </ModalDeprecated>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Modal/examples/ModalNoHeaderFooter.tsx b/packages/react-core/src/deprecated/components/Modal/examples/ModalNoHeaderFooter.tsx
index 952e8349fb1..3ebed042828 100644
--- a/packages/react-core/src/deprecated/components/Modal/examples/ModalNoHeaderFooter.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/examples/ModalNoHeaderFooter.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button } from '@patternfly/react-core';
 import { Modal as ModalDeprecated, ModalVariant as ModalVariantDeprecated } from '@patternfly/react-core/deprecated';
 
@@ -10,7 +10,7 @@ export const ModalNoHeaderFooter: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show no header/footer modal
       </Button>
@@ -33,6 +33,6 @@ export const ModalNoHeaderFooter: React.FunctionComponent = () => {
         pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
         laborum.
       </ModalDeprecated>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Modal/examples/ModalSmall.tsx b/packages/react-core/src/deprecated/components/Modal/examples/ModalSmall.tsx
index 09d21f96695..2f25689e20e 100644
--- a/packages/react-core/src/deprecated/components/Modal/examples/ModalSmall.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/examples/ModalSmall.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button } from '@patternfly/react-core';
 import { Modal as ModalDeprecated, ModalVariant as ModalVariantDeprecated } from '@patternfly/react-core/deprecated';
 
@@ -10,7 +10,7 @@ export const ModalSmall: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show small modal
       </Button>
@@ -34,6 +34,6 @@ export const ModalSmall: React.FunctionComponent = () => {
         pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
         laborum.
       </ModalDeprecated>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Modal/examples/ModalTitleIcon.tsx b/packages/react-core/src/deprecated/components/Modal/examples/ModalTitleIcon.tsx
index 07310e4fa74..8b830d89593 100644
--- a/packages/react-core/src/deprecated/components/Modal/examples/ModalTitleIcon.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/examples/ModalTitleIcon.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button } from '@patternfly/react-core';
 import { Modal as ModalDeprecated } from '@patternfly/react-core/deprecated';
 
@@ -10,7 +10,7 @@ export const ModalTitleIcon: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show title icon modal
       </Button>
@@ -41,6 +41,6 @@ export const ModalTitleIcon: React.FunctionComponent = () => {
         pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
         laborum.
       </ModalDeprecated>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Modal/examples/ModalTopAligned.tsx b/packages/react-core/src/deprecated/components/Modal/examples/ModalTopAligned.tsx
index 0aa93999e05..28e997deac8 100644
--- a/packages/react-core/src/deprecated/components/Modal/examples/ModalTopAligned.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/examples/ModalTopAligned.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button } from '@patternfly/react-core';
 import { Modal as ModalDeprecated } from '@patternfly/react-core/deprecated';
 
@@ -10,7 +10,7 @@ export const ModalTopAligned: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show top aligned modal
       </Button>
@@ -34,6 +34,6 @@ export const ModalTopAligned: React.FunctionComponent = () => {
         pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
         laborum.
       </ModalDeprecated>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Modal/examples/ModalWithDescription.tsx b/packages/react-core/src/deprecated/components/Modal/examples/ModalWithDescription.tsx
index 7faa7f7c1f5..906d9cccecb 100644
--- a/packages/react-core/src/deprecated/components/Modal/examples/ModalWithDescription.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/examples/ModalWithDescription.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button } from '@patternfly/react-core';
 import { Modal as ModalDeprecated } from '@patternfly/react-core/deprecated';
 
@@ -10,7 +10,7 @@ export const ModalWithDescription: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show modal with description
       </Button>
@@ -34,6 +34,6 @@ export const ModalWithDescription: React.FunctionComponent = () => {
         pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
         laborum.
       </ModalDeprecated>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Modal/examples/ModalWithDropdown.tsx b/packages/react-core/src/deprecated/components/Modal/examples/ModalWithDropdown.tsx
index bb6e2e84683..73b467c0485 100644
--- a/packages/react-core/src/deprecated/components/Modal/examples/ModalWithDropdown.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/examples/ModalWithDropdown.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button, Dropdown, DropdownList, DropdownItem, MenuToggle, MenuToggleElement } from '@patternfly/react-core';
 import { Modal as ModalDeprecated, ModalVariant as ModalVariantDeprecated } from '@patternfly/react-core/deprecated';
 
@@ -35,7 +35,7 @@ export const ModalWithDropdown: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show dropdown modal
       </Button>
@@ -95,6 +95,6 @@ export const ModalWithDropdown: React.FunctionComponent = () => {
           </Dropdown>
         </div>
       </ModalDeprecated>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Modal/examples/ModalWithForm.tsx b/packages/react-core/src/deprecated/components/Modal/examples/ModalWithForm.tsx
index 90bd99720f9..c330cca9d04 100644
--- a/packages/react-core/src/deprecated/components/Modal/examples/ModalWithForm.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/examples/ModalWithForm.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button, Form, FormGroup, FormGroupLabelHelp, Popover, TextInput } from '@patternfly/react-core';
 import { Modal as ModalDeprecated, ModalVariant as ModalVariantDeprecated } from '@patternfly/react-core/deprecated';
 
@@ -27,7 +27,7 @@ export const ModalWithForm: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show modal with form
       </Button>
@@ -144,7 +144,7 @@ export const ModalWithForm: React.FunctionComponent = () => {
                   <div>
                     The
                     <a href="https://schema.org/address" target="_blank" rel="noopener noreferrer">
-                      adress
+                      address
                     </a>
                     of a
                     <a href="https://schema.org/Person" target="_blank" rel="noopener noreferrer">
@@ -178,6 +178,6 @@ export const ModalWithForm: React.FunctionComponent = () => {
           </FormGroup>
         </Form>
       </ModalDeprecated>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Modal/examples/ModalWithHelp.tsx b/packages/react-core/src/deprecated/components/Modal/examples/ModalWithHelp.tsx
index 5171c82d90c..409f4f60908 100644
--- a/packages/react-core/src/deprecated/components/Modal/examples/ModalWithHelp.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/examples/ModalWithHelp.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button, Popover } from '@patternfly/react-core';
 import { Modal as ModalDeprecated } from '@patternfly/react-core/deprecated';
 
@@ -12,7 +12,7 @@ export const ModalWithHelp: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show with help modal
       </Button>
@@ -49,6 +49,6 @@ export const ModalWithHelp: React.FunctionComponent = () => {
         pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
         laborum.
       </ModalDeprecated>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Modal/examples/ModalWithOverflowingContent.tsx b/packages/react-core/src/deprecated/components/Modal/examples/ModalWithOverflowingContent.tsx
index 13ad2c54ac3..57ffd74b0f8 100644
--- a/packages/react-core/src/deprecated/components/Modal/examples/ModalWithOverflowingContent.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/examples/ModalWithOverflowingContent.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button } from '@patternfly/react-core';
 import { Modal as ModalDeprecated, ModalVariant as ModalVariantDeprecated } from '@patternfly/react-core/deprecated';
 
@@ -10,7 +10,7 @@ export const ModalWithOverflowingContent: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show modal
       </Button>
@@ -67,6 +67,6 @@ export const ModalWithOverflowingContent: React.FunctionComponent = () => {
         purus gravida. Nisl purus in mollis nunc sed id semper risus. Id neque aliquam vestibulum morbi. Mauris a diam
         maecenas sed enim ut sem. Egestas tellus rutrum tellus pellentesque.
       </ModalDeprecated>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Modal/examples/ModalWithWizard.tsx b/packages/react-core/src/deprecated/components/Modal/examples/ModalWithWizard.tsx
index 897fcb9dba0..5a9920f84fa 100644
--- a/packages/react-core/src/deprecated/components/Modal/examples/ModalWithWizard.tsx
+++ b/packages/react-core/src/deprecated/components/Modal/examples/ModalWithWizard.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button, Wizard, WizardHeader, WizardStep } from '@patternfly/react-core';
 import { Modal as ModalDeprecated, ModalVariant as ModalVariantDeprecated } from '@patternfly/react-core/deprecated';
 
@@ -20,7 +20,7 @@ export const ModalWithWizard: React.FunctionComponent = () => {
   ));
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show wizard modal
       </Button>
@@ -56,6 +56,6 @@ export const ModalWithWizard: React.FunctionComponent = () => {
           </WizardStep>
         </Wizard>
       </ModalDeprecated>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Tile/Tile.tsx b/packages/react-core/src/deprecated/components/Tile/Tile.tsx
index 5e48d4f00d3..528af1e02c3 100644
--- a/packages/react-core/src/deprecated/components/Tile/Tile.tsx
+++ b/packages/react-core/src/deprecated/components/Tile/Tile.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Tile/tile';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/deprecated/components/Tile/__tests__/Tile.test.tsx b/packages/react-core/src/deprecated/components/Tile/__tests__/Tile.test.tsx
index 18cba5029ab..900643b0a17 100644
--- a/packages/react-core/src/deprecated/components/Tile/__tests__/Tile.test.tsx
+++ b/packages/react-core/src/deprecated/components/Tile/__tests__/Tile.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { Tile } from '../Tile';
 import PlusIcon from '@patternfly/react-icons/dist/esm/icons/plus-icon';
diff --git a/packages/react-core/src/deprecated/components/Tile/examples/Tile.md b/packages/react-core/src/deprecated/components/Tile/examples/Tile.md
index aa989ab5f1c..50857f62e82 100644
--- a/packages/react-core/src/deprecated/components/Tile/examples/Tile.md
+++ b/packages/react-core/src/deprecated/components/Tile/examples/Tile.md
@@ -73,7 +73,6 @@ You can also change the type of `Flex` you can use so that the line breaks in th
 ### Tiles with single selection
 
 ```ts
-import React from 'react';
 import { Tile } from '@patternfly/react-core/deprecated';
 
 const TileSingleSelect: React.FunctionComponent = () => {
@@ -104,7 +103,6 @@ const TileSingleSelect: React.FunctionComponent = () => {
 ### Tiles with multiple selection
 
 ```ts
-import React from 'react';
 import { Tile } from '@patternfly/react-core/deprecated';
 
 const TileMultiSelect: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/deprecated/components/Tile/examples/TileBasic.tsx b/packages/react-core/src/deprecated/components/Tile/examples/TileBasic.tsx
index 72a0bc535eb..a4b645c3b20 100644
--- a/packages/react-core/src/deprecated/components/Tile/examples/TileBasic.tsx
+++ b/packages/react-core/src/deprecated/components/Tile/examples/TileBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tile } from '@patternfly/react-core/deprecated';
 
 export const TileBasic: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/deprecated/components/Tile/examples/TileStacked.tsx b/packages/react-core/src/deprecated/components/Tile/examples/TileStacked.tsx
index f3ede9249a8..f88a79cbe7c 100644
--- a/packages/react-core/src/deprecated/components/Tile/examples/TileStacked.tsx
+++ b/packages/react-core/src/deprecated/components/Tile/examples/TileStacked.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tile } from '@patternfly/react-core/deprecated';
 import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
 
diff --git a/packages/react-core/src/deprecated/components/Tile/examples/TileStackedWithLargeIcons.tsx b/packages/react-core/src/deprecated/components/Tile/examples/TileStackedWithLargeIcons.tsx
index bf498a81ce5..9611435f226 100644
--- a/packages/react-core/src/deprecated/components/Tile/examples/TileStackedWithLargeIcons.tsx
+++ b/packages/react-core/src/deprecated/components/Tile/examples/TileStackedWithLargeIcons.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tile } from '@patternfly/react-core/deprecated';
 import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
 
diff --git a/packages/react-core/src/deprecated/components/Tile/examples/TileWithExtraContent.tsx b/packages/react-core/src/deprecated/components/Tile/examples/TileWithExtraContent.tsx
index 5a7982a3553..82b6fabf720 100644
--- a/packages/react-core/src/deprecated/components/Tile/examples/TileWithExtraContent.tsx
+++ b/packages/react-core/src/deprecated/components/Tile/examples/TileWithExtraContent.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Flex } from '@patternfly/react-core';
 import { Tile } from '@patternfly/react-core/deprecated';
 import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon';
diff --git a/packages/react-core/src/deprecated/components/Tile/examples/TileWithIcon.tsx b/packages/react-core/src/deprecated/components/Tile/examples/TileWithIcon.tsx
index 2c320ff2a23..056be8106cc 100644
--- a/packages/react-core/src/deprecated/components/Tile/examples/TileWithIcon.tsx
+++ b/packages/react-core/src/deprecated/components/Tile/examples/TileWithIcon.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tile } from '@patternfly/react-core/deprecated';
 import PlusIcon from '@patternfly/react-icons/dist/esm/icons/plus-icon';
 
diff --git a/packages/react-core/src/deprecated/components/Tile/examples/TileWithSubtext.tsx b/packages/react-core/src/deprecated/components/Tile/examples/TileWithSubtext.tsx
index c04d2f2a2b0..c9394e45efc 100644
--- a/packages/react-core/src/deprecated/components/Tile/examples/TileWithSubtext.tsx
+++ b/packages/react-core/src/deprecated/components/Tile/examples/TileWithSubtext.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Tile } from '@patternfly/react-core/deprecated';
 
 export const TileWithSubtext: React.FunctionComponent = () => (
diff --git a/packages/react-core/src/deprecated/components/Wizard/Wizard.tsx b/packages/react-core/src/deprecated/components/Wizard/Wizard.tsx
index 8a5a3a71f2d..7312f2e396e 100644
--- a/packages/react-core/src/deprecated/components/Wizard/Wizard.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/Wizard.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, createRef } from 'react';
 import { KeyTypes } from '../../../helpers/constants';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Wizard/wizard';
@@ -125,7 +125,7 @@ interface WizardState {
   isNavOpen: boolean;
 }
 
-class Wizard extends React.Component<WizardProps, WizardState> {
+class Wizard extends Component<WizardProps, WizardState> {
   static displayName = 'Wizard';
   private static currentId = 0;
   static defaultProps: PickOptional<WizardProps> = {
@@ -181,7 +181,7 @@ class Wizard extends React.Component<WizardProps, WizardState> {
       }
     }
 
-    this.drawerRef = React.createRef();
+    this.drawerRef = createRef();
   }
 
   private handleKeyClicks = (event: KeyboardEvent): void => {
diff --git a/packages/react-core/src/deprecated/components/Wizard/WizardBody.tsx b/packages/react-core/src/deprecated/components/Wizard/WizardBody.tsx
index 534cbe5a185..571d4e7fa12 100644
--- a/packages/react-core/src/deprecated/components/Wizard/WizardBody.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/WizardBody.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useEffect, useRef, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/Wizard/wizard';
 import { css } from '@patternfly/react-styles';
 import { WizardDrawerWrapper } from './WizardDrawerWrapper';
@@ -43,11 +43,11 @@ export const WizardBody: React.FunctionComponent<WizardBodyProps> = ({
   activeStep
 }: WizardBodyProps) => {
   const MainComponent = mainComponent;
-  const [hasScrollbar, setHasScrollbar] = React.useState(false);
-  const [previousWidth, setPreviousWidth] = React.useState<number | undefined>(undefined);
-  const wizardBodyRef = React.useRef(null);
+  const [hasScrollbar, setHasScrollbar] = useState(false);
+  const [previousWidth, setPreviousWidth] = useState<number | undefined>(undefined);
+  const wizardBodyRef = useRef(null);
 
-  React.useEffect(() => {
+  useEffect(() => {
     const resize = () => {
       if (wizardBodyRef?.current) {
         const { offsetWidth, offsetHeight, scrollHeight } = wizardBodyRef.current;
diff --git a/packages/react-core/src/deprecated/components/Wizard/WizardContext.ts b/packages/react-core/src/deprecated/components/Wizard/WizardContext.ts
index 4598f1b8311..fe1c4a730cc 100644
--- a/packages/react-core/src/deprecated/components/Wizard/WizardContext.ts
+++ b/packages/react-core/src/deprecated/components/Wizard/WizardContext.ts
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { createContext } from 'react';
 import { WizardStep } from './Wizard';
 
 export interface WizardContextType {
@@ -10,7 +10,7 @@ export interface WizardContextType {
   activeStep: WizardStep;
 }
 
-export const WizardContext = React.createContext<WizardContextType>({
+export const WizardContext = createContext<WizardContextType>({
   goToStepById: () => null,
   goToStepByName: () => null,
   onNext: () => null,
diff --git a/packages/react-core/src/deprecated/components/Wizard/WizardDrawerWrapper.tsx b/packages/react-core/src/deprecated/components/Wizard/WizardDrawerWrapper.tsx
index c11590a00df..9ecbae96fce 100644
--- a/packages/react-core/src/deprecated/components/Wizard/WizardDrawerWrapper.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/WizardDrawerWrapper.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import type { JSX } from 'react';
 
 export interface WizardDrawerWrapperProps {
diff --git a/packages/react-core/src/deprecated/components/Wizard/WizardFooter.tsx b/packages/react-core/src/deprecated/components/Wizard/WizardFooter.tsx
index 286319bf778..ff38a4fde29 100644
--- a/packages/react-core/src/deprecated/components/Wizard/WizardFooter.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/WizardFooter.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Wizard/wizard';
 
diff --git a/packages/react-core/src/deprecated/components/Wizard/WizardFooterInternal.tsx b/packages/react-core/src/deprecated/components/Wizard/WizardFooterInternal.tsx
index cf79c6c92a0..d7815bfbbef 100644
--- a/packages/react-core/src/deprecated/components/Wizard/WizardFooterInternal.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/WizardFooterInternal.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Wizard/wizard';
 import { Button, ButtonVariant } from '../../../components/Button';
diff --git a/packages/react-core/src/deprecated/components/Wizard/WizardHeader.tsx b/packages/react-core/src/deprecated/components/Wizard/WizardHeader.tsx
index fdc70efbfb9..1b8ada8211f 100644
--- a/packages/react-core/src/deprecated/components/Wizard/WizardHeader.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/WizardHeader.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Wizard/wizard';
 import { css } from '@patternfly/react-styles';
 import { Button } from '../../../components/Button';
diff --git a/packages/react-core/src/deprecated/components/Wizard/WizardNav.tsx b/packages/react-core/src/deprecated/components/Wizard/WizardNav.tsx
index 685c4d2a7bc..fa8c587e5bf 100644
--- a/packages/react-core/src/deprecated/components/Wizard/WizardNav.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/WizardNav.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Wizard/wizard';
 import { css } from '@patternfly/react-styles';
 import { useOUIAProps, OUIAProps } from '../../../helpers';
diff --git a/packages/react-core/src/deprecated/components/Wizard/WizardNavItem.tsx b/packages/react-core/src/deprecated/components/Wizard/WizardNavItem.tsx
index f7a3c9abf9f..66437617f5f 100644
--- a/packages/react-core/src/deprecated/components/Wizard/WizardNavItem.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/WizardNavItem.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useEffect, useState } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Wizard/wizard';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
@@ -45,9 +45,9 @@ export const WizardNavItem: React.FunctionComponent<WizardNavItemProps> = ({
   const ouiaProps = useOUIAProps(WizardNavItem.displayName, ouiaId, ouiaSafe);
   const NavItemComponent = navItemComponent;
 
-  const [isExpanded, setIsExpanded] = React.useState(false);
+  const [isExpanded, setIsExpanded] = useState(false);
 
-  React.useEffect(() => {
+  useEffect(() => {
     setIsExpanded(isCurrent);
   }, [isCurrent]);
 
diff --git a/packages/react-core/src/deprecated/components/Wizard/WizardToggle.tsx b/packages/react-core/src/deprecated/components/Wizard/WizardToggle.tsx
index ac203849ac6..ac32b747e13 100644
--- a/packages/react-core/src/deprecated/components/Wizard/WizardToggle.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/WizardToggle.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Fragment } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Wizard/wizard';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
@@ -78,7 +78,7 @@ export const WizardToggle: React.FunctionComponent<WizardToggleProps> = ({
   }
 
   return (
-    <React.Fragment>
+    <Fragment>
       <button
         onClick={() => onNavToggle(!isNavOpen)}
         className={css(styles.wizardToggle, isNavOpen && 'pf-m-expanded')}
@@ -115,7 +115,7 @@ export const WizardToggle: React.FunctionComponent<WizardToggleProps> = ({
         </div>
         {children}
       </div>
-    </React.Fragment>
+    </Fragment>
   );
 };
 WizardToggle.displayName = 'WizardToggle';
diff --git a/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardBody.test.tsx b/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardBody.test.tsx
index fd4658e0d40..28b3d97a621 100644
--- a/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardBody.test.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardBody.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { WizardBody } from '../../WizardBody';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardFooter.test.tsx b/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardFooter.test.tsx
index 0aa34d5596b..b5ebe0bcfe6 100644
--- a/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardFooter.test.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardFooter.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { WizardFooter } from '../../WizardFooter';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardFooterInternal.test.tsx b/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardFooterInternal.test.tsx
index 2386e8bb42d..9d051128eda 100644
--- a/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardFooterInternal.test.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardFooterInternal.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { WizardFooterInternal } from '../../WizardFooterInternal';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardHeader.test.tsx b/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardHeader.test.tsx
index c7e7cd8484c..e100f370c43 100644
--- a/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardHeader.test.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardHeader.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { WizardHeader } from '../../WizardHeader';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardNav.test.tsx b/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardNav.test.tsx
index 04c255cfd35..23af3479b24 100644
--- a/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardNav.test.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardNav.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { WizardNav } from '../../WizardNav';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardNavItem.test.tsx b/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardNavItem.test.tsx
index 6688d26e139..dcb3daef888 100644
--- a/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardNavItem.test.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardNavItem.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { WizardNavItem } from '../../WizardNavItem';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardToggle.test.tsx b/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardToggle.test.tsx
index cf5debfc88b..a330a511494 100644
--- a/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardToggle.test.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/WizardToggle.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { WizardToggle } from '../../WizardToggle';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/deprecated/components/Wizard/__tests__/Wizard.test.tsx b/packages/react-core/src/deprecated/components/Wizard/__tests__/Wizard.test.tsx
index f374a86a07f..84f77743bf5 100644
--- a/packages/react-core/src/deprecated/components/Wizard/__tests__/Wizard.test.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/__tests__/Wizard.test.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { render, screen } from '@testing-library/react';
 import { Wizard, WizardStepFunctionType, WizardStep } from '../Wizard';
 import { DrawerPanelContent, DrawerHead } from '../../../../../src/components/Drawer';
@@ -284,7 +284,7 @@ test('wiz with disable sub step', () => {
 
 test('startAtStep can be used to externally control the current step of the wizard', async () => {
   const WizardTest = () => {
-    const [step, setStep] = React.useState(1);
+    const [step, setStep] = useState(1);
 
     const incrementStep = () => {
       setStep((prevStep) => prevStep + 1);
diff --git a/packages/react-core/src/deprecated/components/Wizard/examples/Wizard.md b/packages/react-core/src/deprecated/components/Wizard/examples/Wizard.md
index c6e2ef89b0c..2a1b1772a51 100644
--- a/packages/react-core/src/deprecated/components/Wizard/examples/Wizard.md
+++ b/packages/react-core/src/deprecated/components/Wizard/examples/Wizard.md
@@ -9,6 +9,7 @@ source: react-deprecated
 deprecated: true
 ---
 
+import { Fragment } from 'react';
 import { Button, Drawer, DrawerActions, DrawerCloseButton, DrawerColorVariant,
 DrawerContent, DrawerContentBody, DrawerHead, DrawerPanelContent, DrawerSection, ModalVariant, Alert, EmptyState, EmptyStateFooter, EmptyStateBody, EmptyStateActions, Title, Progress, Form, FormGroup, TextInput } from '@patternfly/react-core';
 import { Wizard as WizardDeprecated, WizardFooter as WizardFooterDeprecated, WizardContextConsumer as WizardContextConsumerDeprecated } from '@patternfly/react-core/deprecated';
@@ -86,7 +87,6 @@ interface WizardContext {
 ### Progressive steps
 
 ```js
-import React from 'react';
 import { Button, Radio, Alert } from '@patternfly/react-core';
 import {
   Wizard as WizardDeprecated,
diff --git a/packages/react-core/src/deprecated/components/Wizard/examples/WizardAnchorsForNavItems.tsx b/packages/react-core/src/deprecated/components/Wizard/examples/WizardAnchorsForNavItems.tsx
index 04f7b8fb105..5e35bc6c591 100644
--- a/packages/react-core/src/deprecated/components/Wizard/examples/WizardAnchorsForNavItems.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/examples/WizardAnchorsForNavItems.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Button } from '@patternfly/react-core';
 import { Wizard as WizardDeprecated } from '@patternfly/react-core/deprecated';
 import ExternalLinkAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon';
diff --git a/packages/react-core/src/deprecated/components/Wizard/examples/WizardBasic.tsx b/packages/react-core/src/deprecated/components/Wizard/examples/WizardBasic.tsx
index 8c7b41ef878..473c68fa9d3 100644
--- a/packages/react-core/src/deprecated/components/Wizard/examples/WizardBasic.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/examples/WizardBasic.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Wizard as WizardDeprecated } from '@patternfly/react-core/deprecated';
 
 export const WizardBasic: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/deprecated/components/Wizard/examples/WizardBasicWithDisabledSteps.tsx b/packages/react-core/src/deprecated/components/Wizard/examples/WizardBasicWithDisabledSteps.tsx
index 646cdb5ab94..5965b319b60 100644
--- a/packages/react-core/src/deprecated/components/Wizard/examples/WizardBasicWithDisabledSteps.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/examples/WizardBasicWithDisabledSteps.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Wizard as WizardDeprecated } from '@patternfly/react-core/deprecated';
 
 export const WizardBasicWithDisabledSteps: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/deprecated/components/Wizard/examples/WizardEnabledOnFormValidation.tsx b/packages/react-core/src/deprecated/components/Wizard/examples/WizardEnabledOnFormValidation.tsx
index ec3473a668f..b3f7117acc1 100644
--- a/packages/react-core/src/deprecated/components/Wizard/examples/WizardEnabledOnFormValidation.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/examples/WizardEnabledOnFormValidation.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Form, FormGroup, TextInput } from '@patternfly/react-core';
 import { Wizard as WizardDeprecated, WizardStep } from '@patternfly/react-core/deprecated';
 interface PrevStepInfo {
diff --git a/packages/react-core/src/deprecated/components/Wizard/examples/WizardExpandableSteps.tsx b/packages/react-core/src/deprecated/components/Wizard/examples/WizardExpandableSteps.tsx
index e43d8308912..aae08b4d231 100644
--- a/packages/react-core/src/deprecated/components/Wizard/examples/WizardExpandableSteps.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/examples/WizardExpandableSteps.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Wizard as WizardDeprecated } from '@patternfly/react-core/deprecated';
 
 export const WizardExpandableSteps: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/deprecated/components/Wizard/examples/WizardFinished.tsx b/packages/react-core/src/deprecated/components/Wizard/examples/WizardFinished.tsx
index b27fe110d36..d8c2f5ba605 100644
--- a/packages/react-core/src/deprecated/components/Wizard/examples/WizardFinished.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/examples/WizardFinished.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   EmptyState,
   EmptyStateFooter,
diff --git a/packages/react-core/src/deprecated/components/Wizard/examples/WizardGetCurrentStep.tsx b/packages/react-core/src/deprecated/components/Wizard/examples/WizardGetCurrentStep.tsx
index ca2115a6d65..ca5cf301d89 100644
--- a/packages/react-core/src/deprecated/components/Wizard/examples/WizardGetCurrentStep.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/examples/WizardGetCurrentStep.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Wizard as WizardDeprecated, WizardStep } from '@patternfly/react-core/deprecated';
 
 export const WizardGetCurrentStep: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/deprecated/components/Wizard/examples/WizardInModal.tsx b/packages/react-core/src/deprecated/components/Wizard/examples/WizardInModal.tsx
index 191c3c7a63a..bc782a8a81f 100644
--- a/packages/react-core/src/deprecated/components/Wizard/examples/WizardInModal.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/examples/WizardInModal.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Button } from '@patternfly/react-core';
 import { Wizard as WizardDeprecated } from '@patternfly/react-core/deprecated';
 
@@ -24,7 +24,7 @@ export const WizardInModal: React.FunctionComponent = () => {
   const title = 'Wizard in modal example';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Button variant="primary" onClick={handleModalToggle}>
         Show Modal
       </Button>
@@ -36,6 +36,6 @@ export const WizardInModal: React.FunctionComponent = () => {
         onClose={handleWizardToggle}
         isOpen={isOpen}
       />
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/deprecated/components/Wizard/examples/WizardIncrementallyEnabledSteps.tsx b/packages/react-core/src/deprecated/components/Wizard/examples/WizardIncrementallyEnabledSteps.tsx
index fbe72670e74..02666d9cca4 100644
--- a/packages/react-core/src/deprecated/components/Wizard/examples/WizardIncrementallyEnabledSteps.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/examples/WizardIncrementallyEnabledSteps.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Wizard as WizardDeprecated, WizardStep } from '@patternfly/react-core/deprecated';
 
 export const WizardIncrementallyEnabledSteps: React.FunctionComponent = () => {
diff --git a/packages/react-core/src/deprecated/components/Wizard/examples/WizardValidateOnButtonPress.tsx b/packages/react-core/src/deprecated/components/Wizard/examples/WizardValidateOnButtonPress.tsx
index 53484e9ba33..8aa547e4b2e 100644
--- a/packages/react-core/src/deprecated/components/Wizard/examples/WizardValidateOnButtonPress.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/examples/WizardValidateOnButtonPress.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   EmptyState,
   EmptyStateFooter,
diff --git a/packages/react-core/src/deprecated/components/Wizard/examples/WizardWithDrawer.tsx b/packages/react-core/src/deprecated/components/Wizard/examples/WizardWithDrawer.tsx
index afc25f84a4e..19cf8c222eb 100644
--- a/packages/react-core/src/deprecated/components/Wizard/examples/WizardWithDrawer.tsx
+++ b/packages/react-core/src/deprecated/components/Wizard/examples/WizardWithDrawer.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import {
   Button,
   DrawerActions,
@@ -117,7 +117,7 @@ export const WizardWithDrawer: React.FunctionComponent = () => {
   const title = 'Wizard with drawer example';
 
   return (
-    <React.Fragment>
+    <Fragment>
       <WizardDeprecated
         height={400}
         isDrawerExpanded={isDrawerExpanded}
@@ -126,6 +126,6 @@ export const WizardWithDrawer: React.FunctionComponent = () => {
         navAriaLabel={`${title} steps`}
         steps={steps}
       />
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-core/src/helpers/FocusTrap/__tests__/Generated/FocusTrap.test.tsx b/packages/react-core/src/helpers/FocusTrap/__tests__/Generated/FocusTrap.test.tsx
index b3d12650f98..44bc762eaec 100644
--- a/packages/react-core/src/helpers/FocusTrap/__tests__/Generated/FocusTrap.test.tsx
+++ b/packages/react-core/src/helpers/FocusTrap/__tests__/Generated/FocusTrap.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { FocusTrap } from '../../FocusTrap';
 
diff --git a/packages/react-core/src/helpers/GenerateId/GenerateId.ts b/packages/react-core/src/helpers/GenerateId/GenerateId.ts
index a6baa49887a..8732012caa9 100644
--- a/packages/react-core/src/helpers/GenerateId/GenerateId.ts
+++ b/packages/react-core/src/helpers/GenerateId/GenerateId.ts
@@ -10,8 +10,7 @@
  *  </GenerateId>
  *  );
  */
-
-import * as React from 'react';
+import { Component } from 'react';
 import { getUniqueId } from '../util';
 
 let currentId = 0;
@@ -34,7 +33,7 @@ export interface GenerateIdProps {
   isRandom?: boolean;
 }
 
-class GenerateId extends React.Component<GenerateIdProps, {}> {
+class GenerateId extends Component<GenerateIdProps, {}> {
   static displayName = 'GenerateId';
   static defaultProps = {
     prefix: 'pf-random-id-',
diff --git a/packages/react-core/src/helpers/GenerateId/__mocks__/GenerateId.ts b/packages/react-core/src/helpers/GenerateId/__mocks__/GenerateId.ts
index 64269706265..4c7079b2e5a 100644
--- a/packages/react-core/src/helpers/GenerateId/__mocks__/GenerateId.ts
+++ b/packages/react-core/src/helpers/GenerateId/__mocks__/GenerateId.ts
@@ -1,6 +1,6 @@
-import * as React from 'react';
+import { Component } from 'react';
 import { GenerateIdProps } from '../GenerateId';
-class GenerateId extends React.Component<GenerateIdProps, {}> {
+class GenerateId extends Component<GenerateIdProps, {}> {
   static displayName = 'GenerateId';
 
   render() {
diff --git a/packages/react-core/src/helpers/GenerateId/__tests__/GenerateId.test.tsx b/packages/react-core/src/helpers/GenerateId/__tests__/GenerateId.test.tsx
index d2fa294c6ea..b53d4e04c0e 100644
--- a/packages/react-core/src/helpers/GenerateId/__tests__/GenerateId.test.tsx
+++ b/packages/react-core/src/helpers/GenerateId/__tests__/GenerateId.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { GenerateId } from '../GenerateId';
 
diff --git a/packages/react-core/src/helpers/KeyboardHandler.tsx b/packages/react-core/src/helpers/KeyboardHandler.tsx
index ea21885330e..eb9cded147f 100644
--- a/packages/react-core/src/helpers/KeyboardHandler.tsx
+++ b/packages/react-core/src/helpers/KeyboardHandler.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 import { canUseDOM } from './util';
 
 export interface KeyboardHandlerProps {
@@ -203,7 +203,7 @@ export const onToggleArrowKeydownDefault = (event: KeyboardEvent, menuRef: React
   focusableElement && (focusableElement as HTMLElement).focus();
 };
 
-class KeyboardHandler extends React.Component<KeyboardHandlerProps> {
+class KeyboardHandler extends Component<KeyboardHandlerProps> {
   static displayName = 'KeyboardHandler';
   static defaultProps: KeyboardHandlerProps = {
     containerRef: null,
@@ -255,7 +255,7 @@ class KeyboardHandler extends React.Component<KeyboardHandlerProps> {
     // Pass the event off to be handled by any custom handler
     additionalKeyHandler && additionalKeyHandler(event);
 
-    // Initalize navigableElements from the createNavigableElements callback
+    // Initialize navigableElements from the createNavigableElements callback
     const navigableElements = createNavigableElements();
     if (!navigableElements) {
       // eslint-disable-next-line no-console
diff --git a/packages/react-core/src/helpers/OUIA/OUIA.md b/packages/react-core/src/helpers/OUIA/OUIA.md
index 4c2135f52f3..da2167535c0 100644
--- a/packages/react-core/src/helpers/OUIA/OUIA.md
+++ b/packages/react-core/src/helpers/OUIA/OUIA.md
@@ -2,6 +2,7 @@
 id: Open UI Automation
 section: developer-resources
 ---
+import { Fragment } from 'react';
 
 ## About Open UI Automation
 
@@ -40,15 +41,15 @@ component.
 ### Example
 
 ```js
-import React from 'react';
+import { Fragment } from 'react';
 import { Button } from '@patternfly/react-core';
 
-<React.Fragment>
+<Fragment>
   <Button>Button</Button>
   <br />
   <br />
   <Button ouiaId="static_id">Button with ouiaId</Button>
-</React.Fragment>
+</Fragment>
 ```
 
 ## OUIA-compliant PatternFly 5 components
diff --git a/packages/react-core/src/helpers/Popper/Popper.tsx b/packages/react-core/src/helpers/Popper/Popper.tsx
index 771d46c0f91..3d0dc501614 100644
--- a/packages/react-core/src/helpers/Popper/Popper.tsx
+++ b/packages/react-core/src/helpers/Popper/Popper.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement, isValidElement, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import * as ReactDOM from 'react-dom';
 import { usePopper } from './thirdparty/react-popper/usePopper';
 import { Placement, Modifier } from './thirdparty/popper-core';
@@ -215,17 +215,17 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
   onShown = () => {},
   preventOverflow = false
 }) => {
-  const [triggerElement, setTriggerElement] = React.useState(null);
-  const [refElement, setRefElement] = React.useState<HTMLElement>(null);
-  const [popperElement, setPopperElement] = React.useState<HTMLElement>(null);
-  const [popperContent, setPopperContent] = React.useState(null);
-  const [ready, setReady] = React.useState(false);
-  const [opacity, setOpacity] = React.useState(0);
-  const [internalIsVisible, setInternalIsVisible] = React.useState(isVisible);
-  const transitionTimerRef = React.useRef(null);
-  const showTimerRef = React.useRef(null);
-  const hideTimerRef = React.useRef(null);
-  const prevExitDelayRef = React.useRef<number>(undefined);
+  const [triggerElement, setTriggerElement] = useState(null);
+  const [refElement, setRefElement] = useState<HTMLElement>(null);
+  const [popperElement, setPopperElement] = useState<HTMLElement>(null);
+  const [popperContent, setPopperContent] = useState(null);
+  const [ready, setReady] = useState(false);
+  const [opacity, setOpacity] = useState(0);
+  const [internalIsVisible, setInternalIsVisible] = useState(isVisible);
+  const transitionTimerRef = useRef(null);
+  const showTimerRef = useRef(null);
+  const hideTimerRef = useRef(null);
+  const prevExitDelayRef = useRef<number>(undefined);
 
   const refOrTrigger = refElement || triggerElement;
   const showPopper = isVisible || internalIsVisible;
@@ -233,7 +233,7 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
   const triggerParent = ((triggerRef as React.RefObject<any>)?.current || triggerElement)?.parentElement;
   const languageDirection = getLanguageDirection(triggerParent);
 
-  const internalPosition = React.useMemo<'left' | 'right' | 'center'>(() => {
+  const internalPosition = useMemo<'left' | 'right' | 'center'>(() => {
     const fixedPositions = { left: 'left', right: 'right', center: 'center' };
 
     const positionMap = {
@@ -252,25 +252,25 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
     return positionMap[languageDirection][position] as 'left' | 'right' | 'center';
   }, [position, languageDirection]);
 
-  const onDocumentClickCallback = React.useCallback(
+  const onDocumentClickCallback = useCallback(
     (event: MouseEvent) => onDocumentClick(event, refOrTrigger, popperElement),
     [showPopper, triggerElement, refElement, popperElement, onDocumentClick]
   );
 
-  React.useEffect(() => {
+  useEffect(() => {
     setReady(true);
     onMount();
   }, []);
 
   // Cancel all timers on unmount
-  React.useEffect(
+  useEffect(
     () => () => {
       clearTimeouts([transitionTimerRef, hideTimerRef, showTimerRef]);
     },
     []
   );
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (triggerRef) {
       if ((triggerRef as React.RefObject<any>).current) {
         setRefElement((triggerRef as React.RefObject<any>).current);
@@ -279,7 +279,7 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
       }
     }
   }, [triggerRef, trigger]);
-  React.useEffect(() => {
+  useEffect(() => {
     // When the popperRef is defined or the popper visibility changes, ensure the popper element is up to date
     if (popperRef) {
       if ((popperRef as React.RefObject<any>).current) {
@@ -289,7 +289,7 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
       }
     }
   }, [showPopper, popperRef]);
-  React.useEffect(() => {
+  useEffect(() => {
     // Trigger a Popper update when content changes.
     const observer = new MutationObserver(() => {
       update && update();
@@ -312,7 +312,7 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
     }
   };
 
-  React.useEffect(() => {
+  useEffect(() => {
     addEventListener(onMouseEnter, refOrTrigger, 'mouseenter');
     addEventListener(onMouseLeave, refOrTrigger, 'mouseleave');
     addEventListener(onFocus, refOrTrigger, 'focus');
@@ -364,13 +364,13 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
     }
     return convertedPlacement as Placement;
   };
-  const getPlacementMemo = React.useMemo(getPlacement, [direction, internalPosition, placement]);
-  const getOppositePlacementMemo = React.useMemo(
+  const getPlacementMemo = useMemo(getPlacement, [direction, internalPosition, placement]);
+  const getOppositePlacementMemo = useMemo(
     () => getOppositePlacement(getPlacement()),
     [direction, internalPosition, placement]
   );
 
-  const widthMods: Modifier<'widthMods', {}> = React.useMemo(
+  const widthMods: Modifier<'widthMods', {}> = useMemo(
     () => ({
       name: 'widthMods',
       enabled: width !== undefined || minWidth !== undefined || maxWidth !== undefined,
@@ -446,7 +446,7 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
   /** We want to forceUpdate only when a tooltip's content is dynamically updated.
    * TODO: Investigate into 3rd party libraries for a less limited/specific solution
    */
-  React.useEffect(() => {
+  useEffect(() => {
     // currentPopperContent = {tooltip children} || {dropdown children}
     const currentPopperContent =
       popper?.props?.children?.[1]?.props?.children || popper?.props?.children?.props?.children;
@@ -457,7 +457,7 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
     }
   }, [popper]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (prevExitDelayRef.current < exitDelay) {
       clearTimeouts([transitionTimerRef, hideTimerRef]);
       hideTimerRef.current = setTimeout(() => {
@@ -491,7 +491,7 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
     }, exitDelay);
   };
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (isVisible) {
       show();
     } else {
@@ -522,7 +522,7 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
   };
 
   const getMenuWithPopper = () => {
-    const localPopper = React.cloneElement(popper, options);
+    const localPopper = cloneElement(popper, options);
 
     return popperRef ? (
       localPopper
@@ -549,7 +549,7 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
 
   return (
     <>
-      {!triggerRef && trigger && React.isValidElement(trigger) && (
+      {!triggerRef && trigger && isValidElement(trigger) && (
         <div
           style={{ display: 'contents' }}
           ref={(node) => {
@@ -559,7 +559,7 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
           {trigger}
         </div>
       )}
-      {triggerRef && trigger && React.isValidElement(trigger) && trigger}
+      {triggerRef && trigger && isValidElement(trigger) && trigger}
       {ready && showPopper && getPopper()}
     </>
   );
diff --git a/packages/react-core/src/helpers/Popper/thirdparty/react-popper/usePopper.ts b/packages/react-core/src/helpers/Popper/thirdparty/react-popper/usePopper.ts
index e5ae319470f..97b99893ae4 100644
--- a/packages/react-core/src/helpers/Popper/thirdparty/react-popper/usePopper.ts
+++ b/packages/react-core/src/helpers/Popper/thirdparty/react-popper/usePopper.ts
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
-
-import * as React from 'react';
+import { useMemo, useRef, useState } from 'react';
 import { createPopper as defaultCreatePopper, Options as PopperOptions, VirtualElement } from '../popper-core/popper';
 import { useIsomorphicLayoutEffect } from '../../../../helpers/useIsomorphicLayout';
 
@@ -41,7 +40,7 @@ export const usePopper = (
   popperElement: HTMLElement | null | undefined,
   options: Options = {}
 ) => {
-  const prevOptions = React.useRef<PopperOptions | null | undefined>(null);
+  const prevOptions = useRef<PopperOptions | null | undefined>(null);
 
   const optionsWithDefaults = {
     onFirstUpdate: options.onFirstUpdate,
@@ -50,7 +49,7 @@ export const usePopper = (
     modifiers: options.modifiers || EMPTY_MODIFIERS
   };
 
-  const [state, setState] = React.useState<State>({
+  const [state, setState] = useState<State>({
     styles: {
       popper: {
         position: optionsWithDefaults.strategy,
@@ -61,7 +60,7 @@ export const usePopper = (
     attributes: {}
   });
 
-  const updateStateModifier = React.useMemo(
+  const updateStateModifier = useMemo(
     () => ({
       name: 'updateState',
       enabled: true,
@@ -80,7 +79,7 @@ export const usePopper = (
     []
   );
 
-  const popperOptions = React.useMemo(() => {
+  const popperOptions = useMemo(() => {
     const newOptions = {
       onFirstUpdate: optionsWithDefaults.onFirstUpdate,
       placement: optionsWithDefaults.placement,
@@ -102,7 +101,7 @@ export const usePopper = (
     updateStateModifier
   ]);
 
-  const popperInstanceRef = React.useRef<any>(undefined);
+  const popperInstanceRef = useRef<any>(undefined);
 
   useIsomorphicLayoutEffect(() => {
     if (popperInstanceRef && popperInstanceRef.current) {
diff --git a/packages/react-core/src/helpers/useInterval.ts b/packages/react-core/src/helpers/useInterval.ts
index 39a29dc722c..c9846683963 100644
--- a/packages/react-core/src/helpers/useInterval.ts
+++ b/packages/react-core/src/helpers/useInterval.ts
@@ -1,18 +1,17 @@
-import * as React from 'react';
-
 /** This is a custom React hook in a format suggest by Dan Abramov in a blog post here:
  * https://overreacted.io/making-setinterval-declarative-with-react-hooks/. It allows setInterval to be used
  * declaratively in functional React components.
  */
+import { useEffect, useRef } from 'react';
 
 export function useInterval(callback: () => void, delay: number | null) {
-  const savedCallback = React.useRef(() => {});
+  const savedCallback = useRef(() => {});
 
-  React.useEffect(() => {
+  useEffect(() => {
     savedCallback.current = callback;
   }, [callback]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     function tick() {
       savedCallback.current();
     }
diff --git a/packages/react-core/src/helpers/useIsomorphicLayout.ts b/packages/react-core/src/helpers/useIsomorphicLayout.ts
index 57ae7e83c62..a782a54570b 100644
--- a/packages/react-core/src/helpers/useIsomorphicLayout.ts
+++ b/packages/react-core/src/helpers/useIsomorphicLayout.ts
@@ -1,7 +1,7 @@
-import * as React from 'react';
+import { useEffect, useLayoutEffect } from 'react';
 import { canUseDOM } from './util';
 
 /**
  * Small wrapper around `useLayoutEffect` to get rid of the warning on SSR envs
  */
-export const useIsomorphicLayoutEffect = canUseDOM ? React.useLayoutEffect : React.useEffect;
+export const useIsomorphicLayoutEffect = canUseDOM ? useLayoutEffect : useEffect;
diff --git a/packages/react-core/src/layouts/Bullseye/Bullseye.tsx b/packages/react-core/src/layouts/Bullseye/Bullseye.tsx
index f2f26bbf299..c3d6c4b6397 100644
--- a/packages/react-core/src/layouts/Bullseye/Bullseye.tsx
+++ b/packages/react-core/src/layouts/Bullseye/Bullseye.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/layouts/Bullseye/bullseye';
 
diff --git a/packages/react-core/src/layouts/Bullseye/__tests__/Bullseye.test.tsx b/packages/react-core/src/layouts/Bullseye/__tests__/Bullseye.test.tsx
index 8c802d6689e..26850ef6786 100644
--- a/packages/react-core/src/layouts/Bullseye/__tests__/Bullseye.test.tsx
+++ b/packages/react-core/src/layouts/Bullseye/__tests__/Bullseye.test.tsx
@@ -1,4 +1,4 @@
-import React, { type JSX } from 'react';
+import { type JSX } from 'react';
 import { render, screen } from '@testing-library/react';
 import { Bullseye } from '../Bullseye';
 
diff --git a/packages/react-core/src/layouts/Bullseye/examples/Bullseye.md b/packages/react-core/src/layouts/Bullseye/examples/Bullseye.md
index c96b5ac14c6..fbafa25a1f9 100644
--- a/packages/react-core/src/layouts/Bullseye/examples/Bullseye.md
+++ b/packages/react-core/src/layouts/Bullseye/examples/Bullseye.md
@@ -12,7 +12,6 @@ import './bullseye.css';
 ### Basic
 
 ```js
-import React from 'react';
 import { Bullseye } from '@patternfly/react-core';
 
 <Bullseye>
diff --git a/packages/react-core/src/layouts/Flex/Flex.tsx b/packages/react-core/src/layouts/Flex/Flex.tsx
index 92399cc7aca..256673a1984 100644
--- a/packages/react-core/src/layouts/Flex/Flex.tsx
+++ b/packages/react-core/src/layouts/Flex/Flex.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/layouts/Flex/flex';
 import * as flexToken from '@patternfly/react-tokens/dist/esm/l_flex_item_Order';
diff --git a/packages/react-core/src/layouts/Flex/FlexItem.tsx b/packages/react-core/src/layouts/Flex/FlexItem.tsx
index 84e70586c80..c4c5b5f8c28 100644
--- a/packages/react-core/src/layouts/Flex/FlexItem.tsx
+++ b/packages/react-core/src/layouts/Flex/FlexItem.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/layouts/Flex/flex';
 import * as flexToken from '@patternfly/react-tokens/dist/esm/l_flex_item_Order';
diff --git a/packages/react-core/src/layouts/Flex/__tests__/Flex.test.tsx b/packages/react-core/src/layouts/Flex/__tests__/Flex.test.tsx
index b42acf03c89..5fbc29280ac 100644
--- a/packages/react-core/src/layouts/Flex/__tests__/Flex.test.tsx
+++ b/packages/react-core/src/layouts/Flex/__tests__/Flex.test.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 import { render, screen } from '@testing-library/react';
 
 import { Flex } from '../Flex';
diff --git a/packages/react-core/src/layouts/Flex/__tests__/Generated/FlexItem.test.tsx b/packages/react-core/src/layouts/Flex/__tests__/Generated/FlexItem.test.tsx
index a6b9cbf69ff..82c39c4fd9f 100644
--- a/packages/react-core/src/layouts/Flex/__tests__/Generated/FlexItem.test.tsx
+++ b/packages/react-core/src/layouts/Flex/__tests__/Generated/FlexItem.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { FlexItem } from '../../FlexItem';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/layouts/Flex/examples/Flex.md b/packages/react-core/src/layouts/Flex/examples/Flex.md
index 2e9351aff3b..7b639836198 100644
--- a/packages/react-core/src/layouts/Flex/examples/Flex.md
+++ b/packages/react-core/src/layouts/Flex/examples/Flex.md
@@ -12,7 +12,6 @@ import './flex.css';
 ### Basic
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex>
@@ -27,7 +26,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Nesting
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex>
@@ -46,7 +44,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Nested with items
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex>
@@ -77,7 +74,6 @@ The flex layout provides two ways of spacing its direct children.
 ### Individually spaced
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex>
@@ -95,7 +91,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Spacing xl
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex spaceItems={{ default: 'spaceItemsXl' }}>
@@ -110,7 +105,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Spacing none
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex spaceItems={{ default: 'spaceItemsNone' }}>
@@ -127,7 +121,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Row gap
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex rowGap={{ default: 'rowGap2xl' }}>
@@ -147,7 +140,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Column gap
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex columnGap={{ default: 'columnGap2xl' }}>
@@ -167,7 +159,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Gap
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex gap={{ default: 'gap2xl' }}>
@@ -189,7 +180,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Default layout
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex className="example-border">
@@ -204,7 +194,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Inline
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex className="example-border" display={{ default: 'inlineFlex' }}>
@@ -219,7 +208,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Using canGrow
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex>
@@ -241,7 +229,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Adjusting width
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex>
@@ -263,7 +250,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Specifying column widths
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex>
@@ -287,7 +273,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Column layout
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex direction={{ default: 'column' }}>
@@ -300,7 +285,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Stacking elements
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex direction={{ default: 'column' }}>
@@ -322,7 +306,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Nesting elements in columns
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex>
@@ -343,7 +326,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Switching between direction column and row
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex direction={{ default: 'column', lg: 'row' }}>
@@ -363,7 +345,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Controlling width of text
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex direction={{ default: 'column', lg: 'row' }}>
@@ -386,7 +367,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Aligning right
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex className="example-border">
@@ -401,7 +381,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Align right on single item
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex className="example-border">
@@ -413,7 +392,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Align right on multiple groups
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex>
@@ -435,7 +413,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Align adjacent content
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex>
@@ -455,7 +432,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Align self flex end
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex>
@@ -474,7 +450,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Align self center
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex>
@@ -493,7 +468,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Align self baseline
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex>
@@ -512,7 +486,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Align self stretch
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex>
@@ -533,7 +506,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Justify content flex end
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex className="example-border" justifyContent={{ default: 'justifyContentFlexEnd' }}>
@@ -547,7 +519,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Justify content space between
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex className="example-border" justifyContent={{ default: 'justifyContentSpaceBetween' }}>
@@ -560,7 +531,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Justify content flex start
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex className="example-border" justifyContent={{ default: 'justifyContentFlexStart' }}>
@@ -575,7 +545,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### First last ordering
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex className="example-border">
@@ -592,7 +561,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Responsive first last ordering
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex className="example-border">
@@ -611,7 +579,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Ordering
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex className="example-border">
@@ -639,7 +606,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Responsive ordering
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex className="example-border">
@@ -668,7 +634,6 @@ import { Flex, FlexItem } from '@patternfly/react-core';
 ### Alternative components
 
 ```js
-import React from 'react';
 import { Flex, FlexItem } from '@patternfly/react-core';
 
 <Flex component="ul">
diff --git a/packages/react-core/src/layouts/Gallery/Gallery.tsx b/packages/react-core/src/layouts/Gallery/Gallery.tsx
index 358b7f3afb0..2937f63ccee 100644
--- a/packages/react-core/src/layouts/Gallery/Gallery.tsx
+++ b/packages/react-core/src/layouts/Gallery/Gallery.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/layouts/Gallery/gallery';
 import cssGridTemplateColumnsMin from '@patternfly/react-tokens/dist/esm/l_gallery_GridTemplateColumns_min';
diff --git a/packages/react-core/src/layouts/Gallery/GalleryItem.tsx b/packages/react-core/src/layouts/Gallery/GalleryItem.tsx
index 50e9b374e18..a4df982b7c6 100644
--- a/packages/react-core/src/layouts/Gallery/GalleryItem.tsx
+++ b/packages/react-core/src/layouts/Gallery/GalleryItem.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 export interface GalleryItemProps extends React.HTMLProps<HTMLDivElement> {
   /** content rendered inside the Gallery Item */
   children?: React.ReactNode;
diff --git a/packages/react-core/src/layouts/Gallery/__tests__/Gallery.test.tsx b/packages/react-core/src/layouts/Gallery/__tests__/Gallery.test.tsx
index a2fa5ed115d..f74f25abf34 100644
--- a/packages/react-core/src/layouts/Gallery/__tests__/Gallery.test.tsx
+++ b/packages/react-core/src/layouts/Gallery/__tests__/Gallery.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Gallery } from '../Gallery';
 import { GalleryItem } from '../GalleryItem';
 import { render } from '@testing-library/react';
diff --git a/packages/react-core/src/layouts/Gallery/__tests__/Generated/GalleryItem.test.tsx b/packages/react-core/src/layouts/Gallery/__tests__/Generated/GalleryItem.test.tsx
index 160b4012f06..4acdbbfcc01 100644
--- a/packages/react-core/src/layouts/Gallery/__tests__/Generated/GalleryItem.test.tsx
+++ b/packages/react-core/src/layouts/Gallery/__tests__/Generated/GalleryItem.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { GalleryItem } from '../../GalleryItem';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/layouts/Gallery/examples/Gallery.md b/packages/react-core/src/layouts/Gallery/examples/Gallery.md
index 0ea04561a56..eb504e8d0e7 100644
--- a/packages/react-core/src/layouts/Gallery/examples/Gallery.md
+++ b/packages/react-core/src/layouts/Gallery/examples/Gallery.md
@@ -12,7 +12,6 @@ import './gallery.css';
 ### Basic
 
 ```js
-import React from 'react';
 import { Gallery, GalleryItem } from '@patternfly/react-core';
 
 <Gallery>
@@ -30,7 +29,6 @@ import { Gallery, GalleryItem } from '@patternfly/react-core';
 ### With gutters
 
 ```js
-import React from 'react';
 import { Gallery, GalleryItem } from '@patternfly/react-core';
 
 <Gallery hasGutter>
@@ -46,7 +44,6 @@ import { Gallery, GalleryItem } from '@patternfly/react-core';
 ### Adjusting min widths
 
 ```js
-import React from 'react';
 import { Gallery, GalleryItem } from '@patternfly/react-core';
 
 <Gallery
@@ -72,7 +69,6 @@ import { Gallery, GalleryItem } from '@patternfly/react-core';
 ### Adjusting max widths
 
 ```js
-import React from 'react';
 import { Gallery, GalleryItem } from '@patternfly/react-core';
 
 <Gallery
@@ -97,7 +93,6 @@ import { Gallery, GalleryItem } from '@patternfly/react-core';
 ### Adjusting min and max widths
 
 ```js
-import React from 'react';
 import { Gallery, GalleryItem } from '@patternfly/react-core';
 
 <Gallery
@@ -126,7 +121,6 @@ import { Gallery, GalleryItem } from '@patternfly/react-core';
 ### Alternative components
 
 ```js
-import React from 'react';
 import { Gallery, GalleryItem } from '@patternfly/react-core';
 
 <Gallery component="ul">
diff --git a/packages/react-core/src/layouts/Grid/Grid.tsx b/packages/react-core/src/layouts/Grid/Grid.tsx
index 08293715c77..e1ef6dccdaf 100644
--- a/packages/react-core/src/layouts/Grid/Grid.tsx
+++ b/packages/react-core/src/layouts/Grid/Grid.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/layouts/Grid/grid';
 import { css } from '@patternfly/react-styles';
 import { DeviceSizes } from '../../styles/sizes';
diff --git a/packages/react-core/src/layouts/Grid/GridItem.tsx b/packages/react-core/src/layouts/Grid/GridItem.tsx
index 4d420d7e888..7007c6431a9 100644
--- a/packages/react-core/src/layouts/Grid/GridItem.tsx
+++ b/packages/react-core/src/layouts/Grid/GridItem.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/layouts/Grid/grid';
 import { css } from '@patternfly/react-styles';
 import { DeviceSizes } from '../../styles/sizes';
diff --git a/packages/react-core/src/layouts/Grid/__tests__/Grid.test.tsx b/packages/react-core/src/layouts/Grid/__tests__/Grid.test.tsx
index d720bcfefd2..3db82cbca37 100644
--- a/packages/react-core/src/layouts/Grid/__tests__/Grid.test.tsx
+++ b/packages/react-core/src/layouts/Grid/__tests__/Grid.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Grid } from '../Grid';
 import { GridItem } from '../GridItem';
 import { render } from '@testing-library/react';
diff --git a/packages/react-core/src/layouts/Grid/__tests__/GridItem.test.tsx b/packages/react-core/src/layouts/Grid/__tests__/GridItem.test.tsx
index 1e3c04de9bf..9bfe67c0609 100644
--- a/packages/react-core/src/layouts/Grid/__tests__/GridItem.test.tsx
+++ b/packages/react-core/src/layouts/Grid/__tests__/GridItem.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { GridItem } from '../GridItem';
 import { render } from '@testing-library/react';
 import { DeviceSizes } from '../../../styles/sizes';
diff --git a/packages/react-core/src/layouts/Grid/examples/Grid.md b/packages/react-core/src/layouts/Grid/examples/Grid.md
index e5047fa754a..46de6c7f310 100644
--- a/packages/react-core/src/layouts/Grid/examples/Grid.md
+++ b/packages/react-core/src/layouts/Grid/examples/Grid.md
@@ -12,7 +12,6 @@ import './grid.css';
 ### Basic
 
 ```js
-import React from 'react';
 import { Grid, GridItem } from '@patternfly/react-core';
 
 <Grid>
@@ -38,7 +37,6 @@ import { Grid, GridItem } from '@patternfly/react-core';
 ### With gutters
 
 ```js
-import React from 'react';
 import { Grid, GridItem } from '@patternfly/react-core';
 
 <Grid hasGutter>
@@ -64,7 +62,6 @@ import { Grid, GridItem } from '@patternfly/react-core';
 ### With overrides
 
 ```js
-import React from 'react';
 import { Grid, GridItem } from '@patternfly/react-core';
 
 <Grid sm={6} md={4} lg={3} xl2={1}>
@@ -90,7 +87,6 @@ import { Grid, GridItem } from '@patternfly/react-core';
 ### Standard ordering
 
 ```js
-import React from 'react';
 import { Grid, GridItem } from '@patternfly/react-core';
 
 <Grid hasGutter span={3}>
@@ -103,7 +99,6 @@ import { Grid, GridItem } from '@patternfly/react-core';
 ### Responsive ordering
 
 ```js
-import React from 'react';
 import { Grid, GridItem } from '@patternfly/react-core';
 
 <Grid hasGutter span={3}>
@@ -116,7 +111,6 @@ import { Grid, GridItem } from '@patternfly/react-core';
 ### Grouped ordering
 
 ```js
-import React from 'react';
 import { Grid, GridItem } from '@patternfly/react-core';
 
 <Grid hasGutter span={12}>
@@ -138,7 +132,6 @@ import { Grid, GridItem } from '@patternfly/react-core';
 ### Alternative components
 
 ```js
-import React from 'react';
 import { Grid, GridItem } from '@patternfly/react-core';
 
 <Grid component="ul">
diff --git a/packages/react-core/src/layouts/Level/Level.tsx b/packages/react-core/src/layouts/Level/Level.tsx
index 0b6784cb484..634fb9cae37 100644
--- a/packages/react-core/src/layouts/Level/Level.tsx
+++ b/packages/react-core/src/layouts/Level/Level.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/layouts/Level/level';
 
diff --git a/packages/react-core/src/layouts/Level/LevelItem.tsx b/packages/react-core/src/layouts/Level/LevelItem.tsx
index dbae2b1ddd2..9e7a6af588e 100644
--- a/packages/react-core/src/layouts/Level/LevelItem.tsx
+++ b/packages/react-core/src/layouts/Level/LevelItem.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 export interface LevelItemProps extends React.HTMLProps<HTMLDivElement> {
   /** content rendered inside the Level Layout Item */
   children?: React.ReactNode;
diff --git a/packages/react-core/src/layouts/Level/__tests__/Generated/LevelItem.test.tsx b/packages/react-core/src/layouts/Level/__tests__/Generated/LevelItem.test.tsx
index 2d527d239e9..80f565dcac2 100644
--- a/packages/react-core/src/layouts/Level/__tests__/Generated/LevelItem.test.tsx
+++ b/packages/react-core/src/layouts/Level/__tests__/Generated/LevelItem.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { LevelItem } from '../../LevelItem';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/layouts/Level/__tests__/Level.test.tsx b/packages/react-core/src/layouts/Level/__tests__/Level.test.tsx
index 8b5f2ea5cd1..9572628ec8c 100644
--- a/packages/react-core/src/layouts/Level/__tests__/Level.test.tsx
+++ b/packages/react-core/src/layouts/Level/__tests__/Level.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Level } from '../Level';
 import { LevelItem } from '../LevelItem';
 import { render } from '@testing-library/react';
diff --git a/packages/react-core/src/layouts/Level/examples/Level.md b/packages/react-core/src/layouts/Level/examples/Level.md
index b5b659b620f..9311b69f606 100644
--- a/packages/react-core/src/layouts/Level/examples/Level.md
+++ b/packages/react-core/src/layouts/Level/examples/Level.md
@@ -12,7 +12,6 @@ import './level.css';
 ### Basic
 
 ```js
-import React from 'react';
 import { Level, LevelItem } from '@patternfly/react-core';
 
 <Level>
@@ -25,7 +24,6 @@ import { Level, LevelItem } from '@patternfly/react-core';
 ### With gutters
 
 ```js
-import React from 'react';
 import { Level, LevelItem } from '@patternfly/react-core';
 
 <Level hasGutter>
diff --git a/packages/react-core/src/layouts/Split/Split.tsx b/packages/react-core/src/layouts/Split/Split.tsx
index 2b28600f54e..dea71b6a996 100644
--- a/packages/react-core/src/layouts/Split/Split.tsx
+++ b/packages/react-core/src/layouts/Split/Split.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/layouts/Split/split';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/layouts/Split/SplitItem.tsx b/packages/react-core/src/layouts/Split/SplitItem.tsx
index bbdb5e30d26..ff30b93d1f1 100644
--- a/packages/react-core/src/layouts/Split/SplitItem.tsx
+++ b/packages/react-core/src/layouts/Split/SplitItem.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/layouts/Split/split';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/layouts/Split/__tests__/Generated/SplitItem.test.tsx b/packages/react-core/src/layouts/Split/__tests__/Generated/SplitItem.test.tsx
index af36910de2b..54bfa497428 100644
--- a/packages/react-core/src/layouts/Split/__tests__/Generated/SplitItem.test.tsx
+++ b/packages/react-core/src/layouts/Split/__tests__/Generated/SplitItem.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { SplitItem } from '../../SplitItem';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/layouts/Split/__tests__/Split.test.tsx b/packages/react-core/src/layouts/Split/__tests__/Split.test.tsx
index f3bb76c48b1..34659593d5c 100644
--- a/packages/react-core/src/layouts/Split/__tests__/Split.test.tsx
+++ b/packages/react-core/src/layouts/Split/__tests__/Split.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { Split } from '../Split';
 import { SplitItem } from '../SplitItem';
diff --git a/packages/react-core/src/layouts/Split/examples/Split.md b/packages/react-core/src/layouts/Split/examples/Split.md
index 0830f3a985b..501a3f24c66 100644
--- a/packages/react-core/src/layouts/Split/examples/Split.md
+++ b/packages/react-core/src/layouts/Split/examples/Split.md
@@ -12,7 +12,6 @@ import './split.css';
 ### Basic
 
 ```js
-import React from 'react';
 import { Split, SplitItem } from '@patternfly/react-core';
 
 <Split>
@@ -25,7 +24,6 @@ import { Split, SplitItem } from '@patternfly/react-core';
 ### With gutter
 
 ```js
-import React from 'react';
 import { Split, SplitItem } from '@patternfly/react-core';
 
 <Split hasGutter>
@@ -38,7 +36,6 @@ import { Split, SplitItem } from '@patternfly/react-core';
 ### Wrappable
 
 ```js
-import React from 'react';
 import { Split, SplitItem } from '@patternfly/react-core';
 
 <Split hasGutter isWrappable>
diff --git a/packages/react-core/src/layouts/Stack/Stack.tsx b/packages/react-core/src/layouts/Stack/Stack.tsx
index 1aa2f945e16..df0d2326b23 100644
--- a/packages/react-core/src/layouts/Stack/Stack.tsx
+++ b/packages/react-core/src/layouts/Stack/Stack.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/layouts/Stack/stack';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/layouts/Stack/StackItem.tsx b/packages/react-core/src/layouts/Stack/StackItem.tsx
index 3df743e65c3..928056df035 100644
--- a/packages/react-core/src/layouts/Stack/StackItem.tsx
+++ b/packages/react-core/src/layouts/Stack/StackItem.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/layouts/Stack/stack';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-core/src/layouts/Stack/__tests__/Generated/StackItem.test.tsx b/packages/react-core/src/layouts/Stack/__tests__/Generated/StackItem.test.tsx
index 38ab064b77f..478e183bb1b 100644
--- a/packages/react-core/src/layouts/Stack/__tests__/Generated/StackItem.test.tsx
+++ b/packages/react-core/src/layouts/Stack/__tests__/Generated/StackItem.test.tsx
@@ -1,7 +1,6 @@
 /**
  * This test was generated
  */
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { StackItem } from '../../StackItem';
 // any missing imports can usually be resolved by adding them here
diff --git a/packages/react-core/src/layouts/Stack/__tests__/Stack.test.tsx b/packages/react-core/src/layouts/Stack/__tests__/Stack.test.tsx
index 185248f03f1..279c3432202 100644
--- a/packages/react-core/src/layouts/Stack/__tests__/Stack.test.tsx
+++ b/packages/react-core/src/layouts/Stack/__tests__/Stack.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { Stack } from '../Stack';
 import { StackItem } from '../StackItem';
diff --git a/packages/react-core/src/layouts/Stack/examples/Stack.md b/packages/react-core/src/layouts/Stack/examples/Stack.md
index 5569e4d4ef5..fdb34f40ff1 100644
--- a/packages/react-core/src/layouts/Stack/examples/Stack.md
+++ b/packages/react-core/src/layouts/Stack/examples/Stack.md
@@ -12,7 +12,6 @@ import './stack.css';
 ### Basic
 
 ```js
-import React from 'react';
 import { Stack, StackItem } from '@patternfly/react-core';
 
 <Stack>
@@ -25,7 +24,6 @@ import { Stack, StackItem } from '@patternfly/react-core';
 ### With gutter
 
 ```js
-import React from 'react';
 import { Stack, StackItem } from '@patternfly/react-core';
 
 <Stack hasGutter>
diff --git a/packages/react-docs/README.md b/packages/react-docs/README.md
index 8ea3e31562a..be417ab9c6f 100644
--- a/packages/react-docs/README.md
+++ b/packages/react-docs/README.md
@@ -16,7 +16,6 @@ Include JS code blocks:
 ``````md
 ### Your example title
 ```js
-import React from 'react';
 import { YourComponent } from '@patternfly/react-core';
 
 BasicExample = () => (
diff --git a/packages/react-docs/patternfly-docs/pages/icons.js b/packages/react-docs/patternfly-docs/pages/icons.js
index f3e9500bbaa..fd66ba337b9 100644
--- a/packages/react-docs/patternfly-docs/pages/icons.js
+++ b/packages/react-docs/patternfly-docs/pages/icons.js
@@ -1,4 +1,4 @@
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
+// eslint-disable-next-line
 import React from 'react';
 import { Content } from '@patternfly/react-core/dist/esm/components/Content';
 import { Grid, GridItem } from '@patternfly/react-core/dist/esm/layouts/Grid';
diff --git a/packages/react-docs/patternfly-docs/pages/index.js b/packages/react-docs/patternfly-docs/pages/index.js
index 320a08c48d5..0da5002610d 100644
--- a/packages/react-docs/patternfly-docs/pages/index.js
+++ b/packages/react-docs/patternfly-docs/pages/index.js
@@ -1,4 +1,4 @@
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
+// eslint-disable-next-line
 import React from 'react';
 import { PageSection } from '@patternfly/react-core/dist/esm/components/Page/PageSection';
 import { Title } from '@patternfly/react-core/dist/esm/components/Title';
diff --git a/packages/react-drag-drop/src/components/DragDrop/DragButton.tsx b/packages/react-drag-drop/src/components/DragDrop/DragButton.tsx
index c416afa2433..3c42ce1e1ad 100644
--- a/packages/react-drag-drop/src/components/DragDrop/DragButton.tsx
+++ b/packages/react-drag-drop/src/components/DragDrop/DragButton.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import { Button } from '@patternfly/react-core/dist/esm/components/Button';
 import dragButtonStyles from '@patternfly/react-styles/css/components/DataList/data-list';
diff --git a/packages/react-drag-drop/src/components/DragDrop/DragDropContainer.tsx b/packages/react-drag-drop/src/components/DragDrop/DragDropContainer.tsx
index 3ae9cb28f30..68bf81048d2 100644
--- a/packages/react-drag-drop/src/components/DragDrop/DragDropContainer.tsx
+++ b/packages/react-drag-drop/src/components/DragDrop/DragDropContainer.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import * as ReactDOM from 'react-dom';
 import { css } from '@patternfly/react-styles';
 import {
@@ -79,17 +79,17 @@ export const DragDropContainer: React.FunctionComponent<DragDropContainerProps>
   overlayProps,
   ...props
 }: DragDropContainerProps) => {
-  const itemsCopy = React.useRef<Record<string, DraggableObject[]> | null>(null);
-  const hasRecentlyMovedContainer = React.useRef(false);
-  const [activeId, setActiveId] = React.useState<UniqueIdentifier>(null);
-  const lastOverId = React.useRef<UniqueIdentifier | null>(null);
+  const itemsCopy = useRef<Record<string, DraggableObject[]> | null>(null);
+  const hasRecentlyMovedContainer = useRef(false);
+  const [activeId, setActiveId] = useState<UniqueIdentifier>(null);
+  const lastOverId = useRef<UniqueIdentifier | null>(null);
 
-  const findItem = React.useCallback(
+  const findItem = useCallback(
     (id: UniqueIdentifier, containerId: UniqueIdentifier) => items[containerId].find((item) => item.id === id),
     [items]
   );
 
-  const findContainer = React.useCallback(
+  const findContainer = useCallback(
     (id: UniqueIdentifier) => {
       if (id in items) {
         return id;
@@ -106,7 +106,7 @@ export const DragDropContainer: React.FunctionComponent<DragDropContainerProps>
     })
   );
 
-  const collisionDetectionStrategy: CollisionDetection = React.useCallback(
+  const collisionDetectionStrategy: CollisionDetection = useCallback(
     (args) => {
       if (activeId && activeId in items) {
         return closestCenter({
@@ -146,7 +146,7 @@ export const DragDropContainer: React.FunctionComponent<DragDropContainerProps>
     [activeId, items]
   );
 
-  React.useEffect(() => {
+  useEffect(() => {
     requestAnimationFrame(() => {
       hasRecentlyMovedContainer.current = false;
     });
diff --git a/packages/react-drag-drop/src/components/DragDrop/DragDropSort.tsx b/packages/react-drag-drop/src/components/DragDrop/DragDropSort.tsx
index 37235a23310..e099212134d 100644
--- a/packages/react-drag-drop/src/components/DragDrop/DragDropSort.tsx
+++ b/packages/react-drag-drop/src/components/DragDrop/DragDropSort.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useMemo } from 'react';
 import { DndContextProps, DragEndEvent, DragStartEvent } from '@dnd-kit/core';
 import { Droppable } from './Droppable';
 import { DragDropContainer, DraggableObject } from './DragDropContainer';
@@ -38,7 +38,7 @@ export const DragDropSort: React.FunctionComponent<DragDropSortProps> = ({
   overlayProps,
   ...props
 }: DragDropSortProps) => {
-  const itemIds = React.useMemo(() => (items ? Array.from(items, (item) => item.id as string) : []), [items]);
+  const itemIds = useMemo(() => (items ? Array.from(items, (item) => item.id as string) : []), [items]);
 
   const handleDragStart = (event: DragStartEvent) => {
     onDrag(event, itemIds.indexOf(event.active.id as string));
diff --git a/packages/react-drag-drop/src/components/DragDrop/Draggable.tsx b/packages/react-drag-drop/src/components/DragDrop/Draggable.tsx
index c675f9236de..71b2bcf2c98 100644
--- a/packages/react-drag-drop/src/components/DragDrop/Draggable.tsx
+++ b/packages/react-drag-drop/src/components/DragDrop/Draggable.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import { css } from '@patternfly/react-styles';
diff --git a/packages/react-drag-drop/src/components/DragDrop/DraggableDataListItem.tsx b/packages/react-drag-drop/src/components/DragDrop/DraggableDataListItem.tsx
index b2549d8b8a9..ae0afa365b5 100644
--- a/packages/react-drag-drop/src/components/DragDrop/DraggableDataListItem.tsx
+++ b/packages/react-drag-drop/src/components/DragDrop/DraggableDataListItem.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import { css } from '@patternfly/react-styles';
diff --git a/packages/react-drag-drop/src/components/DragDrop/DraggableDualListSelectorListItem.tsx b/packages/react-drag-drop/src/components/DragDrop/DraggableDualListSelectorListItem.tsx
index c7804f09e17..734ca7b28e1 100644
--- a/packages/react-drag-drop/src/components/DragDrop/DraggableDualListSelectorListItem.tsx
+++ b/packages/react-drag-drop/src/components/DragDrop/DraggableDualListSelectorListItem.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useContext } from 'react';
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import { css } from '@patternfly/react-styles';
@@ -42,7 +42,7 @@ export const DraggableDualListSelectorListItem: React.FunctionComponent<Draggabl
     animateLayoutChanges: () => false
   });
 
-  const { setFocusedOption } = React.useContext(DualListSelectorListContext);
+  const { setFocusedOption } = useContext(DualListSelectorListContext);
 
   const style = {
     transform: CSS.Transform.toString(transform),
diff --git a/packages/react-drag-drop/src/components/DragDrop/Droppable.tsx b/packages/react-drag-drop/src/components/DragDrop/Droppable.tsx
index 9d05930cd1d..40265d1b827 100644
--- a/packages/react-drag-drop/src/components/DragDrop/Droppable.tsx
+++ b/packages/react-drag-drop/src/components/DragDrop/Droppable.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement, useMemo } from 'react';
 import { useDroppable } from '@dnd-kit/core';
 import { DraggableObject } from './DragDropContainer';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
@@ -17,7 +17,7 @@ interface DroppableProps extends React.HTMLProps<HTMLDivElement> {
   wrapper?: React.ReactElement<any>;
   /** The variant determines which component wraps the draggable object.
    * Default variant wraps the draggable object in a div.
-   * DataList vairant wraps the draggable object in a DataListItem
+   * DataList variant wraps the draggable object in a DataListItem
    * DualListSelectorList variant wraps the draggable objects in a DualListSelectorListItem and a div.pf-c-dual-list-selector__item-text element
    * TableComposable variant wraps the draggable objects in TODO
    * */
@@ -31,7 +31,7 @@ export const Droppable: React.FunctionComponent<DroppableProps> = ({
   wrapper,
   ...props
 }: DroppableProps) => {
-  const itemIds = React.useMemo(() => (items ? Array.from(items, (item) => item.id as string) : []), [items]);
+  const itemIds = useMemo(() => (items ? Array.from(items, (item) => item.id as string) : []), [items]);
   const { setNodeRef } = useDroppable({ id: id ? id : 'droppable' });
 
   const content = items.map((item: DraggableObject) => {
@@ -60,7 +60,7 @@ export const Droppable: React.FunctionComponent<DroppableProps> = ({
   return (
     <SortableContext items={itemIds} strategy={verticalListSortingStrategy} id={id}>
       {wrapper &&
-        React.cloneElement(wrapper, {
+        cloneElement(wrapper, {
           children: content,
           ref: setNodeRef,
           ...props
diff --git a/packages/react-drag-drop/src/components/DragDrop/__tests__/DragDrop.test.tsx b/packages/react-drag-drop/src/components/DragDrop/__tests__/DragDrop.test.tsx
index 98a08bf4c91..30e172a999b 100644
--- a/packages/react-drag-drop/src/components/DragDrop/__tests__/DragDrop.test.tsx
+++ b/packages/react-drag-drop/src/components/DragDrop/__tests__/DragDrop.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render } from '@testing-library/react';
 import { DragDropSort } from '../';
 
diff --git a/packages/react-drag-drop/src/components/DragDrop/examples/BasicSorting.tsx b/packages/react-drag-drop/src/components/DragDrop/examples/BasicSorting.tsx
index 40021ef9f60..a4a11fc529e 100644
--- a/packages/react-drag-drop/src/components/DragDrop/examples/BasicSorting.tsx
+++ b/packages/react-drag-drop/src/components/DragDrop/examples/BasicSorting.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { useState } from 'react';
 import { DragDropSort, DraggableObject } from '@patternfly/react-drag-drop';
 
 export const BasicSorting: React.FunctionComponent = () => {
-  const [items, setItems] = React.useState<DraggableObject[]>([
+  const [items, setItems] = useState<DraggableObject[]>([
     { id: 'basic-1', content: 'one' },
     { id: 'basic-2', content: 'two' },
     { id: 'basic-3', content: 'three' }
diff --git a/packages/react-drag-drop/src/components/DragDrop/examples/DataListDraggable.tsx b/packages/react-drag-drop/src/components/DragDrop/examples/DataListDraggable.tsx
index d67ac52f4b8..c12d9d12806 100644
--- a/packages/react-drag-drop/src/components/DragDrop/examples/DataListDraggable.tsx
+++ b/packages/react-drag-drop/src/components/DragDrop/examples/DataListDraggable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { DataList, DataListCell, DataListCheck, DataListControl, DataListItemCells } from '@patternfly/react-core';
 import { DragDropSort, DraggableObject } from '@patternfly/react-drag-drop';
 
@@ -22,7 +22,7 @@ const getItems = (count: number): DraggableObject[] =>
   }));
 
 export const DataListDraggable: React.FunctionComponent = (props) => {
-  const [items, setItems] = React.useState<DraggableObject[]>(getItems(10));
+  const [items, setItems] = useState<DraggableObject[]>(getItems(10));
 
   return (
     <DragDropSort
diff --git a/packages/react-drag-drop/src/components/DragDrop/examples/DragDrop.md b/packages/react-drag-drop/src/components/DragDrop/examples/DragDrop.md
index 8ce4a288a14..df654c6c5f8 100644
--- a/packages/react-drag-drop/src/components/DragDrop/examples/DragDrop.md
+++ b/packages/react-drag-drop/src/components/DragDrop/examples/DragDrop.md
@@ -8,6 +8,7 @@ hideNavItem: true
 
 Note: This drag and drop implementation lives in its own package at [@patternfly/react-drag-drop](https://www.npmjs.com/package/@patternfly/react-drag-drop)!
 
+import { useState } from 'react';
 import AngleDoubleLeftIcon from '@patternfly/react-icons/dist/esm/icons/angle-double-left-icon';
 import AngleLeftIcon from '@patternfly/react-icons/dist/esm/icons/angle-left-icon';
 import AngleDoubleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-double-right-icon';
diff --git a/packages/react-drag-drop/src/components/DragDrop/examples/DragDropContainerBasic.tsx b/packages/react-drag-drop/src/components/DragDrop/examples/DragDropContainerBasic.tsx
index cd0e98f95f4..0dbe0970fdc 100644
--- a/packages/react-drag-drop/src/components/DragDrop/examples/DragDropContainerBasic.tsx
+++ b/packages/react-drag-drop/src/components/DragDrop/examples/DragDropContainerBasic.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   Droppable as NewDroppable,
   DraggableObject,
@@ -9,7 +9,7 @@ import {
 } from '@patternfly/react-drag-drop';
 
 export const DragDropContainerBasic: React.FunctionComponent = () => {
-  const [allItems, setAllItems] = React.useState<Record<string, DraggableObject[]>>({
+  const [allItems, setAllItems] = useState<Record<string, DraggableObject[]>>({
     container1: [
       { id: 'button-1', content: 'one' },
       { id: 'button-2', content: 'two' },
diff --git a/packages/react-drag-drop/src/components/DragDrop/examples/DragDropContainerDataList.tsx b/packages/react-drag-drop/src/components/DragDrop/examples/DragDropContainerDataList.tsx
index 1de1688a061..b3bbe22875f 100644
--- a/packages/react-drag-drop/src/components/DragDrop/examples/DragDropContainerDataList.tsx
+++ b/packages/react-drag-drop/src/components/DragDrop/examples/DragDropContainerDataList.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   DataList,
   DataListCell,
@@ -35,7 +35,7 @@ const getItems = (from: number, count: number): DraggableObject[] =>
   }));
 
 export const DataListDraggable: React.FunctionComponent = (props) => {
-  const [items, setItems] = React.useState<Record<string, DraggableObject[]>>({
+  const [items, setItems] = useState<Record<string, DraggableObject[]>>({
     group1: getItems(0, 5),
     group2: getItems(5, 5)
   });
diff --git a/packages/react-drag-drop/src/components/DragDrop/examples/DragDropContainerDualListSelector.tsx b/packages/react-drag-drop/src/components/DragDrop/examples/DragDropContainerDualListSelector.tsx
index ea058fdb452..a2aa634cc25 100644
--- a/packages/react-drag-drop/src/components/DragDrop/examples/DragDropContainerDualListSelector.tsx
+++ b/packages/react-drag-drop/src/components/DragDrop/examples/DragDropContainerDualListSelector.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useEffect, useState } from 'react';
 import {
   DualListSelector,
   DualListSelectorPane,
@@ -14,21 +14,21 @@ import AngleDoubleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-d
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
 
 export const DragDropContainerDualListSelector: React.FunctionComponent = () => {
-  const [ignoreNextOptionSelect, setIgnoreNextOptionSelect] = React.useState(false);
-  const [availableOptions, setAvailableOptions] = React.useState<DraggableObject[]>([
+  const [ignoreNextOptionSelect, setIgnoreNextOptionSelect] = useState(false);
+  const [availableOptions, setAvailableOptions] = useState<DraggableObject[]>([
     { id: 'Apple', content: 'Apple', props: { key: 'Apple', isSelected: false } },
     { id: 'Banana', content: 'Banana', props: { key: 'Banana', isSelected: false } },
     { id: 'Pineapple', content: 'Pineapple', props: { key: 'Pineapple', isSelected: false } }
   ]);
 
-  const [chosenOptions, setChosenOptions] = React.useState<DraggableObject[]>([
+  const [chosenOptions, setChosenOptions] = useState<DraggableObject[]>([
     { id: 'Orange', content: 'Orange', props: { key: 'Orange', isSelected: false } },
     { id: 'Grape', content: 'Grape', props: { key: 'Grape', isSelected: false } },
     { id: 'Peach', content: 'Peach', props: { key: 'Peach', isSelected: false } },
     { id: 'Strawberry', content: 'Strawberry', props: { key: 'Strawberry', isSelected: false } }
   ]);
 
-  const [allDraggableItems, setAllItems] = React.useState<Record<string, DraggableObject[]>>({
+  const [allDraggableItems, setAllItems] = useState<Record<string, DraggableObject[]>>({
     available: availableOptions.map((option, index) => ({
       ...option,
       props: {
@@ -53,7 +53,7 @@ export const DragDropContainerDualListSelector: React.FunctionComponent = () =>
     setAllItems(items);
   };
 
-  React.useEffect(() => {
+  useEffect(() => {
     setAllItems({
       available: availableOptions.map((option, index) => ({
         ...option,
diff --git a/packages/react-drag-drop/src/components/DragDrop/examples/DragDropDemos.md b/packages/react-drag-drop/src/components/DragDrop/examples/DragDropDemos.md
index 0cfb7ef0665..0c2f9540e73 100644
--- a/packages/react-drag-drop/src/components/DragDrop/examples/DragDropDemos.md
+++ b/packages/react-drag-drop/src/components/DragDrop/examples/DragDropDemos.md
@@ -7,6 +7,7 @@ propComponents: ['DragDropSort', 'DraggableObject']
 
 Note: This drag and drop implementation lives in its own package at [@patternfly/react-drag-drop](https://www.npmjs.com/package/@patternfly/react-drag-drop)!
 
+import { useEffect, useState } from 'react';
 import AngleDoubleLeftIcon from '@patternfly/react-icons/dist/esm/icons/angle-double-left-icon';
 import AngleLeftIcon from '@patternfly/react-icons/dist/esm/icons/angle-left-icon';
 import AngleDoubleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-double-right-icon';
diff --git a/packages/react-drag-drop/src/components/DragDrop/examples/DualListSelectorDraggable.tsx b/packages/react-drag-drop/src/components/DragDrop/examples/DualListSelectorDraggable.tsx
index 21329fe1476..8b65aeb8d28 100644
--- a/packages/react-drag-drop/src/components/DragDrop/examples/DualListSelectorDraggable.tsx
+++ b/packages/react-drag-drop/src/components/DragDrop/examples/DualListSelectorDraggable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   DualListSelector,
   DualListSelectorPane,
@@ -15,14 +15,14 @@ import AngleDoubleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-d
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
 
 export const ComposableDualListSelector: React.FunctionComponent = () => {
-  const [ignoreNextOptionSelect, setIgnoreNextOptionSelect] = React.useState(false);
-  const [availableOptions, setAvailableOptions] = React.useState<DraggableObject[]>([
+  const [ignoreNextOptionSelect, setIgnoreNextOptionSelect] = useState(false);
+  const [availableOptions, setAvailableOptions] = useState<DraggableObject[]>([
     { id: 'Apple', content: 'Apple', props: { key: 'Apple', isSelected: false } },
     { id: 'Banana', content: 'Banana', props: { key: 'Banana', isSelected: false } },
     { id: 'Pineapple', content: 'Pineapple', props: { key: 'Pineapple', isSelected: false } }
   ]);
 
-  const [chosenOptions, setChosenOptions] = React.useState<DraggableObject[]>([
+  const [chosenOptions, setChosenOptions] = useState<DraggableObject[]>([
     { id: 'Orange', content: 'Orange', props: { key: 'Orange', isSelected: false } },
     { id: 'Grape', content: 'Grape', props: { key: 'Grape', isSelected: false } },
     { id: 'Peach', content: 'Peach', props: { key: 'Peach', isSelected: false } },
diff --git a/packages/react-icons/src/__tests__/createIcon.test.tsx b/packages/react-icons/src/__tests__/createIcon.test.tsx
index bd72064c422..a84da563b2a 100644
--- a/packages/react-icons/src/__tests__/createIcon.test.tsx
+++ b/packages/react-icons/src/__tests__/createIcon.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { createIcon } from '../createIcon';
 
@@ -29,7 +28,7 @@ test('aria-hidden is true if no title is specified', () => {
   expect(screen.getByRole('img', { hidden: true })).toHaveAttribute('aria-hidden', 'true');
 });
 
-test('title is not renderd if a title is not passed', () => {
+test('title is not rendered if a title is not passed', () => {
   render(<SVGIcon />);
   expect(screen.queryByRole('img', { hidden: true })?.querySelector('title')).toBeNull();
 });
diff --git a/packages/react-icons/src/createIcon.tsx b/packages/react-icons/src/createIcon.tsx
index c38737d652a..12c3af5de5e 100644
--- a/packages/react-icons/src/createIcon.tsx
+++ b/packages/react-icons/src/createIcon.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 
 export interface IconDefinition {
   name?: string;
@@ -27,7 +27,7 @@ export function createIcon({
   height,
   svgPath
 }: IconDefinition): React.ComponentClass<SVGIconProps> {
-  return class SVGIcon extends React.Component<SVGIconProps> {
+  return class SVGIcon extends Component<SVGIconProps> {
     static displayName = name;
 
     id = `icon-title-${currentId++}`;
diff --git a/packages/react-integration/demo-app-ts/src/App.tsx b/packages/react-integration/demo-app-ts/src/App.tsx
index a46fecc8a8d..b223861c0e5 100755
--- a/packages/react-integration/demo-app-ts/src/App.tsx
+++ b/packages/react-integration/demo-app-ts/src/App.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component, createElement } from 'react';
 import { BrowserRouter as Router, Route, Link, Routes } from 'react-router-dom';
 import { Avatar } from '@patternfly/react-core/dist/esm/components/Avatar';
 import { Brand } from '@patternfly/react-core/dist/esm/components/Brand';
@@ -33,7 +33,7 @@ interface AppState {
   isDarkTheme: boolean;
 }
 
-class App extends React.Component<{}, AppState> {
+class App extends Component<{}, AppState> {
   state: AppState = {
     activeItem: '',
     isNavOpen: true,
@@ -67,9 +67,7 @@ class App extends React.Component<{}, AppState> {
         {Demos.map((demo) => (
           <Route
             path={`/${demo.id}-nav-link`}
-            element={
-              <PageSection id={`/${demo.id}-page-section`}>{React.createElement(demo.componentType)}</PageSection>
-            }
+            element={<PageSection id={`/${demo.id}-page-section`}>{createElement(demo.componentType)}</PageSection>}
             key={demo.id}
           />
         ))}
@@ -78,7 +76,7 @@ class App extends React.Component<{}, AppState> {
             path="/"
             element={
               <PageSection id={`/${defaultDemo.id}-page-section`}>
-                {React.createElement(defaultDemo.componentType)}
+                {createElement(defaultDemo.componentType)}
               </PageSection>
             }
             key={defaultDemo.id}
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/AboutModal/AboutModalDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/AboutModal/AboutModalDemo.tsx
index 30aa5e8f5a7..4f7e2d42b03 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/AboutModal/AboutModalDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/AboutModal/AboutModalDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import { AboutModal, Button, Content } from '@patternfly/react-core';
 const brandImg = '../../../assets/images/brandImg.svg';
 
@@ -6,7 +6,7 @@ interface AboutModalState {
   isModalOpen: boolean;
 }
 
-export class AboutModalDemo extends React.Component<{}, AboutModalState> {
+export class AboutModalDemo extends Component<{}, AboutModalState> {
   static displayName = 'AboutModalDemo';
   constructor(props: {}) {
     super(props);
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/Accordion/AccordionDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/Accordion/AccordionDemo.tsx
index 0c8673805fc..483342d1ca4 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/Accordion/AccordionDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/Accordion/AccordionDemo.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { useState } from 'react';
 import { Accordion, AccordionItem, AccordionContent, AccordionToggle } from '@patternfly/react-core';
 
 export const AccordionDemo = () => {
-  const [expanded, setExpanded] = React.useState('');
+  const [expanded, setExpanded] = useState('');
 
   const onToggle = (id: string) => {
     if (id === expanded) {
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/AlertDemo/AlertDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/AlertDemo/AlertDemo.tsx
index 8934b159b19..1067818727f 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/AlertDemo/AlertDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/AlertDemo/AlertDemo.tsx
@@ -1,5 +1,5 @@
+import { Component } from 'react';
 import { Alert, AlertActionCloseButton } from '@patternfly/react-core';
-import React from 'react';
 import UserIcon from '@patternfly/react-icons/dist/esm/icons/user-icon';
 
 interface AlertDemoState {
@@ -7,7 +7,7 @@ interface AlertDemoState {
   alertTwoVisible: boolean;
 }
 
-export class AlertDemo extends React.Component<{}, AlertDemoState> {
+export class AlertDemo extends Component<{}, AlertDemoState> {
   static displayName = 'AlertDemo';
   constructor(props: {}) {
     super(props);
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/AlertDemo/AlertTimeoutCloseButtonDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/AlertDemo/AlertTimeoutCloseButtonDemo.tsx
index 357959dd58d..237b2bf107f 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/AlertDemo/AlertTimeoutCloseButtonDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/AlertDemo/AlertTimeoutCloseButtonDemo.tsx
@@ -1,11 +1,11 @@
+import { Component } from 'react';
 import { Alert, Button, AlertActionCloseButton } from '@patternfly/react-core';
-import React from 'react';
 
 interface AlertTimeoutCloseButtonDemoState {
   isOpenAlert: boolean;
 }
 
-export class AlertTimeoutCloseButtonDemo extends React.Component<{}, AlertTimeoutCloseButtonDemoState> {
+export class AlertTimeoutCloseButtonDemo extends Component<{}, AlertTimeoutCloseButtonDemoState> {
   static displayName = 'AlertTimeoutCloseButtonDemo';
   constructor(props: {}) {
     super(props);
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/AlertGroupDemo/AlertGroupDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/AlertGroupDemo/AlertGroupDemo.tsx
index bcf7d90e2e5..38a6aea1412 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/AlertGroupDemo/AlertGroupDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/AlertGroupDemo/AlertGroupDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import {
   Alert,
   AlertGroup,
@@ -21,7 +21,7 @@ interface AlertGroupDemoState {
   timer: number;
 }
 
-export class AlertGroupDemo extends React.Component<{}, AlertGroupDemoState> {
+export class AlertGroupDemo extends Component<{}, AlertGroupDemoState> {
   static displayName = 'AlertGroupDemo';
   stopAsyncAlerts: () => void;
   removeAlert: (key: number | string) => void;
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/AlertGroupDemo/AlertGroupTimeoutFromBottomDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/AlertGroupDemo/AlertGroupTimeoutFromBottomDemo.tsx
index 0316b1d18cc..7043f7e8fa3 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/AlertGroupDemo/AlertGroupTimeoutFromBottomDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/AlertGroupDemo/AlertGroupTimeoutFromBottomDemo.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { useState } from 'react';
 import { Alert, AlertActionLink, AlertGroup, Button } from '@patternfly/react-core';
 
 export const AlertGroupTimeoutFromBottomDemo: React.FunctionComponent = () => {
-  const [alerts, setAlerts] = React.useState<React.ReactNode[]>([]);
-  const [count, setCount] = React.useState(0);
+  const [alerts, setAlerts] = useState<React.ReactNode[]>([]);
+  const [count, setCount] = useState(0);
   const onClick = () => {
     const timeout = 3000;
     setAlerts((prevAlerts) => [
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/BreadcrumbDemo/BreadcrumbDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/BreadcrumbDemo/BreadcrumbDemo.tsx
index 6192b843e55..de181bc61c9 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/BreadcrumbDemo/BreadcrumbDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/BreadcrumbDemo/BreadcrumbDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import {
   Badge,
   Breadcrumb,
@@ -13,7 +13,7 @@ import {
 import AngleLeftIcon from '@patternfly/react-icons/dist/esm/icons/angle-left-icon';
 import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon';
 
-export class BreadcrumbDemo extends React.Component {
+export class BreadcrumbDemo extends Component {
   static displayName = 'BreadcrumbDemo';
   state = {
     isOpen: false
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ChipDemo/ChipDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ChipDemo/ChipDemo.tsx
index 306a011a92c..b8b288e5dd1 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/ChipDemo/ChipDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/ChipDemo/ChipDemo.tsx
@@ -1,5 +1,4 @@
 import { Chip } from '@patternfly/react-core/deprecated';
-import React from 'react';
 
 export const ChipDemo: React.FunctionComponent = () => (
   <>
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ClipboardCopyDemo/ClipboardCopyDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ClipboardCopyDemo/ClipboardCopyDemo.tsx
index 35475bdd8e4..6c0c7cbd33e 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/ClipboardCopyDemo/ClipboardCopyDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/ClipboardCopyDemo/ClipboardCopyDemo.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Component } from 'react';
 import { ClipboardCopy, ClipboardCopyVariant, ClipboardCopyAction, Button } from '@patternfly/react-core';
 import PlayIcon from '@patternfly/react-icons/dist/esm/icons/play-icon';
 
-export class ClipboardCopyDemo extends React.Component {
+export class ClipboardCopyDemo extends Component {
   static displayName = 'ClipboardCopyDemo';
   render() {
     return (
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/CodeEditorDemo/CodeEditorDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/CodeEditorDemo/CodeEditorDemo.tsx
index 3abfc4bb554..65241fb2829 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/CodeEditorDemo/CodeEditorDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/CodeEditorDemo/CodeEditorDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import { CodeEditor, CodeEditorControl, CodeEditorProps, Language } from '@patternfly/react-code-editor';
 import { Button, Checkbox } from '@patternfly/react-core';
 import PlayIcon from '@patternfly/react-icons/dist/esm/icons/play-icon';
@@ -11,7 +11,7 @@ interface CodeEditorDemoState {
   code: string;
 }
 
-export class CodeEditorDemo extends React.Component<CodeEditorProps, CodeEditorDemoState> {
+export class CodeEditorDemo extends Component<CodeEditorProps, CodeEditorDemoState> {
   static displayName = 'CodeEditorDemo';
   constructor(props: CodeEditorProps) {
     super(props);
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/DataListDemo/DataListCompactDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/DataListDemo/DataListCompactDemo.tsx
index baf9442b25d..ae83d04b17d 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/DataListDemo/DataListCompactDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/DataListDemo/DataListCompactDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import {
   DataList,
   DataListProps,
@@ -12,7 +12,7 @@ interface DataListState {
   selectedDataListItemId: string;
 }
 
-export class DataListCompactDemo extends React.Component<DataListProps, DataListState> {
+export class DataListCompactDemo extends Component<DataListProps, DataListState> {
   static displayName = 'DataListCompactDemo';
   constructor(props: DataListProps) {
     super(props);
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/DataListDemo/DataListDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/DataListDemo/DataListDemo.tsx
index 148a36ce629..1c6bc304f71 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/DataListDemo/DataListDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/DataListDemo/DataListDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import {
   DataList,
   DataListProps,
@@ -20,7 +20,7 @@ interface DataListState {
   isOpen: boolean;
 }
 
-class DataListDemo extends React.Component<DataListProps, DataListState> {
+class DataListDemo extends Component<DataListProps, DataListState> {
   static displayName = 'DataListDemo';
   constructor(props: DataListProps) {
     super(props);
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/DataListDemo/DataListDraggableDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/DataListDemo/DataListDraggableDemo.tsx
index 0e075a9a0de..1209643f571 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/DataListDemo/DataListDraggableDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/DataListDemo/DataListDraggableDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import {
   DataList,
   DataListItem,
@@ -28,7 +28,7 @@ const reorder = (list: ItemType[], startIndex: number, endIndex: number) => {
   return result;
 };
 
-class DataListDraggableDemo extends React.Component {
+class DataListDraggableDemo extends Component {
   static displayName = 'DataListDraggableDemo';
   state = {
     liveText: '',
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/DatePickerDemo/DatePickerDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/DatePickerDemo/DatePickerDemo.tsx
index c04bccd85b8..9f95c7b734d 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/DatePickerDemo/DatePickerDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/DatePickerDemo/DatePickerDemo.tsx
@@ -1,9 +1,9 @@
+import { useRef, useState } from 'react';
 import { DatePicker, DatePickerRef } from '@patternfly/react-core';
-import React from 'react';
 
 export const DatePickerDemo = () => {
-  const [value, setValue] = React.useState('2020-03-18');
-  const controlledDateRef = React.useRef<DatePickerRef>(null);
+  const [value, setValue] = useState('2020-03-18');
+  const controlledDateRef = useRef<DatePickerRef>(null);
 
   const rangeValidator = (date: Date) => {
     if (date < new Date('2020-03-17')) {
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/DrawerDemo/DrawerDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/DrawerDemo/DrawerDemo.tsx
index 29f328907a5..6286a8a2330 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/DrawerDemo/DrawerDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/DrawerDemo/DrawerDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import { Component, createRef } from 'react';
 import {
   Button,
   Drawer,
@@ -27,7 +27,7 @@ export class DrawerDemo extends Component<DrawerProps, DrawerDemoState> {
     isCustomFocusExpanded: false
   };
 
-  drawerRef = React.createRef<HTMLButtonElement>();
+  drawerRef = createRef<HTMLButtonElement>();
 
   onExpand = () => {
     this.drawerRef.current && this.drawerRef.current.focus();
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/DrawerDemo/DrawerResizeDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/DrawerDemo/DrawerResizeDemo.tsx
index 081a7e122e1..4ed02138d99 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/DrawerDemo/DrawerResizeDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/DrawerDemo/DrawerResizeDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component, createRef } from 'react';
 import {
   Button,
   Drawer,
@@ -17,7 +17,7 @@ export interface DrawerResizeDemoState {
   panelWidth: number;
 }
 
-export class DrawerResizeDemo extends React.Component<DrawerProps, DrawerResizeDemoState> {
+export class DrawerResizeDemo extends Component<DrawerProps, DrawerResizeDemoState> {
   static displayName = 'DrawerDemo';
   constructor(props: DrawerProps) {
     super(props);
@@ -26,7 +26,7 @@ export class DrawerResizeDemo extends React.Component<DrawerProps, DrawerResizeD
       panelWidth: 200
     };
   }
-  drawerRef = React.createRef<HTMLButtonElement>();
+  drawerRef = createRef<HTMLButtonElement>();
 
   onExpand = () => {
     this.drawerRef.current && this.drawerRef.current.focus();
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/DropdownDemo/DropdownDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/DropdownDemo/DropdownDemo.tsx
index 9d3fb458b62..badfaac07f8 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/DropdownDemo/DropdownDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/DropdownDemo/DropdownDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { Dropdown, DropdownList, DropdownItem, Divider, MenuToggle } from '@patternfly/react-core';
 
 const dropDownItems = (
@@ -35,8 +35,8 @@ const dropDownItems = (
 );
 
 export const DropdownDemo: React.FunctionComponent = () => {
-  const [isOpen, setIsOpen] = React.useState(false);
-  const [isNoAutofocusOpen, setIsNoAutofocusOpen] = React.useState(false);
+  const [isOpen, setIsOpen] = useState(false);
+  const [isNoAutofocusOpen, setIsNoAutofocusOpen] = useState(false);
 
   const onToggleClick = () => {
     setIsOpen(!isOpen);
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDemo/DualListSelectorBasicDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDemo/DualListSelectorBasicDemo.tsx
index 784c4c7c96d..28f11388e8a 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDemo/DualListSelectorBasicDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDemo/DualListSelectorBasicDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   DualListSelector,
   DualListSelectorPane,
@@ -19,13 +19,13 @@ interface Option {
 }
 
 export const DualListSelectorBasicDemo: React.FunctionComponent = () => {
-  const [availableOptions, setAvailableOptions] = React.useState<Option[]>([
+  const [availableOptions, setAvailableOptions] = useState<Option[]>([
     { text: 'Option 1', selected: false, isVisible: true },
     { text: 'Option 2', selected: false, isVisible: true },
     { text: 'Option 3', selected: false, isVisible: true },
     { text: 'Option 4', selected: false, isVisible: true }
   ]);
-  const [chosenOptions, setChosenOptions] = React.useState<Option[]>([]);
+  const [chosenOptions, setChosenOptions] = useState<Option[]>([]);
 
   // callback for moving selected options between lists
   const moveSelected = (fromAvailable: boolean) => {
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDemo/DualListSelectorTreeDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDemo/DualListSelectorTreeDemo.tsx
index 61324a39eae..8d2e6609e40 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDemo/DualListSelectorTreeDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDemo/DualListSelectorTreeDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useMemo, useState } from 'react';
 import {
   DualListSelector,
   DualListSelectorPane,
@@ -32,10 +32,10 @@ interface ExampleProps {
 }
 
 const DualListSelectorComposableTree: React.FunctionComponent<ExampleProps> = ({ data }: ExampleProps) => {
-  const [checkedLeafIds, setCheckedLeafIds] = React.useState<string[]>([]);
-  const [chosenLeafIds, setChosenLeafIds] = React.useState<string[]>(['beans', 'beef', 'chicken', 'tofu']);
-  const [chosenFilter, setChosenFilter] = React.useState<string>('');
-  const [availableFilter, setAvailableFilter] = React.useState<string>('');
+  const [checkedLeafIds, setCheckedLeafIds] = useState<string[]>([]);
+  const [chosenLeafIds, setChosenLeafIds] = useState<string[]>(['beans', 'beef', 'chicken', 'tofu']);
+  const [chosenFilter, setChosenFilter] = useState<string>('');
+  const [availableFilter, setAvailableFilter] = useState<string>('');
 
   // helper function to build memoized lists
   const buildTextById = (node: FoodNode): { [key: string]: string } => {
@@ -80,7 +80,7 @@ const DualListSelectorComposableTree: React.FunctionComponent<ExampleProps> = ({
   };
 
   // Builds a map of child leaf nodes by node id - memoized so that it only rebuilds the list if the data changes.
-  const { memoizedLeavesById, memoizedAllLeaves, memoizedNodeTexts } = React.useMemo(() => {
+  const { memoizedLeavesById, memoizedAllLeaves, memoizedNodeTexts } = useMemo(() => {
     let leavesById: { [key: string]: string[] } = {};
     let allLeaves: string[] = [];
     let nodeTexts: { [key: string]: string } = {};
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDemo/DualListSelectorWithActionsDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDemo/DualListSelectorWithActionsDemo.tsx
index 79c1093b63a..057c172872b 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDemo/DualListSelectorWithActionsDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDemo/DualListSelectorWithActionsDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import {
   Button,
   ButtonVariant,
@@ -39,21 +39,21 @@ interface Option {
 type SortDirection = 'asc' | 'desc';
 
 export const DualListSelectorWithActionsDemo: React.FunctionComponent = () => {
-  const [availableOptions, setAvailableOptions] = React.useState<Option[]>([
+  const [availableOptions, setAvailableOptions] = useState<Option[]>([
     { text: 'Option 1', selected: false, isVisible: true },
     { text: 'Option 2', selected: false, isVisible: true },
     { text: 'Option 3', selected: false, isVisible: true },
     { text: 'Option 4', selected: false, isVisible: true }
   ]);
 
-  const [chosenOptions, setChosenOptions] = React.useState<Option[]>([]);
-  const [isAvailableKebabOpen, setIsAvailableKebabOpen] = React.useState(false);
-  const [isChosenKebabOpen, setIsChosenKebabOpen] = React.useState(false);
-  const [availableFilter, setAvailableFilter] = React.useState('');
-  const [chosenFilter, setChosenFilter] = React.useState('');
-  const [availableSortDirection, setAvailableSortDirection] = React.useState<SortDirection>('desc');
-  const [chosenSortDirection, setChosenSortDirection] = React.useState<SortDirection>('desc');
-  const [isDisabled, setIsDisabled] = React.useState(false);
+  const [chosenOptions, setChosenOptions] = useState<Option[]>([]);
+  const [isAvailableKebabOpen, setIsAvailableKebabOpen] = useState(false);
+  const [isChosenKebabOpen, setIsChosenKebabOpen] = useState(false);
+  const [availableFilter, setAvailableFilter] = useState('');
+  const [chosenFilter, setChosenFilter] = useState('');
+  const [availableSortDirection, setAvailableSortDirection] = useState<SortDirection>('desc');
+  const [chosenSortDirection, setChosenSortDirection] = useState<SortDirection>('desc');
+  const [isDisabled, setIsDisabled] = useState(false);
 
   // callback for moving selected options between lists
   const moveSelected = (fromAvailable: boolean) => {
@@ -257,7 +257,7 @@ export const DualListSelectorWithActionsDemo: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <DualListSelector>
         <DualListSelectorPane
           title="Available options"
@@ -355,6 +355,6 @@ export const DualListSelectorWithActionsDemo: React.FunctionComponent = () => {
         isChecked={isDisabled}
         onChange={() => setIsDisabled(!isDisabled)}
       />
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedBasicDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedBasicDemo.tsx
index 75d52e31a8b..ee1fd0f85f8 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedBasicDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedBasicDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import { Component } from 'react';
 import {
   DualListSelector as DLSDeprecated,
   DualListSelectorProps as DLSPropsDeprecated
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedTreeDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedTreeDemo.tsx
index 8e4b4dac0cc..8f7dbbad5d0 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedTreeDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedTreeDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import { Component } from 'react';
 import {
   DualListSelector as DLSDeprecated,
   DualListSelectorProps as DLSPropsDeprecated,
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedWithActionsDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedWithActionsDemo.tsx
index 4447bc1d896..9ddc114529e 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedWithActionsDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/DualListSelectorDeprecatedDemo/DualListSelectorDeprecatedWithActionsDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import { Button, ButtonVariant, Dropdown, DropdownItem, DropdownList, MenuToggle } from '@patternfly/react-core';
 import {
   DualListSelector as DLSDeprecated,
@@ -17,7 +17,7 @@ interface DualListSelectorState {
   chosenDescending: boolean;
 }
 
-class DualListSelectorDeprecatedWithActionsDemo extends React.Component<DLSPropsDeprecated, DualListSelectorState> {
+class DualListSelectorDeprecatedWithActionsDemo extends Component<DLSPropsDeprecated, DualListSelectorState> {
   static displayName = 'DualListSelectorDemo';
   onSort: (panel: string) => void;
   onListChange: (
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ExpandableSectionDemo/ExpandableSectionDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ExpandableSectionDemo/ExpandableSectionDemo.tsx
index 0bd22e40ba8..59168b4e26b 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/ExpandableSectionDemo/ExpandableSectionDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/ExpandableSectionDemo/ExpandableSectionDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import { ExpandableSection, ExpandableSectionToggle, Stack, StackItem } from '@patternfly/react-core';
 
 interface ExpandableSectionState {
@@ -7,7 +7,7 @@ interface ExpandableSectionState {
   isDisclosureExpanded: boolean;
 }
 
-export class ExpandableSectionDemo extends React.Component<null, ExpandableSectionState> {
+export class ExpandableSectionDemo extends Component<null, ExpandableSectionState> {
   static displayName = 'ExpandableSectionDemo';
   state = {
     isExpanded: false,
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ExpandableSectionDemo/ExpandableSectionTruncateDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ExpandableSectionDemo/ExpandableSectionTruncateDemo.tsx
index ab3e988b362..a87d91a4e37 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/ExpandableSectionDemo/ExpandableSectionTruncateDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/ExpandableSectionDemo/ExpandableSectionTruncateDemo.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import { useState } from 'react';
 import { ExpandableSection, ExpandableSectionVariant } from '@patternfly/react-core';
 
 export const ExpandableSectionTruncateDemo: React.FunctionComponent = () => {
-  const [isExpanded, setIsExpanded] = React.useState(false);
-  const [isResizableExpanded, setIsResizableExpanded] = React.useState(false);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const [isResizableExpanded, setIsResizableExpanded] = useState(false);
 
   const onToggle = (_event: React.MouseEvent, isExpanded: boolean) => {
     setIsExpanded(isExpanded);
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/FormDemo/FormDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/FormDemo/FormDemo.tsx
index b501f383d38..1f7444fe6ce 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/FormDemo/FormDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/FormDemo/FormDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import { Component, createRef } from 'react';
 import {
   Button,
   Divider,
@@ -74,8 +74,8 @@ export class FormDemo extends Component<FormProps, FormState> {
     this.handleCheckboxChange = this.handleCheckboxChange.bind(this);
   }
 
-  labelHelpRef: React.RefObject<HTMLSpanElement | null> = React.createRef();
-  textInputRef: React.RefObject<HTMLInputElement | null> = React.createRef();
+  labelHelpRef: React.RefObject<HTMLSpanElement | null> = createRef();
+  textInputRef: React.RefObject<HTMLInputElement | null> = createRef();
 
   handleTextInputChange = (_event: React.FormEvent<HTMLInputElement>, value: string) => {
     this.setState({ value, isValid: /^\d+$/.test(value) });
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/InputGroupDemo/InputGroupDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/InputGroupDemo/InputGroupDemo.tsx
index 8bda8622753..e1667b9824a 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/InputGroupDemo/InputGroupDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/InputGroupDemo/InputGroupDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import DollarSignIcon from '@patternfly/react-icons/dist/esm/icons/dollar-sign-icon';
 import AtIcon from '@patternfly/react-icons/dist/esm/icons/at-icon';
 import CalendarAltIcon from '@patternfly/react-icons/dist/esm/icons/calendar-alt-icon';
@@ -26,7 +26,7 @@ interface InputGroupState {
   selected: string;
 }
 
-export class InputGroupDemo extends React.Component<{}, InputGroupState> {
+export class InputGroupDemo extends Component<{}, InputGroupState> {
   static displayName = 'InputGroupDemo';
   onToggle: () => void;
   onSelect: (event: any) => void;
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/LoginPageDemo/LoginPageDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/LoginPageDemo/LoginPageDemo.tsx
index d128b8667ee..ac6ce379c76 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/LoginPageDemo/LoginPageDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/LoginPageDemo/LoginPageDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import { Component } from 'react';
 /* eslint-disable camelcase */
 import brandImg from '../../../assets/images/brandImgColor.svg';
 import pfbg_icon from '../../../assets/images/pfbg-icon.svg';
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/MastheadDemo/MastheadDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/MastheadDemo/MastheadDemo.tsx
index 700ebc2d8a6..c8433567a31 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/MastheadDemo/MastheadDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/MastheadDemo/MastheadDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import { Component } from 'react';
 import {
   Masthead,
   MastheadToggle,
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/MenuDemo/MenuDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/MenuDemo/MenuDemo.tsx
index b28c5afe881..2ede5594084 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/MenuDemo/MenuDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/MenuDemo/MenuDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import { Component } from 'react';
 
 import {
   Menu,
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/MenuDemo/MenuDrilldownDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/MenuDemo/MenuDrilldownDemo.tsx
index 41f34dc6989..3dfcf454c73 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/MenuDemo/MenuDrilldownDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/MenuDemo/MenuDrilldownDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import { Component } from 'react';
 import { Menu, MenuContent, MenuList, MenuItem, Divider, DrilldownMenu } from '@patternfly/react-core';
 import StorageDomainIcon from '@patternfly/react-icons/dist/esm/icons/storage-domain-icon';
 import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ModalDemo/ModalDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ModalDemo/ModalDemo.tsx
index 35519f6073e..f7c4bc6a84c 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/ModalDemo/ModalDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/ModalDemo/ModalDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import {
   Button,
   Modal,
@@ -28,7 +28,7 @@ interface ModalDemoState {
   isCustomFocusModalOpen: boolean;
 }
 
-export class ModalDemo extends React.Component<React.HTMLProps<HTMLDivElement>, ModalDemoState> {
+export class ModalDemo extends Component<React.HTMLProps<HTMLDivElement>, ModalDemoState> {
   static displayName = 'ModalDemo';
 
   state = {
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ModalDeprecatedDemo/ModalDeprecatedDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ModalDeprecatedDemo/ModalDeprecatedDemo.tsx
index b533328c3a8..962a00cde4d 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/ModalDeprecatedDemo/ModalDeprecatedDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/ModalDeprecatedDemo/ModalDeprecatedDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component, Fragment } from 'react';
 import { Button, Title, TitleSizes } from '@patternfly/react-core';
 import { Modal as ModalDeprecated, ModalVariant as ModalVariantDeprecated } from '@patternfly/react-core/deprecated';
 import WarningTriangleIcon from '@patternfly/react-icons/dist/esm/icons/warning-triangle-icon';
@@ -20,7 +20,7 @@ interface ModalDemoState {
   isCustomFocusModalOpen: boolean;
 }
 
-export class ModalDeprecatedDemo extends React.Component<React.HTMLProps<HTMLDivElement>, ModalDemoState> {
+export class ModalDeprecatedDemo extends Component<React.HTMLProps<HTMLDivElement>, ModalDemoState> {
   static displayName = 'ModalDeprecatedDemo';
 
   state = {
@@ -285,14 +285,14 @@ export class ModalDeprecatedDemo extends React.Component<React.HTMLProps<HTMLDiv
     const { isCustomHeaderFooterModalOpen } = this.state;
 
     const header = (
-      <React.Fragment>
+      <Fragment>
         <Title id="customHeaderTitle" headingLevel="h1" size={TitleSizes['2xl']}>
           Custom Modal Header/Footer
         </Title>
         <p id="customHeaderDescription" className={spacing.ptSm}>
           Allows for custom content in the header and/or footer by passing components.
         </p>
-      </React.Fragment>
+      </Fragment>
     );
 
     const footer = (
@@ -482,7 +482,7 @@ export class ModalDeprecatedDemo extends React.Component<React.HTMLProps<HTMLDiv
     };
 
     return (
-      <React.Fragment>
+      <Fragment>
         <div id="tabstop-test" tabIndex={0} style={{ display: 'flex', flexDirection: 'row', flexWrap: 'wrap' }}>
           <Button style={buttonStyle} variant="primary" onClick={this.handleModalToggle} id="showDefaultModalButton">
             Show Modal
@@ -575,7 +575,7 @@ export class ModalDeprecatedDemo extends React.Component<React.HTMLProps<HTMLDiv
         {this.renderModalWithAlertVariant()}
         {this.renderHelpModal()}
         {this.renderCustomFocusModal()}
-      </React.Fragment>
+      </Fragment>
     );
   }
 }
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/NavDemo/NavDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/NavDemo/NavDemo.tsx
index 79731575221..f4e0d7e0143 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/NavDemo/NavDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/NavDemo/NavDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import { Component } from 'react';
 
 import {
   Nav,
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/NotificationBadgeDemo/NotificationBadgeDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/NotificationBadgeDemo/NotificationBadgeDemo.tsx
index 2a2414af754..f3f7a390698 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/NotificationBadgeDemo/NotificationBadgeDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/NotificationBadgeDemo/NotificationBadgeDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import { NotificationBadge, NotificationBadgeProps, NotificationBadgeVariant } from '@patternfly/react-core';
 
 interface NotificationBadgeDemoState {
@@ -7,7 +7,7 @@ interface NotificationBadgeDemoState {
   secondCount: number;
 }
 
-export class NotificationBadgeDemo extends React.Component<NotificationBadgeProps, NotificationBadgeDemoState> {
+export class NotificationBadgeDemo extends Component<NotificationBadgeProps, NotificationBadgeDemoState> {
   static displayName = 'NotificationBadgeDemo';
   onFirstClick: () => void;
   onSecondClick: () => void;
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerBasicDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerBasicDemo.tsx
index 510e7e5c7d0..e3ee5d2f297 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerBasicDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerBasicDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import {
   NotificationDrawer,
   NotificationDrawerProps,
@@ -22,10 +22,7 @@ interface BasicNotificationDrawerDemoState {
   isOpen: boolean[];
 }
 
-export class BasicNotificationDrawerDemo extends React.Component<
-  NotificationDrawerProps,
-  BasicNotificationDrawerDemoState
-> {
+export class BasicNotificationDrawerDemo extends Component<NotificationDrawerProps, BasicNotificationDrawerDemoState> {
   static displayName = 'BasicNotificationDrawerDemo';
   constructor(props: NotificationDrawerProps) {
     super(props);
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerGroupsDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerGroupsDemo.tsx
index c19b01c56cf..ce033429232 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerGroupsDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerGroupsDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import {
   Button,
   EmptyState,
@@ -33,7 +33,7 @@ interface GroupsNotificationDrawerDemoState {
   thirdGroupExpanded: boolean;
 }
 
-class GroupsNotificationDrawerDemo extends React.Component<NotificationDrawerProps, GroupsNotificationDrawerDemoState> {
+class GroupsNotificationDrawerDemo extends Component<NotificationDrawerProps, GroupsNotificationDrawerDemoState> {
   static displayName = 'GroupsNotificationDrawerDemo';
   constructor(props: NotificationDrawerProps) {
     super(props);
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerLightweightDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerLightweightDemo.tsx
index e3bdb170dc6..4d0884659eb 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerLightweightDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/NotificationDrawerDemo/NotificationDrawerLightweightDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import {
   Button,
   EmptyState,
@@ -25,10 +25,7 @@ interface GroupsNotificationDrawerDemoState {
   thirdGroupIsOpen: boolean;
 }
 
-class LightweightNotificationDrawerDemo extends React.Component<
-  NotificationDrawerProps,
-  GroupsNotificationDrawerDemoState
-> {
+class LightweightNotificationDrawerDemo extends Component<NotificationDrawerProps, GroupsNotificationDrawerDemoState> {
   static displayName = 'LightweightNotificationDrawerDemo';
   constructor(props: NotificationDrawerProps) {
     super(props);
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/NumberInputDemo/NumberInputDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/NumberInputDemo/NumberInputDemo.tsx
index a09bac4fc77..9beb0aaf22b 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/NumberInputDemo/NumberInputDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/NumberInputDemo/NumberInputDemo.tsx
@@ -1,5 +1,5 @@
 import { NumberInput } from '@patternfly/react-core';
-import React, { Component } from 'react';
+import { Component } from 'react';
 
 export interface NumberInputDemoState {
   value: number;
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/OverflowMenuDemo/OverflowMenuDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/OverflowMenuDemo/OverflowMenuDemo.tsx
index fb1fb03eb55..bcf17406196 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/OverflowMenuDemo/OverflowMenuDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/OverflowMenuDemo/OverflowMenuDemo.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, createRef } from 'react';
 import {
   OverflowMenu,
   OverflowMenuControl,
@@ -16,7 +16,7 @@ import AlignCenterIcon from '@patternfly/react-icons/dist/esm/icons/align-center
 import AlignRightIcon from '@patternfly/react-icons/dist/esm/icons/align-right-icon';
 import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
 
-export class OverflowMenuDemo extends React.Component {
+export class OverflowMenuDemo extends Component {
   static displayName = 'OverflowMenuDemo';
   state = {
     isSimpleOpen: false,
@@ -25,7 +25,7 @@ export class OverflowMenuDemo extends React.Component {
     isContainerBreakpointOpen: false
   };
 
-  breakpointContainerRef = React.createRef<HTMLDivElement>();
+  breakpointContainerRef = createRef<HTMLDivElement>();
 
   style = {
     display: 'flex',
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/PageDemo/PageManagedSidebarClosedDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/PageDemo/PageManagedSidebarClosedDemo.tsx
index e034b60dc13..980b3b478f7 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/PageDemo/PageManagedSidebarClosedDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/PageDemo/PageManagedSidebarClosedDemo.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Page,
   Masthead,
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/PaginationDemo/PaginationDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/PaginationDemo/PaginationDemo.tsx
index ce7b942d07b..0262a43591d 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/PaginationDemo/PaginationDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/PaginationDemo/PaginationDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import { Pagination, PaginationVariant, Stack, StackItem, Title } from '@patternfly/react-core';
 
 interface OptionsMenuDemoState {
@@ -8,7 +8,7 @@ interface OptionsMenuDemoState {
   perPage: number;
 }
 
-export class PaginationDemo extends React.Component<React.HTMLProps<HTMLDivElement>, OptionsMenuDemoState> {
+export class PaginationDemo extends Component<React.HTMLProps<HTMLDivElement>, OptionsMenuDemoState> {
   static displayName = 'PaginationDemo';
   state = {
     topPage: 1,
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/PopoverDemo/PopoverDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/PopoverDemo/PopoverDemo.tsx
index 859738b0f6d..7287c35e035 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/PopoverDemo/PopoverDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/PopoverDemo/PopoverDemo.tsx
@@ -1,5 +1,5 @@
 import { Popover, Button } from '@patternfly/react-core';
-import React, { Component } from 'react';
+import { Component, createRef } from 'react';
 
 export class PopoverDemo extends Component {
   popoverRef: React.RefObject<HTMLButtonElement | null>;
@@ -11,7 +11,7 @@ export class PopoverDemo extends Component {
 
   constructor(props: any) {
     super(props);
-    this.popoverRef = React.createRef();
+    this.popoverRef = createRef();
   }
 
   componentDidMount() {
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/RadioDemo/RadioDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/RadioDemo/RadioDemo.tsx
index af2ea5a93d0..0386d37296c 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/RadioDemo/RadioDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/RadioDemo/RadioDemo.tsx
@@ -1,5 +1,5 @@
 import { Radio, RadioProps } from '@patternfly/react-core';
-import React, { Component } from 'react';
+import { Component } from 'react';
 export class RadioDemo extends Component {
   state = {
     value: '4'
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/SearchInputDemo/SearchInputDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/SearchInputDemo/SearchInputDemo.tsx
index 477b14162a6..cb5a4685169 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/SearchInputDemo/SearchInputDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/SearchInputDemo/SearchInputDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import { Component, createRef } from 'react';
 import { SearchInput, SearchInputProps, Button } from '@patternfly/react-core';
 
 interface SearchInputState {
@@ -12,7 +12,7 @@ export class SearchInputDemo extends Component<SearchInputProps, SearchInputStat
   inputRef: React.RefObject<HTMLInputElement | null>;
   constructor(props: SearchInputProps) {
     super(props);
-    this.inputRef = React.createRef();
+    this.inputRef = createRef();
     this.state = {
       value: '',
       resultsCount: 0,
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/SimpleList/SimpleListDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/SimpleList/SimpleListDemo.tsx
index 7302500c6e5..de0c721a88d 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/SimpleList/SimpleListDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/SimpleList/SimpleListDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import { Component } from 'react';
 import { SimpleList, SimpleListGroup, SimpleListItem, SimpleListItemProps } from '@patternfly/react-core';
 
 interface SimpleListDemoState {
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/SwitchDemo/SwitchDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/SwitchDemo/SwitchDemo.tsx
index 3464dceaf3d..b891201bfba 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/SwitchDemo/SwitchDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/SwitchDemo/SwitchDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import { Component } from 'react';
 import { Switch, Button } from '@patternfly/react-core';
 import { Table, TableBody, TableHeader } from '@patternfly/react-table/deprecated';
 
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableCollapsibleDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableCollapsibleDemo.tsx
index c9169bb7654..4146686ba2a 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableCollapsibleDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableCollapsibleDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import { Component } from 'react';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 import { expandable, ICell, IRow } from '@patternfly/react-table';
 
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableComposableDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableComposableDemo.tsx
index f02f4cc6531..16bcf9f4090 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableComposableDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableComposableDemo.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import * as React from 'react';
+import { useState } from 'react';
 import {
   Table,
   Thead,
@@ -40,7 +40,7 @@ export const TableComposableDemo = () => {
       ['one - 2', null, null, 'four - 2', 'five - 2'],
       ['one - 3', 'two - 3', 'three - 3', 'four - 3', 'five - 3']
     ];
-    const [hasFirstColumnHeader, setHasFirstColumnHeader] = React.useState(false);
+    const [hasFirstColumnHeader, setHasFirstColumnHeader] = useState(false);
 
     return (
       <>
@@ -193,15 +193,15 @@ export const TableComposableDemo = () => {
       'This is a really long table header that goes on for a long time 4.',
       'This is a really long table header that goes on for a long time 5.'
     ];
-    const [rows, setRows] = React.useState([
+    const [rows, setRows] = useState([
       ['one', 'two', 'a', 'four', 'five'],
       ['a', 'two', 'k', 'four', 'five'],
       ['p', 'two', 'b', 'four', 'five']
     ]);
     // index of the currently active column
-    const [activeSortIndex, setActiveSortIndex] = React.useState(-1);
+    const [activeSortIndex, setActiveSortIndex] = useState(-1);
     // sort direction of the currently active column
-    const [activeSortDirection, setActiveSortDirection] = React.useState<'asc' | 'desc' | 'none'>('none');
+    const [activeSortDirection, setActiveSortDirection] = useState<'asc' | 'desc' | 'none'>('none');
     const onSort = (_event: React.MouseEvent, index: number, direction: 'asc' | 'desc' | 'none') => {
       setActiveSortIndex(index);
       setActiveSortDirection(direction);
@@ -262,9 +262,9 @@ export const TableComposableDemo = () => {
       ['a', 'two', 'k', 'four', 'five'],
       ['p', 'two', 'b', 'four', 'five']
     ];
-    const [allRowsSelected, setAllRowsSelected] = React.useState(false);
+    const [allRowsSelected, setAllRowsSelected] = useState(false);
 
-    const [selected, setSelected] = React.useState(rows.map(() => false));
+    const [selected, setSelected] = useState(rows.map(() => false));
     const onSelect: OnSelect = (_event, isSelected, rowId) => {
       setSelected(selected.map((sel, index) => (index === rowId ? isSelected : sel)));
       if (!isSelected && allRowsSelected) {
@@ -339,7 +339,7 @@ export const TableComposableDemo = () => {
       ['a', 'two', 'k', 'four', 'five'],
       ['p', 'two', 'b', 'four', 'five']
     ];
-    const [selected, setSelected] = React.useState(-1);
+    const [selected, setSelected] = useState(-1);
     const onSelect: OnSelect = (_event, _isSelected, rowId) => {
       setSelected(rowId);
     };
@@ -482,7 +482,7 @@ export const TableComposableDemo = () => {
       ['4', '2', 'b', 'four', 'five'],
       ['5', '2', 'b', 'four', 'five']
     ];
-    const [choice, setChoice] = React.useState('default');
+    const [choice, setChoice] = useState('default');
     const handleItemClick = (event: React.MouseEvent<any> | React.KeyboardEvent | MouseEvent) => {
       const id = event.currentTarget.id;
       setChoice(id);
@@ -583,10 +583,8 @@ export const TableComposableDemo = () => {
     ];
     const numColumns = columns.length;
     // Init all to true
-    const [expanded, setExpanded] = React.useState(
-      Object.fromEntries(Object.entries(rowPairs).map(([k]) => [k, true]))
-    );
-    const [compact, setCompact] = React.useState(true);
+    const [expanded, setExpanded] = useState(Object.fromEntries(Object.entries(rowPairs).map(([k]) => [k, true])));
+    const [compact, setCompact] = useState(true);
     const toggleCompact = (checked: boolean) => {
       setCompact(checked);
     };
@@ -660,7 +658,7 @@ export const TableComposableDemo = () => {
                   // some examples of how you could customize colSpan based on your needs
                   const getColSpan = () => {
                     // we have 6 columns (1 expandable column + 5 regular columns)
-                    // for the rowPairs where we've specificed `fullWidth`, add +1 to account for the expandable column
+                    // for the rowPairs where we've specified `fullWidth`, add +1 to account for the expandable column
                     let colSpan = 1;
                     if (numChildCells === 1) {
                       // single child cell: take up full width
@@ -711,7 +709,7 @@ export const TableComposableDemo = () => {
       ['siemur/test-space', 3, 4, 2, '10 minutes', 'Open in Github']
     ];
     // index corresponds to row index, and value corresponds to column index of the expanded, null means no cell is expanded
-    const [activeChild, setActiveChild] = React.useState([1, null]);
+    const [activeChild, setActiveChild] = useState([1, null]);
     const DemoSortableTable = ({ firstColumnRows, id }: { firstColumnRows: string[]; id: string }) => {
       const columns = ['Repositories', 'Branches', 'Pull requests', 'Workspaces', 'Last Commit'];
       const rows = [firstColumnRows, ['a', 'two', 'k', 'four', 'five'], ['p', 'two', 'b', 'four', 'five']];
@@ -1038,15 +1036,15 @@ export const TableComposableDemo = () => {
 
   const ComposableTableFavoritable = () => {
     const columns = ['Repositories', 'Branches', 'Pull requests', 'Workspaces', 'Last commit'];
-    const [rows, setRows] = React.useState([
+    const [rows, setRows] = useState([
       { favorited: true, cells: ['one', 'two', 'three', 'four', 'five'] },
       { favorited: false, cells: ['one - 2', null, null, 'four - 2', 'five - 2'] },
       { favorited: false, cells: ['one - 3', 'two - 3', 'three - 3', 'four - 3', 'five - 3'] }
     ]);
     // index of the currently active column
-    const [activeSortIndex, setActiveSortIndex] = React.useState(-1);
+    const [activeSortIndex, setActiveSortIndex] = useState(-1);
     // sort direction of the currently active column
-    const [activeSortDirection, setActiveSortDirection] = React.useState('none');
+    const [activeSortDirection, setActiveSortDirection] = useState('none');
     const onSort: OnSort = (_event, index, direction) => {
       setActiveSortIndex(index);
       setActiveSortDirection(direction);
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableCompoundExpandableDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableCompoundExpandableDemo.tsx
index 0cb1a87d031..71eba0f0959 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableCompoundExpandableDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableCompoundExpandableDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import { Component } from 'react';
 import { compoundExpand, IRow, ICell, IRowCell } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableEditableCompoundExpandableDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableEditableCompoundExpandableDemo.tsx
index ba7974ab927..16d52aeeeec 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableEditableCompoundExpandableDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableEditableCompoundExpandableDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import { Component } from 'react';
 import { compoundExpand, IRow, ICell, IRowCell } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableEditableDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableEditableDemo.tsx
index 3e42ebc8565..9eac6a6046e 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableEditableDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableEditableDemo.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 import {
   TableVariant,
   ICell,
@@ -43,7 +43,7 @@ interface TableState {
   columns: (ICell | string)[];
 }
 
-export class TableEditableDemo extends React.Component<TableProps, TableState> {
+export class TableEditableDemo extends Component<TableProps, TableState> {
   static displayName = 'TableEditableDemo';
 
   constructor(props: TableProps) {
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableEmptyStateDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableEmptyStateDemo.tsx
index 769e0c917ea..27b57d65556 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableEmptyStateDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableEmptyStateDemo.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 import { IRow, ICell } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 
@@ -12,7 +12,7 @@ import {
 } from '@patternfly/react-core';
 import CubesIcon from '@patternfly/react-icons/dist/esm/icons/cubes-icon';
 
-class EmptyStateTable extends React.Component<TableProps, { columns: (ICell | string)[]; rows: IRow[] }> {
+class EmptyStateTable extends Component<TableProps, { columns: (ICell | string)[]; rows: IRow[] }> {
   static displayName = 'EmptyStateTable';
   constructor(props: TableProps) {
     super(props);
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableFavoritesDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableFavoritesDemo.tsx
index a183406cea6..6ebca06d6cd 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableFavoritesDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableFavoritesDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import { Component } from 'react';
 import { sortable, ICell, IRow, ISortBy } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 import { Checkbox } from '@patternfly/react-core';
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableRowWrapperDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableRowWrapperDemo.tsx
index 1ebcd2f80ec..87b2d293bf2 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableRowWrapperDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableRowWrapperDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component, type JSX } from 'react';
+import { Component, type JSX } from 'react';
 import { RowWrapperProps, ICell, IRow } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableSelectableDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableSelectableDemo.tsx
index 56dc4030130..9a1b8e7a544 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableSelectableDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableSelectableDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import { Component } from 'react';
 import { headerCol, ICell, IRow, RowSelectVariant } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 import spacing from '@patternfly/react-styles/css/utilities/Spacing/spacing';
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableSimpleDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableSimpleDemo.tsx
index 68bc213b409..ddeadde0dc2 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableSimpleDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableSimpleDemo.tsx
@@ -1,11 +1,8 @@
-import * as React from 'react';
+import { Component } from 'react';
 import { textCenter, ICell, IRow } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 
-export class TableSimpleDemo extends React.Component<
-  TableProps,
-  { columns: (ICell | string)[]; rows: (IRow | string[])[] }
-> {
+export class TableSimpleDemo extends Component<TableProps, { columns: (ICell | string)[]; rows: (IRow | string[])[] }> {
   static displayName = 'TableSimpleDemo';
   constructor(props: TableProps) {
     super(props);
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableSortableDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableSortableDemo.tsx
index fe244988e07..8f2d60bc53d 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableSortableDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableSortableDemo.tsx
@@ -1,8 +1,8 @@
-import * as React from 'react';
+import { Component } from 'react';
 import { sortable, SortByDirection, ICell, IRow, ISortBy } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 
-export class TableSortableDemo extends React.Component<
+export class TableSortableDemo extends Component<
   TableProps,
   { columns: (ICell | string)[]; rows: IRow[]; sortBy: ISortBy }
 > {
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableSortableForCompoundExpandableDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableSortableForCompoundExpandableDemo.tsx
index ca6ac9f73f4..2d40c9beb66 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableSortableForCompoundExpandableDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TableDemo/TableSortableForCompoundExpandableDemo.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 import { TableVariant, sortable, SortByDirection, ICell, IRow, ISortBy } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 
@@ -16,7 +16,7 @@ interface DemoSortableTableState {
   sortBy: ISortBy;
 }
 
-export class DemoSortableTable extends React.Component<DemoSortableTableProps, DemoSortableTableState> {
+export class DemoSortableTable extends Component<DemoSortableTableProps, DemoSortableTableState> {
   static displayName = 'DemoSortableTable';
   constructor(props: TableProps) {
     super(props);
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsDemo.tsx
index 6e46bb8d951..9f1f043e10e 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component, RefObject } from 'react';
+import { Component, createRef, RefObject } from 'react';
 import { Tabs, Tab, TabContent, TabTitleText, TabTitleIcon, Button } from '@patternfly/react-core';
 import UsersIcon from '@patternfly/react-icons/dist/esm/icons/users-icon';
 
@@ -17,9 +17,9 @@ export class TabDemo extends Component {
   constructor(props: {}) {
     super(props);
 
-    this.contentRef1 = React.createRef<HTMLDivElement>();
-    this.contentRef2 = React.createRef<HTMLDivElement>();
-    this.contentRef3 = React.createRef<HTMLDivElement>();
+    this.contentRef1 = createRef<HTMLDivElement>();
+    this.contentRef2 = createRef<HTMLDivElement>();
+    this.contentRef3 = createRef<HTMLDivElement>();
   }
 
   // Toggle currently active tab
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsDisabledDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsDisabledDemo.tsx
index ac69d7aff63..45eb6b9b376 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsDisabledDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsDisabledDemo.tsx
@@ -1,7 +1,7 @@
-import React from 'react';
+import { Component, createRef } from 'react';
 import { Tabs, Tab, TabTitleText, Tooltip } from '@patternfly/react-core';
 
-export class TabsDisabledDemo extends React.Component {
+export class TabsDisabledDemo extends Component {
   static displayName = 'TabsDisabledDemo';
   state = {
     activeTabKey: 0,
@@ -20,7 +20,7 @@ export class TabsDisabledDemo extends React.Component {
 
   render() {
     const { activeTabKey } = this.state;
-    const tooltipRef = React.createRef();
+    const tooltipRef = createRef();
 
     return (
       <>
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsExpandableDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsExpandableDemo.tsx
index d6dd65e0aa9..03d89b6aec4 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsExpandableDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsExpandableDemo.tsx
@@ -1,5 +1,5 @@
 import { Tabs, Tab, TabTitleText } from '@patternfly/react-core';
-import React, { Component } from 'react';
+import { Component } from 'react';
 
 export class TabsExpandableDemo extends Component {
   state = {
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsHorizontalOverflowDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsHorizontalOverflowDemo.tsx
index 5f5d9715553..020d8efe035 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsHorizontalOverflowDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsHorizontalOverflowDemo.tsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import { useState } from 'react';
 import { Tabs, Tab, TabTitleText, Checkbox } from '@patternfly/react-core';
 
 export const TabsHorizontalOverflowDemo: React.FunctionComponent = () => {
-  const [activeTabKey, setActiveTabKey] = React.useState<string | number>(0);
-  const [showTabCount, setShowTabCount] = React.useState(false);
-  const [defaultTitleText, setDefaultTitleText] = React.useState<string>();
-  const [toggleAriaLabel, setToggleAriaLabel] = React.useState<string>();
+  const [activeTabKey, setActiveTabKey] = useState<string | number>(0);
+  const [showTabCount, setShowTabCount] = useState(false);
+  const [defaultTitleText, setDefaultTitleText] = useState<string>();
+  const [toggleAriaLabel, setToggleAriaLabel] = useState<string>();
 
   const handleTabClick = (_event: React.MouseEvent<HTMLElement, MouseEvent>, tabIndex: string | number) => {
     setActiveTabKey(tabIndex);
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsStringEventKeyDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsStringEventKeyDemo.tsx
index 7ff0f9e8de5..5aca39d675d 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsStringEventKeyDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsStringEventKeyDemo.tsx
@@ -1,5 +1,5 @@
 import { Tabs, Tab, TabContent, TabTitleText } from '@patternfly/react-core';
-import React, { Component, RefObject } from 'react';
+import { Component, createRef, RefObject } from 'react';
 
 export class TabsStringEventKeyDemo extends Component {
   state = {
@@ -13,9 +13,9 @@ export class TabsStringEventKeyDemo extends Component {
   constructor(props: {}) {
     super(props);
 
-    this.contentRefOne = React.createRef<HTMLDivElement>();
-    this.contentRefTwo = React.createRef<HTMLDivElement>();
-    this.contentRefThree = React.createRef<HTMLDivElement>();
+    this.contentRefOne = createRef<HTMLDivElement>();
+    this.contentRefTwo = createRef<HTMLDivElement>();
+    this.contentRefThree = createRef<HTMLDivElement>();
   }
 
   // Toggle currently active tab
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsUncontrolledDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsUncontrolledDemo.tsx
index 3538ce968a6..fd43624f5d4 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsUncontrolledDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TabsDemo/TabsUncontrolledDemo.tsx
@@ -1,4 +1,4 @@
-import React, { Component, RefObject } from 'react';
+import { Component, createRef, RefObject } from 'react';
 import { Tabs, Tab, TabContent, TabTitleText, TabTitleIcon, Button } from '@patternfly/react-core';
 import UsersIcon from '@patternfly/react-icons/dist/esm/icons/users-icon';
 
@@ -13,9 +13,9 @@ export class TabUncontrolledDemo extends Component {
   constructor(props: {}) {
     super(props);
 
-    this.contentRef1 = React.createRef<HTMLDivElement>();
-    this.contentRef2 = React.createRef<HTMLDivElement>();
-    this.contentRef3 = React.createRef<HTMLDivElement>();
+    this.contentRef1 = createRef<HTMLDivElement>();
+    this.contentRef2 = createRef<HTMLDivElement>();
+    this.contentRef3 = createRef<HTMLDivElement>();
   }
 
   componentDidMount() {
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TextAreaDemo/TextAreaDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TextAreaDemo/TextAreaDemo.tsx
index 412d4655f44..b883daf3e52 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TextAreaDemo/TextAreaDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TextAreaDemo/TextAreaDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import { Content, TextArea, ValidatedOptions } from '@patternfly/react-core';
 
 interface TextAreaState {
@@ -14,7 +14,7 @@ interface TextAreaState {
   validated: ValidatedOptions.default | ValidatedOptions.error | ValidatedOptions.success | ValidatedOptions.warning;
 }
 
-export class TextAreaDemo extends React.Component<{}, TextAreaState> {
+export class TextAreaDemo extends Component<{}, TextAreaState> {
   static displayName = 'TextAreaDemo';
   state = {
     textAreaValue: '',
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TextInputDemo/TextInputDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TextInputDemo/TextInputDemo.tsx
index 01f57fe009b..4e7ea4be07b 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TextInputDemo/TextInputDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TextInputDemo/TextInputDemo.tsx
@@ -1,5 +1,5 @@
 import { Content, TextInput, TextInputProps, ValidatedOptions } from '@patternfly/react-core';
-import React, { Component } from 'react';
+import { Component, createRef } from 'react';
 
 export class TextInputDemo extends Component {
   state = {
@@ -11,7 +11,7 @@ export class TextInputDemo extends Component {
     validated: ValidatedOptions.default
   };
 
-  ref = React.createRef<HTMLInputElement>();
+  ref = createRef<HTMLInputElement>();
 
   handleTextInputChange = (_event: React.FormEvent<HTMLInputElement>, value: string) => {
     this.setState({ value });
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ToggleGroupDemo/ToggleGroupDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ToggleGroupDemo/ToggleGroupDemo.tsx
index a4855135d5b..30a405935d1 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/ToggleGroupDemo/ToggleGroupDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/ToggleGroupDemo/ToggleGroupDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import { ToggleGroup, ToggleGroupItem, ToggleGroupProps } from '@patternfly/react-core';
 import UndoIcon from '@patternfly/react-icons/dist/esm/icons/undo-icon';
 import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon';
@@ -16,7 +16,7 @@ interface ToggleGroupState {
   };
 }
 
-export class ToggleGroupDemo extends React.Component<ToggleGroupProps, ToggleGroupState> {
+export class ToggleGroupDemo extends Component<ToggleGroupProps, ToggleGroupState> {
   static displayName = 'ToggleGroupDemo';
   constructor(props: ToggleGroupProps) {
     super(props);
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ToolbarDemo/ToolbarDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ToolbarDemo/ToolbarDemo.tsx
index 49232673441..515f0023e0d 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/ToolbarDemo/ToolbarDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/ToolbarDemo/ToolbarDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import {
   Button,
   ButtonVariant,
@@ -45,7 +45,7 @@ interface ToolbarState {
   kebabIsOpen: boolean;
 }
 
-class ToolbarDemo extends React.Component<ToolbarProps, ToolbarState> {
+class ToolbarDemo extends Component<ToolbarProps, ToolbarState> {
   static displayName = 'ToolbarDemo';
   state = {
     isOpen: false,
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ToolbarDemo/ToolbarVisibilityDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ToolbarDemo/ToolbarVisibilityDemo.tsx
index a86646bff26..a079652ad11 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/ToolbarDemo/ToolbarVisibilityDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/ToolbarDemo/ToolbarVisibilityDemo.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
+import { Component } from 'react';
 import { Toolbar, ToolbarContent, ToolbarGroup, ToolbarItem, ToolbarToggleGroup } from '@patternfly/react-core';
 import FilterIcon from '@patternfly/react-icons/dist/esm/icons/filter-icon';
 
-export class ToolbarVisibilityDemo extends React.Component {
+export class ToolbarVisibilityDemo extends Component {
   static displayName = 'ToolbarVisibilityDemo';
 
   render() {
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TooltipDemo/TooltipDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TooltipDemo/TooltipDemo.tsx
index 9f7f9896a1c..8201d774949 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TooltipDemo/TooltipDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TooltipDemo/TooltipDemo.tsx
@@ -1,5 +1,5 @@
+import { Component, createRef } from 'react';
 import { Tooltip } from '@patternfly/react-core';
-import React, { Component } from 'react';
 
 export class TooltipDemo extends Component {
   tooltipRef: React.RefObject<HTMLButtonElement | null>;
@@ -10,7 +10,7 @@ export class TooltipDemo extends Component {
 
   constructor(props: any) {
     super(props);
-    this.tooltipRef = React.createRef();
+    this.tooltipRef = createRef();
   }
 
   componentDidMount() {
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/TreeViewDemo/TreeViewDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/TreeViewDemo/TreeViewDemo.tsx
index 6fbb91d8dfc..843a89450b7 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/TreeViewDemo/TreeViewDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/TreeViewDemo/TreeViewDemo.tsx
@@ -9,7 +9,7 @@ import {
 } from '@patternfly/react-core';
 import FolderIcon from '@patternfly/react-icons/dist/esm/icons/folder-icon';
 import FolderOpenIcon from '@patternfly/react-icons/dist/esm/icons/folder-open-icon';
-import React, { Component } from 'react';
+import { Component } from 'react';
 
 export class TreeViewDemo extends Component {
   componentDidMount() {
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/WizardDemo/WizardDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/WizardDemo/WizardDemo.tsx
index ccc52ded820..a5b109c8369 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/WizardDemo/WizardDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/WizardDemo/WizardDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Component } from 'react';
 import { Button, Wizard, WizardHeader, WizardStep, Modal } from '@patternfly/react-core';
 
 import ExternalLinkAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon';
@@ -9,7 +9,7 @@ interface WizardDemoState {
   isOpenWithRole: boolean;
 }
 
-class WizardDemo extends React.Component<React.HTMLProps<HTMLDivElement>, WizardDemoState> {
+class WizardDemo extends Component<React.HTMLProps<HTMLDivElement>, WizardDemoState> {
   static displayName = 'WizardDemo';
   state = {
     isOpen: false,
diff --git a/packages/react-integration/demo-app-ts/src/components/demos/WizardDeprecatedDemo/WizardDeprecatedDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/WizardDeprecatedDemo/WizardDeprecatedDemo.tsx
index 91119986abf..1211353ff28 100644
--- a/packages/react-integration/demo-app-ts/src/components/demos/WizardDeprecatedDemo/WizardDeprecatedDemo.tsx
+++ b/packages/react-integration/demo-app-ts/src/components/demos/WizardDeprecatedDemo/WizardDeprecatedDemo.tsx
@@ -1,13 +1,13 @@
+import { Component } from 'react';
 import { Button } from '@patternfly/react-core';
 import { Wizard, WizardStep } from '@patternfly/react-core/deprecated';
-import React from 'react';
 
 interface WizardDeprecatedDemoState {
   isOpen: boolean;
   isOpenWithRole: boolean;
 }
 
-export class WizardDeprecatedDemo extends React.Component<React.HTMLProps<HTMLDivElement>, WizardDeprecatedDemoState> {
+export class WizardDeprecatedDemo extends Component<React.HTMLProps<HTMLDivElement>, WizardDeprecatedDemoState> {
   static displayName = 'WizardDemo';
   state = {
     isOpen: false,
diff --git a/packages/react-table/src/components/Table/ActionsColumn.tsx b/packages/react-table/src/components/Table/ActionsColumn.tsx
index 3a32bb7f4c2..cc72264c851 100644
--- a/packages/react-table/src/components/Table/ActionsColumn.tsx
+++ b/packages/react-table/src/components/Table/ActionsColumn.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { cloneElement, forwardRef, Fragment, useState } from 'react';
 import { Dropdown, DropdownItem, DropdownList } from '@patternfly/react-core/dist/esm/components/Dropdown';
 import { Button } from '@patternfly/react-core/dist/esm/components/Button';
 import { Divider } from '@patternfly/react-core/dist/esm/components/Divider';
@@ -49,7 +49,7 @@ const ActionsColumnBase: React.FunctionComponent<ActionsColumnProps> = ({
   isOnOpenChangeDisabled = false,
   ...props
 }: ActionsColumnProps) => {
-  const [isOpen, setIsOpen] = React.useState(false);
+  const [isOpen, setIsOpen] = useState(false);
 
   const onToggle = () => {
     setIsOpen(!isOpen);
@@ -70,7 +70,7 @@ const ActionsColumnBase: React.FunctionComponent<ActionsColumnProps> = ({
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       {items
         .filter((item) => item.isOutsideDropdown)
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -88,7 +88,7 @@ const ActionsColumnBase: React.FunctionComponent<ActionsColumnProps> = ({
               {title}
             </Button>
           ) : (
-            React.cloneElement(title as React.ReactElement<any>, { onClick, isDisabled, ...props })
+            cloneElement(title as React.ReactElement<any>, { onClick, isDisabled, ...props })
           )
         )}
       <Dropdown
@@ -150,11 +150,11 @@ const ActionsColumnBase: React.FunctionComponent<ActionsColumnProps> = ({
             )}
         </DropdownList>
       </Dropdown>
-    </React.Fragment>
+    </Fragment>
   );
 };
 
-export const ActionsColumn = React.forwardRef((props: ActionsColumnProps, ref: React.Ref<HTMLElement>) => (
+export const ActionsColumn = forwardRef((props: ActionsColumnProps, ref: React.Ref<HTMLElement>) => (
   <ActionsColumnBase {...props} innerRef={ref} />
 ));
 ActionsColumn.displayName = 'ActionsColumn';
diff --git a/packages/react-table/src/components/Table/Caption.tsx b/packages/react-table/src/components/Table/Caption.tsx
index 48705f888f1..88f7e8599ce 100644
--- a/packages/react-table/src/components/Table/Caption.tsx
+++ b/packages/react-table/src/components/Table/Caption.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-table/src/components/Table/CollapseColumn.tsx b/packages/react-table/src/components/Table/CollapseColumn.tsx
index 1ace597f517..0371398927d 100644
--- a/packages/react-table/src/components/Table/CollapseColumn.tsx
+++ b/packages/react-table/src/components/Table/CollapseColumn.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Fragment } from 'react';
 import AngleDownIcon from '@patternfly/react-icons/dist/esm/icons/angle-down-icon';
 import { css } from '@patternfly/react-styles';
 import { Button } from '@patternfly/react-core/dist/esm/components/Button';
@@ -20,7 +20,7 @@ export const CollapseColumn: React.FunctionComponent<CollapseColumnProps> = ({
   onToggle,
   ...props
 }: CollapseColumnProps) => (
-  <React.Fragment>
+  <Fragment>
     {isOpen !== undefined && (
       <Button
         className={css(className, isOpen && styles.modifiers.expanded)}
@@ -37,6 +37,6 @@ export const CollapseColumn: React.FunctionComponent<CollapseColumnProps> = ({
       />
     )}
     {children}
-  </React.Fragment>
+  </Fragment>
 );
 CollapseColumn.displayName = 'CollapseColumn';
diff --git a/packages/react-table/src/components/Table/DraggableCell.tsx b/packages/react-table/src/components/Table/DraggableCell.tsx
index 5ac409f23b6..ee7c781c5fe 100644
--- a/packages/react-table/src/components/Table/DraggableCell.tsx
+++ b/packages/react-table/src/components/Table/DraggableCell.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import GripVerticalIcon from '@patternfly/react-icons/dist/esm/icons/grip-vertical-icon';
 import { Button } from '@patternfly/react-core/dist/esm/components/Button';
 
diff --git a/packages/react-table/src/components/Table/DraggableRowWrapper.tsx b/packages/react-table/src/components/Table/DraggableRowWrapper.tsx
index 9f485a1e1f8..c7ab7d62c21 100644
--- a/packages/react-table/src/components/Table/DraggableRowWrapper.tsx
+++ b/packages/react-table/src/components/Table/DraggableRowWrapper.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 import stylesTreeView from '@patternfly/react-styles/css/components/Table/table-tree-view';
diff --git a/packages/react-table/src/components/Table/EditColumn.tsx b/packages/react-table/src/components/Table/EditColumn.tsx
index 8a4b76c78dc..cb07afc72be 100644
--- a/packages/react-table/src/components/Table/EditColumn.tsx
+++ b/packages/react-table/src/components/Table/EditColumn.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Fragment } from 'react';
 import { Button } from '@patternfly/react-core/dist/esm/components/Button';
 import PencilAltIcon from '@patternfly/react-icons/dist/esm/icons/pencil-alt-icon';
 import CheckIcon from '@patternfly/react-icons/dist/esm/icons/check-icon';
@@ -30,7 +30,7 @@ export const EditColumn: React.FunctionComponent<EditColumnProps> = ({
   editAriaLabel,
   ...props
 }: EditColumnProps) => (
-  <React.Fragment>
+  <Fragment>
     <div className={css(inlineStyles.inlineEditGroup, inlineStyles.modifiers.iconGroup, 'pf-m-action-group')}>
       <div className={css(inlineStyles.inlineEditAction)}>
         <Button
@@ -60,6 +60,6 @@ export const EditColumn: React.FunctionComponent<EditColumnProps> = ({
         icon={<PencilAltIcon />}
       />
     </div>
-  </React.Fragment>
+  </Fragment>
 );
 EditColumn.displayName = 'EditColumn';
diff --git a/packages/react-table/src/components/Table/EditableSelectInputCell.tsx b/packages/react-table/src/components/Table/EditableSelectInputCell.tsx
index 2b8109b526a..aa14fe277f8 100644
--- a/packages/react-table/src/components/Table/EditableSelectInputCell.tsx
+++ b/packages/react-table/src/components/Table/EditableSelectInputCell.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Fragment } from 'react';
 import { css } from '@patternfly/react-styles';
 import { Select, SelectList } from '@patternfly/react-core/dist/esm/components/Select';
 import { MenuToggle } from '@patternfly/react-core/dist/esm/components/MenuToggle';
@@ -76,7 +76,7 @@ export const EditableSelectInputCell: React.FunctionComponent<IEditableSelectInp
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <div className={inlineStyles.inlineEditValue}>{Array.isArray(value) ? value.join(', ') : value}</div>
       <div className={inlineStyles.inlineEditInput}>
         {select}
@@ -84,7 +84,7 @@ export const EditableSelectInputCell: React.FunctionComponent<IEditableSelectInp
           {props.errorText}
         </div>
       </div>
-    </React.Fragment>
+    </Fragment>
   );
 };
 EditableSelectInputCell.displayName = 'EditableSelectInputCell';
diff --git a/packages/react-table/src/components/Table/EditableTextCell.tsx b/packages/react-table/src/components/Table/EditableTextCell.tsx
index 287b776d29e..04dfbbb2689 100644
--- a/packages/react-table/src/components/Table/EditableTextCell.tsx
+++ b/packages/react-table/src/components/Table/EditableTextCell.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Fragment } from 'react';
 import { TextInput } from '@patternfly/react-core/dist/esm/components/TextInput';
 import inlineStyles from '@patternfly/react-styles/css/components/InlineEdit/inline-edit';
 import formStyles from '@patternfly/react-styles/css/components/Form/form';
@@ -36,7 +36,7 @@ export const EditableTextCell: React.FunctionComponent<IEditableTextCell> = ({
   inputAriaLabel,
   isDisabled = false
 }: IEditableTextCell) => (
-  <React.Fragment>
+  <Fragment>
     <div className={inlineStyles.inlineEditValue}>{value}</div>
     <div className={inlineStyles.inlineEditInput}>
       <TextInput
@@ -53,6 +53,6 @@ export const EditableTextCell: React.FunctionComponent<IEditableTextCell> = ({
         {props.errorText}
       </div>
     </div>
-  </React.Fragment>
+  </Fragment>
 );
 EditableTextCell.displayName = 'EditableTextCell';
diff --git a/packages/react-table/src/components/Table/ExpandableRowContent.tsx b/packages/react-table/src/components/Table/ExpandableRowContent.tsx
index 1549a19e17b..d991b706ca8 100644
--- a/packages/react-table/src/components/Table/ExpandableRowContent.tsx
+++ b/packages/react-table/src/components/Table/ExpandableRowContent.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 
diff --git a/packages/react-table/src/components/Table/FavoritesCell.tsx b/packages/react-table/src/components/Table/FavoritesCell.tsx
index c0b87d85871..20a60634682 100644
--- a/packages/react-table/src/components/Table/FavoritesCell.tsx
+++ b/packages/react-table/src/components/Table/FavoritesCell.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import StarIcon from '@patternfly/react-icons/dist/esm/icons/star-icon';
 import { Button } from '@patternfly/react-core/dist/esm/components/Button';
 
diff --git a/packages/react-table/src/components/Table/HeaderCellInfoWrapper.tsx b/packages/react-table/src/components/Table/HeaderCellInfoWrapper.tsx
index 54eac4de34c..1ce46f55f4d 100644
--- a/packages/react-table/src/components/Table/HeaderCellInfoWrapper.tsx
+++ b/packages/react-table/src/components/Table/HeaderCellInfoWrapper.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Table/table';
diff --git a/packages/react-table/src/components/Table/InnerScrollContainer.tsx b/packages/react-table/src/components/Table/InnerScrollContainer.tsx
index 8df766e80c1..f5e0be5be58 100644
--- a/packages/react-table/src/components/Table/InnerScrollContainer.tsx
+++ b/packages/react-table/src/components/Table/InnerScrollContainer.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Table/table-scrollable';
 
diff --git a/packages/react-table/src/components/Table/OuterScrollContainer.tsx b/packages/react-table/src/components/Table/OuterScrollContainer.tsx
index edb830fdd28..e2bdce862db 100644
--- a/packages/react-table/src/components/Table/OuterScrollContainer.tsx
+++ b/packages/react-table/src/components/Table/OuterScrollContainer.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Table/table-scrollable';
 
diff --git a/packages/react-table/src/components/Table/RowWrapper.tsx b/packages/react-table/src/components/Table/RowWrapper.tsx
index f8d17756e9e..8f01f7550cb 100644
--- a/packages/react-table/src/components/Table/RowWrapper.tsx
+++ b/packages/react-table/src/components/Table/RowWrapper.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component } from 'react';
 import { OUIAProps } from '@patternfly/react-core/dist/esm/helpers/OUIA/ouia';
 import { debounce, canUseDOM } from '@patternfly/react-core/dist/esm/helpers/util';
 import { Tr } from './Tr';
@@ -26,7 +26,7 @@ export interface RowWrapperProps extends OUIAProps {
   ouiaId?: number | string;
 }
 
-class RowWrapper extends React.Component<RowWrapperProps> {
+class RowWrapper extends Component<RowWrapperProps> {
   static displayName = 'RowWrapper';
   static defaultProps = {
     className: '' as string,
diff --git a/packages/react-table/src/components/Table/SelectColumn.tsx b/packages/react-table/src/components/Table/SelectColumn.tsx
index c2e2de64205..46472495423 100644
--- a/packages/react-table/src/components/Table/SelectColumn.tsx
+++ b/packages/react-table/src/components/Table/SelectColumn.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { createRef, Fragment } from 'react';
 import { Tooltip, TooltipProps } from '@patternfly/react-core/dist/esm/components/Tooltip';
 
 export enum RowSelectVariant {
@@ -28,15 +28,15 @@ export const SelectColumn: React.FunctionComponent<SelectColumnProps> = ({
   tooltipProps,
   ...props
 }: SelectColumnProps) => {
-  const inputRef = React.createRef<HTMLInputElement>();
+  const inputRef = createRef<HTMLInputElement>();
 
   const content = (
-    <React.Fragment>
+    <Fragment>
       <label>
         <input {...props} ref={inputRef} type={selectVariant} onChange={onSelect} />
       </label>
       {children}
-    </React.Fragment>
+    </Fragment>
   );
 
   return tooltip ? (
diff --git a/packages/react-table/src/components/Table/SortColumn.tsx b/packages/react-table/src/components/Table/SortColumn.tsx
index f9d4db45d17..0633183ceca 100644
--- a/packages/react-table/src/components/Table/SortColumn.tsx
+++ b/packages/react-table/src/components/Table/SortColumn.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useState } from 'react';
 import LongArrowAltUpIcon from '@patternfly/react-icons/dist/esm/icons/long-arrow-alt-up-icon';
 import LongArrowAltDownIcon from '@patternfly/react-icons/dist/esm/icons/long-arrow-alt-down-icon';
 import ArrowsAltVIcon from '@patternfly/react-icons/dist/esm/icons/arrows-alt-v-icon';
@@ -42,7 +42,7 @@ export const SortColumn: React.FunctionComponent<SortColumnProps> = ({
   ...props
 }: SortColumnProps) => {
   let SortedByIcon;
-  const [focused, setFocused] = React.useState(false);
+  const [focused, setFocused] = useState(false);
   if (isSortedBy) {
     SortedByIcon = sortDirection === SortByDirection.asc ? LongArrowAltUpIcon : LongArrowAltDownIcon;
   } else {
diff --git a/packages/react-table/src/components/Table/Table.tsx b/packages/react-table/src/components/Table/Table.tsx
index bc917ec6c3b..d03643ad604 100644
--- a/packages/react-table/src/components/Table/Table.tsx
+++ b/packages/react-table/src/components/Table/Table.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { createContext, forwardRef, useEffect, useRef, useState, type JSX } from 'react';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 import stylesGrid from '@patternfly/react-styles/css/components/Table/table-grid';
 import stylesTreeView from '@patternfly/react-styles/css/components/Table/table-tree-view';
@@ -10,8 +10,6 @@ import { KeyTypes } from '@patternfly/react-core/dist/esm/helpers/constants';
 import { useOUIAProps, OUIAProps } from '@patternfly/react-core/dist/esm/helpers/OUIA/ouia';
 import { TableGridBreakpoint, TableVariant } from './TableTypes';
 
-import type { JSX } from 'react';
-
 export interface BaseCellProps {
   /** Content rendered inside the cell */
   children?: React.ReactNode;
@@ -77,7 +75,7 @@ interface TableContextProps {
   registerSelectableRow?: () => void;
 }
 
-export const TableContext = React.createContext<TableContextProps>({
+export const TableContext = createContext<TableContextProps>({
   registerSelectableRow: () => {}
 });
 
@@ -103,13 +101,13 @@ const TableBase: React.FunctionComponent<TableProps> = ({
   selectableRowCaptionText,
   ...props
 }: TableProps) => {
-  const ref = React.useRef(null);
+  const ref = useRef(null);
   const tableRef = innerRef || ref;
 
-  const [hasSelectableRows, setHasSelectableRows] = React.useState(false);
-  const [tableCaption, setTableCaption] = React.useState<JSX.Element | undefined>();
+  const [hasSelectableRows, setHasSelectableRows] = useState(false);
+  const [tableCaption, setTableCaption] = useState<JSX.Element | undefined>();
 
-  React.useEffect(() => {
+  useEffect(() => {
     document.addEventListener('keydown', handleKeys);
 
     // sets up roving tab-index to tree tables only
@@ -123,7 +121,7 @@ const TableBase: React.FunctionComponent<TableProps> = ({
     };
   }, [tableRef, tableRef.current]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (selectableRowCaptionText) {
       setTableCaption(
         <caption>
@@ -228,7 +226,7 @@ const TableBase: React.FunctionComponent<TableProps> = ({
   );
 };
 
-export const Table = React.forwardRef((props: TableProps, ref: React.Ref<HTMLTableElement>) => (
+export const Table = forwardRef((props: TableProps, ref: React.Ref<HTMLTableElement>) => (
   <TableBase {...props} innerRef={ref as React.MutableRefObject<any>} />
 ));
 Table.displayName = 'Table';
diff --git a/packages/react-table/src/components/Table/TableText.tsx b/packages/react-table/src/components/Table/TableText.tsx
index 659e787263d..4a1cbfc1f87 100644
--- a/packages/react-table/src/components/Table/TableText.tsx
+++ b/packages/react-table/src/components/Table/TableText.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { createRef, useEffect, useState } from 'react';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 import { css } from '@patternfly/react-styles';
 import { Tooltip, TooltipProps } from '@patternfly/react-core/dist/esm/components/Tooltip';
@@ -33,7 +33,7 @@ export interface TableTextProps extends React.HTMLProps<HTMLDivElement> {
   onMouseEnter?: (event: any) => void;
   /** Determines if the TableText is focused by parent component */
   focused?: boolean;
-  /** Determines if tooltip should have normal visbility behavior. If false, the tooltip will only be shown when children is not entirely visible */
+  /** Determines if tooltip should have normal visibility behavior. If false, the tooltip will only be shown when children is not entirely visible */
   tooltipHasDefaultBehavior?: boolean;
 }
 
@@ -50,9 +50,9 @@ export const TableText: React.FunctionComponent<TableTextProps> = ({
   ...props
 }: TableTextProps) => {
   const Component: TableTextVariant | 'span' | 'div' = variant;
-  const textRef = React.createRef<HTMLElement>();
+  const textRef = createRef<HTMLElement>();
 
-  const [tooltip, setTooltip] = React.useState(tooltipProp);
+  const [tooltip, setTooltip] = useState(tooltipProp);
   const onMouseEnter = (event: any) => {
     if (event.target.offsetWidth < event.target.scrollWidth) {
       setTooltip(tooltipProp || event.target.innerText);
@@ -81,7 +81,7 @@ export const TableText: React.FunctionComponent<TableTextProps> = ({
     </Component>
   );
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (!tooltipHasDefaultBehavior) {
       if (focused) {
         onFocus(textRef.current);
diff --git a/packages/react-table/src/components/Table/TableTypes.tsx b/packages/react-table/src/components/Table/TableTypes.tsx
index 74a5aa08dee..c58e49dae1d 100644
--- a/packages/react-table/src/components/Table/TableTypes.tsx
+++ b/packages/react-table/src/components/Table/TableTypes.tsx
@@ -1,7 +1,6 @@
 import { formatterValueType, ColumnType, RowType, RowKeyType, HeaderType } from './base/types';
 import { SortByDirection } from './SortColumn';
 import { DropdownItemProps } from '@patternfly/react-core/dist/esm/components/Dropdown';
-import * as React from 'react';
 import { CustomActionsToggleProps } from './ActionsColumn';
 import { ButtonProps } from '@patternfly/react-core/dist/esm/components/Button';
 import { TooltipProps } from '@patternfly/react-core/dist/esm/components/Tooltip';
diff --git a/packages/react-table/src/components/Table/Tbody.tsx b/packages/react-table/src/components/Table/Tbody.tsx
index 1e99ca92fcf..462032b0325 100644
--- a/packages/react-table/src/components/Table/Tbody.tsx
+++ b/packages/react-table/src/components/Table/Tbody.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 
@@ -42,7 +42,7 @@ const TbodyBase: React.FunctionComponent<TbodyProps> = ({
   </tbody>
 );
 
-export const Tbody = React.forwardRef((props: TbodyProps, ref: React.Ref<HTMLTableSectionElement>) => (
+export const Tbody = forwardRef((props: TbodyProps, ref: React.Ref<HTMLTableSectionElement>) => (
   <TbodyBase {...props} innerRef={ref} />
 ));
 Tbody.displayName = 'Tbody';
diff --git a/packages/react-table/src/components/Table/Td.tsx b/packages/react-table/src/components/Table/Td.tsx
index c05c0bc1d4a..298ad9c593f 100644
--- a/packages/react-table/src/components/Table/Td.tsx
+++ b/packages/react-table/src/components/Table/Td.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { createRef, forwardRef, useEffect, useState } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 import scrollStyles from '@patternfly/react-styles/css/components/Table/table-scrollable';
@@ -109,9 +109,9 @@ const TdBase: React.FunctionComponent<TdProps> = ({
   stickyRightOffset,
   ...props
 }: TdProps) => {
-  const [showTooltip, setShowTooltip] = React.useState(false);
-  const [truncated, setTruncated] = React.useState(false);
-  const cellRef = innerRef ? innerRef : React.createRef();
+  const [showTooltip, setShowTooltip] = useState(false);
+  const [truncated, setTruncated] = useState(false);
+  const cellRef = innerRef ? innerRef : createRef();
   const onMouseEnter = (event: any) => {
     if (event.target.offsetWidth < event.target.scrollWidth) {
       !showTooltip && setShowTooltip(true);
@@ -261,7 +261,7 @@ const TdBase: React.FunctionComponent<TdProps> = ({
     (className && className.includes(treeViewStyles.tableTreeViewTitleCell)) ||
     (mergedClassName && mergedClassName.includes(treeViewStyles.tableTreeViewTitleCell));
 
-  React.useEffect(() => {
+  useEffect(() => {
     setTruncated(
       (cellRef as React.RefObject<HTMLElement | null>).current.offsetWidth <
         (cellRef as React.RefObject<HTMLElement | null>).current.scrollWidth
@@ -319,7 +319,7 @@ const TdBase: React.FunctionComponent<TdProps> = ({
   );
 };
 
-export const Td = React.forwardRef((props: TdProps, ref: React.Ref<HTMLTableDataCellElement>) => (
+export const Td = forwardRef((props: TdProps, ref: React.Ref<HTMLTableDataCellElement>) => (
   <TdBase {...props} innerRef={ref} />
 ));
 Td.displayName = 'Td';
diff --git a/packages/react-table/src/components/Table/Th.tsx b/packages/react-table/src/components/Table/Th.tsx
index 161f768fc51..2aadd521f7f 100644
--- a/packages/react-table/src/components/Table/Th.tsx
+++ b/packages/react-table/src/components/Table/Th.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { createRef, forwardRef, useEffect, useState } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 import scrollStyles from '@patternfly/react-styles/css/components/Table/table-scrollable';
@@ -103,9 +103,9 @@ const ThBase: React.FunctionComponent<ThProps> = ({
     );
   }
 
-  const [showTooltip, setShowTooltip] = React.useState(false);
-  const [truncated, setTruncated] = React.useState(false);
-  const cellRef = innerRef ? innerRef : React.createRef();
+  const [showTooltip, setShowTooltip] = useState(false);
+  const [truncated, setTruncated] = useState(false);
+  const cellRef = innerRef ? innerRef : createRef();
   const onMouseEnter = (event: any) => {
     if (event.target.offsetWidth < event.target.scrollWidth) {
       !showTooltip && setShowTooltip(true);
@@ -196,7 +196,7 @@ const ThBase: React.FunctionComponent<ThProps> = ({
     ...mergedProps
   } = merged;
 
-  React.useEffect(() => {
+  useEffect(() => {
     setTruncated(
       (cellRef as React.RefObject<HTMLElement | null>).current.offsetWidth <
         (cellRef as React.RefObject<HTMLElement | null>).current.scrollWidth
@@ -258,7 +258,7 @@ const ThBase: React.FunctionComponent<ThProps> = ({
   );
 };
 
-export const Th = React.forwardRef((props: ThProps, ref: React.Ref<HTMLTableHeaderCellElement>) => (
+export const Th = forwardRef((props: ThProps, ref: React.Ref<HTMLTableHeaderCellElement>) => (
   <ThBase {...props} innerRef={ref} />
 ));
 Th.displayName = 'Th';
diff --git a/packages/react-table/src/components/Table/Thead.tsx b/packages/react-table/src/components/Table/Thead.tsx
index e35cca777d3..97a1d549c4c 100644
--- a/packages/react-table/src/components/Table/Thead.tsx
+++ b/packages/react-table/src/components/Table/Thead.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef } from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 
@@ -37,7 +37,7 @@ const TheadBase: React.FunctionComponent<TheadProps> = ({
   </thead>
 );
 
-export const Thead = React.forwardRef((props: TheadProps, ref: React.Ref<HTMLTableSectionElement>) => (
+export const Thead = forwardRef((props: TheadProps, ref: React.Ref<HTMLTableSectionElement>) => (
   <TheadBase {...props} innerRef={ref} />
 ));
 Thead.displayName = 'Thead';
diff --git a/packages/react-table/src/components/Table/Tr.tsx b/packages/react-table/src/components/Table/Tr.tsx
index 04eeb35c353..75bb1eb08f1 100644
--- a/packages/react-table/src/components/Table/Tr.tsx
+++ b/packages/react-table/src/components/Table/Tr.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { forwardRef, useContext, useEffect, useState } from 'react';
 import { useOUIAProps, OUIAProps } from '@patternfly/react-core/dist/esm/helpers';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 import inlineStyles from '@patternfly/react-styles/css/components/InlineEdit/inline-edit';
@@ -63,7 +63,7 @@ const TrBase: React.FunctionComponent<TrProps> = ({
   ...props
 }: TrProps) => {
   const ouiaProps = useOUIAProps('TableRow', ouiaId, ouiaSafe);
-  const [computedAriaLabel, setComputedAriaLabel] = React.useState<string | undefined>('');
+  const [computedAriaLabel, setComputedAriaLabel] = useState<string | undefined>('');
 
   let onKeyDown = null;
   if (onRowClick) {
@@ -77,9 +77,9 @@ const TrBase: React.FunctionComponent<TrProps> = ({
 
   const rowIsHidden = isHidden || (isExpanded !== undefined && !isExpanded);
 
-  const { registerSelectableRow } = React.useContext(TableContext);
+  const { registerSelectableRow } = useContext(TableContext);
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (isSelectable && !rowIsHidden) {
       setComputedAriaLabel(`${isRowSelected ? 'Row selected' : ''}`);
       registerSelectableRow();
@@ -120,7 +120,7 @@ const TrBase: React.FunctionComponent<TrProps> = ({
   );
 };
 
-export const Tr = React.forwardRef((props: TrProps, ref: React.Ref<HTMLTableRowElement>) => (
+export const Tr = forwardRef((props: TrProps, ref: React.Ref<HTMLTableRowElement>) => (
   <TrBase {...props} innerRef={ref} />
 ));
 Tr.displayName = 'Tr';
diff --git a/packages/react-table/src/components/Table/TreeRowWrapper.tsx b/packages/react-table/src/components/Table/TreeRowWrapper.tsx
index 885cae64a7c..9f3edd0d6ac 100644
--- a/packages/react-table/src/components/Table/TreeRowWrapper.tsx
+++ b/packages/react-table/src/components/Table/TreeRowWrapper.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 import stylesTreeView from '@patternfly/react-styles/css/components/Table/table-tree-view';
diff --git a/packages/react-table/src/components/Table/__tests__/RowWrapper.test.tsx b/packages/react-table/src/components/Table/__tests__/RowWrapper.test.tsx
index d6cbcbf77fb..683c2055adf 100644
--- a/packages/react-table/src/components/Table/__tests__/RowWrapper.test.tsx
+++ b/packages/react-table/src/components/Table/__tests__/RowWrapper.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render } from '@testing-library/react';
 import { RowWrapper, RowWrapperProps } from '../RowWrapper';
 
diff --git a/packages/react-table/src/components/Table/__tests__/Th.test.tsx b/packages/react-table/src/components/Table/__tests__/Th.test.tsx
index ab4f71cf7bc..06c4bf2c3fc 100644
--- a/packages/react-table/src/components/Table/__tests__/Th.test.tsx
+++ b/packages/react-table/src/components/Table/__tests__/Th.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Th } from '../Th';
 
diff --git a/packages/react-table/src/components/Table/base/merge-props.ts b/packages/react-table/src/components/Table/base/merge-props.ts
index 2df72052f9c..e07a9f151ca 100644
--- a/packages/react-table/src/components/Table/base/merge-props.ts
+++ b/packages/react-table/src/components/Table/base/merge-props.ts
@@ -4,7 +4,7 @@
  * Forked from reactabular-table version 8.14.0
  * https://github.com/reactabular/reactabular/tree/v8.14.0/packages/reactabular-table/src
  */
-import * as React from 'react';
+import { cloneElement } from 'react';
 import mergeWith from 'lodash/mergeWith';
 import { css } from '@patternfly/react-styles';
 
@@ -24,7 +24,7 @@ export function mergeProps(...props: any) {
     if (key === 'children') {
       if (a && b) {
         // compose the two
-        return React.cloneElement(a, {
+        return cloneElement(a, {
           children: b
         });
       }
diff --git a/packages/react-table/src/components/Table/base/provider.tsx b/packages/react-table/src/components/Table/base/provider.tsx
index 5ab4762a889..4f99baeaadb 100644
--- a/packages/react-table/src/components/Table/base/provider.tsx
+++ b/packages/react-table/src/components/Table/base/provider.tsx
@@ -4,7 +4,7 @@
  * Forked from reactabular-table version 8.14.0
  * https://github.com/reactabular/reactabular/tree/v8.14.0/packages/reactabular-table/src
  */
-import * as React from 'react';
+import { Component, createContext, createElement } from 'react';
 import { RenderersTypes, TableDefaults, ColumnsType } from './types';
 
 export interface ProviderProps extends RenderersTypes {
@@ -15,12 +15,12 @@ export interface ProviderProps extends RenderersTypes {
   borders?: boolean;
 }
 
-export const ProviderContext = React.createContext({
+export const ProviderContext = createContext({
   columns: null as ColumnsType,
   renderers: null as RenderersTypes['renderers']
 });
 
-class Provider extends React.Component<ProviderProps, {}> {
+class Provider extends Component<ProviderProps, {}> {
   static displayName = 'Provider';
   static defaultProps = {
     renderers: TableDefaults.renderers
@@ -38,7 +38,7 @@ class Provider extends React.Component<ProviderProps, {}> {
       finalRenderers = components;
     }
 
-    const provider = React.createElement(renderers.table || TableDefaults.renderers.table, props, children);
+    const provider = createElement(renderers.table || TableDefaults.renderers.table, props, children);
     return (
       <ProviderContext.Provider
         value={{
diff --git a/packages/react-table/src/components/Table/base/types.tsx b/packages/react-table/src/components/Table/base/types.tsx
index eb4b43f0247..bee426566f5 100644
--- a/packages/react-table/src/components/Table/base/types.tsx
+++ b/packages/react-table/src/components/Table/base/types.tsx
@@ -4,8 +4,6 @@
  * Forked from reactabular-table version 8.14.0
  * https://github.com/reactabular/reactabular/tree/v8.14.0/packages/reactabular-table/src
  */
-
-import * as React from 'react';
 import { ButtonProps } from '@patternfly/react-core/dist/esm/components/Button';
 import { PopoverProps } from '@patternfly/react-core/dist/esm/components/Popover';
 import { SelectProps } from '@patternfly/react-core/dist/esm/components/Select';
diff --git a/packages/react-table/src/components/Table/examples/Table.md b/packages/react-table/src/components/Table/examples/Table.md
index 6daa7d7cd29..659754c54c8 100644
--- a/packages/react-table/src/components/Table/examples/Table.md
+++ b/packages/react-table/src/components/Table/examples/Table.md
@@ -41,6 +41,7 @@ The `Table` component takes an explicit and declarative approach, and its implem
 
 The documentation for the deprecated table implementation can be found under the [React deprecated](/components/table/react-deprecated) tab. It is configuration based and takes a less declarative and more implicit approach to laying out the table structure, such as the rows and cells within it.
 
+import { Fragment, isValidElement, useCallback, useEffect, useRef, useState } from 'react';
 import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
 import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
 import CodeIcon from '@patternfly/react-icons/dist/esm/icons/code-icon';
@@ -189,7 +190,7 @@ If actions menus are getting clipped by other items on the page, such as sticky
 
 ### Actions Overflow
 
-Useing an `OverflowMenu` in the actions column, allowing the actions to condense into a dropdown if necessary for space.
+Using an `OverflowMenu` in the actions column, allowing the actions to condense into a dropdown if necessary for space.
 
 ```ts file="TableActionsOverflow.tsx"
 
diff --git a/packages/react-table/src/components/Table/examples/TableActions.tsx b/packages/react-table/src/components/Table/examples/TableActions.tsx
index 64ab513762f..5468d4f965d 100644
--- a/packages/react-table/src/components/Table/examples/TableActions.tsx
+++ b/packages/react-table/src/components/Table/examples/TableActions.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { Button, MenuToggle, ToggleGroup, ToggleGroupItem, ToggleGroupItemProps } from '@patternfly/react-core';
 import {
   Table,
@@ -45,7 +45,7 @@ export const TableActions: React.FunctionComponent = () => {
   };
 
   // This state is just for the ToggleGroup in this example and isn't necessary for Table usage.
-  const [exampleChoice, setExampleChoice] = React.useState<ExampleType>('defaultToggle');
+  const [exampleChoice, setExampleChoice] = useState<ExampleType>('defaultToggle');
   const onExampleTypeChange: ToggleGroupItemProps['onChange'] = (event, _isSelected) => {
     const id = event.currentTarget.id;
     setExampleChoice(id as ExampleType);
@@ -93,7 +93,7 @@ export const TableActions: React.FunctionComponent = () => {
   ];
 
   return (
-    <React.Fragment>
+    <Fragment>
       <ToggleGroup aria-label="Default uses kebab toggle">
         <ToggleGroupItem
           text="Default actions toggle"
@@ -163,6 +163,6 @@ export const TableActions: React.FunctionComponent = () => {
           })}
         </Tbody>
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-table/src/components/Table/examples/TableActionsOverflow.tsx b/packages/react-table/src/components/Table/examples/TableActionsOverflow.tsx
index b685ea195e7..ecf40155c3a 100644
--- a/packages/react-table/src/components/Table/examples/TableActionsOverflow.tsx
+++ b/packages/react-table/src/components/Table/examples/TableActionsOverflow.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import {
   Button,
   OverflowMenu,
@@ -33,7 +33,7 @@ export const TableActions: React.FunctionComponent = () => {
     { name: '5', branches: '2', prs: 'b', workspaces: 'four', lastCommit: 'five', isMenuOpen: false }
   ];
 
-  const [repos, setRepos] = React.useState(repositories);
+  const [repos, setRepos] = useState(repositories);
 
   const columnNames = {
     name: 'Repositories',
@@ -45,7 +45,7 @@ export const TableActions: React.FunctionComponent = () => {
 
   const dropdownItems = [
     <OverflowMenuDropdownItem itemId={0} key="item1" isShared>
-      Pimary
+      Primary
     </OverflowMenuDropdownItem>,
     <OverflowMenuDropdownItem itemId={1} key="item2" isShared>
       Secondary
@@ -56,7 +56,7 @@ export const TableActions: React.FunctionComponent = () => {
   ];
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Table aria-label="Actions table">
         <Thead>
           <Tr>
@@ -122,6 +122,6 @@ export const TableActions: React.FunctionComponent = () => {
           ))}
         </Tbody>
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-table/src/components/Table/examples/TableBasic.tsx b/packages/react-table/src/components/Table/examples/TableBasic.tsx
index 29803a796e7..eb8fb204509 100644
--- a/packages/react-table/src/components/Table/examples/TableBasic.tsx
+++ b/packages/react-table/src/components/Table/examples/TableBasic.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { ToggleGroup, ToggleGroupItem, ToggleGroupItemProps } from '@patternfly/react-core';
 import { Table, Caption, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 
@@ -29,14 +29,14 @@ export const TableBasic: React.FunctionComponent = () => {
   };
 
   // This state is just for the ToggleGroup in this example and isn't necessary for Table usage.
-  const [exampleChoice, setExampleChoice] = React.useState<ExampleType>('default');
+  const [exampleChoice, setExampleChoice] = useState<ExampleType>('default');
   const onExampleTypeChange: ToggleGroupItemProps['onChange'] = (event, _isSelected) => {
     const id = event.currentTarget.id;
     setExampleChoice(id as ExampleType);
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <ToggleGroup aria-label="Default with single selectable">
         <ToggleGroupItem
           text="Default"
@@ -84,6 +84,6 @@ export const TableBasic: React.FunctionComponent = () => {
           ))}
         </Tbody>
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-table/src/components/Table/examples/TableCellWidth.tsx b/packages/react-table/src/components/Table/examples/TableCellWidth.tsx
index c6b3322f8a3..9b59662f95e 100644
--- a/packages/react-table/src/components/Table/examples/TableCellWidth.tsx
+++ b/packages/react-table/src/components/Table/examples/TableCellWidth.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 
 interface Repository {
diff --git a/packages/react-table/src/components/Table/examples/TableClickable.tsx b/packages/react-table/src/components/Table/examples/TableClickable.tsx
index 7102484a403..7ba22507a7f 100644
--- a/packages/react-table/src/components/Table/examples/TableClickable.tsx
+++ b/packages/react-table/src/components/Table/examples/TableClickable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 
 interface Repository {
@@ -27,7 +27,7 @@ export const TableClickable: React.FunctionComponent = () => {
 
   // In this example, selected rows are tracked by the repo names from each row. This could be any unique identifier.
   // This is to prevent state from being based on row order index in case we later add sorting.
-  const [selectedRepoName, setSelectedRepoName] = React.useState('');
+  const [selectedRepoName, setSelectedRepoName] = useState('');
 
   return (
     <Table aria-label="Clickable table">
diff --git a/packages/react-table/src/components/Table/examples/TableCompoundExpandable.tsx b/packages/react-table/src/components/Table/examples/TableCompoundExpandable.tsx
index 12482e29c0c..282aa9013ad 100644
--- a/packages/react-table/src/components/Table/examples/TableCompoundExpandable.tsx
+++ b/packages/react-table/src/components/Table/examples/TableCompoundExpandable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td, TdProps, ExpandableRowContent } from '@patternfly/react-table';
 
 import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
@@ -33,7 +33,7 @@ export const TableCompoundExpandable: React.FunctionComponent = () => {
   // In this example, expanded cells are tracked by the repo and property names from each row. This could be any pair of unique identifiers.
   // This is to prevent state from being based on row and column order index in case we later add sorting and rearranging columns.
   // Note that this behavior is very similar to selection state.
-  const [expandedCells, setExpandedCells] = React.useState<Record<string, ColumnKey>>({
+  const [expandedCells, setExpandedCells] = useState<Record<string, ColumnKey>>({
     'siemur/test-space': 'branches' // Default to the first cell of the first row being expanded
   });
   const setCellExpanded = (repo: Repository, columnKey: ColumnKey, isExpanding = true) => {
diff --git a/packages/react-table/src/components/Table/examples/TableControllingText.tsx b/packages/react-table/src/components/Table/examples/TableControllingText.tsx
index 4d82a9141ea..10404be1fe9 100644
--- a/packages/react-table/src/components/Table/examples/TableControllingText.tsx
+++ b/packages/react-table/src/components/Table/examples/TableControllingText.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 
 // This example has been simplified to focus on the text modifier props. In real usage,
diff --git a/packages/react-table/src/components/Table/examples/TableDraggable.tsx b/packages/react-table/src/components/Table/examples/TableDraggable.tsx
index 96ffbd5187d..35be8fdbaff 100644
--- a/packages/react-table/src/components/Table/examples/TableDraggable.tsx
+++ b/packages/react-table/src/components/Table/examples/TableDraggable.tsx
@@ -1,15 +1,15 @@
-import React from 'react';
+import { useRef, useState } from 'react';
 import { Table, Thead, Tbody, Tr, Th, Td, TbodyProps, TrProps } from '@patternfly/react-table';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 
 export const TableDraggable: React.FunctionComponent = () => {
-  const [draggedItemId, setDraggedItemId] = React.useState<string | null>(null);
-  const [draggingToItemIndex, setDraggingToItemIndex] = React.useState<number | null>(null);
-  const [isDragging, setIsDragging] = React.useState(false);
-  const [itemOrder, setItemOrder] = React.useState(['row1', 'row2', 'row3']);
-  const [tempItemOrder, setTempItemOrder] = React.useState<string[]>([]);
+  const [draggedItemId, setDraggedItemId] = useState<string | null>(null);
+  const [draggingToItemIndex, setDraggingToItemIndex] = useState<number | null>(null);
+  const [isDragging, setIsDragging] = useState(false);
+  const [itemOrder, setItemOrder] = useState(['row1', 'row2', 'row3']);
+  const [tempItemOrder, setTempItemOrder] = useState<string[]>([]);
 
-  const bodyRef = React.useRef<HTMLTableSectionElement>(undefined);
+  const bodyRef = useRef<HTMLTableSectionElement>(undefined);
 
   const onDragStart: TrProps['onDragStart'] = (evt) => {
     evt.dataTransfer.effectAllowed = 'move';
diff --git a/packages/react-table/src/components/Table/examples/TableEditable.tsx b/packages/react-table/src/components/Table/examples/TableEditable.tsx
index e8d5fd2bdf8..03742cf87b7 100644
--- a/packages/react-table/src/components/Table/examples/TableEditable.tsx
+++ b/packages/react-table/src/components/Table/examples/TableEditable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { isValidElement, useRef, useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 import { Button, Checkbox, Radio, TextInput, KeyTypes, getUniqueId } from '@patternfly/react-core';
 import PencilAltIcon from '@patternfly/react-icons/dist/esm/icons/pencil-alt-icon';
@@ -18,7 +18,7 @@ const EditButtonsCell: React.FunctionComponent<EditButtonsCellProps> = ({
   elementToFocusOnEditRef,
   rowAriaLabel = 'row'
 }) => {
-  const editButtonRef = React.useRef<HTMLButtonElement>(undefined);
+  const editButtonRef = useRef<HTMLButtonElement>(undefined);
 
   const onKeyDown = (event: React.KeyboardEvent<HTMLButtonElement>, button: 'edit' | 'stopEditing') => {
     const focusRef = button === 'edit' ? elementToFocusOnEditRef : editButtonRef;
@@ -97,7 +97,7 @@ const EditableCell: React.FunctionComponent<EditableCellProps> = ({
   role,
   ariaLabel
 }) => {
-  const hasMultipleInputs = Array.isArray(editingValue) && editingValue.every((elem) => React.isValidElement(elem));
+  const hasMultipleInputs = Array.isArray(editingValue) && editingValue.every((elem) => isValidElement(elem));
 
   return (
     <Td dataLabel={dataLabel}>
@@ -134,10 +134,10 @@ const EditableRow: React.FunctionComponent<EditableRow> = ({
   ariaLabel,
   rowIndex
 }) => {
-  const [editable, setEditable] = React.useState(false);
-  const [editedData, setEditedData] = React.useState(data);
+  const [editable, setEditable] = useState(false);
+  const [editedData, setEditedData] = useState(data);
 
-  const inputRef = React.useRef(undefined);
+  const inputRef = useRef(undefined);
 
   return (
     <Tr className={css(inlineEditStyles.inlineEdit, editable ? inlineEditStyles.modifiers.inlineEditable : '')}>
@@ -273,7 +273,7 @@ export const TableEditable: React.FunctionComponent = () => {
     }
   ];
 
-  const [rows, setRows] = React.useState(initialRows);
+  const [rows, setRows] = useState(initialRows);
 
   const columnNames: ColumnNames<CustomData> = {
     textInput: 'Text input',
diff --git a/packages/react-table/src/components/Table/examples/TableEmptyState.tsx b/packages/react-table/src/components/Table/examples/TableEmptyState.tsx
index 2407e297bae..7e0e05e8ce5 100644
--- a/packages/react-table/src/components/Table/examples/TableEmptyState.tsx
+++ b/packages/react-table/src/components/Table/examples/TableEmptyState.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 import {
   Bullseye,
diff --git a/packages/react-table/src/components/Table/examples/TableExpandable.tsx b/packages/react-table/src/components/Table/examples/TableExpandable.tsx
index 95b008a4812..50f483ac8b3 100644
--- a/packages/react-table/src/components/Table/examples/TableExpandable.tsx
+++ b/packages/react-table/src/components/Table/examples/TableExpandable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td, ExpandableRowContent } from '@patternfly/react-table';
 import { Checkbox } from '@patternfly/react-core';
 
@@ -96,7 +96,7 @@ export const TableExpandable: React.FunctionComponent = () => {
   // This is to prevent state from being based on row order index in case we later add sorting.
   // Note that this behavior is very similar to selection state.
   const initialExpandedRepoNames = repositories.filter((repo) => !!repo.details).map((repo) => repo.name); // Default to all expanded
-  const [expandedRepoNames, setExpandedRepoNames] = React.useState<string[]>(initialExpandedRepoNames);
+  const [expandedRepoNames, setExpandedRepoNames] = useState<string[]>(initialExpandedRepoNames);
   const setRepoExpanded = (repo: Repository, isExpanding = true) =>
     setExpandedRepoNames((prevExpanded) => {
       const otherExpandedRepoNames = prevExpanded.filter((r) => r !== repo.name);
@@ -104,10 +104,10 @@ export const TableExpandable: React.FunctionComponent = () => {
     });
   const isRepoExpanded = (repo: Repository) => expandedRepoNames.includes(repo.name);
 
-  const [isExampleCompact, setIsExampleCompact] = React.useState(true);
+  const [isExampleCompact, setIsExampleCompact] = useState(true);
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Checkbox
         label="Compact"
         isChecked={isExampleCompact}
@@ -195,6 +195,6 @@ export const TableExpandable: React.FunctionComponent = () => {
           );
         })}
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-table/src/components/Table/examples/TableFavoritable.tsx b/packages/react-table/src/components/Table/examples/TableFavoritable.tsx
index 3b559ecdc44..0e5787ef703 100644
--- a/packages/react-table/src/components/Table/examples/TableFavoritable.tsx
+++ b/packages/react-table/src/components/Table/examples/TableFavoritable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useCallback, useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td, ThProps } from '@patternfly/react-table';
 
 interface Repository {
@@ -28,13 +28,13 @@ export const TableFavoritable: React.FunctionComponent = () => {
   // Index of the currently sorted column
   // Note: if you intend to make columns reorderable, you may instead want to use a non-numeric key
   // as the identifier of the sorted column. See the "Compound expandable" example.
-  const [activeSortIndex, setActiveSortIndex] = React.useState<number>();
+  const [activeSortIndex, setActiveSortIndex] = useState<number>();
 
   // Sort direction of the currently sorted column
-  const [activeSortDirection, setActiveSortDirection] = React.useState<'asc' | 'desc'>();
+  const [activeSortDirection, setActiveSortDirection] = useState<'asc' | 'desc'>();
 
   // Favorite state is similar to selection state, see Selectable with checkbox.
-  const [favoriteRepoNames, setFavoriteRepoNames] = React.useState<string[]>([]);
+  const [favoriteRepoNames, setFavoriteRepoNames] = useState<string[]>([]);
   const setRepoFavorited = (repo: Repository, isFavoriting = true) =>
     setFavoriteRepoNames((prevFavorites) => {
       const otherFavorites = prevFavorites.filter((r) => r !== repo.name);
@@ -43,14 +43,14 @@ export const TableFavoritable: React.FunctionComponent = () => {
   const isRepoFavorited = (repo: Repository) => favoriteRepoNames.includes(repo.name);
 
   // State of the header cell to favorite / unfavorite all rows
-  const [headerFavorited, setHeaderFavorited] = React.useState(false);
+  const [headerFavorited, setHeaderFavorited] = useState(false);
 
   // Since OnSort specifies sorted columns by index, we need sortable values for our object by column index.
   // In this example we only deal with booleans here because we only sort on the favorites column.
   // For more complex sorting, see Sortable.
   // Note: We also memoize the sortable values with useCallback to prevent rows jumping around when you change
   // the favorites while sorting on that column. Only updating the sort state will reorder the rows.
-  const getSortableRowValues = React.useCallback(
+  const getSortableRowValues = useCallback(
     (repo: Repository): boolean[] => [isRepoFavorited(repo)],
     [activeSortIndex, activeSortDirection]
   );
diff --git a/packages/react-table/src/components/Table/examples/TableMisc.tsx b/packages/react-table/src/components/Table/examples/TableMisc.tsx
index 16d1ae6edf3..ea6f8cdd8b9 100644
--- a/packages/react-table/src/components/Table/examples/TableMisc.tsx
+++ b/packages/react-table/src/components/Table/examples/TableMisc.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 /* eslint-disable camelcase */
 import t_global_background_color_secondary_default from '@patternfly/react-tokens/dist/esm/t_global_background_color_secondary_default';
diff --git a/packages/react-table/src/components/Table/examples/TableMultipleStickyColumns.tsx b/packages/react-table/src/components/Table/examples/TableMultipleStickyColumns.tsx
index a2c99a4adfe..e8b9901cddd 100644
--- a/packages/react-table/src/components/Table/examples/TableMultipleStickyColumns.tsx
+++ b/packages/react-table/src/components/Table/examples/TableMultipleStickyColumns.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td, InnerScrollContainer, ThProps } from '@patternfly/react-table';
 import BlueprintIcon from '@patternfly/react-icons/dist/esm/icons/blueprint-icon';
 
@@ -43,10 +43,10 @@ export const TableMultipleStickyColumns: React.FunctionComponent = () => {
   // Index of the currently sorted column
   // Note: if you intend to make columns reorderable, you may instead want to use a non-numeric key
   // as the identifier of the sorted column. See the "Compound expandable" example.
-  const [activeSortIndex, setActiveSortIndex] = React.useState<number | null>(null);
+  const [activeSortIndex, setActiveSortIndex] = useState<number | null>(null);
 
   // Sort direction of the currently sorted column
-  const [activeSortDirection, setActiveSortDirection] = React.useState<'asc' | 'desc' | null>(null);
+  const [activeSortDirection, setActiveSortDirection] = useState<'asc' | 'desc' | null>(null);
 
   // Since OnSort specifies sorted columns by index, we need sortable values for our object by column index.
   // This example is trivial since our data objects just contain strings, but if the data was more complex
diff --git a/packages/react-table/src/components/Table/examples/TableNestedExpandable.tsx b/packages/react-table/src/components/Table/examples/TableNestedExpandable.tsx
index f2ef7359dcc..4ccb89938ad 100644
--- a/packages/react-table/src/components/Table/examples/TableNestedExpandable.tsx
+++ b/packages/react-table/src/components/Table/examples/TableNestedExpandable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td, InnerScrollContainer, ExpandableRowContent } from '@patternfly/react-table';
 import { Button } from '@patternfly/react-core';
 
@@ -51,7 +51,7 @@ export const TableNestedExpandable: React.FunctionComponent = () => {
   // In this example, expanded rows are tracked by the team names from each row. This could be any unique identifier.
   // This is to prevent state from being based on row order index in case we later add sorting.
   // Note that this behavior is very similar to selection state.
-  const [expandedTeamNames, setExpandedTeamNames] = React.useState<string[]>([]);
+  const [expandedTeamNames, setExpandedTeamNames] = useState<string[]>([]);
   const setTeamExpanded = (team: Team, isExpanding = true) =>
     setExpandedTeamNames((prevExpanded) => {
       const otherExpandedTeamNames = prevExpanded.filter((t) => t !== team.name);
diff --git a/packages/react-table/src/components/Table/examples/TableNestedHeaders.tsx b/packages/react-table/src/components/Table/examples/TableNestedHeaders.tsx
index f9fefd8f63b..a8b3bb6c518 100644
--- a/packages/react-table/src/components/Table/examples/TableNestedHeaders.tsx
+++ b/packages/react-table/src/components/Table/examples/TableNestedHeaders.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td, InnerScrollContainer, ThProps } from '@patternfly/react-table';
 import { Stack, StackItem, Timestamp } from '@patternfly/react-core';
 interface PodConnection {
@@ -55,10 +55,10 @@ export const TableNestedHeaders: React.FunctionComponent = () => {
   // Index of the currently sorted column
   // Note: if you intend to make columns reorderable, you may instead want to use a non-numeric key
   // as the identifier of the sorted column. See the "Compound expandable" example.
-  const [activeSortIndex, setActiveSortIndex] = React.useState<number | null>(null);
+  const [activeSortIndex, setActiveSortIndex] = useState<number | null>(null);
 
   // Sort direction of the currently sorted column
-  const [activeSortDirection, setActiveSortDirection] = React.useState<'asc' | 'desc' | null>(null);
+  const [activeSortDirection, setActiveSortDirection] = useState<'asc' | 'desc' | null>(null);
 
   // Since OnSort specifies sorted columns by index, we need sortable values for our object by column index.
   const getSortableRowValues = (connection: PodConnection): (string | number)[] => {
diff --git a/packages/react-table/src/components/Table/examples/TableNestedStickyHeader.tsx b/packages/react-table/src/components/Table/examples/TableNestedStickyHeader.tsx
index 099e950628d..c40a84b5b9b 100644
--- a/packages/react-table/src/components/Table/examples/TableNestedStickyHeader.tsx
+++ b/packages/react-table/src/components/Table/examples/TableNestedStickyHeader.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td, InnerScrollContainer, ThProps } from '@patternfly/react-table';
 import { Stack, StackItem, Timestamp } from '@patternfly/react-core';
 interface PodConnection {
@@ -55,10 +55,10 @@ export const TableNestedHeaders: React.FunctionComponent = () => {
   // Index of the currently sorted column
   // Note: if you intend to make columns reorderable, you may instead want to use a non-numeric key
   // as the identifier of the sorted column. See the "Compound expandable" example.
-  const [activeSortIndex, setActiveSortIndex] = React.useState<number | null>(null);
+  const [activeSortIndex, setActiveSortIndex] = useState<number | null>(null);
 
   // Sort direction of the currently sorted column
-  const [activeSortDirection, setActiveSortDirection] = React.useState<'asc' | 'desc' | null>(null);
+  const [activeSortDirection, setActiveSortDirection] = useState<'asc' | 'desc' | null>(null);
 
   // Since OnSort specifies sorted columns by index, we need sortable values for our object by column index.
   const getSortableRowValues = (connection: PodConnection): (string | number)[] => {
diff --git a/packages/react-table/src/components/Table/examples/TableNestedTableExpandable.tsx b/packages/react-table/src/components/Table/examples/TableNestedTableExpandable.tsx
index 37570aa540d..b52495fe642 100644
--- a/packages/react-table/src/components/Table/examples/TableNestedTableExpandable.tsx
+++ b/packages/react-table/src/components/Table/examples/TableNestedTableExpandable.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import React from 'react';
+import { useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td, ExpandableRowContent, ActionsColumn, IAction } from '@patternfly/react-table';
 
 interface Repository {
@@ -102,7 +102,7 @@ export const TableExpandable: React.FunctionComponent = () => {
   // This is to prevent state from being based on row order index in case we later add sorting.
   // Note that this behavior is very similar to selection state.
   const initialExpandedRepoNames = repositories.filter((repo) => !!repo.nestedComponent).map((repo) => repo.name); // Default to all expanded
-  const [expandedRepoNames, setExpandedRepoNames] = React.useState<string[]>(initialExpandedRepoNames);
+  const [expandedRepoNames, setExpandedRepoNames] = useState<string[]>(initialExpandedRepoNames);
   const setRepoExpanded = (repo: Repository, isExpanding = true) =>
     setExpandedRepoNames((prevExpanded) => {
       const otherExpandedRepoNames = prevExpanded.filter((r) => r !== repo.name);
diff --git a/packages/react-table/src/components/Table/examples/TableRightStickyColumn.tsx b/packages/react-table/src/components/Table/examples/TableRightStickyColumn.tsx
index c4650185cb3..8a7ffaa4b01 100644
--- a/packages/react-table/src/components/Table/examples/TableRightStickyColumn.tsx
+++ b/packages/react-table/src/components/Table/examples/TableRightStickyColumn.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td, InnerScrollContainer, ThProps } from '@patternfly/react-table';
 
 interface Fact {
@@ -42,10 +42,10 @@ export const ComposableTableRightStickyColumn: React.FunctionComponent = () => {
   // Index of the currently sorted column
   // Note: if you intend to make columns reorderable, you may instead want to use a non-numeric key
   // as the identifier of the sorted column. See the "Compound expandable" example.
-  const [activeSortIndex, setActiveSortIndex] = React.useState<number | null>(null);
+  const [activeSortIndex, setActiveSortIndex] = useState<number | null>(null);
 
   // Sort direction of the currently sorted column
-  const [activeSortDirection, setActiveSortDirection] = React.useState<'asc' | 'desc' | null>(null);
+  const [activeSortDirection, setActiveSortDirection] = useState<'asc' | 'desc' | null>(null);
 
   // Since OnSort specifies sorted columns by index, we need sortable values for our object by column index.
   // This example is trivial since our data objects just contain strings, but if the data was more complex
diff --git a/packages/react-table/src/components/Table/examples/TableSelectable.tsx b/packages/react-table/src/components/Table/examples/TableSelectable.tsx
index 6c6db8b6203..0ae07d9ed71 100644
--- a/packages/react-table/src/components/Table/examples/TableSelectable.tsx
+++ b/packages/react-table/src/components/Table/examples/TableSelectable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useEffect, useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 
 interface Repository {
@@ -33,7 +33,7 @@ export const TableSelectable: React.FunctionComponent = () => {
 
   // In this example, selected rows are tracked by the repo names from each row. This could be any unique identifier.
   // This is to prevent state from being based on row order index in case we later add sorting.
-  const [selectedRepoNames, setSelectedRepoNames] = React.useState<string[]>([]);
+  const [selectedRepoNames, setSelectedRepoNames] = useState<string[]>([]);
   const setRepoSelected = (repo: Repository, isSelecting = true) =>
     setSelectedRepoNames((prevSelected) => {
       const otherSelectedRepoNames = prevSelected.filter((r) => r !== repo.name);
@@ -45,8 +45,8 @@ export const TableSelectable: React.FunctionComponent = () => {
   const isRepoSelected = (repo: Repository) => selectedRepoNames.includes(repo.name);
 
   // To allow shift+click to select/deselect multiple rows
-  const [recentSelectedRowIndex, setRecentSelectedRowIndex] = React.useState<number | null>(null);
-  const [shifting, setShifting] = React.useState(false);
+  const [recentSelectedRowIndex, setRecentSelectedRowIndex] = useState<number | null>(null);
+  const [shifting, setShifting] = useState(false);
 
   const onSelectRepo = (repo: Repository, rowIndex: number, isSelecting: boolean) => {
     // If the user is shift + selecting the checkboxes, then all intermediate checkboxes should be selected
@@ -63,7 +63,7 @@ export const TableSelectable: React.FunctionComponent = () => {
     setRecentSelectedRowIndex(rowIndex);
   };
 
-  React.useEffect(() => {
+  useEffect(() => {
     const onKeyDown = (e: KeyboardEvent) => {
       if (e.key === 'Shift') {
         setShifting(true);
diff --git a/packages/react-table/src/components/Table/examples/TableSelectableRadio.tsx b/packages/react-table/src/components/Table/examples/TableSelectableRadio.tsx
index e932fdf30ba..f556c46c3ff 100644
--- a/packages/react-table/src/components/Table/examples/TableSelectableRadio.tsx
+++ b/packages/react-table/src/components/Table/examples/TableSelectableRadio.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 
 interface Repository {
@@ -29,7 +29,7 @@ export const TableSelectableRadio: React.FunctionComponent = () => {
 
   // In this example, selected rows are tracked by the repo names from each row. This could be any unique identifier.
   // This is to prevent state from being based on row order index in case we later add sorting.
-  const [selectedRepoName, setSelectedRepoName] = React.useState<string | null>(null);
+  const [selectedRepoName, setSelectedRepoName] = useState<string | null>(null);
 
   return (
     <Table aria-label="Selectable table">
diff --git a/packages/react-table/src/components/Table/examples/TableSortable.tsx b/packages/react-table/src/components/Table/examples/TableSortable.tsx
index cab70955616..2eda5015193 100644
--- a/packages/react-table/src/components/Table/examples/TableSortable.tsx
+++ b/packages/react-table/src/components/Table/examples/TableSortable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td, ThProps } from '@patternfly/react-table';
 
 interface Repository {
@@ -28,10 +28,10 @@ export const TableSortable: React.FunctionComponent = () => {
   // Index of the currently sorted column
   // Note: if you intend to make columns reorderable, you may instead want to use a non-numeric key
   // as the identifier of the sorted column. See the "Compound expandable" example.
-  const [activeSortIndex, setActiveSortIndex] = React.useState<number | null>(null);
+  const [activeSortIndex, setActiveSortIndex] = useState<number | null>(null);
 
   // Sort direction of the currently sorted column
-  const [activeSortDirection, setActiveSortDirection] = React.useState<'asc' | 'desc' | null>(null);
+  const [activeSortDirection, setActiveSortDirection] = useState<'asc' | 'desc' | null>(null);
 
   // Since OnSort specifies sorted columns by index, we need sortable values for our object by column index.
   // This example is trivial since our data objects just contain strings, but if the data was more complex
diff --git a/packages/react-table/src/components/Table/examples/TableSortableCustom.tsx b/packages/react-table/src/components/Table/examples/TableSortableCustom.tsx
index 952d3f84fc2..f2e69695e92 100644
--- a/packages/react-table/src/components/Table/examples/TableSortableCustom.tsx
+++ b/packages/react-table/src/components/Table/examples/TableSortableCustom.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td, ThProps } from '@patternfly/react-table';
 import {
   Toolbar,
@@ -37,15 +37,15 @@ export const TableSortableCustom: React.FunctionComponent = () => {
     lastCommit: 'Last commit'
   };
 
-  const [isSortDropdownOpen, setIsSortDropdownOpen] = React.useState(false);
+  const [isSortDropdownOpen, setIsSortDropdownOpen] = useState(false);
 
   // Index of the currently sorted column
   // Note: if you intend to make columns reorderable, you may instead want to use a non-numeric key
   // as the identifier of the sorted column. See the "Compound expandable" example.
-  const [activeSortIndex, setActiveSortIndex] = React.useState<number | null>(null);
+  const [activeSortIndex, setActiveSortIndex] = useState<number | null>(null);
 
   // Sort direction of the currently sorted column
-  const [activeSortDirection, setActiveSortDirection] = React.useState<'asc' | 'desc' | null>(null);
+  const [activeSortDirection, setActiveSortDirection] = useState<'asc' | 'desc' | null>(null);
 
   // Sort dropdown expansion
   // const [isSortDropdownOpen, setIsSortDropdownOpen] = React.useState(false);
@@ -94,7 +94,7 @@ export const TableSortableCustom: React.FunctionComponent = () => {
   });
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Toolbar id="toolbar">
         <ToolbarContent>
           <ToolbarItem>
@@ -168,6 +168,6 @@ export const TableSortableCustom: React.FunctionComponent = () => {
           ))}
         </Tbody>
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-table/src/components/Table/examples/TableStickyColumn.tsx b/packages/react-table/src/components/Table/examples/TableStickyColumn.tsx
index f6fea54a9bb..8c532f98d22 100644
--- a/packages/react-table/src/components/Table/examples/TableStickyColumn.tsx
+++ b/packages/react-table/src/components/Table/examples/TableStickyColumn.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td, InnerScrollContainer, ThProps } from '@patternfly/react-table';
 
 interface Fact {
@@ -42,10 +42,10 @@ export const TableStickyColumn: React.FunctionComponent = () => {
   // Index of the currently sorted column
   // Note: if you intend to make columns reorderable, you may instead want to use a non-numeric key
   // as the identifier of the sorted column. See the "Compound expandable" example.
-  const [activeSortIndex, setActiveSortIndex] = React.useState<number | null>(null);
+  const [activeSortIndex, setActiveSortIndex] = useState<number | null>(null);
 
   // Sort direction of the currently sorted column
-  const [activeSortDirection, setActiveSortDirection] = React.useState<'asc' | 'desc' | null>(null);
+  const [activeSortDirection, setActiveSortDirection] = useState<'asc' | 'desc' | null>(null);
 
   // Since OnSort specifies sorted columns by index, we need sortable values for our object by column index.
   // This example is trivial since our data objects just contain strings, but if the data was more complex
diff --git a/packages/react-table/src/components/Table/examples/TableStickyColumnsAndHeader.tsx b/packages/react-table/src/components/Table/examples/TableStickyColumnsAndHeader.tsx
index afafacfdd2b..2f48764b829 100644
--- a/packages/react-table/src/components/Table/examples/TableStickyColumnsAndHeader.tsx
+++ b/packages/react-table/src/components/Table/examples/TableStickyColumnsAndHeader.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import {
   Table,
   Thead,
@@ -54,10 +54,10 @@ export const TableStickyColumnsAndHeader: React.FunctionComponent = () => {
   // Index of the currently sorted column
   // Note: if you intend to make columns reorderable, you may instead want to use a non-numeric key
   // as the identifier of the sorted column. See the "Compound expandable" example.
-  const [activeSortIndex, setActiveSortIndex] = React.useState(-1);
+  const [activeSortIndex, setActiveSortIndex] = useState(-1);
 
   // Sort direction of the currently sorted column
-  const [activeSortDirection, setActiveSortDirection] = React.useState<ISortBy['direction']>();
+  const [activeSortDirection, setActiveSortDirection] = useState<ISortBy['direction']>();
 
   // Since OnSort specifies sorted columns by index, we need sortable values for our object by column index.
   // This example is trivial since our data objects just contain strings, but if the data was more complex
diff --git a/packages/react-table/src/components/Table/examples/TableStriped.tsx b/packages/react-table/src/components/Table/examples/TableStriped.tsx
index 7f1cf54fd03..61d9a6292f7 100644
--- a/packages/react-table/src/components/Table/examples/TableStriped.tsx
+++ b/packages/react-table/src/components/Table/examples/TableStriped.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Table, Caption, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 
 interface Repository {
diff --git a/packages/react-table/src/components/Table/examples/TableStripedExpandable.tsx b/packages/react-table/src/components/Table/examples/TableStripedExpandable.tsx
index e46c7bb61ef..822e89629fa 100644
--- a/packages/react-table/src/components/Table/examples/TableStripedExpandable.tsx
+++ b/packages/react-table/src/components/Table/examples/TableStripedExpandable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td, ExpandableRowContent } from '@patternfly/react-table';
 import { Checkbox } from '@patternfly/react-core';
 
@@ -92,7 +92,7 @@ export const TableStripedExpandable: React.FunctionComponent = () => {
   // This is to prevent state from being based on row order index in case we later add sorting.
   // Note that this behavior is very similar to selection state.
   const initialExpandedRepoNames = repositories.filter((repo) => !!repo.details).map((repo) => repo.name); // Default to all expanded
-  const [expandedRepoNames, setExpandedRepoNames] = React.useState<string[]>(initialExpandedRepoNames);
+  const [expandedRepoNames, setExpandedRepoNames] = useState<string[]>(initialExpandedRepoNames);
   const setRepoExpanded = (repo: Repository, isExpanding = true) =>
     setExpandedRepoNames((prevExpanded) => {
       const otherExpandedRepoNames = prevExpanded.filter((r) => r !== repo.name);
@@ -100,10 +100,10 @@ export const TableStripedExpandable: React.FunctionComponent = () => {
     });
   const isRepoExpanded = (repo: Repository) => expandedRepoNames.includes(repo.name);
 
-  const [isExampleCompact, setIsExampleCompact] = React.useState(true);
+  const [isExampleCompact, setIsExampleCompact] = useState(true);
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Checkbox
         label="Compact"
         isChecked={isExampleCompact}
@@ -190,6 +190,6 @@ export const TableStripedExpandable: React.FunctionComponent = () => {
           );
         })}
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-table/src/components/Table/examples/TableStripedMultipleTbody.tsx b/packages/react-table/src/components/Table/examples/TableStripedMultipleTbody.tsx
index df0d9c70bae..95eecfce930 100644
--- a/packages/react-table/src/components/Table/examples/TableStripedMultipleTbody.tsx
+++ b/packages/react-table/src/components/Table/examples/TableStripedMultipleTbody.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment } from 'react';
 import { Table, Caption, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 
 interface Repository {
@@ -78,11 +78,11 @@ export const TableStripedMultipleTbody: React.FunctionComponent = () => {
           <Tr key={repo.name}>
             <Td dataLabel={columnNames.name}>
               {repo.description ? (
-                <React.Fragment>
+                <Fragment>
                   {repo.name}
                   <br />
                   <small>{repo.description}</small>
-                </React.Fragment>
+                </Fragment>
               ) : (
                 repo.name
               )}
@@ -99,11 +99,11 @@ export const TableStripedMultipleTbody: React.FunctionComponent = () => {
           <Tr key={repo.name}>
             <Td dataLabel={columnNames.name}>
               {repo.description ? (
-                <React.Fragment>
+                <Fragment>
                   {repo.name}
                   <br />
                   <small>{repo.description}</small>
-                </React.Fragment>
+                </Fragment>
               ) : (
                 repo.name
               )}
diff --git a/packages/react-table/src/components/Table/examples/TableStripedTr.tsx b/packages/react-table/src/components/Table/examples/TableStripedTr.tsx
index 5927275b95e..b8435afda57 100644
--- a/packages/react-table/src/components/Table/examples/TableStripedTr.tsx
+++ b/packages/react-table/src/components/Table/examples/TableStripedTr.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Table, Caption, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 
 interface Repository {
diff --git a/packages/react-table/src/components/Table/examples/TableTextModifiers.tsx b/packages/react-table/src/components/Table/examples/TableTextModifiers.tsx
index 974ed99931d..3d3e9593458 100644
--- a/packages/react-table/src/components/Table/examples/TableTextModifiers.tsx
+++ b/packages/react-table/src/components/Table/examples/TableTextModifiers.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td, TableText } from '@patternfly/react-table';
 
 // This example has been simplified to focus on the text modifier props. In real usage,
@@ -10,7 +10,7 @@ const columnNames = {
 };
 
 export const TableTextModifiers: React.FunctionComponent = () => {
-  const [focused, setFocused] = React.useState(false);
+  const [focused, setFocused] = useState(false);
 
   return (
     <Table aria-label="Table text">
diff --git a/packages/react-table/src/components/Table/examples/TableTree.tsx b/packages/react-table/src/components/Table/examples/TableTree.tsx
index fcbb2e8ddbc..194427e32c3 100644
--- a/packages/react-table/src/components/Table/examples/TableTree.tsx
+++ b/packages/react-table/src/components/Table/examples/TableTree.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td, TreeRowWrapper, TdProps } from '@patternfly/react-table';
 import LeafIcon from '@patternfly/react-icons/dist/esm/icons/leaf-icon';
 import FolderIcon from '@patternfly/react-icons/dist/esm/icons/folder-icon';
@@ -84,9 +84,9 @@ export const TableTree: React.FunctionComponent = () => {
     workspaces: 'Workspaces'
   };
 
-  const [expandedNodeNames, setExpandedNodeNames] = React.useState<string[]>(['Repositories one']);
-  const [expandedDetailsNodeNames, setExpandedDetailsNodeNames] = React.useState<string[]>([]);
-  const [selectedNodeNames, setSelectedNodeNames] = React.useState<string[]>([]);
+  const [expandedNodeNames, setExpandedNodeNames] = useState<string[]>(['Repositories one']);
+  const [expandedDetailsNodeNames, setExpandedDetailsNodeNames] = useState<string[]>([]);
+  const [selectedNodeNames, setSelectedNodeNames] = useState<string[]>([]);
 
   const getDescendants = (node: RepositoriesTreeNode): RepositoriesTreeNode[] => {
     if (!node.children || !node.children.length) {
diff --git a/packages/react-table/src/components/Table/examples/TableTreeNoInset.tsx b/packages/react-table/src/components/Table/examples/TableTreeNoInset.tsx
index e987b2d430f..88f4fb762ec 100644
--- a/packages/react-table/src/components/Table/examples/TableTreeNoInset.tsx
+++ b/packages/react-table/src/components/Table/examples/TableTreeNoInset.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td, TreeRowWrapper, TdProps } from '@patternfly/react-table';
 import LeafIcon from '@patternfly/react-icons/dist/esm/icons/leaf-icon';
 
@@ -42,7 +42,7 @@ export const TableTreeNoInset: React.FunctionComponent = () => {
     workspaces: 'Workspaces'
   };
 
-  const [selectedNodeNames, setSelectedNodeNames] = React.useState<string[]>([]);
+  const [selectedNodeNames, setSelectedNodeNames] = useState<string[]>([]);
   const isNodeChecked = (node: RepositoriesTreeNode) => selectedNodeNames.includes(node.name);
 
   /**
diff --git a/packages/react-table/src/components/Table/utils/decorators/cellActions.tsx b/packages/react-table/src/components/Table/utils/decorators/cellActions.tsx
index adef0c16dee..68dac1f0696 100644
--- a/packages/react-table/src/components/Table/utils/decorators/cellActions.tsx
+++ b/packages/react-table/src/components/Table/utils/decorators/cellActions.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 import { ActionsColumn } from '../../ActionsColumn';
diff --git a/packages/react-table/src/components/Table/utils/decorators/collapsible.tsx b/packages/react-table/src/components/Table/utils/decorators/collapsible.tsx
index 1c3595fa2ea..3737376baa0 100644
--- a/packages/react-table/src/components/Table/utils/decorators/collapsible.tsx
+++ b/packages/react-table/src/components/Table/utils/decorators/collapsible.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 import { CollapseColumn } from '../../CollapseColumn';
diff --git a/packages/react-table/src/components/Table/utils/decorators/compoundExpand.tsx b/packages/react-table/src/components/Table/utils/decorators/compoundExpand.tsx
index 484edd1745b..03bbd6a8d04 100644
--- a/packages/react-table/src/components/Table/utils/decorators/compoundExpand.tsx
+++ b/packages/react-table/src/components/Table/utils/decorators/compoundExpand.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 import { IExtra, IFormatterValueType, ITransform } from '../../TableTypes';
diff --git a/packages/react-table/src/components/Table/utils/decorators/favoritable.tsx b/packages/react-table/src/components/Table/utils/decorators/favoritable.tsx
index 264d0c5a5bb..0f402be4c50 100644
--- a/packages/react-table/src/components/Table/utils/decorators/favoritable.tsx
+++ b/packages/react-table/src/components/Table/utils/decorators/favoritable.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 import { IExtra, IFormatterValueType, ITransform } from '../../TableTypes';
diff --git a/packages/react-table/src/components/Table/utils/decorators/headerCol.tsx b/packages/react-table/src/components/Table/utils/decorators/headerCol.tsx
index 1aad56cc4eb..ccc3d925aa8 100644
--- a/packages/react-table/src/components/Table/utils/decorators/headerCol.tsx
+++ b/packages/react-table/src/components/Table/utils/decorators/headerCol.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { IExtra, IFormatterValueType, ITransform } from '../../TableTypes';
 
 export const headerCol = (id = 'simple-node') => {
diff --git a/packages/react-table/src/components/Table/utils/decorators/info.tsx b/packages/react-table/src/components/Table/utils/decorators/info.tsx
index b78bce4554b..9c24770d973 100644
--- a/packages/react-table/src/components/Table/utils/decorators/info.tsx
+++ b/packages/react-table/src/components/Table/utils/decorators/info.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { ThInfoType } from '../../base/types';
 import { HeaderCellInfoWrapper } from '../../HeaderCellInfoWrapper';
 import { IFormatterValueType, ITransform } from '../../TableTypes';
diff --git a/packages/react-table/src/components/Table/utils/decorators/selectable.tsx b/packages/react-table/src/components/Table/utils/decorators/selectable.tsx
index 71362242176..a536acd876e 100644
--- a/packages/react-table/src/components/Table/utils/decorators/selectable.tsx
+++ b/packages/react-table/src/components/Table/utils/decorators/selectable.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 import { IExtra, IFormatterValueType, ITransform } from '../../TableTypes';
diff --git a/packages/react-table/src/components/Table/utils/decorators/sortable.tsx b/packages/react-table/src/components/Table/utils/decorators/sortable.tsx
index 15033117af7..aaed3ae3660 100644
--- a/packages/react-table/src/components/Table/utils/decorators/sortable.tsx
+++ b/packages/react-table/src/components/Table/utils/decorators/sortable.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 import { IExtra, IFormatterValueType, ITransform } from '../../TableTypes';
diff --git a/packages/react-table/src/components/Table/utils/decorators/treeRow.tsx b/packages/react-table/src/components/Table/utils/decorators/treeRow.tsx
index 640eee99e7c..76fd686cfb1 100644
--- a/packages/react-table/src/components/Table/utils/decorators/treeRow.tsx
+++ b/packages/react-table/src/components/Table/utils/decorators/treeRow.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { IExtra, IFormatterValueType, OnCheckChange, OnTreeRowCollapse, OnToggleRowDetails } from '../../TableTypes';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/react-styles/css/components/Table/table';
diff --git a/packages/react-table/src/demos/DashboardHeader.tsx b/packages/react-table/src/demos/DashboardHeader.tsx
index eb6db52aeba..4677000e7b9 100644
--- a/packages/react-table/src/demos/DashboardHeader.tsx
+++ b/packages/react-table/src/demos/DashboardHeader.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import {
   Avatar,
   Button,
diff --git a/packages/react-table/src/demos/DashboardWrapper.tsx b/packages/react-table/src/demos/DashboardWrapper.tsx
index 5a59344a592..b39388a99a7 100644
--- a/packages/react-table/src/demos/DashboardWrapper.tsx
+++ b/packages/react-table/src/demos/DashboardWrapper.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import { useState } from 'react';
 import {
   Breadcrumb,
   BreadcrumbItem,
diff --git a/packages/react-table/src/demos/examples/TableAutomaticPagination.tsx b/packages/react-table/src/demos/examples/TableAutomaticPagination.tsx
index ab17c272bf1..2e3bf4bf0b9 100644
--- a/packages/react-table/src/demos/examples/TableAutomaticPagination.tsx
+++ b/packages/react-table/src/demos/examples/TableAutomaticPagination.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { Pagination } from '@patternfly/react-core';
 import { Table, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 
@@ -25,9 +25,9 @@ export const TableAutomaticPagination: React.FunctionComponent = () => {
   ];
   const defaultPerPage = 10;
 
-  const [perPage, setPerPage] = React.useState(defaultPerPage);
-  const [page, setPage] = React.useState(1);
-  const [rows, setRows] = React.useState(defaultRows.slice(0, defaultPerPage));
+  const [perPage, setPerPage] = useState(defaultPerPage);
+  const [page, setPage] = useState(1);
+  const [rows, setRows] = useState(defaultRows.slice(0, defaultPerPage));
 
   const handleSetPage = (
     _evt: React.MouseEvent | React.KeyboardEvent | MouseEvent,
@@ -74,7 +74,7 @@ export const TableAutomaticPagination: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       {renderPagination()}
       <Table aria-label="Automated Pagination Table Demo">
         <Thead>
@@ -96,6 +96,6 @@ export const TableAutomaticPagination: React.FunctionComponent = () => {
           ))}
         </Tbody>
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-table/src/demos/examples/TableBulkSelect.tsx b/packages/react-table/src/demos/examples/TableBulkSelect.tsx
index 2c945de6573..2938bf09bf2 100644
--- a/packages/react-table/src/demos/examples/TableBulkSelect.tsx
+++ b/packages/react-table/src/demos/examples/TableBulkSelect.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import {
   Dropdown,
   DropdownList,
diff --git a/packages/react-table/src/demos/examples/TableColumnManagement.tsx b/packages/react-table/src/demos/examples/TableColumnManagement.tsx
index 0e6721cb6dc..d20f789c972 100644
--- a/packages/react-table/src/demos/examples/TableColumnManagement.tsx
+++ b/packages/react-table/src/demos/examples/TableColumnManagement.tsx
@@ -1,4 +1,4 @@
-import React, { type JSX } from 'react';
+import { Fragment, useEffect, useState, type JSX } from 'react';
 
 import {
   Button,
@@ -36,16 +36,16 @@ export const TableColumnManagement: React.FunctionComponent = () => {
   const defaultColumns = columns;
   const defaultRows = rows;
 
-  const [filters, setFilters] = React.useState<string[]>([]);
-  const [filteredColumns, setFilteredColumns] = React.useState<string[]>([]);
-  const [filteredRows, setFilteredRows] = React.useState<SampleDataRow[]>([]);
-  const [managedColumns, setManagedColumns] = React.useState<string[]>(defaultColumns);
-  const [managedRows, setManagedRows] = React.useState<SampleDataRow[]>(defaultRows);
-  const [isModalOpen, setIsModalOpen] = React.useState(false);
-  const [checkedState, setCheckedState] = React.useState<boolean[]>(Array(columns.length).fill(true));
-  const [page, setPage] = React.useState(1);
-  const [perPage, setPerPage] = React.useState(10);
-  const [paginatedRows, setPaginatedRows] = React.useState<any[]>(rows);
+  const [filters, setFilters] = useState<string[]>([]);
+  const [filteredColumns, setFilteredColumns] = useState<string[]>([]);
+  const [filteredRows, setFilteredRows] = useState<SampleDataRow[]>([]);
+  const [managedColumns, setManagedColumns] = useState<string[]>(defaultColumns);
+  const [managedRows, setManagedRows] = useState<SampleDataRow[]>(defaultRows);
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const [checkedState, setCheckedState] = useState<boolean[]>(Array(columns.length).fill(true));
+  const [page, setPage] = useState(1);
+  const [perPage, setPerPage] = useState(10);
+  const [paginatedRows, setPaginatedRows] = useState<any[]>(rows);
 
   const matchCheckboxNameToColumn = (name: string): string => {
     switch (name) {
@@ -123,7 +123,7 @@ export const TableColumnManagement: React.FunctionComponent = () => {
     />
   );
 
-  React.useEffect(() => {
+  useEffect(() => {
     setPaginatedRows(managedRows.slice((page - 1) * perPage, page * perPage - 1));
   }, [managedRows, page, perPage]);
 
@@ -402,7 +402,7 @@ export const TableColumnManagement: React.FunctionComponent = () => {
   };
 
   const toolbarItems = (
-    <React.Fragment>
+    <Fragment>
       <Toolbar id="page-layout-table-column-management-action-toolbar-top">
         <span id="page-layout-table-column-management-action-toolbar-top-select-checkbox-label" hidden>
           Choose one
@@ -431,11 +431,11 @@ export const TableColumnManagement: React.FunctionComponent = () => {
           <ToolbarItem variant="pagination">{renderPagination('top', false)}</ToolbarItem>
         </ToolbarContent>
       </Toolbar>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <DashboardWrapper hasPageTemplateTitle>
         <PageSection isFilled>
           {toolbarItems}
@@ -482,6 +482,6 @@ export const TableColumnManagement: React.FunctionComponent = () => {
           {renderModal()}
         </PageSection>
       </DashboardWrapper>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-table/src/demos/examples/TableColumnManagementWithDraggable.tsx b/packages/react-table/src/demos/examples/TableColumnManagementWithDraggable.tsx
index e3727bf93f0..a6e564071b8 100644
--- a/packages/react-table/src/demos/examples/TableColumnManagementWithDraggable.tsx
+++ b/packages/react-table/src/demos/examples/TableColumnManagementWithDraggable.tsx
@@ -1,4 +1,4 @@
-import React, { type JSX } from 'react';
+import { Fragment, useEffect, useState, type JSX } from 'react';
 
 import {
   Button,
@@ -36,18 +36,18 @@ export const TableColumnManagement: React.FunctionComponent = () => {
   const defaultColumns = columns;
   const defaultRows = rows;
 
-  const [filters, setFilters] = React.useState<string[]>([]);
-  const [filteredColumns, setFilteredColumns] = React.useState<string[]>(defaultColumns);
-  const [filteredRows, setFilteredRows] = React.useState<SampleDataRow[]>(defaultRows);
-  const [managedColumns, setManagedColumns] = React.useState<string[]>(defaultColumns);
-  const [managedRows, setManagedRows] = React.useState<SampleDataRow[]>(defaultRows);
-  const [isModalOpen, setIsModalOpen] = React.useState(false);
-  const [page, setPage] = React.useState(1);
-  const [perPage, setPerPage] = React.useState(10);
-  const [paginatedRows, setPaginatedRows] = React.useState<any[]>(rows);
+  const [filters, setFilters] = useState<string[]>([]);
+  const [filteredColumns, setFilteredColumns] = useState<string[]>(defaultColumns);
+  const [filteredRows, setFilteredRows] = useState<SampleDataRow[]>(defaultRows);
+  const [managedColumns, setManagedColumns] = useState<string[]>(defaultColumns);
+  const [managedRows, setManagedRows] = useState<SampleDataRow[]>(defaultRows);
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const [page, setPage] = useState(1);
+  const [perPage, setPerPage] = useState(10);
+  const [paginatedRows, setPaginatedRows] = useState<any[]>(rows);
 
-  const [columnData, setColumnData] = React.useState(defaultColumns.map((col) => ({ name: col, checked: true })));
-  const [initialColData, setInitialColData] = React.useState(columnData);
+  const [columnData, setColumnData] = useState(defaultColumns.map((col) => ({ name: col, checked: true })));
+  const [initialColData, setInitialColData] = useState(columnData);
 
   const matchSelectedColumnNameToAttr = (name: string): string => {
     switch (name) {
@@ -102,7 +102,7 @@ export const TableColumnManagement: React.FunctionComponent = () => {
     />
   );
 
-  React.useEffect(() => {
+  useEffect(() => {
     setPaginatedRows(managedRows.slice((page - 1) * perPage, page * perPage - 1));
   }, [managedRows, page, perPage]);
 
@@ -297,7 +297,7 @@ export const TableColumnManagement: React.FunctionComponent = () => {
   };
 
   const toolbarItems = (
-    <React.Fragment>
+    <Fragment>
       <Toolbar id="page-layout-table-column-management-action-toolbar-top">
         <span id="page-layout-table-column-management-action-toolbar-top-select-checkbox-label" hidden>
           Choose one
@@ -330,11 +330,11 @@ export const TableColumnManagement: React.FunctionComponent = () => {
           <ToolbarItem variant="pagination">{renderPagination('top', false)}</ToolbarItem>
         </ToolbarContent>
       </Toolbar>
-    </React.Fragment>
+    </Fragment>
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <DashboardWrapper hasPageTemplateTitle>
         <PageSection isFilled>
           {toolbarItems}
@@ -381,6 +381,6 @@ export const TableColumnManagement: React.FunctionComponent = () => {
           {renderModal()}
         </PageSection>
       </DashboardWrapper>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-table/src/demos/examples/TableCompact.tsx b/packages/react-table/src/demos/examples/TableCompact.tsx
index ca1bc5bff38..23452db0d12 100644
--- a/packages/react-table/src/demos/examples/TableCompact.tsx
+++ b/packages/react-table/src/demos/examples/TableCompact.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import {
   Button,
   Card,
@@ -21,10 +21,10 @@ import { rows, columns } from '@patternfly/react-table/dist/esm/demos/sampleData
 import { DashboardWrapper } from '@patternfly/react-table/dist/esm/demos/DashboardWrapper';
 
 export const TableCompact: React.FunctionComponent = () => {
-  const [isSelectOpen, setIsSelectOpen] = React.useState<boolean>(false);
-  const [page, setPage] = React.useState<number>(1);
-  const [perPage, setPerPage] = React.useState<number>(10);
-  const [paginatedRows, setPaginatedRows] = React.useState(rows.slice(0, 10));
+  const [isSelectOpen, setIsSelectOpen] = useState<boolean>(false);
+  const [page, setPage] = useState<number>(1);
+  const [perPage, setPerPage] = useState<number>(10);
+  const [paginatedRows, setPaginatedRows] = useState(rows.slice(0, 10));
 
   const handleSetPage = (
     _evt: React.MouseEvent | React.KeyboardEvent | MouseEvent,
@@ -127,7 +127,7 @@ export const TableCompact: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <DashboardWrapper hasPageTemplateTitle>
         <PageSection isFilled>
           <Card>
@@ -171,6 +171,6 @@ export const TableCompact: React.FunctionComponent = () => {
           </Card>
         </PageSection>
       </DashboardWrapper>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-table/src/demos/examples/TableCompoundExpansion.tsx b/packages/react-table/src/demos/examples/TableCompoundExpansion.tsx
index 28297d448b9..df56087e662 100644
--- a/packages/react-table/src/demos/examples/TableCompoundExpansion.tsx
+++ b/packages/react-table/src/demos/examples/TableCompoundExpansion.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { ActionsColumn, Table, Thead, Tr, Th, Tbody, Td, ExpandableRowContent } from '@patternfly/react-table';
 import {
   Button,
diff --git a/packages/react-table/src/demos/examples/TableEmptyStateDefault.tsx b/packages/react-table/src/demos/examples/TableEmptyStateDefault.tsx
index 533d812370f..dd62de0d80c 100644
--- a/packages/react-table/src/demos/examples/TableEmptyStateDefault.tsx
+++ b/packages/react-table/src/demos/examples/TableEmptyStateDefault.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 import {
   Bullseye,
diff --git a/packages/react-table/src/demos/examples/TableEmptyStateError.tsx b/packages/react-table/src/demos/examples/TableEmptyStateError.tsx
index fa2b9559f9c..e3223eb3c2e 100644
--- a/packages/react-table/src/demos/examples/TableEmptyStateError.tsx
+++ b/packages/react-table/src/demos/examples/TableEmptyStateError.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 import { Bullseye, Card, EmptyState, EmptyStateVariant, EmptyStateBody, PageSection } from '@patternfly/react-core';
 import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
diff --git a/packages/react-table/src/demos/examples/TableEmptyStateLoading.tsx b/packages/react-table/src/demos/examples/TableEmptyStateLoading.tsx
index 77693e03edf..f0fd84d5f0e 100644
--- a/packages/react-table/src/demos/examples/TableEmptyStateLoading.tsx
+++ b/packages/react-table/src/demos/examples/TableEmptyStateLoading.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 import { Bullseye, Card, EmptyState, PageSection, Spinner } from '@patternfly/react-core';
 import { DashboardWrapper } from '@patternfly/react-table/dist/esm/demos/DashboardWrapper';
diff --git a/packages/react-table/src/demos/examples/TableExpandCollapseAll.tsx b/packages/react-table/src/demos/examples/TableExpandCollapseAll.tsx
index 0320c76a717..ab0eb9e2123 100644
--- a/packages/react-table/src/demos/examples/TableExpandCollapseAll.tsx
+++ b/packages/react-table/src/demos/examples/TableExpandCollapseAll.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { Fragment, ReactNode, useEffect, useState } from 'react';
 import { Card, Content, Label, PageSection } from '@patternfly/react-core';
 import { Table, Thead, Tbody, Tr, Th, Td, ExpandableRowContent } from '@patternfly/react-table';
 import { DashboardWrapper } from '@patternfly/react-table/dist/esm/demos/DashboardWrapper';
@@ -120,11 +120,11 @@ const serverData: Server[] = [
 const initialExpandedServerNames = ['US-Node 2']; // Default to expanded
 
 export const TableExpandCollapseAll: React.FunctionComponent = () => {
-  const [areAllExpanded, setAreAllExpanded] = React.useState(false);
-  const [collapseAllAriaLabel, setCollapseAllAriaLabel] = React.useState('Expand all');
-  const [expandedServerNames, setExpandedServerNames] = React.useState(initialExpandedServerNames);
+  const [areAllExpanded, setAreAllExpanded] = useState(false);
+  const [collapseAllAriaLabel, setCollapseAllAriaLabel] = useState('Expand all');
+  const [expandedServerNames, setExpandedServerNames] = useState(initialExpandedServerNames);
 
-  React.useEffect(() => {
+  useEffect(() => {
     const allExpanded = expandedServerNames.length === serverData.length;
     setAreAllExpanded(allExpanded);
     setCollapseAllAriaLabel(allExpanded ? 'Collapse all' : 'Expand all');
@@ -146,7 +146,7 @@ export const TableExpandCollapseAll: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <DashboardWrapper hasPageTemplateTitle>
         <PageSection
           padding={{
@@ -206,6 +206,6 @@ export const TableExpandCollapseAll: React.FunctionComponent = () => {
           </Card>
         </PageSection>
       </DashboardWrapper>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-table/src/demos/examples/TableFilterable.tsx b/packages/react-table/src/demos/examples/TableFilterable.tsx
index d6ed8df2cfb..a823314c14c 100644
--- a/packages/react-table/src/demos/examples/TableFilterable.tsx
+++ b/packages/react-table/src/demos/examples/TableFilterable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import {
   Badge,
   Button,
@@ -27,11 +27,11 @@ import { Table, TableText, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-ta
 import { rows, columns } from '@patternfly/react-table/dist/esm/demos/sampleData';
 
 export const TableFilterable: React.FunctionComponent = () => {
-  const [filters, setFilters] = React.useState<Record<string, string[]>>({ location: [], name: [], status: [] });
-  const [currentCategory, setCurrentCategory] = React.useState('Status');
-  const [isFilterDropdownOpen, setIsFilterDropdownOpen] = React.useState(false);
-  const [isCategoryDropdownOpen, setIsCategoryDropdownOpen] = React.useState(false);
-  const [inputValue, setInputValue] = React.useState('');
+  const [filters, setFilters] = useState<Record<string, string[]>>({ location: [], name: [], status: [] });
+  const [currentCategory, setCurrentCategory] = useState('Status');
+  const [isFilterDropdownOpen, setIsFilterDropdownOpen] = useState(false);
+  const [isCategoryDropdownOpen, setIsCategoryDropdownOpen] = useState(false);
+  const [inputValue, setInputValue] = useState('');
 
   const rowData = rows.slice(0, 10);
 
@@ -184,7 +184,7 @@ export const TableFilterable: React.FunctionComponent = () => {
     ];
 
     return (
-      <React.Fragment>
+      <Fragment>
         <ToolbarFilter
           labels={filters.location}
           deleteLabel={(category, label) => onDelete(category, label as string)}
@@ -265,7 +265,7 @@ export const TableFilterable: React.FunctionComponent = () => {
             {statusMenuItems}
           </Select>
         </ToolbarFilter>
-      </React.Fragment>
+      </Fragment>
     );
   };
 
@@ -337,7 +337,7 @@ export const TableFilterable: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       {renderToolbar()}
       <Table aria-label="Filterable Table Demo">
         <Thead>
@@ -382,6 +382,6 @@ export const TableFilterable: React.FunctionComponent = () => {
           )}
         </Tbody>
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-table/src/demos/examples/TableSortableResponsive.tsx b/packages/react-table/src/demos/examples/TableSortableResponsive.tsx
index 2cd73c05a47..90475c65c79 100644
--- a/packages/react-table/src/demos/examples/TableSortableResponsive.tsx
+++ b/packages/react-table/src/demos/examples/TableSortableResponsive.tsx
@@ -1,5 +1,4 @@
-import React from 'react';
-
+import { Fragment, useEffect, useState } from 'react';
 import {
   Button,
   Card,
@@ -45,7 +44,7 @@ import { rows, columns, SampleDataRow } from '@patternfly/react-table/dist/esm/d
 type Direction = 'asc' | 'desc' | undefined;
 
 export const TableSortableResponsive: React.FunctionComponent = () => {
-  const [isKebabDropdownOpen, setIsKebabDropdownOpen] = React.useState(false);
+  const [isKebabDropdownOpen, setIsKebabDropdownOpen] = useState(false);
 
   const sortRows = (rows: SampleDataRow[], sortIndex: number, sortDirection: Direction) =>
     [...rows].sort((a, b) => {
@@ -65,17 +64,17 @@ export const TableSortableResponsive: React.FunctionComponent = () => {
       return returnValue;
     });
 
-  const [sortedData, setSortedData] = React.useState([...sortRows(rows, 0, 'asc')]);
-  const [sortedRows, setSortedRows] = React.useState([...sortedData]);
-  const [page, setPage] = React.useState(1);
-  const [perPage, setPerPage] = React.useState(10);
+  const [sortedData, setSortedData] = useState([...sortRows(rows, 0, 'asc')]);
+  const [sortedRows, setSortedRows] = useState([...sortedData]);
+  const [page, setPage] = useState(1);
+  const [perPage, setPerPage] = useState(10);
 
   // index of the currently active column
-  const [activeSortIndex, setActiveSortIndex] = React.useState(0);
+  const [activeSortIndex, setActiveSortIndex] = useState(0);
   // sort direction of the currently active column
-  const [activeSortDirection, setActiveSortDirection] = React.useState<Direction>('asc');
+  const [activeSortDirection, setActiveSortDirection] = useState<Direction>('asc');
   // sort dropdown expansion
-  const [isSortDropdownOpen, setIsSortDropdownOpen] = React.useState(false);
+  const [isSortDropdownOpen, setIsSortDropdownOpen] = useState(false);
 
   const onSort = (_event: any, index: number, direction: Direction) => {
     setActiveSortIndex(index);
@@ -86,7 +85,7 @@ export const TableSortableResponsive: React.FunctionComponent = () => {
 
   const kebabDropdownItems = [<OverflowMenuDropdownItem key="kebab-1">Some action</OverflowMenuDropdownItem>];
 
-  React.useEffect(() => {
+  useEffect(() => {
     setSortedRows(sortedData.slice((page - 1) * perPage, page * perPage));
   }, [sortedData, page, perPage]);
 
@@ -228,7 +227,7 @@ export const TableSortableResponsive: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <DashboardWrapper>
         <PageSection isWidthLimited variant={PageSectionVariants.light}>
           <Content>
@@ -327,6 +326,6 @@ export const TableSortableResponsive: React.FunctionComponent = () => {
           </Card>
         </PageSection>
       </DashboardWrapper>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-table/src/demos/examples/TableStaticBottomPagination.tsx b/packages/react-table/src/demos/examples/TableStaticBottomPagination.tsx
index a9a06881139..5462ff0a264 100644
--- a/packages/react-table/src/demos/examples/TableStaticBottomPagination.tsx
+++ b/packages/react-table/src/demos/examples/TableStaticBottomPagination.tsx
@@ -1,5 +1,4 @@
-import React from 'react';
-
+import { Fragment, useState } from 'react';
 import {
   Button,
   Card,
@@ -22,10 +21,10 @@ import { DashboardWrapper } from '@patternfly/react-table/dist/esm/demos/Dashboa
 import { rows, columns } from '@patternfly/react-table/dist/esm/demos/sampleData';
 
 export const TableStaticBottomPagination: React.FunctionComponent = () => {
-  const [isSelectOpen, setIsSelectOpen] = React.useState(false);
-  const [page, setPage] = React.useState(1);
-  const [perPage, setPerPage] = React.useState(10);
-  const [paginatedRows, setPaginatedRows] = React.useState(rows.slice(0, 10));
+  const [isSelectOpen, setIsSelectOpen] = useState(false);
+  const [page, setPage] = useState(1);
+  const [perPage, setPerPage] = useState(10);
+  const [paginatedRows, setPaginatedRows] = useState(rows.slice(0, 10));
   const handleSetPage = (
     _evt: React.MouseEvent | React.KeyboardEvent | MouseEvent,
     newPage: number,
@@ -141,7 +140,7 @@ export const TableStaticBottomPagination: React.FunctionComponent = () => {
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <DashboardWrapper hasPageTemplateTitle>
         <PageSection isFilled>
           <Card>
@@ -177,6 +176,6 @@ export const TableStaticBottomPagination: React.FunctionComponent = () => {
           </Card>
         </PageSection>
       </DashboardWrapper>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-table/src/demos/examples/TableStickyFirstColumn.tsx b/packages/react-table/src/demos/examples/TableStickyFirstColumn.tsx
index b503f934e97..d78c8690b92 100644
--- a/packages/react-table/src/demos/examples/TableStickyFirstColumn.tsx
+++ b/packages/react-table/src/demos/examples/TableStickyFirstColumn.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { Table, Thead, Tr, Th, Tbody, Td, InnerScrollContainer } from '@patternfly/react-table';
 import { Card, PageSection } from '@patternfly/react-core';
 import { DashboardWrapper } from '@patternfly/react-table/dist/esm/demos/DashboardWrapper';
@@ -67,8 +67,8 @@ export const TableStickyFirstColumn = () => {
     header16: 'Header 16'
   };
 
-  const [activeSortIndex, setActiveSortIndex] = React.useState(-1);
-  const [activeSortDirection, setActiveSortDirection] = React.useState<Direction>('asc');
+  const [activeSortIndex, setActiveSortIndex] = useState(-1);
+  const [activeSortDirection, setActiveSortDirection] = useState<Direction>('asc');
   const getSortableRowValues = (fact: Fact) => {
     const {
       name,
diff --git a/packages/react-table/src/demos/examples/TableStickyHeader.tsx b/packages/react-table/src/demos/examples/TableStickyHeader.tsx
index aca264d48bd..7408eea9823 100644
--- a/packages/react-table/src/demos/examples/TableStickyHeader.tsx
+++ b/packages/react-table/src/demos/examples/TableStickyHeader.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { Card, Label, PageSection } from '@patternfly/react-core';
 import { Table, Thead, Tr, Th, Tbody, Td, TableText } from '@patternfly/react-table';
 import { DashboardWrapper } from '@patternfly/react-table/dist/esm/demos/DashboardWrapper';
diff --git a/packages/react-table/src/deprecated/components/Table/Body.tsx b/packages/react-table/src/deprecated/components/Table/Body.tsx
index c9b51c5595f..2817d000c96 100644
--- a/packages/react-table/src/deprecated/components/Table/Body.tsx
+++ b/packages/react-table/src/deprecated/components/Table/Body.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, Fragment } from 'react';
 import { Body as BaseBody } from './base';
 import { RowType, RowKeyType } from '../../../components/Table/base/types';
 import { IRow, IRowCell, IExtraRowData, isRowExpanded } from '../../../components';
@@ -49,7 +49,7 @@ interface IMappedCell {
   [name: string]: IRowCell;
 }
 
-class ContextBody extends React.Component<TableBodyProps, {}> {
+class ContextBody extends Component<TableBodyProps, {}> {
   onRow = (row: IRow, rowProps: any) => {
     const { onRowClick, onRow } = this.props;
     const extendedRowProps = {
@@ -163,7 +163,7 @@ class ContextBody extends React.Component<TableBodyProps, {}> {
     }
 
     return (
-      <React.Fragment>
+      <Fragment>
         {mappedRows && (
           <BaseBody
             {...props}
@@ -174,7 +174,7 @@ class ContextBody extends React.Component<TableBodyProps, {}> {
             className={className}
           />
         )}
-      </React.Fragment>
+      </Fragment>
     );
   }
 }
diff --git a/packages/react-table/src/deprecated/components/Table/BodyCell.tsx b/packages/react-table/src/deprecated/components/Table/BodyCell.tsx
index 50bdb61d1a8..355ed52a45c 100644
--- a/packages/react-table/src/deprecated/components/Table/BodyCell.tsx
+++ b/packages/react-table/src/deprecated/components/Table/BodyCell.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { useState } from 'react';
 import { Tooltip } from '@patternfly/react-core/dist/esm/components/Tooltip';
 import { Bullseye } from '@patternfly/react-core/dist/esm/layouts/Bullseye';
 import { EmptyState } from '@patternfly/react-core/dist/esm/components/EmptyState';
@@ -52,7 +52,7 @@ export const BodyCell: React.FunctionComponent<BodyCellProps> = ({
   /* eslint-enable @typescript-eslint/no-unused-vars */
   ...props
 }: BodyCellProps) => {
-  const [tooltip, setTooltip] = React.useState('');
+  const [tooltip, setTooltip] = useState('');
   const onMouseEnter = (event: any) => {
     if (event.target.offsetWidth < event.target.scrollWidth) {
       if (tooltipProp) {
diff --git a/packages/react-table/src/deprecated/components/Table/BodyWrapper.tsx b/packages/react-table/src/deprecated/components/Table/BodyWrapper.tsx
index 2518d65b91f..10283a98a35 100644
--- a/packages/react-table/src/deprecated/components/Table/BodyWrapper.tsx
+++ b/packages/react-table/src/deprecated/components/Table/BodyWrapper.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Fragment } from 'react';
 import { IRow, IRowData, IExtraData, IHeaderRow } from '../../../components';
 import { mapOpenedRows } from '../../../components';
 import { Tbody } from '../../../components';
@@ -30,13 +30,13 @@ export const BodyWrapper: React.FunctionComponent<BodyWrapperProps> = ({
 }: BodyWrapperProps) => {
   if (mappedRows && mappedRows.some((row) => row.hasOwnProperty('parent'))) {
     return (
-      <React.Fragment>
+      <Fragment>
         {mapOpenedRows(mappedRows, props.children).map((oneRow, key) => (
           <Tbody {...props} isExpanded={oneRow.isOpen} key={`tbody-${key}`} ref={tbodyRef as React.Ref<any>}>
             {oneRow.rows}
           </Tbody>
         ))}
-      </React.Fragment>
+      </Fragment>
     );
   }
   return <Tbody {...props} ref={tbodyRef as React.Ref<any>} />;
diff --git a/packages/react-table/src/deprecated/components/Table/Header.tsx b/packages/react-table/src/deprecated/components/Table/Header.tsx
index 74d3327ae88..3bc97fbc416 100644
--- a/packages/react-table/src/deprecated/components/Table/Header.tsx
+++ b/packages/react-table/src/deprecated/components/Table/Header.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Header } from './base';
 import { IHeaderRow } from '../../../components';
 import { TableContext } from './TableContext';
diff --git a/packages/react-table/src/deprecated/components/Table/HeaderCell.tsx b/packages/react-table/src/deprecated/components/Table/HeaderCell.tsx
index 1bc946f35a2..0134b5fffbd 100644
--- a/packages/react-table/src/deprecated/components/Table/HeaderCell.tsx
+++ b/packages/react-table/src/deprecated/components/Table/HeaderCell.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Th } from '../../../components';
 
 export interface HeaderCellProps {
diff --git a/packages/react-table/src/deprecated/components/Table/Table.tsx b/packages/react-table/src/deprecated/components/Table/Table.tsx
index fb4d557cd84..18c932403c4 100644
--- a/packages/react-table/src/deprecated/components/Table/Table.tsx
+++ b/packages/react-table/src/deprecated/components/Table/Table.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import { Component, type JSX } from 'react';
 import { OUIAProps, getDefaultOUIAId } from '@patternfly/react-core/dist/esm/helpers/OUIA/ouia';
 import inlineStyles from '@patternfly/react-styles/css/components/InlineEdit/inline-edit';
 import { css } from '@patternfly/react-styles';
@@ -29,8 +29,6 @@ import {
   CustomActionsToggleProps
 } from '../../../components';
 
-import type { JSX } from 'react';
-
 export interface TableProps extends OUIAProps {
   /** Adds an accessible name for the Table */
   'aria-label'?: string;
@@ -133,7 +131,7 @@ export interface TableProps extends OUIAProps {
   ouiaSafe?: boolean;
 }
 
-class Table extends React.Component<TableProps, {}> {
+class Table extends Component<TableProps, {}> {
   static displayName = 'Table';
   static hasWarnBeta = false;
   static defaultProps: Partial<TableProps> = {
diff --git a/packages/react-table/src/deprecated/components/Table/TableContext.ts b/packages/react-table/src/deprecated/components/Table/TableContext.ts
index 4758ed0b102..180b9dad5a4 100644
--- a/packages/react-table/src/deprecated/components/Table/TableContext.ts
+++ b/packages/react-table/src/deprecated/components/Table/TableContext.ts
@@ -1,8 +1,8 @@
-import * as React from 'react';
+import { createContext } from 'react';
 import { IHeaderRow, IRow } from '../../../components';
 import { ColumnsType } from '../../../components/Table/base/types';
 
-export const TableContext = React.createContext({
+export const TableContext = createContext({
   headerData: null as ColumnsType,
   headerRows: null as IHeaderRow[],
   rows: [] as (IRow | string[])[]
diff --git a/packages/react-table/src/deprecated/components/Table/__tests__/Table.test.tsx b/packages/react-table/src/deprecated/components/Table/__tests__/Table.test.tsx
index 2ef44c2acf8..823b8e945dc 100644
--- a/packages/react-table/src/deprecated/components/Table/__tests__/Table.test.tsx
+++ b/packages/react-table/src/deprecated/components/Table/__tests__/Table.test.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { render, screen } from '@testing-library/react';
 
 import {
diff --git a/packages/react-table/src/deprecated/components/Table/base/body-row.tsx b/packages/react-table/src/deprecated/components/Table/base/body-row.tsx
index 748a961f3e5..761fcfdbc5e 100644
--- a/packages/react-table/src/deprecated/components/Table/base/body-row.tsx
+++ b/packages/react-table/src/deprecated/components/Table/base/body-row.tsx
@@ -4,8 +4,8 @@
  * Forked from reactabular-table version 8.14.0
  * https://github.com/reactabular/reactabular/tree/v8.14.0/packages/reactabular-table/src
  */
+import { Component, createElement } from 'react';
 import isEqual from 'lodash/isEqual';
-import * as React from 'react';
 import {
   createElementType,
   formatterValueType,
@@ -28,7 +28,7 @@ export interface BodyRowProps {
   rowKey: string;
 }
 
-class BodyRow extends React.Component<BodyRowProps, {}> {
+class BodyRow extends Component<BodyRowProps, {}> {
   static displayName = 'BodyRow';
   static defaultProps = {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -54,7 +54,7 @@ class BodyRow extends React.Component<BodyRowProps, {}> {
   render() {
     const { columns, renderers, onRow, rowKey, rowIndex, rowData } = this.props;
 
-    return React.createElement(
+    return createElement(
       renderers.row as createElementType,
       onRow(rowData, { rowIndex, rowKey }),
       (columns as []).map((column: ColumnType, columnIndex: number) => {
@@ -81,7 +81,7 @@ class BodyRow extends React.Component<BodyRowProps, {}> {
           additionalFormaters = rowData[evaluatedProperty].formatters;
         }
 
-        return React.createElement(
+        return createElement(
           renderers.cell as createElementType,
           {
             key: `col-${columnIndex}-row-${rowIndex}`,
diff --git a/packages/react-table/src/deprecated/components/Table/base/body.tsx b/packages/react-table/src/deprecated/components/Table/base/body.tsx
index f665aa76aff..b21b4cad71f 100644
--- a/packages/react-table/src/deprecated/components/Table/base/body.tsx
+++ b/packages/react-table/src/deprecated/components/Table/base/body.tsx
@@ -4,7 +4,7 @@
  * Forked from reactabular-table version 8.14.0
  * https://github.com/reactabular/reactabular/tree/v8.14.0/packages/reactabular-table/src
  */
-import * as React from 'react';
+import { Component, createElement } from 'react';
 import isEqual from 'lodash/isEqual';
 import {
   RowsType,
@@ -28,7 +28,7 @@ export interface BodyProps {
   className?: string;
 }
 
-class BaseBody extends React.Component<BodyProps, {}> {
+class BaseBody extends Component<BodyProps, {}> {
   static defaultProps = {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     onRow: (...args: any) => ({})
@@ -66,7 +66,7 @@ class BaseBody extends React.Component<BodyProps, {}> {
     const { onRow, rows, rowKey, columns, renderers, ...props } = this.props;
     const children = (rows as []).map((rowData: RowType, index: number) => {
       const key = resolveRowKey({ rowData, rowIndex: index, rowKey });
-      return React.createElement(BodyRow, {
+      return createElement(BodyRow, {
         key,
         renderers: renderers.body,
         onRow,
@@ -77,7 +77,7 @@ class BaseBody extends React.Component<BodyProps, {}> {
       });
     });
 
-    return React.createElement(renderers.body.wrapper as createElementType, props, children);
+    return createElement(renderers.body.wrapper as createElementType, props, children);
   }
 }
 
diff --git a/packages/react-table/src/deprecated/components/Table/base/header-row.tsx b/packages/react-table/src/deprecated/components/Table/base/header-row.tsx
index 6ad4a58467c..60bd8eace8a 100644
--- a/packages/react-table/src/deprecated/components/Table/base/header-row.tsx
+++ b/packages/react-table/src/deprecated/components/Table/base/header-row.tsx
@@ -4,7 +4,7 @@
  * Forked from reactabular-table version 8.14.0
  * https://github.com/reactabular/reactabular/tree/v8.14.0/packages/reactabular-table/src
  */
-import * as React from 'react';
+import { createElement } from 'react';
 import {
   createElementType,
   ColumnType,
@@ -30,7 +30,7 @@ export const HeaderRow: React.FunctionComponent<HeaderRowProps> = ({
   renderers,
   onRow = () => ({})
 }: HeaderRowProps) =>
-  React.createElement(
+  createElement(
     renderers.row as createElementType,
     onRow(rowData, { rowIndex }),
     (rowData as []).map((column: ColumnType, columnIndex: number) => {
@@ -107,7 +107,7 @@ export const HeaderRow: React.FunctionComponent<HeaderRowProps> = ({
         cellNode = transformedProps.children || evaluateFormatters(formatters)(label, extraParameters);
       }
 
-      return React.createElement(
+      return createElement(
         renderers.cell as createElementType,
         {
           key: `${columnIndex}-header`,
diff --git a/packages/react-table/src/deprecated/components/Table/base/header.tsx b/packages/react-table/src/deprecated/components/Table/base/header.tsx
index ff40421e601..da5309ae04f 100644
--- a/packages/react-table/src/deprecated/components/Table/base/header.tsx
+++ b/packages/react-table/src/deprecated/components/Table/base/header.tsx
@@ -4,7 +4,7 @@
  * Forked from reactabular-table version 8.14.0
  * https://github.com/reactabular/reactabular/tree/v8.14.0/packages/reactabular-table/src
  */
-import * as React from 'react';
+import { Component, createElement } from 'react';
 import { createElementType, RowsType, ColumnsType, RenderersTypes } from '../../../../components/Table/base/types';
 import { ProviderContext } from '../../../../components/Table/base/provider';
 
@@ -19,17 +19,17 @@ export interface HeaderProps {
   className?: string;
 }
 
-class BaseHeader extends React.Component<HeaderProps, {}> {
+class BaseHeader extends Component<HeaderProps, {}> {
   render() {
     const { children, headerRows, onRow, renderers, columns, ...props } = this.props;
 
     // If headerRows aren't passed, default to bodyColumns as header rows
-    return React.createElement(
+    return createElement(
       renderers.header.wrapper as createElementType,
       props,
       [
         (headerRows || ([columns] as ColumnsType)).map((rowData, rowIndex) =>
-          React.createElement(HeaderRow, {
+          createElement(HeaderRow, {
             key: `${rowIndex}-header-row`,
             renderers: renderers.header,
             onRow,
diff --git a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableActions.tsx b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableActions.tsx
index 8d8644743cd..ce91d8155ff 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableActions.tsx
+++ b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableActions.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import React from 'react';
+import { Fragment, useState } from 'react';
 import {
   Button,
   Checkbox,
@@ -50,13 +50,13 @@ export const LegacyTableActions: React.FunctionComponent = () => {
   ];
 
   // This state is just for the ToggleGroup in this example and isn't necessary for Table usage.
-  const [propToUse, setPropToUse] = React.useState<ExampleType>('actions');
+  const [propToUse, setPropToUse] = useState<ExampleType>('actions');
   const onPropToUseChange: ToggleGroupItemProps['onChange'] = (event, _isSelected) => {
     const id = event.currentTarget.id;
     setPropToUse(id as ExampleType);
   };
 
-  const [useCustomToggle, setUseCustomToggle] = React.useState(false);
+  const [useCustomToggle, setUseCustomToggle] = useState(false);
 
   const customActionsToggle = (props: CustomActionsToggleProps) => (
     <MenuToggle ref={props.toggleRef} onClick={props.onToggle} isDisabled={props.isDisabled}>
@@ -154,7 +154,7 @@ export const LegacyTableActions: React.FunctionComponent = () => {
   };
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Toolbar>
         <ToolbarContent>
           <ToolbarItem>
@@ -199,6 +199,6 @@ export const LegacyTableActions: React.FunctionComponent = () => {
         <TableHeader />
         <TableBody />
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableBasic.tsx b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableBasic.tsx
index 5f01e26dc5b..abfbdafc9f2 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableBasic.tsx
+++ b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableBasic.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 import { ToggleGroup, ToggleGroupItem, ToggleGroupItemProps } from '@patternfly/react-core';
 interface Repository {
@@ -38,7 +38,7 @@ export const LegacyTableBasic: React.FunctionComponent = () => {
   ];
 
   // This state is just for the ToggleGroup in this example and isn't necessary for table usage.
-  const [exampleChoice, setExampleChoice] = React.useState<ExampleType>('default');
+  const [exampleChoice, setExampleChoice] = useState<ExampleType>('default');
   const onExampleTypeChange: ToggleGroupItemProps['onChange'] = (event, _isSelected) => {
     const id = event.currentTarget.id;
     setExampleChoice(id as ExampleType);
@@ -54,7 +54,7 @@ export const LegacyTableBasic: React.FunctionComponent = () => {
   ]);
 
   return (
-    <React.Fragment>
+    <Fragment>
       <ToggleGroup aria-label="Default with single selectable">
         <ToggleGroupItem
           text="Default"
@@ -85,6 +85,6 @@ export const LegacyTableBasic: React.FunctionComponent = () => {
         <TableHeader />
         <TableBody />
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableCellWidth.tsx b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableCellWidth.tsx
index b143b419c9c..c233fb12f86 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableCellWidth.tsx
+++ b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableCellWidth.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 import { classNames, cellWidth, Visibility } from '@patternfly/react-table';
 
diff --git a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableClickable.tsx b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableClickable.tsx
index 6d67155bb31..8870b0c344d 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableClickable.tsx
+++ b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableClickable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { info, textCenter, ICell } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 import styles from '@patternfly/react-styles/css/components/Table/table';
@@ -33,7 +33,7 @@ export const LegacyTableClickable: React.FunctionComponent = () => {
 
   // In this example, selected rows are tracked by the repo names from each row. This could be any unique identifier.
   // This is to prevent state from being based on row order index in case we later add sorting.
-  const [selectedRepoName, setSelectedRepoName] = React.useState('');
+  const [selectedRepoName, setSelectedRepoName] = useState('');
   const columns: TableProps['cells'] = [
     {
       title: 'Repositories',
diff --git a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableCompoundExpandable.tsx b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableCompoundExpandable.tsx
index 632907e6cd2..5bebe8d6d3e 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableCompoundExpandable.tsx
+++ b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableCompoundExpandable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 import { compoundExpand } from '@patternfly/react-table';
 
@@ -27,7 +27,7 @@ export const LegacyTableCompoundExpandable: React.FunctionComponent = () => {
   // Note that these columnKeys must be in the same order as the `columns` below, because columnIndex will be used to look up the matching key.
   type ColumnKey = 'name' | 'branches' | 'prs' | 'workspaces' | 'lastCommit'; // For typechecking
   const columnKeys: ColumnKey[] = ['name', 'branches', 'prs', 'workspaces', 'lastCommit']; // For indexed order
-  const [expandedCells, setExpandedCells] = React.useState<Record<string, ColumnKey>>({
+  const [expandedCells, setExpandedCells] = useState<Record<string, ColumnKey>>({
     'siemur/test-space': 'branches' // Default to the first cell of the first row being expanded
   });
   const setCellExpanded = (repo: Repository, columnKey: ColumnKey, isExpanding = true) => {
@@ -75,9 +75,9 @@ export const LegacyTableCompoundExpandable: React.FunctionComponent = () => {
         { title: <a href="#">{repo.name}</a>, props: { component: 'th' } },
         {
           title: (
-            <React.Fragment>
+            <Fragment>
               <CodeBranchIcon key="icon" /> {repo.branches}
-            </React.Fragment>
+            </Fragment>
           ),
           props: {
             isOpen: expandedCellKey === 'branches',
@@ -86,9 +86,9 @@ export const LegacyTableCompoundExpandable: React.FunctionComponent = () => {
         },
         {
           title: (
-            <React.Fragment>
+            <Fragment>
               <CodeIcon key="icon" /> {repo.prs}
-            </React.Fragment>
+            </Fragment>
           ),
           props: {
             isOpen: expandedCellKey === 'prs',
@@ -97,9 +97,9 @@ export const LegacyTableCompoundExpandable: React.FunctionComponent = () => {
         },
         {
           title: (
-            <React.Fragment>
+            <Fragment>
               <CubeIcon key="icon" /> {repo.branches}
-            </React.Fragment>
+            </Fragment>
           ),
           props: {
             isOpen: expandedCellKey === 'workspaces',
diff --git a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableControllingText.tsx b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableControllingText.tsx
index 76a56db6c85..865ffe9cefe 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableControllingText.tsx
+++ b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableControllingText.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { cellWidth, truncate, breakWord, wrappable, fitContent, nowrap } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 
diff --git a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableEmptyState.tsx b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableEmptyState.tsx
index d49cd0cf29e..3fbdd3a3c3f 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableEmptyState.tsx
+++ b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableEmptyState.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 import {
   Bullseye,
diff --git a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableExpandable.tsx b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableExpandable.tsx
index 7fe8ff494ec..f2deba01747 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableExpandable.tsx
+++ b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableExpandable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { TableVariant, expandable, IRowCell } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 import { Checkbox } from '@patternfly/react-core';
@@ -78,7 +78,7 @@ export const LegacyTableExpandable: React.FunctionComponent = () => {
   // This is to prevent state from being based on row order index in case we later add sorting.
   // Note that this behavior is very similar to selection state.
   const initialExpandedRepoNames = repositories.filter((repo) => !!repo.details).map((repo) => repo.name); // Default to all expanded
-  const [expandedRepoNames, setExpandedRepoNames] = React.useState<string[]>(initialExpandedRepoNames);
+  const [expandedRepoNames, setExpandedRepoNames] = useState<string[]>(initialExpandedRepoNames);
   const setRepoExpanded = (repo: Repository, isExpanding = true) =>
     setExpandedRepoNames((prevExpanded) => {
       const otherExpandedRepoNames = prevExpanded.filter((r) => r !== repo.name);
@@ -86,7 +86,7 @@ export const LegacyTableExpandable: React.FunctionComponent = () => {
     });
   const isRepoExpanded = (repo: Repository) => expandedRepoNames.includes(repo.name);
 
-  const [isExampleCompact, setIsExampleCompact] = React.useState(true);
+  const [isExampleCompact, setIsExampleCompact] = useState(true);
 
   // We want to be able to reference the original data object based on row index. But because an expanded
   // row takes up two row indexes, repositories[rowIndex] will not be accurate like it would in a normal table.
@@ -145,7 +145,7 @@ export const LegacyTableExpandable: React.FunctionComponent = () => {
   });
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Checkbox
         label="Compact"
         isChecked={isExampleCompact}
@@ -170,6 +170,6 @@ export const LegacyTableExpandable: React.FunctionComponent = () => {
         <TableHeader />
         <TableBody />
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableFavoritable.tsx b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableFavoritable.tsx
index 8ee18daa482..5fa5556c558 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableFavoritable.tsx
+++ b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableFavoritable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useCallback, useState } from 'react';
 import { sortable } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 import { Checkbox } from '@patternfly/react-core';
@@ -22,13 +22,13 @@ export const LegacyTableFavoritable: React.FunctionComponent = () => {
   // Index of the currently sorted column
   // Note: if you intend to make columns reorderable, you may instead want to use a non-numeric key
   // as the identifier of the sorted column. See the "Compound expandable" example.
-  const [activeSortIndex, setActiveSortIndex] = React.useState<number | null>(null);
+  const [activeSortIndex, setActiveSortIndex] = useState<number | null>(null);
 
   // Sort direction of the currently sorted column
-  const [activeSortDirection, setActiveSortDirection] = React.useState<'asc' | 'desc' | null>(null);
+  const [activeSortDirection, setActiveSortDirection] = useState<'asc' | 'desc' | null>(null);
 
   // Favorite state is similar to selection state. See selectedRepoNames and associated code below.
-  const [favoriteRepoNames, setFavoriteRepoNames] = React.useState<string[]>([]);
+  const [favoriteRepoNames, setFavoriteRepoNames] = useState<string[]>([]);
   const setRepoFavorited = (repo: Repository, isFavoriting = true) =>
     setFavoriteRepoNames((prevFavorites) => {
       const otherFavorites = prevFavorites.filter((r) => r !== repo.name);
@@ -39,7 +39,7 @@ export const LegacyTableFavoritable: React.FunctionComponent = () => {
   // Since OnSort specifies sorted columns by index, we need sortable values for our object by column index.
   // Note: We also memoize the sortable values with useCallback to prevent rows jumping around when you change
   // the favorites while sorting on that column. Only updating the sort state will reorder the rows.
-  const getSortableRowValues = React.useCallback(
+  const getSortableRowValues = useCallback(
     (repo: Repository): (boolean | string | number)[] => {
       const { name, branches, prs, workspaces, lastCommit } = repo;
       // Blank value for first column (select checkboxes)
@@ -76,7 +76,7 @@ export const LegacyTableFavoritable: React.FunctionComponent = () => {
 
   // In this example, selected rows are tracked by the repo names from each row. This could be any unique identifier.
   // This is to prevent state from being based on row order index in case we later add sorting.
-  const [selectedRepoNames, setSelectedRepoNames] = React.useState<string[]>([]);
+  const [selectedRepoNames, setSelectedRepoNames] = useState<string[]>([]);
   const setRepoSelected = (repo: Repository, isSelecting = true) =>
     setSelectedRepoNames((prevSelected) => {
       const otherSelectedRepoNames = prevSelected.filter((r) => r !== repo.name);
@@ -109,7 +109,7 @@ export const LegacyTableFavoritable: React.FunctionComponent = () => {
     };
   });
 
-  const [canSortFavorites, setCanSortFavorites] = React.useState(true);
+  const [canSortFavorites, setCanSortFavorites] = useState(true);
 
   return (
     <div>
diff --git a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableMisc.tsx b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableMisc.tsx
index 88f58a11197..d4c3f1a1daf 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableMisc.tsx
+++ b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableMisc.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 import { css } from '@patternfly/react-styles';
 /* eslint-disable camelcase */
diff --git a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableSelectable.tsx b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableSelectable.tsx
index c0913dcb854..b6dc0715ae3 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableSelectable.tsx
+++ b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableSelectable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useEffect, useState } from 'react';
 import { headerCol } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 import { Checkbox } from '@patternfly/react-core';
@@ -28,7 +28,7 @@ export const LegacyTableSelectable: React.FunctionComponent = () => {
 
   // In this example, selected rows are tracked by the repo names from each row. This could be any unique identifier.
   // This is to prevent state from being based on row order index in case we later add sorting.
-  const [selectedRepoNames, setSelectedRepoNames] = React.useState<string[]>([]);
+  const [selectedRepoNames, setSelectedRepoNames] = useState<string[]>([]);
   const setRepoSelected = (repo: Repository, isSelecting = true) =>
     setSelectedRepoNames((prevSelected) => {
       const otherSelectedRepoNames = prevSelected.filter((r) => r !== repo.name);
@@ -38,11 +38,11 @@ export const LegacyTableSelectable: React.FunctionComponent = () => {
     setSelectedRepoNames(isSelecting ? selectableRepos.map((r) => r.name) : []);
   const isRepoSelected = (repo: Repository) => selectedRepoNames.includes(repo.name);
 
-  const [canSelectAll, setCanSelectAll] = React.useState(true);
+  const [canSelectAll, setCanSelectAll] = useState(true);
 
   // To allow shift+click to select/deselect multiple rows
-  const [recentSelectedRowIndex, setRecentSelectedRowIndex] = React.useState<number | null>(null);
-  const [shifting, setShifting] = React.useState(false);
+  const [recentSelectedRowIndex, setRecentSelectedRowIndex] = useState<number | null>(null);
+  const [shifting, setShifting] = useState(false);
 
   const onSelectRepo = (repo: Repository, rowIndex: number, isSelecting: boolean) => {
     // If the user is shift + selecting the checkboxes, then all intermediate checkboxes should be selected
@@ -59,7 +59,7 @@ export const LegacyTableSelectable: React.FunctionComponent = () => {
     setRecentSelectedRowIndex(rowIndex);
   };
 
-  React.useEffect(() => {
+  useEffect(() => {
     const onKeyDown = (e: KeyboardEvent) => {
       if (e.key === 'Shift') {
         setShifting(true);
diff --git a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableSelectableRadio.tsx b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableSelectableRadio.tsx
index 6a88dcd470a..922b3729a99 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableSelectableRadio.tsx
+++ b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableSelectableRadio.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { headerCol } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 
@@ -22,7 +22,7 @@ export const LegacyTableSelectableRadio: React.FunctionComponent = () => {
 
   // In this example, selected rows are tracked by the repo names from each row. This could be any unique identifier.
   // This is to prevent state from being based on row order index in case we later add sorting.
-  const [selectedRepoName, setSelectedRepoName] = React.useState<string | null>(null);
+  const [selectedRepoName, setSelectedRepoName] = useState<string | null>(null);
 
   const columns: TableProps['cells'] = [
     { title: 'Repositories', cellTransforms: [headerCol('selectable-radio')] },
diff --git a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableSortable.tsx b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableSortable.tsx
index 8ce156065b8..4f59f8dd8da 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableSortable.tsx
+++ b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableSortable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { sortable, info, cellWidth, wrappable } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 
@@ -21,10 +21,10 @@ export const LegacyTableSortable: React.FunctionComponent = () => {
   // Index of the currently sorted column
   // Note: if you intend to make columns reorderable, you may instead want to use a non-numeric key
   // as the identifier of the sorted column. See the "Compound expandable" example.
-  const [activeSortIndex, setActiveSortIndex] = React.useState<number | null>(null);
+  const [activeSortIndex, setActiveSortIndex] = useState<number | null>(null);
 
   // Sort direction of the currently sorted column
-  const [activeSortDirection, setActiveSortDirection] = React.useState<'asc' | 'desc' | null>(null);
+  const [activeSortDirection, setActiveSortDirection] = useState<'asc' | 'desc' | null>(null);
 
   // Since OnSort specifies sorted columns by index, we need sortable values for our object by column index.
   // This example is trivial since our data objects just contain strings, but if the data was more complex
diff --git a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableSortableCustom.tsx b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableSortableCustom.tsx
index bb61e6eb8b9..c16c47cc178 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableSortableCustom.tsx
+++ b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableSortableCustom.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { sortable, info } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 import { Toolbar, ToolbarContent, ToolbarItem, MenuToggle, MenuToggleElement } from '@patternfly/react-core';
@@ -35,15 +35,15 @@ export const LegacyTableSortableCustom: React.FunctionComponent = () => {
     lastCommit: 'Last commit'
   };
 
-  const [isSortDropdownOpen, setIsSortDropdownOpen] = React.useState(false);
+  const [isSortDropdownOpen, setIsSortDropdownOpen] = useState(false);
 
   // Index of the currently sorted column
   // Note: if you intend to make columns reorderable, you may instead want to use a non-numeric key
   // as the identifier of the sorted column. See the "Compound expandable" example.
-  const [activeSortIndex, setActiveSortIndex] = React.useState<number | null>(null);
+  const [activeSortIndex, setActiveSortIndex] = useState<number | null>(null);
 
   // Sort direction of the currently sorted column
-  const [activeSortDirection, setActiveSortDirection] = React.useState<'asc' | 'desc' | null>(null);
+  const [activeSortDirection, setActiveSortDirection] = useState<'asc' | 'desc' | null>(null);
 
   // Sort dropdown expansion
   // const [isSortDropdownOpen, setIsSortDropdownOpen] = React.useState(false);
@@ -114,7 +114,7 @@ export const LegacyTableSortableCustom: React.FunctionComponent = () => {
   ]);
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Toolbar id="toolbar">
         <ToolbarContent>
           <ToolbarItem>
@@ -180,6 +180,6 @@ export const LegacyTableSortableCustom: React.FunctionComponent = () => {
         <TableHeader />
         <TableBody />
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableStriped.tsx b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableStriped.tsx
index ea0b6f76554..adf08f24b45 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableStriped.tsx
+++ b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableStriped.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 interface Repository {
   name: string;
diff --git a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableStripedCustomTr.tsx b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableStripedCustomTr.tsx
index 7ff748394bf..67f4263f659 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableStripedCustomTr.tsx
+++ b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableStripedCustomTr.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 import { css } from '@patternfly/react-styles';
 
diff --git a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableStripedExpandable.tsx b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableStripedExpandable.tsx
index 28c1549927b..4c00bf3b6fb 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableStripedExpandable.tsx
+++ b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableStripedExpandable.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { TableVariant, expandable, IRowCell } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 import { Checkbox } from '@patternfly/react-core';
@@ -78,7 +78,7 @@ export const LegacyTableStripedExpandable: React.FunctionComponent = () => {
   // This is to prevent state from being based on row order index in case we later add sorting.
   // Note that this behavior is very similar to selection state.
   const initialExpandedRepoNames = repositories.filter((repo) => !!repo.details).map((repo) => repo.name); // Default to all expanded
-  const [expandedRepoNames, setExpandedRepoNames] = React.useState<string[]>(initialExpandedRepoNames);
+  const [expandedRepoNames, setExpandedRepoNames] = useState<string[]>(initialExpandedRepoNames);
   const setRepoExpanded = (repo: Repository, isExpanding = true) =>
     setExpandedRepoNames((prevExpanded) => {
       const otherExpandedRepoNames = prevExpanded.filter((r) => r !== repo.name);
@@ -86,7 +86,7 @@ export const LegacyTableStripedExpandable: React.FunctionComponent = () => {
     });
   const isRepoExpanded = (repo: Repository) => expandedRepoNames.includes(repo.name);
 
-  const [isExampleCompact, setIsExampleCompact] = React.useState(true);
+  const [isExampleCompact, setIsExampleCompact] = useState(true);
 
   // We want to be able to reference the original data object based on row index. But because an expanded
   // row takes up two row indexes, repositories[rowIndex] will not be accurate like it would in a normal table.
@@ -145,7 +145,7 @@ export const LegacyTableStripedExpandable: React.FunctionComponent = () => {
   });
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Checkbox
         label="Compact"
         isChecked={isExampleCompact}
@@ -170,6 +170,6 @@ export const LegacyTableStripedExpandable: React.FunctionComponent = () => {
         <TableHeader />
         <TableBody />
       </Table>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableTextModifiers.tsx b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableTextModifiers.tsx
index 449879cb1bc..3a4efe9d5ff 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableTextModifiers.tsx
+++ b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableTextModifiers.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { cellWidth, TableText } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody, TableProps } from '@patternfly/react-table/deprecated';
 
diff --git a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableTree.tsx b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableTree.tsx
index 26d1b3fc53f..aa47b3374e3 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/LegacyTableTree.tsx
+++ b/packages/react-table/src/deprecated/components/Table/examples/LegacyTableTree.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useState } from 'react';
 import { treeRow, IRow, OnTreeRowCollapse, OnCheckChange, OnToggleRowDetails } from '@patternfly/react-table';
 import { Table, TableHeader, TableBody } from '@patternfly/react-table/deprecated';
 import LeafIcon from '@patternfly/react-icons/dist/esm/icons/leaf-icon';
@@ -78,9 +78,9 @@ export const LegacyTableTree: React.FunctionComponent = () => {
     }
   ];
 
-  const [expandedNodeNames, setExpandedNodeNames] = React.useState<string[]>(['Repositories one']);
-  const [expandedDetailsNodeNames, setExpandedDetailsNodeNames] = React.useState<string[]>([]);
-  const [selectedNodeNames, setSelectedNodeNames] = React.useState<string[]>([]);
+  const [expandedNodeNames, setExpandedNodeNames] = useState<string[]>(['Repositories one']);
+  const [expandedDetailsNodeNames, setExpandedDetailsNodeNames] = useState<string[]>([]);
+  const [selectedNodeNames, setSelectedNodeNames] = useState<string[]>([]);
 
   const getDescendants = (node: RepositoriesTreeNode): RepositoriesTreeNode[] =>
     [node].concat(...(node.children ? node.children.map(getDescendants) : []));
diff --git a/packages/react-table/src/deprecated/components/Table/examples/Table.md b/packages/react-table/src/deprecated/components/Table/examples/Table.md
index b13b07ba70f..fbcf34a51b4 100644
--- a/packages/react-table/src/deprecated/components/Table/examples/Table.md
+++ b/packages/react-table/src/deprecated/components/Table/examples/Table.md
@@ -13,6 +13,7 @@ Note: Table lives in its own package at [@patternfly/react-table](https://www.np
 
 This deprecated `Table` component is configuration-based and takes a less declarative and more implicit approach to laying out the table structure, such as the rows and cells within it.
 
+import { Fragment, isValidElement, useCallback, useEffect, useRef, useState } from 'react';
 import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
 import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
 import CodeIcon from '@patternfly/react-icons/dist/esm/icons/code-icon';
@@ -314,7 +315,6 @@ Example:
 ```
 
 ```js
-import React from 'react';
 import {
   Table,
   TableHeader,
diff --git a/packages/react-table/src/test-helpers/data-sets.tsx b/packages/react-table/src/test-helpers/data-sets.tsx
index b0e5f588231..1dd792defa5 100644
--- a/packages/react-table/src/test-helpers/data-sets.tsx
+++ b/packages/react-table/src/test-helpers/data-sets.tsx
@@ -1,5 +1,4 @@
 /* eslint-disable no-console */
-import * as React from 'react';
 import { IRow, ICell, IActions, EditableTextCell } from '../components/Table';
 
 export const columns: (ICell | string)[] = [
diff --git a/packages/react-templates/src/components/Dropdown/SimpleDropdown.tsx b/packages/react-templates/src/components/Dropdown/SimpleDropdown.tsx
index 31e770ea1a0..71e920a2647 100644
--- a/packages/react-templates/src/components/Dropdown/SimpleDropdown.tsx
+++ b/packages/react-templates/src/components/Dropdown/SimpleDropdown.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { forwardRef, useState } from 'react';
 import {
   Dropdown,
   DropdownItem,
@@ -69,7 +69,7 @@ const SimpleDropdownBase: React.FunctionComponent<SimpleDropdownProps> = ({
   shouldFocusToggleOnSelect,
   ...props
 }: SimpleDropdownProps) => {
-  const [isOpen, setIsOpen] = React.useState(false);
+  const [isOpen, setIsOpen] = useState(false);
 
   const onSelect = (event: React.MouseEvent<Element, MouseEvent>, value: string | number) => {
     onSelectProp && onSelectProp(event, value);
@@ -132,7 +132,7 @@ const SimpleDropdownBase: React.FunctionComponent<SimpleDropdownProps> = ({
   );
 };
 
-export const SimpleDropdown = React.forwardRef((props: SimpleDropdownProps, ref: React.Ref<any>) => (
+export const SimpleDropdown = forwardRef((props: SimpleDropdownProps, ref: React.Ref<any>) => (
   <SimpleDropdownBase {...props} innerRef={ref} />
 ));
 
diff --git a/packages/react-templates/src/components/Dropdown/__tests__/SimpleDropdown.test.tsx b/packages/react-templates/src/components/Dropdown/__tests__/SimpleDropdown.test.tsx
index 15a141e518f..3f09e7b9925 100644
--- a/packages/react-templates/src/components/Dropdown/__tests__/SimpleDropdown.test.tsx
+++ b/packages/react-templates/src/components/Dropdown/__tests__/SimpleDropdown.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { SimpleDropdown } from '../SimpleDropdown';
diff --git a/packages/react-templates/src/components/Dropdown/examples/DropdownTemplates.md b/packages/react-templates/src/components/Dropdown/examples/DropdownTemplates.md
index 92382f1b179..3eb4925f678 100644
--- a/packages/react-templates/src/components/Dropdown/examples/DropdownTemplates.md
+++ b/packages/react-templates/src/components/Dropdown/examples/DropdownTemplates.md
@@ -11,6 +11,7 @@ Note: Templates live in their own package at [@patternfly/react-templates](https
 
 For custom use cases, please see the dropdown component suite from [@patternfly/react-core](https://www.npmjs.com/package/@patternfly/react-core).
 
+import { Fragment, useState } from 'react';
 import { Checkbox, Flex, FlexItem } from '@patternfly/react-core';
 import { SimpleDropdown } from '@patternfly/react-templates';
 import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
diff --git a/packages/react-templates/src/components/Dropdown/examples/SimpleDropdownExample.tsx b/packages/react-templates/src/components/Dropdown/examples/SimpleDropdownExample.tsx
index ba673c533d8..1e43bc6e24f 100644
--- a/packages/react-templates/src/components/Dropdown/examples/SimpleDropdownExample.tsx
+++ b/packages/react-templates/src/components/Dropdown/examples/SimpleDropdownExample.tsx
@@ -1,10 +1,10 @@
-import React from 'react';
+import { Fragment, useState } from 'react';
 import { Checkbox, Flex, FlexItem } from '@patternfly/react-core';
 import { SimpleDropdown, SimpleDropdownItem } from '@patternfly/react-templates';
 import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
 
 export const SimpleDropdownExample: React.FunctionComponent = () => {
-  const [isDisabled, setIsDisabled] = React.useState(false);
+  const [isDisabled, setIsDisabled] = useState(false);
 
   const items: SimpleDropdownItem[] = [
     // eslint-disable-next-line no-console
@@ -18,7 +18,7 @@ export const SimpleDropdownExample: React.FunctionComponent = () => {
   ];
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Checkbox
         id="simple-example-disabled-toggle"
         label="Disable simple dropdown toggles"
@@ -48,6 +48,6 @@ export const SimpleDropdownExample: React.FunctionComponent = () => {
           />
         </FlexItem>
       </Flex>
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-templates/src/components/Select/CheckboxSelect.tsx b/packages/react-templates/src/components/Select/CheckboxSelect.tsx
index 40fa535808b..16b94ebde58 100644
--- a/packages/react-templates/src/components/Select/CheckboxSelect.tsx
+++ b/packages/react-templates/src/components/Select/CheckboxSelect.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { forwardRef, useEffect, useState } from 'react';
 import { Badge } from '@patternfly/react-core/dist/esm/components/Badge';
 import { MenuToggle, MenuToggleElement, MenuToggleProps } from '@patternfly/react-core/dist/esm/components/MenuToggle';
 import {
@@ -46,10 +46,10 @@ const CheckboxSelectBase: React.FunctionComponent<CheckboxSelectProps> = ({
   toggleProps,
   ...props
 }: CheckboxSelectProps) => {
-  const [isOpen, setIsOpen] = React.useState(false);
-  const [selected, setSelected] = React.useState<string[]>([]);
+  const [isOpen, setIsOpen] = useState(false);
+  const [selected, setSelected] = useState<string[]>([]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     const selectedOptions = initialOptions?.filter((option) => option.selected);
     setSelected(selectedOptions?.map((selectedOption) => String(selectedOption.value)) ?? []);
   }, [initialOptions]);
@@ -122,6 +122,6 @@ const CheckboxSelectBase: React.FunctionComponent<CheckboxSelectProps> = ({
   );
 };
 
-export const CheckboxSelect = React.forwardRef((props: CheckboxSelectProps, ref: React.Ref<any>) => (
+export const CheckboxSelect = forwardRef((props: CheckboxSelectProps, ref: React.Ref<any>) => (
   <CheckboxSelectBase {...props} innerRef={ref} />
 ));
diff --git a/packages/react-templates/src/components/Select/MultiTypeaheadSelect.tsx b/packages/react-templates/src/components/Select/MultiTypeaheadSelect.tsx
index da51c6e5e88..6a6775271b3 100644
--- a/packages/react-templates/src/components/Select/MultiTypeaheadSelect.tsx
+++ b/packages/react-templates/src/components/Select/MultiTypeaheadSelect.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { forwardRef, useEffect, useRef, useState } from 'react';
 import { Button } from '@patternfly/react-core/dist/esm/components/Button';
 import { Label, LabelGroup } from '@patternfly/react-core/dist/esm/components/Label';
 import { MenuToggle, MenuToggleElement, MenuToggleProps } from '@patternfly/react-core/dist/esm/components/MenuToggle';
@@ -62,15 +62,15 @@ export const MultiTypeaheadSelectBase: React.FunctionComponent<MultiTypeaheadSel
   toggleProps,
   ...props
 }: MultiTypeaheadSelectProps) => {
-  const [isOpen, setIsOpen] = React.useState(false);
-  const [selected, setSelected] = React.useState<(string | number)[]>(
+  const [isOpen, setIsOpen] = useState(false);
+  const [selected, setSelected] = useState<(string | number)[]>(
     (initialOptions?.filter((o) => o.selected) ?? []).map((o) => o.value)
   );
-  const [inputValue, setInputValue] = React.useState<string>();
-  const [selectOptions, setSelectOptions] = React.useState<MultiTypeaheadSelectOption[]>(initialOptions);
-  const [focusedItemIndex, setFocusedItemIndex] = React.useState<number | null>(null);
-  const [activeItemId, setActiveItemId] = React.useState<string | null>(null);
-  const textInputRef = React.useRef<HTMLInputElement>(undefined);
+  const [inputValue, setInputValue] = useState<string>();
+  const [selectOptions, setSelectOptions] = useState<MultiTypeaheadSelectOption[]>(initialOptions);
+  const [focusedItemIndex, setFocusedItemIndex] = useState<number | null>(null);
+  const [activeItemId, setActiveItemId] = useState<string | null>(null);
+  const textInputRef = useRef<HTMLInputElement>(undefined);
 
   const NO_RESULTS = 'no results';
 
@@ -79,7 +79,7 @@ export const MultiTypeaheadSelectBase: React.FunctionComponent<MultiTypeaheadSel
     setIsOpen(true);
   };
 
-  React.useEffect(() => {
+  useEffect(() => {
     let newSelectOptions: MultiTypeaheadSelectOption[] = initialOptions;
 
     // Filter menu items based on the text input value when one exists
@@ -108,10 +108,7 @@ export const MultiTypeaheadSelectBase: React.FunctionComponent<MultiTypeaheadSel
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [inputValue, initialOptions]);
 
-  React.useEffect(
-    () => setSelected((initialOptions?.filter((o) => o.selected) ?? []).map((o) => o.value)),
-    [initialOptions]
-  );
+  useEffect(() => setSelected((initialOptions?.filter((o) => o.selected) ?? []).map((o) => o.value)), [initialOptions]);
 
   const setActiveAndFocusedItem = (itemIndex: number) => {
     setFocusedItemIndex(itemIndex);
@@ -340,7 +337,7 @@ export const MultiTypeaheadSelectBase: React.FunctionComponent<MultiTypeaheadSel
 
 MultiTypeaheadSelectBase.displayName = 'MultiTypeaheadSelectBase';
 
-export const MultiTypeaheadSelect = React.forwardRef((props: MultiTypeaheadSelectProps, ref: React.Ref<any>) => (
+export const MultiTypeaheadSelect = forwardRef((props: MultiTypeaheadSelectProps, ref: React.Ref<any>) => (
   <MultiTypeaheadSelectBase {...props} innerRef={ref} />
 ));
 
diff --git a/packages/react-templates/src/components/Select/SimpleSelect.tsx b/packages/react-templates/src/components/Select/SimpleSelect.tsx
index 064d4faac2e..a59dad532a6 100644
--- a/packages/react-templates/src/components/Select/SimpleSelect.tsx
+++ b/packages/react-templates/src/components/Select/SimpleSelect.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { forwardRef, useEffect, useState } from 'react';
 import {
   Select,
   SelectList,
@@ -48,10 +48,10 @@ const SimpleSelectBase: React.FunctionComponent<SimpleSelectProps> = ({
   placeholder = 'Select a value',
   ...props
 }: SimpleSelectProps) => {
-  const [isOpen, setIsOpen] = React.useState(false);
-  const [selected, setSelected] = React.useState<SimpleSelectOption | undefined>();
+  const [isOpen, setIsOpen] = useState(false);
+  const [selected, setSelected] = useState<SimpleSelectOption | undefined>();
 
-  React.useEffect(() => {
+  useEffect(() => {
     const selectedOption = initialOptions?.find((option) => option.selected);
     setSelected(selectedOption);
   }, [initialOptions]);
@@ -114,7 +114,7 @@ const SimpleSelectBase: React.FunctionComponent<SimpleSelectProps> = ({
   );
 };
 
-export const SimpleSelect = React.forwardRef((props: SimpleSelectProps, ref: React.Ref<any>) => (
+export const SimpleSelect = forwardRef((props: SimpleSelectProps, ref: React.Ref<any>) => (
   <SimpleSelectBase {...props} innerRef={ref} />
 ));
 
diff --git a/packages/react-templates/src/components/Select/TypeaheadSelect.tsx b/packages/react-templates/src/components/Select/TypeaheadSelect.tsx
index dd26ad9cc58..93c4568d8e0 100644
--- a/packages/react-templates/src/components/Select/TypeaheadSelect.tsx
+++ b/packages/react-templates/src/components/Select/TypeaheadSelect.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { forwardRef, useEffect, useRef, useState } from 'react';
 import { Button } from '@patternfly/react-core/dist/esm/components/Button';
 import { MenuToggle, MenuToggleElement, MenuToggleProps } from '@patternfly/react-core/dist/esm/components/MenuToggle';
 import {
@@ -79,20 +79,18 @@ export const TypeaheadSelectBase: React.FunctionComponent<TypeaheadSelectProps>
   toggleProps,
   ...props
 }: TypeaheadSelectProps) => {
-  const [isOpen, setIsOpen] = React.useState(false);
-  const [selected, setSelected] = React.useState<string>(String(initialOptions.find((o) => o.selected)?.content ?? ''));
-  const [inputValue, setInputValue] = React.useState<string>(
-    String(initialOptions.find((o) => o.selected)?.content ?? '')
-  );
-  const [filterValue, setFilterValue] = React.useState<string>('');
-  const [selectOptions, setSelectOptions] = React.useState<TypeaheadSelectOption[]>(initialOptions);
-  const [focusedItemIndex, setFocusedItemIndex] = React.useState<number | null>(null);
-  const [activeItemId, setActiveItemId] = React.useState<string | null>(null);
-  const textInputRef = React.useRef<HTMLInputElement>(undefined);
+  const [isOpen, setIsOpen] = useState(false);
+  const [selected, setSelected] = useState<string>(String(initialOptions.find((o) => o.selected)?.content ?? ''));
+  const [inputValue, setInputValue] = useState<string>(String(initialOptions.find((o) => o.selected)?.content ?? ''));
+  const [filterValue, setFilterValue] = useState<string>('');
+  const [selectOptions, setSelectOptions] = useState<TypeaheadSelectOption[]>(initialOptions);
+  const [focusedItemIndex, setFocusedItemIndex] = useState<number | null>(null);
+  const [activeItemId, setActiveItemId] = useState<string | null>(null);
+  const textInputRef = useRef<HTMLInputElement>(undefined);
 
   const NO_RESULTS = 'no results';
 
-  React.useEffect(() => {
+  useEffect(() => {
     let newSelectOptions: TypeaheadSelectOption[] = initialOptions;
 
     // Filter menu items based on the text input value when one exists
@@ -153,7 +151,7 @@ export const TypeaheadSelectBase: React.FunctionComponent<TypeaheadSelectProps>
     noOptionsAvailableMessage
   ]);
 
-  React.useEffect(() => {
+  useEffect(() => {
     // If the selected option changed and the current input value is the previously selected item, update the displayed value.
     const selectedOption = initialOptions.find((o) => o.selected);
     if (inputValue === selected && selectedOption?.value !== selected) {
@@ -376,7 +374,7 @@ export const TypeaheadSelectBase: React.FunctionComponent<TypeaheadSelectProps>
 };
 TypeaheadSelectBase.displayName = 'TypeaheadSelectBase';
 
-export const TypeaheadSelect = React.forwardRef((props: TypeaheadSelectProps, ref: React.Ref<any>) => (
+export const TypeaheadSelect = forwardRef((props: TypeaheadSelectProps, ref: React.Ref<any>) => (
   <TypeaheadSelectBase {...props} innerRef={ref} />
 ));
 
diff --git a/packages/react-templates/src/components/Select/__tests__/CheckboxSelect.test.tsx b/packages/react-templates/src/components/Select/__tests__/CheckboxSelect.test.tsx
index 1c1292af863..8e61c69a073 100644
--- a/packages/react-templates/src/components/Select/__tests__/CheckboxSelect.test.tsx
+++ b/packages/react-templates/src/components/Select/__tests__/CheckboxSelect.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen, waitForElementToBeRemoved } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { CheckboxSelect } from '../CheckboxSelect';
diff --git a/packages/react-templates/src/components/Select/__tests__/CheckboxSelectSnapshots.test.tsx b/packages/react-templates/src/components/Select/__tests__/CheckboxSelectSnapshots.test.tsx
index b0b52331ae6..0517a049d34 100644
--- a/packages/react-templates/src/components/Select/__tests__/CheckboxSelectSnapshots.test.tsx
+++ b/packages/react-templates/src/components/Select/__tests__/CheckboxSelectSnapshots.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { CheckboxSelect } from '../CheckboxSelect';
diff --git a/packages/react-templates/src/components/Select/__tests__/MultiTypeaheadSelect.test.tsx b/packages/react-templates/src/components/Select/__tests__/MultiTypeaheadSelect.test.tsx
index 7316007c57c..d89a8f2d37d 100644
--- a/packages/react-templates/src/components/Select/__tests__/MultiTypeaheadSelect.test.tsx
+++ b/packages/react-templates/src/components/Select/__tests__/MultiTypeaheadSelect.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen, waitForElementToBeRemoved } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { MultiTypeaheadSelect } from '../MultiTypeaheadSelect';
diff --git a/packages/react-templates/src/components/Select/__tests__/SimpleSelect.test.tsx b/packages/react-templates/src/components/Select/__tests__/SimpleSelect.test.tsx
index fea5d0f5c3b..71a59f70dc1 100644
--- a/packages/react-templates/src/components/Select/__tests__/SimpleSelect.test.tsx
+++ b/packages/react-templates/src/components/Select/__tests__/SimpleSelect.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen, waitForElementToBeRemoved } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { SimpleSelect } from '../SimpleSelect';
diff --git a/packages/react-templates/src/components/Select/__tests__/TypeaheadSelect.test.tsx b/packages/react-templates/src/components/Select/__tests__/TypeaheadSelect.test.tsx
index 0d6b937c3d7..daba20ccb89 100644
--- a/packages/react-templates/src/components/Select/__tests__/TypeaheadSelect.test.tsx
+++ b/packages/react-templates/src/components/Select/__tests__/TypeaheadSelect.test.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { render, screen, waitForElementToBeRemoved } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { TypeaheadSelect } from '../TypeaheadSelect';
diff --git a/packages/react-templates/src/components/Select/examples/CheckboxSelectDemo.tsx b/packages/react-templates/src/components/Select/examples/CheckboxSelectDemo.tsx
index 1f865d83553..ccda7396a58 100644
--- a/packages/react-templates/src/components/Select/examples/CheckboxSelectDemo.tsx
+++ b/packages/react-templates/src/components/Select/examples/CheckboxSelectDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useMemo, useState } from 'react';
 import { CheckboxSelect, CheckboxSelectOption } from '@patternfly/react-templates';
 
 const Options: { content: string; value: string; description?: string; isDisabled?: boolean }[] = [
@@ -9,9 +9,9 @@ const Options: { content: string; value: string; description?: string; isDisable
 ];
 
 export const SelectBasic: React.FunctionComponent = () => {
-  const [selected, setSelected] = React.useState<string[]>(['option-2']);
+  const [selected, setSelected] = useState<string[]>(['option-2']);
 
-  const initialOptions = React.useMemo<CheckboxSelectOption[]>(
+  const initialOptions = useMemo<CheckboxSelectOption[]>(
     () => Options.map((o) => ({ ...o, selected: selected.includes(o.value) })),
     [selected]
   );
diff --git a/packages/react-templates/src/components/Select/examples/MultiTypeaheadSelectDemo.tsx b/packages/react-templates/src/components/Select/examples/MultiTypeaheadSelectDemo.tsx
index 6d383760cee..066462cd8e4 100644
--- a/packages/react-templates/src/components/Select/examples/MultiTypeaheadSelectDemo.tsx
+++ b/packages/react-templates/src/components/Select/examples/MultiTypeaheadSelectDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useMemo, useState } from 'react';
 import { MultiTypeaheadSelect, MultiTypeaheadSelectOption } from '@patternfly/react-templates';
 
 const Options = [
@@ -17,9 +17,9 @@ const Options = [
 type SelectionsType = (string | number)[];
 
 export const MultiSelectTypeaheadDemo: React.FunctionComponent = () => {
-  const [selected, setSelected] = React.useState<SelectionsType>(['option5']);
+  const [selected, setSelected] = useState<SelectionsType>(['option5']);
 
-  const initialOptions = React.useMemo<MultiTypeaheadSelectOption[]>(
+  const initialOptions = useMemo<MultiTypeaheadSelectOption[]>(
     () => Options.map((o) => ({ ...o, selected: selected.includes(o.value) })),
     [selected]
   );
diff --git a/packages/react-templates/src/components/Select/examples/SelectTemplates.md b/packages/react-templates/src/components/Select/examples/SelectTemplates.md
index 73dc07edd6b..0c77b9ca084 100644
--- a/packages/react-templates/src/components/Select/examples/SelectTemplates.md
+++ b/packages/react-templates/src/components/Select/examples/SelectTemplates.md
@@ -11,6 +11,7 @@ Note: Templates live in their own package at [@patternfly/react-templates](https
 
 For custom use cases, please see the select component suite from [@patternfly/react-core](https://www.npmjs.com/package/@patternfly/react-core).
 
+import { Fragment, useEffect, useMemo, useState } from 'react';
 import { Checkbox } from '@patternfly/react-core';
 import { SimpleSelect, CheckboxSelect, TypeaheadSelect, MultiTypeaheadSelect } from '@patternfly/react-templates';
 
diff --git a/packages/react-templates/src/components/Select/examples/SimpleSelectDemo.tsx b/packages/react-templates/src/components/Select/examples/SimpleSelectDemo.tsx
index 83cfd0f9bd9..d393b6f4d54 100644
--- a/packages/react-templates/src/components/Select/examples/SimpleSelectDemo.tsx
+++ b/packages/react-templates/src/components/Select/examples/SimpleSelectDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { Fragment, useMemo, useState } from 'react';
 import { Checkbox } from '@patternfly/react-core';
 import { SimpleSelect, SimpleSelectOption } from '@patternfly/react-templates';
 
@@ -9,16 +9,16 @@ const Options: SimpleSelectOption[] = [
 ];
 
 export const SelectSimpleDemo: React.FunctionComponent = () => {
-  const [isDisabled, setIsDisabled] = React.useState<boolean>(false);
-  const [selected, setSelected] = React.useState<string | undefined>('Option1');
+  const [isDisabled, setIsDisabled] = useState<boolean>(false);
+  const [selected, setSelected] = useState<string | undefined>('Option1');
 
-  const initialOptions = React.useMemo<SimpleSelectOption[]>(
+  const initialOptions = useMemo<SimpleSelectOption[]>(
     () => Options.map((o) => ({ ...o, selected: o.value === selected })),
     [selected]
   );
 
   return (
-    <React.Fragment>
+    <Fragment>
       <Checkbox
         id="toggle-disabled"
         label="isDisabled"
@@ -31,6 +31,6 @@ export const SelectSimpleDemo: React.FunctionComponent = () => {
         isDisabled={isDisabled}
         onSelect={(_ev, selection) => setSelected(String(selection))}
       />
-    </React.Fragment>
+    </Fragment>
   );
 };
diff --git a/packages/react-templates/src/components/Select/examples/TypeaheadSelectDemo.tsx b/packages/react-templates/src/components/Select/examples/TypeaheadSelectDemo.tsx
index d2c06a92e8d..8a6e82ff6bb 100644
--- a/packages/react-templates/src/components/Select/examples/TypeaheadSelectDemo.tsx
+++ b/packages/react-templates/src/components/Select/examples/TypeaheadSelectDemo.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { TypeaheadSelect, TypeaheadSelectOption } from '@patternfly/react-templates';
 import { Checkbox } from '@patternfly/react-core';
 
@@ -13,17 +13,17 @@ const Options = [
 
 /* eslint-disable no-console */
 export const SelectTypeaheadDemo: React.FunctionComponent = () => {
-  const [selected, setSelected] = React.useState<string | undefined>();
-  const [options, setOptions] = React.useState(Options);
-  const [isCreatable, setIsCreatable] = React.useState<boolean>(false);
-  const [isCreateOptionOnTop, setIsCreateOptionOnTop] = React.useState<boolean>(false);
+  const [selected, setSelected] = useState<string | undefined>();
+  const [options, setOptions] = useState(Options);
+  const [isCreatable, setIsCreatable] = useState<boolean>(false);
+  const [isCreateOptionOnTop, setIsCreateOptionOnTop] = useState<boolean>(false);
 
-  const initialOptions = React.useMemo<TypeaheadSelectOption[]>(
+  const initialOptions = useMemo<TypeaheadSelectOption[]>(
     () => options.map((o) => ({ ...o, selected: o.value === selected })),
     [options, selected]
   );
 
-  React.useEffect(() => {
+  useEffect(() => {
     console.log(`Selected: ${selected || 'none'}`);
   }, [selected]);