diff --git a/ts/state/roots/createCallManager.tsx b/ts/state/roots/createCallManager.tsx
index d3cacb7c90e1..87b21c1ef3fe 100644
--- a/ts/state/roots/createCallManager.tsx
+++ b/ts/state/roots/createCallManager.tsx
@@ -5,14 +5,8 @@ import { Store } from 'redux';
 
 import { SmartCallManager } from '../smart/CallManager';
 
-// Workaround: A react component's required properties are filtering up through connect()
-//   https://github.com/DefinitelyTyped/DefinitelyTyped/issues/31363
-/* eslint-disable @typescript-eslint/no-explicit-any */
-const FilteredCallManager = SmartCallManager as any;
-/* eslint-enable @typescript-eslint/no-explicit-any */
-
 export const createCallManager = (store: Store): React.ReactElement => (
   <Provider store={store}>
-    <FilteredCallManager />
+    <SmartCallManager />
   </Provider>
 );
diff --git a/ts/state/roots/createLeftPane.tsx b/ts/state/roots/createLeftPane.tsx
index 5d577d9f60c8..51e7098eb9f0 100644
--- a/ts/state/roots/createLeftPane.tsx
+++ b/ts/state/roots/createLeftPane.tsx
@@ -5,14 +5,8 @@ import { Store } from 'redux';
 
 import { SmartLeftPane } from '../smart/LeftPane';
 
-// Workaround: A react component's required properties are filtering up through connect()
-//   https://github.com/DefinitelyTyped/DefinitelyTyped/issues/31363
-/* eslint-disable @typescript-eslint/no-explicit-any */
-const FilteredLeftPane = SmartLeftPane as any;
-/* eslint-enable @typescript-eslint/no-explicit-any */
-
 export const createLeftPane = (store: Store): React.ReactElement => (
   <Provider store={store}>
-    <FilteredLeftPane />
+    <SmartLeftPane />
   </Provider>
 );
diff --git a/ts/state/roots/createStickerManager.tsx b/ts/state/roots/createStickerManager.tsx
index 7eaf953b1d08..2b6686b489d6 100644
--- a/ts/state/roots/createStickerManager.tsx
+++ b/ts/state/roots/createStickerManager.tsx
@@ -5,14 +5,8 @@ import { Store } from 'redux';
 
 import { SmartStickerManager } from '../smart/StickerManager';
 
-// Workaround: A react component's required properties are filtering up through connect()
-//   https://github.com/DefinitelyTyped/DefinitelyTyped/issues/31363
-/* eslint-disable @typescript-eslint/no-explicit-any */
-const FilteredStickerManager = SmartStickerManager as any;
-/* eslint-enable @typescript-eslint/no-explicit-any */
-
 export const createStickerManager = (store: Store): React.ReactElement => (
   <Provider store={store}>
-    <FilteredStickerManager />
+    <SmartStickerManager />
   </Provider>
 );
diff --git a/ts/state/smart/CallManager.tsx b/ts/state/smart/CallManager.tsx
index e64fbc35d718..3282bb8743dc 100644
--- a/ts/state/smart/CallManager.tsx
+++ b/ts/state/smart/CallManager.tsx
@@ -8,14 +8,8 @@ import { getIntl } from '../selectors/user';
 
 import { SmartCallingDeviceSelection } from './CallingDeviceSelection';
 
-// Workaround: A react component's required properties are filtering up through connect()
-//   https://github.com/DefinitelyTyped/DefinitelyTyped/issues/31363
-/* eslint-disable @typescript-eslint/no-explicit-any */
-const FilteredCallingDeviceSelection = SmartCallingDeviceSelection as any;
-/* eslint-enable @typescript-eslint/no-explicit-any */
-
 function renderDeviceSelection(): JSX.Element {
-  return <FilteredCallingDeviceSelection />;
+  return <SmartCallingDeviceSelection />;
 }
 
 const mapStateToProps = (state: StateType) => {
diff --git a/ts/state/smart/LeftPane.tsx b/ts/state/smart/LeftPane.tsx
index 0d8c1b2d8b3d..db927f6c317e 100644
--- a/ts/state/smart/LeftPane.tsx
+++ b/ts/state/smart/LeftPane.tsx
@@ -22,31 +22,26 @@ import { SmartUpdateDialog } from './UpdateDialog';
 // Workaround: A react component's required properties are filtering up through connect()
 //   https://github.com/DefinitelyTyped/DefinitelyTyped/issues/31363
 /* eslint-disable @typescript-eslint/no-explicit-any */
-const FilteredSmartMainHeader = SmartMainHeader as any;
 const FilteredSmartMessageSearchResult = SmartMessageSearchResult as any;
-const FilteredSmartNetworkStatus = SmartNetworkStatus as any;
-const FilteredSmartUpdateDialog = SmartUpdateDialog as any;
-const FilteredSmartExpiredBuildDialog = SmartExpiredBuildDialog as any;
-const FilteredSmartRelinkDialog = SmartRelinkDialog as any;
 /* eslint-enable @typescript-eslint/no-explicit-any */
 
 function renderExpiredBuildDialog(): JSX.Element {
-  return <FilteredSmartExpiredBuildDialog />;
+  return <SmartExpiredBuildDialog />;
 }
 function renderMainHeader(): JSX.Element {
-  return <FilteredSmartMainHeader />;
+  return <SmartMainHeader />;
 }
 function renderMessageSearchResult(id: string): JSX.Element {
   return <FilteredSmartMessageSearchResult id={id} />;
 }
 function renderNetworkStatus(): JSX.Element {
-  return <FilteredSmartNetworkStatus />;
+  return <SmartNetworkStatus />;
 }
 function renderRelinkDialog(): JSX.Element {
-  return <FilteredSmartRelinkDialog />;
+  return <SmartRelinkDialog />;
 }
 function renderUpdateDialog(): JSX.Element {
-  return <FilteredSmartUpdateDialog />;
+  return <SmartUpdateDialog />;
 }
 
 const mapStateToProps = (state: StateType) => {