diff --git a/frontend/e2e/ReviewTemplate.spec.ts b/frontend/e2e/ReviewTemplate.spec.ts
index edf8aa9d..c8360403 100644
--- a/frontend/e2e/ReviewTemplate.spec.ts
+++ b/frontend/e2e/ReviewTemplate.spec.ts
@@ -15,17 +15,6 @@ test.describe("ReviewTemplate Page", () => {
     await expect(page).toHaveURL("/extract/upload");
   });
 
-  // Test the Done button functionality
-  test("Done button navigates correctly", async ({ page }) => {
-    const submitButton = page.getByRole("button", { name: "Done" });
-    await expect(submitButton).toBeDisabled();
-    const errorRows = await page.locator("tr *[data-testid='edit-fix-error']");
-    for (const row of await errorRows.elementHandles()) {
-      await row.click();
-      await page.keyboard.press("Enter");
-    }
-  });
-
   // Test the extracted data section
   test("Displays extracted data with overall confidence score", async ({
     page,
@@ -120,10 +109,11 @@ test.describe("ReviewTemplate Page", () => {
       await page.keyboard.press("Enter");
     }
 
+    const finalSubmitButton = page.getByRole("button", { name: "Download CSV" });
     await expect(submitButton).toBeEnabled();
     await submitButton.click();
 
-    await submitButton.click();
+    await finalSubmitButton.click();
     await expect(page).toHaveURL("/");
   });
 });
diff --git a/frontend/src/components/ExtractDataHeader.tsx b/frontend/src/components/ExtractDataHeader.tsx
index 8f9c2147..db453244 100644
--- a/frontend/src/components/ExtractDataHeader.tsx
+++ b/frontend/src/components/ExtractDataHeader.tsx
@@ -5,9 +5,9 @@ import "./ExtractDataHeader.scss";
 
 interface ExtractDataHeaderProps {
   onBack: () => void;
-  onSubmit: () => void;
   onExit: () => void;
   isUploadComplete: boolean;
+  onSubmit?: () => void;
   hasSubmit?: boolean;
 }
 
diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx
index d99dbf77..7c4ea1bf 100644
--- a/frontend/src/components/Header.tsx
+++ b/frontend/src/components/Header.tsx
@@ -7,7 +7,7 @@ interface UploadHeaderProps {
   title: string;
   isUpload?: boolean;
   onBack: () => void;
-  onSubmit: () => void;
+  onSubmit?: () => void;
 }
 
 export const UploadHeader = ({
@@ -41,9 +41,13 @@ export const UploadHeader = ({
           >
             Back
           </Button>
-          <Button disabled={isUpload} onClick={onSubmit} type="submit" base>
-            Submit
-          </Button>
+          {
+            onSubmit && (
+              <Button disabled={isUpload} onClick={onSubmit} type="submit" base>
+                Submit
+              </Button>
+            )
+          }
         </div>
       </div>
     </Header>
diff --git a/frontend/src/components/ReviewBulk.tsx b/frontend/src/components/ReviewBulk.tsx
index 2125664b..813db2af 100644
--- a/frontend/src/components/ReviewBulk.tsx
+++ b/frontend/src/components/ReviewBulk.tsx
@@ -76,6 +76,11 @@ const ReviewBulk = ({
     );
   };
 
+  const handleCSVDownload = () => {
+    onDownload();
+    navigate("/");
+  }
+
   return (
     <div className="display-flex flex-column flex-justify-start width-full height-full padding-1 padding-top-2">
       <ExtractDataHeader
@@ -107,7 +112,7 @@ const ReviewBulk = ({
                   0
                 }
                 type="button"
-                onClick={() => onDownload()}
+                onClick={handleCSVDownload}
               >
                 <Icon.FileDownload className="csv-icon" />
                 Download CSV
@@ -143,14 +148,6 @@ const ReviewBulk = ({
               >
                 Cancel
               </Button>
-              <Button
-                className="extract-button-submit"
-                onClick={() => navigate("/")}
-                type="submit"
-                disabled={resultsTable.some((row) => row.errors > 0)}
-              >
-                Done
-              </Button>
             </div>
           </div>
         </div>
diff --git a/frontend/src/pages/ExtractUpload.tsx b/frontend/src/pages/ExtractUpload.tsx
index 4a53bed2..4acd73f6 100644
--- a/frontend/src/pages/ExtractUpload.tsx
+++ b/frontend/src/pages/ExtractUpload.tsx
@@ -41,7 +41,7 @@ const ExtractUpload = () => {
           navigate("/");
           clearFiles();
         }}
-        onSubmit={() => navigate("/extract/process")}
+        hasSubmit={false}
         isUploadComplete={isUploadComplete}
       />
       <Divider margin="0px" />
diff --git a/frontend/src/pages/UploadTemplate.tsx b/frontend/src/pages/UploadTemplate.tsx
index 9884ccdf..f09ecb7d 100644
--- a/frontend/src/pages/UploadTemplate.tsx
+++ b/frontend/src/pages/UploadTemplate.tsx
@@ -25,7 +25,6 @@ export const UploadTemplate = () => {
         onBack={() => {
           navigate("/");
         }}
-        onSubmit={() => navigate("/new-template/annotate")}
         isUpload={files.length === 0}
       />
       <Divider margin="0px" />
diff --git a/frontend/src/pages/__snapshots__/UploadTemplate.test.tsx.snap b/frontend/src/pages/__snapshots__/UploadTemplate.test.tsx.snap
index 7586af7b..ae36bf1f 100644
--- a/frontend/src/pages/__snapshots__/UploadTemplate.test.tsx.snap
+++ b/frontend/src/pages/__snapshots__/UploadTemplate.test.tsx.snap
@@ -49,14 +49,6 @@ exports[`UploadTemplate component > matches the snapshot 1`] = `
           >
             Back
           </button>
-          <button
-            class="usa-button usa-button--base"
-            data-testid="button"
-            disabled=""
-            type="submit"
-          >
-            Submit
-          </button>
         </div>
       </div>
     </header>