diff --git a/frontend/src/core/components/tools/shared/FilesToolStep.tsx b/frontend/src/core/components/tools/shared/FilesToolStep.tsx
index 8804b9fad..b1e8933f5 100644
--- a/frontend/src/core/components/tools/shared/FilesToolStep.tsx
+++ b/frontend/src/core/components/tools/shared/FilesToolStep.tsx
@@ -10,28 +10,20 @@ export interface FilesToolStepProps {
   minFiles?: number;
 }
 
-export function CreateFilesToolStep(props: FilesToolStepProps & {
-  createStep: (title: string, props: any, children?: React.ReactNode) => React.ReactElement
-}): React.ReactElement {
-  const { t } = useTranslation();
-  const { createStep, ...stepProps } = props;
-
-  return createStep(t("files.title", "Files"), {
-    isVisible: true,
-    isCollapsed: stepProps.isCollapsed,
-    onCollapsedClick: stepProps.onCollapsedClick
-  }, (
-    <FileStatusIndicator
-      selectedFiles={stepProps.selectedFiles}
-      minFiles={stepProps.minFiles}
-    />
-  ));
-}
-
-// Backwards compatibility wrapper
 export function createFilesToolStep(
   createStep: (title: string, props: any, children?: React.ReactNode) => React.ReactElement,
   props: FilesToolStepProps
 ): React.ReactElement {
-  return <CreateFilesToolStep createStep={createStep} {...props} />;
+  const { t } = useTranslation();
+
+  return createStep(t("files.title", "Files"), {
+    isVisible: true,
+    isCollapsed: props.isCollapsed,
+    onCollapsedClick: props.onCollapsedClick
+  }, (
+    <FileStatusIndicator
+      selectedFiles={props.selectedFiles}
+      minFiles={props.minFiles}
+    />
+  ));
 }
diff --git a/frontend/src/core/components/tools/shared/ReviewToolStep.tsx b/frontend/src/core/components/tools/shared/ReviewToolStep.tsx
index 79e9989fd..30c8c906e 100644
--- a/frontend/src/core/components/tools/shared/ReviewToolStep.tsx
+++ b/frontend/src/core/components/tools/shared/ReviewToolStep.tsx
@@ -103,29 +103,21 @@ function ReviewStepContent<TParams = unknown>({
   );
 }
 
-export function CreateReviewToolStep<TParams = unknown>(props: ReviewToolStepProps<TParams> & {
-  createStep: (title: string, props: any, children?: React.ReactNode) => React.ReactElement
-}): React.ReactElement {
-  const { t } = useTranslation();
-  const { createStep, ...stepProps } = props;
-
-  return createStep(
-    t("review", "Review"),
-    {
-      isVisible: stepProps.isVisible,
-      isCollapsed: stepProps.isCollapsed,
-      onCollapsedClick: stepProps.onCollapsedClick,
-      _excludeFromCount: true,
-      _noPadding: true,
-    },
-    <ReviewStepContent operation={stepProps.operation} onFileClick={stepProps.onFileClick} onUndo={stepProps.onUndo} />
-  );
-}
-
-// Backwards compatibility wrapper
 export function createReviewToolStep<TParams = unknown>(
   createStep: (title: string, props: any, children?: React.ReactNode) => React.ReactElement,
   props: ReviewToolStepProps<TParams>
 ): React.ReactElement {
-  return <CreateReviewToolStep createStep={createStep} {...props} />;
+  const { t } = useTranslation();
+
+  return createStep(
+    t("review", "Review"),
+    {
+      isVisible: props.isVisible,
+      isCollapsed: props.isCollapsed,
+      onCollapsedClick: props.onCollapsedClick,
+      _excludeFromCount: true,
+      _noPadding: true,
+    },
+    <ReviewStepContent operation={props.operation} onFileClick={props.onFileClick} onUndo={props.onUndo} />
+  );
 }