diff --git a/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx b/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx
index 751cf7c1c4f..132448c50ad 100644
--- a/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx
+++ b/packages/react-code-editor/src/components/CodeEditor/CodeEditorControl.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Button, ButtonProps, PopoverPosition, Tooltip } from '@patternfly/react-core';
+import { Button, ButtonProps, Tooltip } from '@patternfly/react-core';
 import { CodeEditorContext } from './CodeEditorUtils';
 
 /** Allows customizing the code editor controls by passing this sub-component into the
@@ -11,32 +11,8 @@ export interface CodeEditorControlProps extends Omit<ButtonProps, 'onClick'> {
   'aria-label'?: string;
   /** Additional classes added to the code editor control. */
   className?: string;
-  /** @deprecated  Delay in ms before the tooltip appears. */
-  entryDelay?: number;
-  /** @deprecated  Delay in ms before the tooltip disappears. */
-  exitDelay?: number;
   /** Icon rendered inside the code editor control. */
   icon: React.ReactNode;
-  /** @deprecated Maximum width of the tooltip (default 150px). */
-  maxWidth?: string;
-  /** @deprecated Copy button popover position. */
-  position?:
-    | PopoverPosition
-    | 'auto'
-    | 'top'
-    | 'bottom'
-    | 'left'
-    | 'right'
-    | 'top-start'
-    | 'top-end'
-    | 'bottom-start'
-    | 'bottom-end'
-    | 'left-start'
-    | 'left-end'
-    | 'right-start'
-    | 'right-end';
-  /** @deprecated Text to display in the tooltip*/
-  toolTipText?: React.ReactNode;
   /** Event handler for the click of the button */
   onClick: (code: string, event?: any) => void;
   /** Flag indicating that the button is visible above the code editor. */
@@ -49,11 +25,6 @@ export const CodeEditorControl: React.FunctionComponent<CodeEditorControlProps>
   icon,
   className,
   'aria-label': ariaLabel,
-  toolTipText,
-  exitDelay,
-  entryDelay,
-  maxWidth,
-  position,
   onClick = () => {},
   isVisible = true,
   tooltipProps = {},
@@ -61,57 +32,12 @@ export const CodeEditorControl: React.FunctionComponent<CodeEditorControlProps>
 }: CodeEditorControlProps) => {
   const context = React.useContext(CodeEditorContext);
 
-  if (entryDelay !== undefined) {
-    // eslint-disable-next-line no-console
-    console.warn(
-      'CodeEditorControl: entryDelay prop has been deprecated. ' +
-        'Pass the entryDelay via the tooltipProps prop instead.'
-    );
-  }
-
-  if (exitDelay !== undefined) {
-    // eslint-disable-next-line no-console
-    console.warn(
-      'CodeEditorControl: exitDelay prop has been deprecated. ' +
-        'Pass the exitDelay via the tooltipProps prop instead.'
-    );
-  }
-
-  if (maxWidth !== undefined) {
-    // eslint-disable-next-line no-console
-    console.warn(
-      'CodeEditorControl: maxWidth prop has been deprecated. ' + 'Pass the maxWidth via the tooltipProps prop instead.'
-    );
-  }
-
-  if (position !== undefined) {
-    // eslint-disable-next-line no-console
-    console.warn(
-      'CodeEditorControl: position prop has been deprecated. ' + 'Pass the position via the tooltipProps prop instead.'
-    );
-  }
-
-  if (toolTipText !== undefined) {
-    // eslint-disable-next-line no-console
-    console.warn(
-      'CodeEditorControl: toolTipText prop has been deprecated. ' +
-        'Pass the toolTipText by setting the content field in tooltipProps prop instead.'
-    );
-  }
-
   const onCustomClick = (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
     onClick(context.code, event);
   };
 
   return isVisible ? (
-    <Tooltip
-      exitDelay={exitDelay}
-      entryDelay={entryDelay}
-      maxWidth={maxWidth}
-      position={position}
-      content={<div>{toolTipText}</div>}
-      {...tooltipProps}
-    >
+    <Tooltip {...tooltipProps}>
       <Button className={className} onClick={onCustomClick} variant="control" aria-label={ariaLabel} {...props}>
         {icon}
       </Button>
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 056898bbffa..8038ba2e73e 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
@@ -76,7 +76,6 @@ export class CodeEditorDemo extends React.Component<CodeEditorProps, CodeEditorD
       <CodeEditorControl
         icon={<PlayIcon />}
         aria-label="Execute code"
-        toolTipText="Execute code"
         onClick={this.onExecuteCode}
         isVisible={code !== ''}
       />