diff --git a/src/app/Dashboard/AutomatedAnalysis/AutomatedAnalysisFilters.tsx b/src/app/Dashboard/AutomatedAnalysis/AutomatedAnalysisFilters.tsx
index eac960027..3c50e42f2 100644
--- a/src/app/Dashboard/AutomatedAnalysis/AutomatedAnalysisFilters.tsx
+++ b/src/app/Dashboard/AutomatedAnalysis/AutomatedAnalysisFilters.tsx
@@ -29,7 +29,6 @@ import {
   MenuToggle,
   MenuToggleElement,
 } from '@patternfly/react-core';
-//import { Dropdown, DropdownItem, DropdownPosition, DropdownToggle } from '@patternfly/react-core/deprecated';
 import { EllipsisVIcon, FilterIcon } from '@patternfly/react-icons';
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
@@ -128,13 +127,6 @@ export const AutomatedAnalysisFilters: React.FC<AutomatedAnalysisFiltersProps> =
   const categoryDropdown = React.useMemo(() => {
     return (
       <Dropdown
-        //aria-label={'Category Dropdown'}
-        //position={DropdownPosition.left}
-        /* toggle={
-          <DropdownToggle aria-label={currentCategory} onToggle={onCategoryToggle}>
-            <FilterIcon /> {getCategoryDisplay(currentCategory)}
-          </DropdownToggle>
-        } */
         toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
           <MenuToggle ref={toggleRef} aria-label={currentCategory} onClick={() => onCategoryToggle()}>
             <FilterIcon />
@@ -145,7 +137,6 @@ export const AutomatedAnalysisFilters: React.FC<AutomatedAnalysisFiltersProps> =
         isOpen={isCategoryDropdownOpen}
         popperProps={{
           position: 'left',
-          //aria: 'Category Dropdown',
         }}
       >
         <DropdownList>
diff --git a/src/app/Dashboard/DashboardLayoutToolbar.tsx b/src/app/Dashboard/DashboardLayoutToolbar.tsx
index bd6384bb9..2b439c46e 100644
--- a/src/app/Dashboard/DashboardLayoutToolbar.tsx
+++ b/src/app/Dashboard/DashboardLayoutToolbar.tsx
@@ -47,13 +47,6 @@ import {
   Dropdown as PF5Dropdown,
   DropdownItem as PF5DropdownItem,
 } from '@patternfly/react-core';
-/* import {
-  Dropdown as PF4Dropdown,
-  DropdownItem as PF4DropdownItem,
-  DropdownToggle,
-  DropdownToggleAction,
-} from '@patternfly/react-core/deprecated';
- */
 import {
   EllipsisVIcon,
   FileIcon,
@@ -293,24 +286,23 @@ export const DashboardLayoutToolbar: React.FC<DashboardLayoutToolbarProps> = (_p
             ref={toggleRef}
             className="dashboard-layout-create-dropdown-toggle"
             splitButtonOptions={{
-              items:[
-              <DropdownItem
-                key="action"
-                onClick={(_e) => {
-                  createBlankLayout();
-                  setIsSelectorOpen(false);
-                }}
-              >
-                <span style={{ display: 'flex', alignItems: 'center' }}>
-                  <PlusCircleIcon style={{ marginRight: 'var(--pf-global--spacer--sm)' }} />
-                  {t('DashboardLayoutToolbar.NEW_LAYOUT')}
-                </span>
-              </DropdownItem>,
-            ]
+              items: [
+                <DropdownItem
+                  key="action"
+                  onClick={(_e) => {
+                    createBlankLayout();
+                    setIsSelectorOpen(false);
+                  }}
+                >
+                  <span style={{ display: 'flex', alignItems: 'center' }}>
+                    <PlusCircleIcon style={{ marginRight: 'var(--pf-global--spacer--sm)' }} />
+                    {t('DashboardLayoutToolbar.NEW_LAYOUT')}
+                  </span>
+                </DropdownItem>,
+              ],
             }}
             variant="primary"
             //splitButtonVariant="action"
-            
           >
             <EllipsisVIcon />
           </MenuToggle>
diff --git a/src/app/Dashboard/LayoutTemplatePicker.tsx b/src/app/Dashboard/LayoutTemplatePicker.tsx
index 417092f71..838771c09 100644
--- a/src/app/Dashboard/LayoutTemplatePicker.tsx
+++ b/src/app/Dashboard/LayoutTemplatePicker.tsx
@@ -65,7 +65,6 @@ import {
   MenuToggle,
   MenuToggleElement,
 } from '@patternfly/react-core';
-import { SelectOptionObject } from '@patternfly/react-core/deprecated';
 import {
   ArrowsAltVIcon,
   FilterIcon,
diff --git a/src/app/Recordings/ArchivedRecordingsTable.tsx b/src/app/Recordings/ArchivedRecordingsTable.tsx
index b49ed9810..8372dfaea 100644
--- a/src/app/Recordings/ArchivedRecordingsTable.tsx
+++ b/src/app/Recordings/ArchivedRecordingsTable.tsx
@@ -75,7 +75,6 @@ import {
   MenuToggle,
   MenuToggleElement,
 } from '@patternfly/react-core';
-//import { Dropdown, KebabToggle } from '@patternfly/react-core/deprecated';
 import { UploadIcon, EllipsisVIcon } from '@patternfly/react-icons';
 import { Tbody, Tr, Td, ExpandableRowContent, Table, SortByDirection } from '@patternfly/react-table';
 import * as React from 'react';
@@ -716,12 +715,8 @@ const ArchivedRecordingsToolbar: React.FC<ArchivedRecordingsToolbarProps> = (pro
               </OverflowMenuContent>
               <OverflowMenuControl>
                 <Dropdown
-                  //aria-label={'archive-recording-actions'}
                   isPlain
-                  //isFlipEnabled
                   onSelect={() => setActionToggleOpen(false)}
-                  //menuAppendTo={'parent'}
-                  //toggle={<KebabToggle id="archive-recording-actions-toggle-kebab" onToggle={handleActionToggle} />}
                   toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
                     <MenuToggle ref={toggleRef} onClick={() => handleActionToggle()}>
                       <EllipsisVIcon />
diff --git a/src/app/Recordings/RecordingFilters.tsx b/src/app/Recordings/RecordingFilters.tsx
index 32431c823..35e23482e 100644
--- a/src/app/Recordings/RecordingFilters.tsx
+++ b/src/app/Recordings/RecordingFilters.tsx
@@ -34,7 +34,6 @@ import {
   MenuToggle,
   MenuToggleElement,
 } from '@patternfly/react-core';
-//import { Dropdown, DropdownItem, DropdownPosition, DropdownToggle } from '@patternfly/react-core/deprecated';
 import { FilterIcon, EllipsisVIcon } from '@patternfly/react-icons';
 import * as React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
@@ -161,13 +160,6 @@ export const RecordingFilters: React.FC<RecordingFiltersProps> = ({
   const categoryDropdown = React.useMemo(() => {
     return (
       <Dropdown
-        //aria-label={'Category Dropdown'}
-        //position={DropdownPosition.left}
-        /* toggle={
-          <DropdownToggle aria-label={currentCategory} onToggle={onCategoryToggle}>
-            <FilterIcon /> {categoriesToDisplayNames[currentCategory]}
-          </DropdownToggle>
-        } */
         toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
           <MenuToggle ref={toggleRef} aria-label={currentCategory} onClick={() => onCategoryToggle()}>
             <FilterIcon />
diff --git a/src/app/SecurityPanel/Credentials/CredentialTestTable.tsx b/src/app/SecurityPanel/Credentials/CredentialTestTable.tsx
index 049b077ce..d8c15fb1b 100644
--- a/src/app/SecurityPanel/Credentials/CredentialTestTable.tsx
+++ b/src/app/SecurityPanel/Credentials/CredentialTestTable.tsx
@@ -43,7 +43,6 @@ import {
   Select,
   SelectOption,
 } from '@patternfly/react-core';
-//import { Select, SelectOption, SelectVariant } from '@patternfly/react-core/deprecated';
 import { ExclamationCircleIcon, SearchIcon, WarningTriangleIcon } from '@patternfly/react-icons';
 import {
   InnerScrollContainer,