diff --git a/app/src/components/blocks/deleteDocumentsStage/DeleteDocumentsStage.tsx b/app/src/components/blocks/deleteDocumentsStage/DeleteDocumentsStage.tsx
index 8c0dc4e09..1308a02ec 100644
--- a/app/src/components/blocks/deleteDocumentsStage/DeleteDocumentsStage.tsx
+++ b/app/src/components/blocks/deleteDocumentsStage/DeleteDocumentsStage.tsx
@@ -136,78 +136,67 @@ function DeleteDocumentsStage({
     };
     useTitle({ pageTitle: 'Delete files' });
 
+    const PageIndexView = () => (
+        <>
+            <BackLink onClick={handleNoOption} href="#">
+                Back
+            </BackLink>
+            {deletionStage === SUBMISSION_STATE.FAILED && <ServiceError />}
+            {showNoOptionSelectedMessage && (
+                <ErrorBox
+                    messageTitle={'There is a problem '}
+                    messageLinkBody={'You must select an option'}
+                    errorBoxSummaryId={'error-box-summary'}
+                    errorInputLink={'#delete-docs'}
+                    dataTestId={'delete-error-box'}
+                />
+            )}
+            <form onSubmit={handleSubmit(submit)}>
+                <Fieldset id="radio-selection">
+                    <Fieldset.Legend isPageHeading>
+                        Are you sure you want to permanently delete files for:
+                    </Fieldset.Legend>
+                    <div>{patientInfo}</div>
+                    <Radios
+                        id="delete-docs"
+                        error={showNoOptionSelectedMessage && noOptionSelectedError}
+                    >
+                        <Radios.Radio
+                            value={DELETE_DOCUMENTS_OPTION.YES}
+                            inputRef={deleteDocsRef}
+                            {...radioProps}
+                            id="yes-radio-button"
+                            data-testid="yes-radio-btn"
+                        >
+                            Yes
+                        </Radios.Radio>
+                        <Radios.Radio
+                            value={DELETE_DOCUMENTS_OPTION.NO}
+                            inputRef={deleteDocsRef}
+                            {...radioProps}
+                            id="no-radio-button"
+                            data-testid="no-radio-btn"
+                        >
+                            No
+                        </Radios.Radio>
+                    </Radios>
+                </Fieldset>
+                {deletionStage === SUBMISSION_STATE.PENDING ? (
+                    <SpinnerButton id="delete-docs-spinner" status="Deleting..." disabled={true} />
+                ) : (
+                    <Button type="submit" id="delete-submit-button" data-testid="delete-submit-btn">
+                        Continue
+                    </Button>
+                )}
+            </form>
+        </>
+    );
+
     return (
         <>
             <div>
                 <Routes>
-                    <Route
-                        index
-                        element={
-                            <>
-                                <BackLink onClick={handleNoOption} href="#">
-                                    Back
-                                </BackLink>
-                                {deletionStage === SUBMISSION_STATE.FAILED && <ServiceError />}
-                                {showNoOptionSelectedMessage && (
-                                    <ErrorBox
-                                        messageTitle={'There is a problem '}
-                                        messageLinkBody={'You must select an option'}
-                                        errorBoxSummaryId={'error-box-summary'}
-                                        errorInputLink={'#delete-docs'}
-                                        dataTestId={'delete-error-box'}
-                                    />
-                                )}
-                                <form onSubmit={handleSubmit(submit)}>
-                                    <Fieldset id="radio-selection">
-                                        <Fieldset.Legend isPageHeading>
-                                            Are you sure you want to permanently delete files for:
-                                        </Fieldset.Legend>
-                                        <div>{patientInfo}</div>
-                                        <Radios
-                                            id="delete-docs"
-                                            error={
-                                                showNoOptionSelectedMessage && noOptionSelectedError
-                                            }
-                                        >
-                                            <Radios.Radio
-                                                value={DELETE_DOCUMENTS_OPTION.YES}
-                                                inputRef={deleteDocsRef}
-                                                {...radioProps}
-                                                id="yes-radio-button"
-                                                data-testid="yes-radio-btn"
-                                            >
-                                                Yes
-                                            </Radios.Radio>
-                                            <Radios.Radio
-                                                value={DELETE_DOCUMENTS_OPTION.NO}
-                                                inputRef={deleteDocsRef}
-                                                {...radioProps}
-                                                id="no-radio-button"
-                                                data-testid="no-radio-btn"
-                                            >
-                                                No
-                                            </Radios.Radio>
-                                        </Radios>
-                                    </Fieldset>
-                                    {deletionStage === SUBMISSION_STATE.PENDING ? (
-                                        <SpinnerButton
-                                            id="delete-docs-spinner"
-                                            status="Deleting..."
-                                            disabled={true}
-                                        />
-                                    ) : (
-                                        <Button
-                                            type="submit"
-                                            id="delete-submit-button"
-                                            data-testid="delete-submit-btn"
-                                        >
-                                            Continue
-                                        </Button>
-                                    )}
-                                </form>
-                            </>
-                        }
-                    />
+                    <Route index element={<PageIndexView />} />
                     <Route
                         path={getLastURLPath(routeChildren.ARF_DELETE_COMPLETE)}
                         element={
diff --git a/app/src/pages/documentSearchResultsPage/DocumentSearchResultsPage.tsx b/app/src/pages/documentSearchResultsPage/DocumentSearchResultsPage.tsx
index d5fca048c..e155f38e1 100644
--- a/app/src/pages/documentSearchResultsPage/DocumentSearchResultsPage.tsx
+++ b/app/src/pages/documentSearchResultsPage/DocumentSearchResultsPage.tsx
@@ -80,78 +80,72 @@ function DocumentSearchResultsPage() {
     const pageHeader = 'Download electronic health records and attachments';
     useTitle({ pageTitle: pageHeader });
 
+    const PageIndexView = () => (
+        <>
+            <h1 id="download-page-title">{pageHeader}</h1>
+
+            {(submissionState === SUBMISSION_STATE.FAILED ||
+                downloadState === SUBMISSION_STATE.FAILED) && <ServiceError />}
+
+            <PatientSummary />
+
+            {submissionState === SUBMISSION_STATE.PENDING && (
+                <ProgressBar status="Loading..."></ProgressBar>
+            )}
+
+            {submissionState === SUBMISSION_STATE.SUCCEEDED && (
+                <>
+                    {searchResults.length && patientDetails ? (
+                        <>
+                            <DocumentSearchResults searchResults={searchResults} />
+                            <DocumentSearchResultsOptions
+                                nhsNumber={nhsNumber}
+                                downloadState={downloadState}
+                                updateDownloadState={handleUpdateDownloadState}
+                                setIsDeletingDocuments={setIsDeletingDocuments}
+                            />
+                        </>
+                    ) : (
+                        <p>
+                            <strong id="no-files-message">
+                                There are no documents available for this patient.
+                            </strong>
+                        </p>
+                    )}
+                </>
+            )}
+
+            {downloadState === SUBMISSION_STATE.FAILED && (
+                <ErrorBox
+                    messageTitle={'There is a problem with the documents'}
+                    messageBody={'An error has occurred while preparing your download'}
+                    errorBoxSummaryId={'error-box-summary'}
+                />
+            )}
+
+            {(submissionState === SUBMISSION_STATE.FAILED ||
+                submissionState === SUBMISSION_STATE.SUCCEEDED) && (
+                <p>
+                    <Link
+                        id="start-again-link"
+                        to=""
+                        onClick={(e) => {
+                            e.preventDefault();
+                            navigate(routes.START);
+                        }}
+                    >
+                        Start Again
+                    </Link>
+                </p>
+            )}
+        </>
+    );
+
     return (
         <>
             <div>
                 <Routes>
-                    <Route
-                        index
-                        element={
-                            <>
-                                <h1 id="download-page-title">{pageHeader}</h1>
-
-                                {(submissionState === SUBMISSION_STATE.FAILED ||
-                                    downloadState === SUBMISSION_STATE.FAILED) && <ServiceError />}
-
-                                <PatientSummary />
-
-                                {submissionState === SUBMISSION_STATE.PENDING && (
-                                    <ProgressBar status="Loading..."></ProgressBar>
-                                )}
-
-                                {submissionState === SUBMISSION_STATE.SUCCEEDED && (
-                                    <>
-                                        {searchResults.length && patientDetails ? (
-                                            <>
-                                                <DocumentSearchResults
-                                                    searchResults={searchResults}
-                                                />
-                                                <DocumentSearchResultsOptions
-                                                    nhsNumber={nhsNumber}
-                                                    downloadState={downloadState}
-                                                    updateDownloadState={handleUpdateDownloadState}
-                                                    setIsDeletingDocuments={setIsDeletingDocuments}
-                                                />
-                                            </>
-                                        ) : (
-                                            <p>
-                                                <strong id="no-files-message">
-                                                    There are no documents available for this
-                                                    patient.
-                                                </strong>
-                                            </p>
-                                        )}
-                                    </>
-                                )}
-
-                                {downloadState === SUBMISSION_STATE.FAILED && (
-                                    <ErrorBox
-                                        messageTitle={'There is a problem with the documents'}
-                                        messageBody={
-                                            'An error has occurred while preparing your download'
-                                        }
-                                        errorBoxSummaryId={'error-box-summary'}
-                                    />
-                                )}
-
-                                {(submissionState === SUBMISSION_STATE.FAILED ||
-                                    submissionState === SUBMISSION_STATE.SUCCEEDED) && (
-                                    <p>
-                                        <Link
-                                            id="start-again-link"
-                                            to=""
-                                            onClick={(e) => {
-                                                e.preventDefault();
-                                                navigate(routes.START);
-                                            }}
-                                        >
-                                            Start Again
-                                        </Link>
-                                    </p>
-                                )}
-                            </>
-                        }
-                    />
+                    <Route index element={<PageIndexView />} />
                     <Route
                         path={getLastURLPath(routeChildren.ARF_DELETE) + '/*'}
                         element={
diff --git a/app/src/pages/lloydGeorgeUploadPage/LloydGeorgeUploadPage.tsx b/app/src/pages/lloydGeorgeUploadPage/LloydGeorgeUploadPage.tsx
index ef7efd12d..5b5ce95ea 100644
--- a/app/src/pages/lloydGeorgeUploadPage/LloydGeorgeUploadPage.tsx
+++ b/app/src/pages/lloydGeorgeUploadPage/LloydGeorgeUploadPage.tsx
@@ -205,7 +205,6 @@ function LloydGeorgeUploadPage() {
             const uploadingDocuments = documents.map((doc) => {
                 const documentMetadata = uploadSession[doc.file.name];
                 const documentReference = documentMetadata.fields.key;
-                // const documentReference = "test123"
                 return {
                     ...doc,
                     state: DOCUMENT_UPLOAD_STATE.UPLOADING,
diff --git a/app/src/types/blocks/lloydGeorgeActions.ts b/app/src/types/blocks/lloydGeorgeActions.ts
index 9373b1471..df88e0760 100644
--- a/app/src/types/blocks/lloydGeorgeActions.ts
+++ b/app/src/types/blocks/lloydGeorgeActions.ts
@@ -1,5 +1,5 @@
 import { REPOSITORY_ROLE } from '../generic/authRole';
-import { routeChildren } from '../generic/routes';
+import { routeChildren, routes } from '../generic/routes';
 import { LG_RECORD_STAGE } from './lloydGeorgeStages';
 
 export enum RECORD_ACTION {
@@ -7,11 +7,13 @@ export enum RECORD_ACTION {
     DOWNLOAD = 1,
 }
 
+type ActionRoute = routeChildren | routes;
+
 export type LGRecordActionLink = {
     label: string;
     key: string;
     stage?: LG_RECORD_STAGE;
-    href?: unknown;
+    href?: ActionRoute;
     onClick?: () => void;
     type: RECORD_ACTION;
     unauthorised?: Array<REPOSITORY_ROLE>;