diff --git a/cypress/e2e/sample_test_spec/SampleTestAdvanceFilters.cy.ts b/cypress/e2e/sample_test_spec/SampleTestAdvanceFilters.cy.ts
deleted file mode 100644
index 562eb22a75e..00000000000
--- a/cypress/e2e/sample_test_spec/SampleTestAdvanceFilters.cy.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import LoginPage from "pageobject/Login/LoginPage";
-
-const loginPage = new LoginPage();
-
-describe("Sample Filter", () => {
-  before(() => {
-    loginPage.loginByRole("districtAdmin");
-    cy.saveLocalStorage();
-  });
-
-  beforeEach(() => {
-    cy.restoreLocalStorage();
-    cy.clearLocalStorage(/filters--.+/);
-    cy.awaitUrl("/sample");
-    cy.contains("Advanced Filters").click();
-  });
-
-  it("Filter by Status", () => {
-    cy.get("#status").click();
-    cy.get("li[role='option']")
-      .contains(/^APPROVED$/)
-      .click();
-  });
-
-  it("Filter by sample type", () => {
-    cy.get("#sample_type").click();
-    cy.get("li[role='option']")
-      .contains(/^Biopsy$/)
-      .click();
-  });
-
-  afterEach(() => {
-    cy.intercept(/\/api\/v1\/test_sample/).as("sample_filter");
-    cy.contains("Apply").click();
-    cy.wait("@sample_filter");
-    cy.saveLocalStorage();
-  });
-});
diff --git a/cypress/e2e/sample_test_spec/SampleTestHomepage.cy.ts b/cypress/e2e/sample_test_spec/SampleTestHomepage.cy.ts
deleted file mode 100644
index 491da5ee7ad..00000000000
--- a/cypress/e2e/sample_test_spec/SampleTestHomepage.cy.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import LoginPage from "pageobject/Login/LoginPage";
-
-const loginPage = new LoginPage();
-
-describe("Sample List", () => {
-  before(() => {
-    loginPage.loginByRole("districtAdmin");
-    cy.saveLocalStorage();
-  });
-
-  beforeEach(() => {
-    cy.restoreLocalStorage();
-    cy.clearLocalStorage(/filters--.+/);
-    cy.awaitUrl("/sample");
-  });
-
-  it("Search by District name", () => {
-    cy.intercept(/\/api\/v1\/test_sample/).as("test_sample");
-    cy.get("[name='district_name']").type("Test");
-    cy.wait("@test_sample").its("response.statusCode").should("eq", 200);
-    cy.url().should("include", "Test");
-  });
-
-  it("Search by Patient Name", () => {
-    cy.intercept(/\/api\/v1\/test_sample/).as("test_sample");
-    cy.get("[name='patient_name']").type("Test");
-    cy.wait("@test_sample").its("response.statusCode").should("eq", 200);
-    cy.url().should("include", "Test");
-  });
-
-  it("Update Sample Status", () => {
-    cy.contains("UPDATE SAMPLE TEST STATUS").click();
-  });
-
-  it("View Sample Details", () => {
-    cy.contains("Sample Details").click();
-  });
-
-  it("Next/Previous Page", () => {
-    // only works for desktop mode
-    cy.get("button")
-      .should("contain", "Next")
-      .contains("Next")
-      .click({ force: true });
-    cy.get("button")
-      .should("contain", "Previous")
-      .contains("Previous")
-      .click({ force: true });
-  });
-
-  afterEach(() => {
-    cy.saveLocalStorage();
-  });
-});
diff --git a/cypress/e2e/sample_test_spec/SampleTestRequest.cy.ts b/cypress/e2e/sample_test_spec/SampleTestRequest.cy.ts
deleted file mode 100644
index a4b26d328e5..00000000000
--- a/cypress/e2e/sample_test_spec/SampleTestRequest.cy.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import LoginPage from "pageobject/Login/LoginPage";
-import { PatientConsultationPage } from "pageobject/Patient/PatientConsultation";
-import { PatientPage } from "pageobject/Patient/PatientCreation";
-import { SampleTestPage } from "pageobject/Sample/SampleTestCreate";
-
-describe("Sample Test", () => {
-  const sampleTestPage = new SampleTestPage();
-  const patientPage = new PatientPage();
-  const loginPage = new LoginPage();
-  const patientConsultationPage = new PatientConsultationPage();
-  const patientName = "Dummy Patient Eleven";
-  const sampleTestType = "BA/ETA";
-  const icmrCategory = "Cat 0";
-  const icmrLabel = "Test Icmr Label";
-  const doctorName = "Dr John Doe";
-  const atypicalDetails = "Patient showing unusual symptoms";
-  const diagnosis = "Suspected respiratory infection";
-  const etiologyIdentified = "Bacterial infection suspected";
-  const differentialDiagnosis = "Possibly a viral infection";
-  const fastTrackReason =
-    "The patient has a high risk of complications and requires immediate testing.";
-  const sampleTestStatus = "Request Submitted";
-  const expectedSampleTestType = "ba/eta";
-  const sampleTestResult = "Awaiting";
-
-  before(() => {
-    loginPage.loginByRole("districtAdmin");
-    cy.saveLocalStorage();
-  });
-
-  beforeEach(() => {
-    cy.restoreLocalStorage();
-    cy.clearLocalStorage(/filters--.+/);
-  });
-
-  it("should request a new sample test", () => {
-    // Ensure patient list API is loaded before proceeding
-    cy.awaitUrl("/patients");
-    patientPage.visitPatient(patientName);
-    patientConsultationPage.interceptPatientDetailsAPI();
-    patientConsultationPage.clickPatientDetails();
-    patientConsultationPage.verifyPatientDetailsResponse();
-    // Visit SampleRequest Page
-    sampleTestPage.visitSampleRequestPage();
-    // Fill Sample Test Request Form
-    sampleTestPage.selectSampleType(sampleTestType);
-    sampleTestPage.selectIcmrCategory(icmrCategory);
-    sampleTestPage.fillIcmrLabel(icmrLabel);
-    sampleTestPage.fillFastTrackReason(fastTrackReason);
-    sampleTestPage.fillDoctorName(doctorName);
-    sampleTestPage.fillAtypicalPresentation(atypicalDetails);
-    sampleTestPage.fillDiagnosis(diagnosis);
-    sampleTestPage.fillEtiology(etiologyIdentified);
-    sampleTestPage.fillDiffDiagnosis(differentialDiagnosis);
-    sampleTestPage.checkHasSari();
-    sampleTestPage.checkHasAri();
-    sampleTestPage.checkIsUnusualCourse();
-    sampleTestPage.interceptSampleTestReq();
-    // Submit the form and verify notification
-    cy.clickSubmitButton("Confirm your request to send sample for testing");
-    sampleTestPage.verifySampleTestReq();
-    cy.verifyNotification("Sample test created successfully");
-    // Check the updated request history
-    sampleTestPage.checkRequestHistory(
-      sampleTestStatus,
-      expectedSampleTestType,
-      fastTrackReason,
-      sampleTestResult,
-    );
-    // Checking Reflection on Sample Page
-    cy.awaitUrl("/sample");
-    sampleTestPage.interceptGetSampleTestReq();
-    sampleTestPage.searchPatientSample(patientName);
-    sampleTestPage.verifyGetSampleTestReq();
-    sampleTestPage.verifyPatientName(patientName);
-    sampleTestPage.interceptGetSampleTestReq();
-    sampleTestPage.clickOnSampleDetailsBtn();
-    sampleTestPage.verifyGetSampleTestReq();
-    sampleTestPage.verifyPatientTestDetails(
-      patientName,
-      fastTrackReason,
-      doctorName,
-      diagnosis,
-      differentialDiagnosis,
-      etiologyIdentified,
-    );
-  });
-});
diff --git a/cypress/e2e/users_spec/UsersManage.cy.ts b/cypress/e2e/users_spec/UsersManage.cy.ts
index c7d237efb43..8d7ac8695c6 100644
--- a/cypress/e2e/users_spec/UsersManage.cy.ts
+++ b/cypress/e2e/users_spec/UsersManage.cy.ts
@@ -66,7 +66,7 @@ describe("Manage User", () => {
     manageUserPage.verifyEditUserDetails(
       "Devo",
       "Districto",
-      "8/11/1999",
+      "11/08/1999",
       "Female",
     );
   });
diff --git a/cypress/fixtures/external-result-sample.csv b/cypress/fixtures/external-result-sample.csv
deleted file mode 100644
index 2905cdc1af3..00000000000
--- a/cypress/fixtures/external-result-sample.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-District,SRF ID,Name,Age,Age in,Gender,Mobile Number,Address,Ward,Local Body,Local Body Type,Source,Sample Collection Date,Result Date,Test Type,Lab Name,Sample Type,Patient Status,Is Repeat,Patient Category,Result
-Ernakulam,00/EKM/0000,Test Upload,24,years,m,8888888888,Upload test address,7,Poothrikka,grama panchayath,Secondary contact aparna,2020-10-14,2020-10-14,Antigen,Karothukuzhi Laboratory,Ag-SD_Biosensor_Standard_Q_COVID-19_Ag_detection_kit,Asymptomatic,NO,Cat 17: All individuals who wish to get themselves tested,Negative
diff --git a/cypress/pageobject/Sample/SampleTestCreate.ts b/cypress/pageobject/Sample/SampleTestCreate.ts
deleted file mode 100644
index 445d08732c3..00000000000
--- a/cypress/pageobject/Sample/SampleTestCreate.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-export class SampleTestPage {
-  visitSampleRequestPage(): void {
-    cy.get("a").contains("Service Request").click();
-    cy.verifyAndClickElement("#sample-request-btn", "Request Sample Test");
-    cy.url().should("include", "/sample-test");
-  }
-
-  selectSampleType(option: string): void {
-    cy.clickAndSelectOption("#sample-type", option);
-  }
-
-  selectIcmrCategory(option: string): void {
-    cy.clickAndSelectOption("#icmr-category", option);
-  }
-
-  fillIcmrLabel(label: string): void {
-    cy.get("#icmr-label").should("be.visible").type(label);
-  }
-
-  fillFastTrackReason(value: string): void {
-    cy.get("#is_fast_track").should("be.visible").check();
-    cy.get("#fast_track").should("be.visible").type(value);
-  }
-
-  fillDoctorName(value: string): void {
-    cy.get("#doctor_name").should("be.visible").type(value);
-  }
-
-  fillAtypicalPresentation(value: string): void {
-    cy.get("#is_atypical_presentation").should("be.visible").check();
-    cy.get("#atypical_presentation").should("be.visible").type(value);
-  }
-
-  fillDiagnosis(value: string): void {
-    cy.get("#diagnosis").should("be.visible").type(value);
-  }
-
-  fillEtiology(value: string): void {
-    cy.get("#etiology_identified").should("be.visible").type(value);
-  }
-
-  fillDiffDiagnosis(value: string): void {
-    cy.get("#diff_diagnosis").should("be.visible").type(value);
-  }
-
-  checkHasSari(): void {
-    cy.get("#has_sari").should("be.visible").check();
-  }
-
-  checkHasAri(): void {
-    cy.get("#has_ari").should("be.visible").check();
-  }
-
-  checkIsUnusualCourse(): void {
-    cy.get("#is_unusual_course").should("be.visible").check();
-  }
-
-  checkRequestHistory(
-    sampleTestStatus: string,
-    sampleTestType: string,
-    fastTrack: string,
-    sampleTestResult: string,
-  ): void {
-    cy.get("a").contains("Service Request").click();
-    cy.verifyContentPresence("#sample-test-status", [sampleTestStatus]);
-    cy.verifyContentPresence("#sample-test-type", [sampleTestType]);
-    cy.verifyContentPresence("#sample-test-fast-track", [fastTrack]);
-    cy.verifyContentPresence("#sample-test-result", [sampleTestResult]);
-  }
-
-  searchPatientSample(patientName: string): void {
-    cy.get("#search_patient_name").should("be.visible").type(patientName);
-  }
-
-  verifyPatientName(patientName: string): void {
-    cy.verifyContentPresence("#sample-test-patient-name", [patientName]);
-  }
-
-  clickOnSampleDetailsBtn(): void {
-    cy.get("#sample-details-btn").should("be.visible").first().click();
-  }
-
-  verifyPatientTestDetails(
-    patientName: string,
-    fastTrackReason: string,
-    doctorName: string,
-    diagnosis: string,
-    differentialDiagnosis: string,
-    etiologyIdentified: string,
-  ): void {
-    cy.verifyContentPresence("#patient_name", [patientName]);
-    cy.verifyContentPresence("#fast_track_reason", [fastTrackReason]);
-    cy.verifyContentPresence("#doctor_name", [doctorName]);
-    cy.verifyContentPresence("#diagnosis", [diagnosis]);
-    cy.verifyContentPresence("#diff_diagnosis", [differentialDiagnosis]);
-    cy.verifyContentPresence("#etiology_identified", [etiologyIdentified]);
-  }
-
-  interceptSampleTestReq(): void {
-    cy.intercept("POST", "**/api/v1/patient/*/test_sample/").as(
-      "sampleDetails",
-    );
-  }
-
-  verifySampleTestReq(): void {
-    cy.wait("@sampleDetails").its("response.statusCode").should("eq", 201);
-  }
-
-  interceptGetSampleTestReq(): void {
-    cy.intercept("GET", "**/api/v1/test_sample/**").as("getSampleTestReq");
-  }
-
-  verifyGetSampleTestReq(): void {
-    cy.wait("@getSampleTestReq").its("response.statusCode").should("eq", 200);
-  }
-}
diff --git a/package-lock.json b/package-lock.json
index 106518926f4..41d7fcfff8c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,7 +40,7 @@
         "clsx": "^2.1.1",
         "cmdk": "^1.0.4",
         "cross-env": "^7.0.3",
-        "cypress": "^13.16.1",
+        "cypress": "^13.16.0",
         "dayjs": "^1.11.13",
         "echarts": "^5.5.1",
         "echarts-for-react": "^3.0.2",
@@ -7807,11 +7807,10 @@
       "license": "MIT"
     },
     "node_modules/cypress": {
-      "version": "13.16.1",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.16.1.tgz",
-      "integrity": "sha512-17FtCaz0cx7ssWYKXzGB0Vub8xHwpVPr+iPt2fHhLMDhVAPVrplD+rTQsZUsfb19LVBn5iwkEUFjQ1yVVJXsLA==",
+      "version": "13.16.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.16.0.tgz",
+      "integrity": "sha512-g6XcwqnvzXrqiBQR/5gN+QsyRmKRhls1y5E42fyOvsmU7JuY+wM6uHJWj4ZPttjabzbnRvxcik2WemR8+xT6FA==",
       "hasInstallScript": true,
-      "license": "MIT",
       "dependencies": {
         "@cypress/request": "^3.0.6",
         "@cypress/xvfb": "^1.2.4",
diff --git a/package.json b/package.json
index 7bc7e5c117b..15392d09410 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "clsx": "^2.1.1",
     "cmdk": "^1.0.4",
     "cross-env": "^7.0.3",
-    "cypress": "^13.16.1",
+    "cypress": "^13.16.0",
     "dayjs": "^1.11.13",
     "echarts": "^5.5.1",
     "echarts-for-react": "^3.0.2",
diff --git a/public/External-Results-Template.csv b/public/External-Results-Template.csv
deleted file mode 100644
index c2601f2d64f..00000000000
--- a/public/External-Results-Template.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-District,SRF ID,Name,Age,Age in,Gender,Mobile Number,Address,Ward,Local Body,Local Body Type,Source,Sample Collection Date,Result Date,Test Type,Lab Name,Sample Type,Patient Status,Is Repeat,Patient Category,Result
-Ernakulam,00/EKM/0000,Bodhi CSN,24,years,m,8888888888,"CSN HQ
-Kochi, Kerala ",7,Poothrikka,grama panchayath,Secondary contact aparna,2020-10-14,2020-10-14,Antigen,Karothukuzhi Laboratory,Ag-SD_Biosensor_Standard_Q_COVID-19_Ag_detection_kit,Asymptomatic,NO,Cat 17: All individuals who wish to get themselves tested,Negative
\ No newline at end of file
diff --git a/public/locale/en.json b/public/locale/en.json
index 53e18580f56..56a50bc8558 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -181,14 +181,6 @@
   "ROUNDS_TYPE__NORMAL": "Brief Update",
   "ROUNDS_TYPE__TELEMEDICINE": "Tele-medicine Log",
   "ROUNDS_TYPE__VENTILATOR": "Detailed Update",
-  "SAMPLE_TEST_HISTORY__APPROVED": "Approved",
-  "SAMPLE_TEST_HISTORY__COMPLETED": "Completed",
-  "SAMPLE_TEST_HISTORY__RECEIVED_AT_LAB": "Received At Lab",
-  "SAMPLE_TEST_HISTORY__REQUEST_SUBMITTED": "Request Submitted",
-  "SAMPLE_TEST_RESULT__AWAITING": "Awaiting",
-  "SAMPLE_TEST_RESULT__INVALID": "Invalid",
-  "SAMPLE_TEST_RESULT__NEGATIVE": "Negative",
-  "SAMPLE_TEST_RESULT__POSITIVE": "Positive",
   "SLEEP__EXCESSIVE": "Excessive",
   "SLEEP__NO_SLEEP": "No sleep",
   "SLEEP__SATISFACTORY": "Satisfactory",
diff --git a/public/locale/hi.json b/public/locale/hi.json
index b3c172021dd..9e6a667ba23 100644
--- a/public/locale/hi.json
+++ b/public/locale/hi.json
@@ -106,7 +106,6 @@
   "SORT_OPTIONS__name": "मरीज़ का नाम AZ",
   "SORT_OPTIONS__review_time": "सबसे पुरानी समीक्षा तिथि पहले",
   "SORT_OPTIONS__taken_at": "सबसे पुरानी ली गई तारीख पहले",
-  "Sample Test": "नमूना परीक्षण",
   "Shifting": "स्थानांतरण",
   "Submit": "जमा करना",
   "TELEMEDICINE": "सुदूर",
diff --git a/src/App.tsx b/src/App.tsx
index c91849de559..b4d1a1570a9 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,4 +1,8 @@
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import {
+  QueryCache,
+  QueryClient,
+  QueryClientProvider,
+} from "@tanstack/react-query";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 import { Suspense } from "react";
 
@@ -12,17 +16,21 @@ import AuthUserProvider from "@/Providers/AuthUserProvider";
 import HistoryAPIProvider from "@/Providers/HistoryAPIProvider";
 import Routers from "@/Routers";
 import { FeatureFlagsProvider } from "@/Utils/featureFlags";
+import { handleQueryError } from "@/Utils/request/errorHandler";
 
 import { PubSubProvider } from "./Utils/pubsubContext";
 
 const queryClient = new QueryClient({
   defaultOptions: {
     queries: {
-      retry: 3,
+      retry: 2,
       refetchOnWindowFocus: false,
       staleTime: 5 * 60 * 1000, // 5 minutes
     },
   },
+  queryCache: new QueryCache({
+    onError: handleQueryError,
+  }),
 });
 
 const App = () => {
diff --git a/src/Routers/AppRouter.tsx b/src/Routers/AppRouter.tsx
index 8ba9460e34b..e5b3d5b3eb1 100644
--- a/src/Routers/AppRouter.tsx
+++ b/src/Routers/AppRouter.tsx
@@ -24,7 +24,6 @@ import ConsultationRoutes from "@/Routers/routes/ConsultationRoutes";
 import FacilityRoutes from "@/Routers/routes/FacilityRoutes";
 import PatientRoutes from "@/Routers/routes/PatientRoutes";
 import ResourceRoutes from "@/Routers/routes/ResourceRoutes";
-import SampleRoutes from "@/Routers/routes/SampleRoutes";
 import ShiftingRoutes from "@/Routers/routes/ShiftingRoutes";
 import UserRoutes from "@/Routers/routes/UserRoutes";
 
@@ -51,7 +50,6 @@ const Routes: AppRoutes = {
   ...FacilityRoutes,
   ...PatientRoutes,
   ...ResourceRoutes,
-  ...SampleRoutes,
   ...ShiftingRoutes,
   ...UserRoutes,
 
diff --git a/src/Routers/routes/SampleRoutes.tsx b/src/Routers/routes/SampleRoutes.tsx
deleted file mode 100644
index d9d3162cdd9..00000000000
--- a/src/Routers/routes/SampleRoutes.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { SampleDetails } from "@/components/Patient/SampleDetails";
-import SampleReport from "@/components/Patient/SamplePreview";
-import { SampleTest } from "@/components/Patient/SampleTest";
-import SampleViewAdmin from "@/components/Patient/SampleViewAdmin";
-
-import { AppRoutes } from "@/Routers/AppRouter";
-
-const SampleRoutes: AppRoutes = {
-  "/sample": () => <SampleViewAdmin />,
-  "/sample/:id": ({ id }) => <SampleDetails id={id} />,
-  "/patient/:patientId/test_sample/:sampleId/icmr_sample": ({
-    patientId,
-    sampleId,
-  }) => <SampleReport id={patientId} sampleId={sampleId} />,
-  "/facility/:facilityId/patient/:patientId/sample-test": ({
-    facilityId,
-    patientId,
-  }) => <SampleTest facilityId={facilityId} patientId={patientId} />,
-  "/facility/:facilityId/patient/:patientId/sample/:id": ({ id }) => (
-    <SampleDetails id={id} />
-  ),
-};
-
-export default SampleRoutes;
diff --git a/src/Utils/request/README.md b/src/Utils/request/README.md
index 0780d3149f6..3c1279e1554 100644
--- a/src/Utils/request/README.md
+++ b/src/Utils/request/README.md
@@ -4,41 +4,108 @@ CARE now uses TanStack Query (formerly React Query) as its data fetching solutio
 
 ## Using TanStack Query (Recommended for new code)
 
-For new API integrations, we recommend using TanStack Query directly:
+For new API integrations, we recommend using TanStack Query with `query` utility function. This is a wrapper around `fetch` that works seamlessly with TanStack Query. It handles response parsing, error handling, setting headers, and more.
 
 ```tsx
 import { useQuery } from "@tanstack/react-query";
-import request from "@/Utils/request/request";
-import FooRoutes from "@foo/routes";
+import query from "@/Utils/request/query";
 
-export default function FooDetails({ id }) {
-  const { data, isLoading, error } = useQuery({
-    queryKey: [FooRoutes.getFoo.path, id],
-    queryFn: async () => {
-      const response = await request(FooRoutes.getFoo, {
-        pathParams: { id }
-      });
-      return response.data;
-    }
+export default function UserProfile() {
+  const { data, isLoading } = useQuery({
+    queryKey: [routes.users.current.path],
+    queryFn: query(routes.users.current)
   });
 
   if (isLoading) return <Loading />;
-  if (error) return <Error error={error} />;
+  return <div>{data?.name}</div>;
+}
 
-  return (
-    <div>
-      <span>{data.id}</span>
-      <span>{data.name}</span>
-    </div>
-  );
+// With path parameters
+function PatientDetails({ id }: { id: string }) {
+  const { data } = useQuery({
+    queryKey: ['patient', id],
+    queryFn: query(routes.patient.get, {
+      pathParams: { id }
+    })
+  });
+
+  return <div>{data?.name}</div>;
+}
+
+// With query parameters
+function SearchMedicines() {
+  const { data } = useQuery({
+    queryKey: ['medicines', 'paracetamol'],
+    queryFn: query(routes.medicine.search, {
+      queryParams: { search: 'paracetamol' }
+    })
+  });
+
+  return <MedicinesList medicines={data?.results} />;
+}
+
+// When you need response status/error handling
+function FacilityDetails({ id }: { id: string }) {
+  const { data, isLoading } = useQuery({
+    queryKey: ["facility", id],
+    queryFn: query(routes.getFacility, {
+      pathParams: { id },
+      silent: true
+    })
+  });
+
+  if (isLoading) return <Loading />;
+  return <div>{data?.name}</div>;
+}
+
+### query
+
+`query` is our wrapper around fetch that works seamlessly with TanStack Query. It:
+- Handles response parsing (JSON, text, blobs).
+- Constructs proper error objects.
+- Sets the headers appropriately.
+- Integrates with our global error handling.
+
+```typescript
+interface QueryOptions {
+  pathParams?: Record<string, string>;  // URL parameters
+  queryParams?: Record<string, string>; // Query string parameters
+  silent?: boolean;                     // Suppress error notifications
 }
+
+// Basic usage
+useQuery({
+  queryKey: ["users"],
+  queryFn: query(routes.users.list)
+});
+
+// With parameters
+useQuery({
+  queryKey: ["user", id],
+  queryFn: query(routes.users.get, {
+    pathParams: { id },
+    queryParams: { include: "details" },
+    silent: true  // Optional: suppress error notifications
+  })
+});
 ```
 
+### Error Handling
+
+All API errors are now handled globally. Common scenarios like:
+
+- Session expiry -> Redirects to /session-expired
+- Bad requests (400/406) -> Shows error notification
+are automatically handled.
+
+Use the `silent: true` option to suppress error notifications for specific queries.
+
 ## Migration Guide & Reference
 
 ### Understanding the Transition
 
 Our codebase contains two patterns for data fetching:
+
 1. Legacy pattern using `useTanStackQueryInstead` (wrapper around TanStack Query)
 2. Modern pattern using TanStack Query directly
 
@@ -60,12 +127,9 @@ function LegacyComponent({ id }) {
 function ModernComponent({ id }) {
   const { data, isLoading, error, refetch } = useQuery({
     queryKey: [UserRoutes.getUser.path, id],
-    queryFn: async () => {
-      const response = await request(UserRoutes.getUser, {
-        pathParams: { id }
-      });
-      return response.data;
-    },
+    queryFn: query(UserRoutes.getUser, {
+      pathParams: { id }
+    }),
     enabled: true,
     refetchOnWindowFocus: false
   });
@@ -100,7 +164,7 @@ useTanStackQueryInstead(route, { prefetch: shouldFetch })
 // Modern
 useQuery({
   queryKey: [route.path],
-  queryFn: async () => (await request(route)).data,
+  queryFn: query(route),
   enabled: shouldFetch
 })
 ```
@@ -116,13 +180,10 @@ useTanStackQueryInstead(route, {
 // Modern
 useQuery({
   queryKey: [route.path, id, filter],
-  queryFn: async () => {
-    const response = await request(route, {
-      pathParams: { id },
-      query: { filter }
-    });
-    return response.data;
-  }
+  queryFn: query(route, {
+    pathParams: { id },
+    queryParams: { filter }
+  })
 })
 ```
 
@@ -135,12 +196,10 @@ if (res?.status === 403) handleForbidden();
 // Modern
 useQuery({
   queryKey: [route.path],
-  queryFn: async () => {
-    const response = await request(route);
-    if (response.res.status === 403) handleForbidden();
-    return response.data;
-  },
-  onError: (error) => handleError(error)
+  queryFn: query(route, {
+    silent: true // Optional: suppress error notifications
+  })
+  // Error handling is now done globally
 })
 ```
 
diff --git a/src/Utils/request/api.tsx b/src/Utils/request/api.tsx
index 40021007773..e7df6312c84 100644
--- a/src/Utils/request/api.tsx
+++ b/src/Utils/request/api.tsx
@@ -70,12 +70,7 @@ import {
   NotificationData,
   PNconfigData,
 } from "@/components/Notifications/models";
-import {
-  DailyRoundsModel,
-  PatientModel,
-  SampleReportModel,
-  SampleTestModel,
-} from "@/components/Patient/models";
+import { DailyRoundsModel, PatientModel } from "@/components/Patient/models";
 import {
   CreateFileRequest,
   CreateFileResponse,
@@ -785,22 +780,6 @@ const routes = {
     method: "GET",
     TRes: Type<PaginatedResponse<PatientNotesEditModel>>(),
   },
-  sampleTestList: {
-    path: "/api/v1/patient/{patientId}/test_sample/",
-    method: "GET",
-    TRes: Type<PaginatedResponse<SampleTestModel>>(),
-  },
-  createSampleTest: {
-    path: "/api/v1/patient/{patientId}/test_sample/",
-    method: "POST",
-    TRes: Type<PatientModel>(),
-    TBody: Type<SampleTestModel>(),
-  },
-  sampleReport: {
-    path: "/api/v1/patient/{id}/test_sample/{sampleId}/icmr_sample/",
-    method: "GET",
-    TRes: Type<SampleReportModel>(),
-  },
 
   // States
   statesList: {
@@ -869,24 +848,6 @@ const routes = {
     TRes: Type<PaginatedResponse<WardModel>>(),
   },
 
-  // Sample Test
-  getTestSampleList: {
-    path: "/api/v1/test_sample/",
-    method: "GET",
-    TRes: Type<PaginatedResponse<SampleTestModel>>(),
-  },
-  getTestSample: {
-    path: "/api/v1/test_sample/{id}/",
-    method: "GET",
-    TRes: Type<SampleTestModel>(),
-  },
-  patchSample: {
-    path: "/api/v1/test_sample/{id}/",
-    method: "PATCH",
-    TBody: Type<SampleTestModel>(),
-    TRes: Type<PatientModel>(),
-  },
-
   //inventory
   getItems: {
     path: "/api/v1/items/",
diff --git a/src/Utils/request/errorHandler.ts b/src/Utils/request/errorHandler.ts
new file mode 100644
index 00000000000..68d7e4600bb
--- /dev/null
+++ b/src/Utils/request/errorHandler.ts
@@ -0,0 +1,54 @@
+import { navigate } from "raviger";
+
+import * as Notifications from "@/Utils/Notifications";
+import { QueryError } from "@/Utils/request/queryError";
+
+export function handleQueryError(error: Error) {
+  if (error.name === "AbortError") {
+    return;
+  }
+
+  if (!(error instanceof QueryError)) {
+    Notifications.Error({ msg: error.message || "Something went wrong!" });
+    return;
+  }
+
+  if (error.silent) {
+    return;
+  }
+
+  const cause = error.cause;
+
+  if (isSessionExpired(cause)) {
+    handleSessionExpired();
+    return;
+  }
+
+  if (isBadRequest(error)) {
+    Notifications.BadRequest({ errs: cause });
+    return;
+  }
+
+  Notifications.Error({
+    msg: cause?.detail || "Something went wrong...!",
+  });
+}
+
+function isSessionExpired(error: QueryError["cause"]) {
+  return (
+    // If Authorization header is not valid
+    error?.code === "token_not_valid" ||
+    // If Authorization header is not provided
+    error?.detail === "Authentication credentials were not provided."
+  );
+}
+
+function handleSessionExpired() {
+  if (!location.pathname.startsWith("/session-expired")) {
+    navigate(`/session-expired?redirect=${window.location.href}`);
+  }
+}
+
+function isBadRequest(error: QueryError) {
+  return error.status === 400 || error.status === 406;
+}
diff --git a/src/Utils/request/query.ts b/src/Utils/request/query.ts
new file mode 100644
index 00000000000..3431f625728
--- /dev/null
+++ b/src/Utils/request/query.ts
@@ -0,0 +1,56 @@
+import careConfig from "@careConfig";
+
+import { QueryError } from "@/Utils/request/queryError";
+import { getResponseBody } from "@/Utils/request/request";
+import { QueryOptions, Route } from "@/Utils/request/types";
+import { makeHeaders, makeUrl } from "@/Utils/request/utils";
+
+async function queryRequest<TData, TBody>(
+  { path, method, noAuth }: Route<TData, TBody>,
+  options?: QueryOptions<TBody>,
+): Promise<TData> {
+  const url = `${careConfig.apiUrl}${makeUrl(path, options?.queryParams, options?.pathParams)}`;
+
+  const fetchOptions: RequestInit = {
+    method,
+    headers: makeHeaders(noAuth ?? false),
+    signal: options?.signal,
+  };
+
+  if (options?.body) {
+    fetchOptions.body = JSON.stringify(options.body);
+  }
+
+  let res: Response;
+
+  try {
+    res = await fetch(url, fetchOptions);
+  } catch {
+    throw new Error("Network Error");
+  }
+
+  const data = await getResponseBody<TData>(res);
+
+  if (!res.ok) {
+    throw new QueryError({
+      message: "Request Failed",
+      status: res.status,
+      silent: options?.silent ?? false,
+      cause: data as unknown as Record<string, unknown>,
+    });
+  }
+
+  return data;
+}
+
+/**
+ * Creates a TanStack Query compatible request function
+ */
+export default function query<TData, TBody>(
+  route: Route<TData, TBody>,
+  options?: QueryOptions<TBody>,
+) {
+  return ({ signal }: { signal: AbortSignal }) => {
+    return queryRequest(route, { ...options, signal });
+  };
+}
diff --git a/src/Utils/request/queryError.ts b/src/Utils/request/queryError.ts
new file mode 100644
index 00000000000..cdfad312ef4
--- /dev/null
+++ b/src/Utils/request/queryError.ts
@@ -0,0 +1,24 @@
+type QueryErrorCause = Record<string, unknown> | undefined;
+
+export class QueryError extends Error {
+  status: number;
+  silent: boolean;
+  cause?: QueryErrorCause;
+
+  constructor({
+    message,
+    status,
+    silent,
+    cause,
+  }: {
+    message: string;
+    status: number;
+    silent: boolean;
+    cause?: Record<string, unknown>;
+  }) {
+    super(message, { cause });
+    this.status = status;
+    this.silent = silent;
+    this.cause = cause;
+  }
+}
diff --git a/src/Utils/request/request.ts b/src/Utils/request/request.ts
index 73bc9763f50..bd1cabc523c 100644
--- a/src/Utils/request/request.ts
+++ b/src/Utils/request/request.ts
@@ -61,7 +61,7 @@ export default async function request<TData, TBody>(
   return result;
 }
 
-async function getResponseBody<TData>(res: Response): Promise<TData> {
+export async function getResponseBody<TData>(res: Response): Promise<TData> {
   if (!(res.headers.get("content-length") !== "0")) {
     return null as TData;
   }
diff --git a/src/Utils/request/types.ts b/src/Utils/request/types.ts
index 668f937dbf0..20f095ae6fd 100644
--- a/src/Utils/request/types.ts
+++ b/src/Utils/request/types.ts
@@ -35,6 +35,14 @@ export interface RequestOptions<TData = unknown, TBody = unknown> {
   silent?: boolean;
 }
 
+export interface QueryOptions<TBody = unknown> {
+  pathParams?: Record<string, string>;
+  queryParams?: Record<string, string>;
+  body?: TBody;
+  silent?: boolean;
+  signal?: AbortSignal;
+}
+
 export interface PaginatedResponse<TItem> {
   count: number;
   next: string | null;
diff --git a/src/common/constants.tsx b/src/common/constants.tsx
index 9d0be731565..ff215a0635a 100644
--- a/src/common/constants.tsx
+++ b/src/common/constants.tsx
@@ -363,13 +363,6 @@ export const GENDER_TYPES = [
   { id: 3, text: "Transgender", icon: "TRANS" },
 ] as const;
 
-export const SAMPLE_TEST_RESULT = [
-  { id: 1, text: "POSITIVE" },
-  { id: 2, text: "NEGATIVE" },
-  { id: 3, text: "AWAITING" },
-  { id: 4, text: "INVALID" },
-];
-
 export const CONSULTATION_SUGGESTION = [
   { id: "HI", text: "Home Isolation", deprecated: true }, // # Deprecated. Preserving option for backward compatibility (use only for readonly operations)
   { id: "A", text: "Admission" },
@@ -463,48 +456,6 @@ export const PATIENT_CATEGORIES: {
 
 export const PATIENT_FILTER_CATEGORIES = PATIENT_CATEGORIES;
 
-export const SAMPLE_TEST_STATUS = [
-  { id: 1, text: "REQUEST_SUBMITTED", desc: "Request Submitted" },
-  { id: 2, text: "APPROVED", desc: "Approved for Sample Collection" },
-  { id: 3, text: "DENIED", desc: "Request Denied" },
-  {
-    id: 4,
-    text: "SENT_TO_COLLECTON_CENTRE",
-    desc: "Sample taken and sent to collection centre",
-  },
-  { id: 5, text: "RECEIVED_AND_FORWARED", desc: "Received And Forwarded" },
-  { id: 6, text: "RECEIVED_AT_LAB", desc: "Received At Lab" },
-  { id: 7, text: "COMPLETED", desc: "Test Completed" },
-];
-
-export const SAMPLE_FLOW_RULES = {
-  REQUEST_SUBMITTED: ["APPROVED", "DENIED"],
-  APPROVED: [
-    "SENT_TO_COLLECTON_CENTRE",
-    "RECEIVED_AND_FORWARED",
-    "RECEIVED_AT_LAB",
-    "COMPLETED",
-  ],
-  DENIED: ["REQUEST_SUBMITTED"],
-  SENT_TO_COLLECTON_CENTRE: [
-    "RECEIVED_AND_FORWARED",
-    "RECEIVED_AT_LAB",
-    "COMPLETED",
-  ],
-  RECEIVED_AND_FORWARED: ["RECEIVED_AT_LAB", "COMPLETED"],
-  RECEIVED_AT_LAB: ["COMPLETED"],
-};
-
-export const TEST_TYPE = [
-  "UNK",
-  "ANTIGEN",
-  "RTPCR",
-  "CBNAAT",
-  "TRUENAT",
-  "RTLAMP",
-  "POCPCR",
-];
-
 export const VACCINES = [
   "CoviShield",
   "Covaxin",
diff --git a/src/components/Common/Breadcrumbs.tsx b/src/components/Common/Breadcrumbs.tsx
index 0435d7675d9..c2c4aa57446 100644
--- a/src/components/Common/Breadcrumbs.tsx
+++ b/src/components/Common/Breadcrumbs.tsx
@@ -13,7 +13,6 @@ const MENU_TAGS: { [key: string]: string } = {
   facility: "Facilities",
   patients: "Patients",
   assets: "Assets",
-  sample: "Sample Tests",
   shifting: "Shiftings",
   resource: "Resources",
   users: "Users",
diff --git a/src/components/Common/Sidebar/Sidebar.tsx b/src/components/Common/Sidebar/Sidebar.tsx
index ed0a1a4eee5..423d0d6f18b 100644
--- a/src/components/Common/Sidebar/Sidebar.tsx
+++ b/src/components/Common/Sidebar/Sidebar.tsx
@@ -59,7 +59,6 @@ const StatelessSidebar = ({
     { text: t("facilities"), to: "/facility", icon: "d-hospital" },
     { text: t("patients"), to: "/patients", icon: "d-patient" },
     { text: t("assets"), to: "/assets", icon: "d-folder" },
-    { text: t("sample_test"), to: "/sample", icon: "d-microscope" },
     { text: t("shifting"), to: "/shifting", icon: "d-ambulance" },
     { text: t("resource"), to: "/resource", icon: "d-book-open" },
     { text: t("users"), to: "/users", icon: "d-people" },
diff --git a/src/components/Patient/PatientDetailsTab/SampleTestHistory.tsx b/src/components/Patient/PatientDetailsTab/SampleTestHistory.tsx
deleted file mode 100644
index b7a907fe662..00000000000
--- a/src/components/Patient/PatientDetailsTab/SampleTestHistory.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import { navigate } from "raviger";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-
-import CareIcon from "@/CAREUI/icons/CareIcon";
-import PaginatedList from "@/CAREUI/misc/PaginatedList";
-
-import ButtonV2 from "@/components/Common/ButtonV2";
-import CircularProgress from "@/components/Common/CircularProgress";
-
-import { NonReadOnlyUsers } from "@/Utils/AuthorizeFor";
-import routes from "@/Utils/request/api";
-
-import { PatientProps } from ".";
-import { SampleTestCard } from "../SampleTestCard";
-import { PatientModel, SampleTestModel } from "../models";
-
-export const SampleTestHistory = (props: PatientProps) => {
-  const { patientData, facilityId, id } = props;
-  const [_selectedStatus, setSelectedStatus] = useState<{
-    status: number;
-    sample: SampleTestModel | null;
-  }>({ status: 0, sample: null });
-  const [_showAlertMessage, setShowAlertMessage] = useState(false);
-
-  const isPatientInactive = (patientData: PatientModel, facilityId: string) => {
-    if (!patientData) return true;
-    return (
-      !patientData.is_active ||
-      !(
-        patientData?.last_consultation &&
-        patientData.last_consultation.facility === facilityId
-      )
-    );
-  };
-
-  const confirmApproval = (status: number, sample: SampleTestModel) => {
-    setSelectedStatus({ status, sample });
-    setShowAlertMessage(true);
-  };
-
-  const { t } = useTranslation();
-
-  return (
-    <div className="mt-4 px-3 md:px-0">
-      <div>
-        <div className="flex justify-between items-center">
-          <h2 className="my-4 ml-0 text-2xl font-semibold leading-tight">
-            {t("sample_test_history")}
-          </h2>
-          <ButtonV2
-            className="bg-green-600 px-3 py-2 font-semibold text-white hover:bg-green-500"
-            disabled={isPatientInactive(patientData, facilityId)}
-            size="default"
-            onClick={() =>
-              navigate(
-                `/facility/${patientData?.facility}/patient/${id}/sample-test`,
-              )
-            }
-            authorizeFor={NonReadOnlyUsers}
-            id="sample-request-btn"
-          >
-            <span className="flex w-full items-center justify-start gap-2">
-              <CareIcon icon="l-medkit" className="text-xl" />
-              {t("request_sample_test")}
-            </span>
-          </ButtonV2>
-        </div>
-      </div>
-
-      <PaginatedList
-        route={routes.sampleTestList}
-        pathParams={{ patientId: id }}
-        perPage={5}
-      >
-        {(_, query) => (
-          <div>
-            <PaginatedList.WhenLoading>
-              <CircularProgress />
-            </PaginatedList.WhenLoading>
-            <PaginatedList.WhenEmpty className="py-2">
-              <div className="h-full space-y-2 rounded-lg bg-white p-7 shadow">
-                <div className="flex w-full items-center justify-center text-xl font-bold text-secondary-500">
-                  {t("no_records_found")}
-                </div>
-              </div>
-            </PaginatedList.WhenEmpty>
-            <PaginatedList.Items<SampleTestModel>>
-              {(item) => (
-                <SampleTestCard
-                  refetch={query.refetch}
-                  itemData={item}
-                  handleApproval={confirmApproval}
-                  facilityId={facilityId}
-                  patientId={id}
-                />
-              )}
-            </PaginatedList.Items>
-            <div className="flex w-full items-center justify-center">
-              <PaginatedList.Paginator hideIfSinglePage />
-            </div>
-          </div>
-        )}
-      </PaginatedList>
-    </div>
-  );
-};
diff --git a/src/components/Patient/PatientDetailsTab/index.tsx b/src/components/Patient/PatientDetailsTab/index.tsx
index effc9b667f8..6f4b7ecc982 100644
--- a/src/components/Patient/PatientDetailsTab/index.tsx
+++ b/src/components/Patient/PatientDetailsTab/index.tsx
@@ -4,7 +4,6 @@ import EncounterHistory from "./EncounterHistory";
 import { HealthProfileSummary } from "./HealthProfileSummary";
 import { ImmunisationRecords } from "./ImmunisationRecords";
 import PatientNotes from "./Notes";
-import { SampleTestHistory } from "./SampleTestHistory";
 import ShiftingHistory from "./ShiftingHistory";
 
 export interface PatientProps {
@@ -34,10 +33,6 @@ export const patientTabs = [
     route: "shift",
     component: ShiftingHistory,
   },
-  {
-    route: "request-sample-test",
-    component: SampleTestHistory,
-  },
   {
     route: "patient-notes",
     component: PatientNotes,
diff --git a/src/components/Patient/PatientHome.tsx b/src/components/Patient/PatientHome.tsx
index 7ae439fa80b..253bd823ac0 100644
--- a/src/components/Patient/PatientHome.tsx
+++ b/src/components/Patient/PatientHome.tsx
@@ -11,7 +11,6 @@ import {
   DISCHARGE_REASONS,
   GENDER_TYPES,
   OCCUPATION_TYPES,
-  SAMPLE_TEST_STATUS,
 } from "@/common/constants";
 
 import dayjs from "@/Utils/dayjs";
@@ -40,7 +39,7 @@ import Page from "../Common/Page";
 import { SkillModel, UserBareMinimum } from "../Users/models";
 import { patientTabs } from "./PatientDetailsTab";
 import { isPatientMandatoryDataFilled } from "./Utils";
-import { AssignedToObjectModel, PatientModel, SampleTestModel } from "./models";
+import { AssignedToObjectModel, PatientModel } from "./models";
 
 export const parseOccupation = (occupation: string | undefined) => {
   return OCCUPATION_TYPES.find((i) => i.value === occupation)?.text;
@@ -56,10 +55,6 @@ export const PatientHome = (props: {
 
   const authUser = useAuthUser();
   const { t } = useTranslation();
-  const [selectedStatus, _setSelectedStatus] = useState<{
-    status: number;
-    sample: SampleTestModel | null;
-  }>({ status: 0, sample: null });
 
   const [assignedVolunteer, setAssignedVolunteer] = useState<
     AssignedToObjectModel | undefined
@@ -69,7 +64,6 @@ export const PatientHome = (props: {
     setAssignedVolunteer(patientData.assigned_to_object);
   }, [patientData.assigned_to_object]);
 
-  const [showAlertMessage, setShowAlertMessage] = useState(false);
   const [openAssignVolunteerDialog, setOpenAssignVolunteerDialog] =
     useState(false);
 
@@ -152,31 +146,6 @@ export const PatientHome = (props: {
     return `${first}, ${second} and ${rest.length} other skills...`;
   };
 
-  const handleApproval = async () => {
-    const { status, sample } = selectedStatus;
-    const sampleData = {
-      id: sample?.id,
-      status: status.toString(),
-      consultation: sample?.consultation,
-    };
-    const statusName = SAMPLE_TEST_STATUS.find((i) => i.id === status)?.desc;
-
-    await request(routes.patchSample, {
-      body: sampleData,
-      pathParams: {
-        id: sample?.id || "",
-      },
-      onResponse: ({ res }) => {
-        if (res?.ok) {
-          Notification.Success({
-            msg: `Request ${statusName}`,
-          });
-        }
-        setShowAlertMessage(false);
-      },
-    });
-  };
-
   if (isLoading) {
     return <Loading />;
   }
@@ -216,15 +185,6 @@ export const PatientHome = (props: {
       }}
       backUrl={facilityId ? `/facility/${facilityId}/patients` : "/patients"}
     >
-      <ConfirmDialog
-        title={t("send_sample_to_collection_centre_title")}
-        description={t("send_sample_to_collection_centre_description")}
-        show={showAlertMessage}
-        action={t("approve")}
-        onConfirm={() => handleApproval()}
-        onClose={() => setShowAlertMessage(false)}
-      />
-
       <div className="mt-3" data-testid="patient-dashboard">
         <div className="px-3 md:px-0">
           <div className="rounded-md bg-white p-3 shadow-sm">
diff --git a/src/components/Patient/SampleDetails.tsx b/src/components/Patient/SampleDetails.tsx
deleted file mode 100644
index f0e5f0039e5..00000000000
--- a/src/components/Patient/SampleDetails.tsx
+++ /dev/null
@@ -1,558 +0,0 @@
-import { Link, navigate } from "raviger";
-import { useTranslation } from "react-i18next";
-
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { Card, CardContent, CardHeader } from "@/components/ui/card";
-
-import Loading from "@/components/Common/Loading";
-import Page from "@/components/Common/Page";
-import { FileUpload } from "@/components/Files/FileUpload";
-import { FlowModel } from "@/components/Patient/models";
-
-import { GENDER_TYPES, TEST_TYPE_CHOICES } from "@/common/constants";
-
-import { DetailRoute } from "@/Routers/types";
-import routes from "@/Utils/request/api";
-import useTanStackQueryInstead from "@/Utils/request/useQuery";
-import { formatDateTime, formatPatientAge } from "@/Utils/utils";
-
-export const SampleDetails = ({ id }: DetailRoute) => {
-  const { t } = useTranslation();
-  const { loading: isLoading, data: sampleDetails } = useTanStackQueryInstead(
-    routes.getTestSample,
-    {
-      pathParams: {
-        id,
-      },
-      onResponse: ({ res, data }) => {
-        if (!(res?.ok && data)) {
-          navigate("/not-found");
-        }
-      },
-    },
-  );
-
-  const yesOrNoBadge = (param: any) =>
-    param ? (
-      <span className="badge badge-pill badge-warning">{t("yes")}</span>
-    ) : (
-      <span className="badge badge-pill badge-secondary">{t("no")}</span>
-    );
-
-  const showPatientCard = (patientData: any) => {
-    const patientGender = GENDER_TYPES.find(
-      (i) => i.id === patientData?.gender,
-    )?.text;
-    const testType = TEST_TYPE_CHOICES.find(
-      (i) => i.id === patientData?.test_type,
-    )?.text;
-
-    return (
-      <div className="mr-3 mt-2 h-full rounded-lg border bg-white p-4 text-black shadow md:mr-8">
-        <div className="grid grid-cols-1 md:grid-cols-2">
-          <div className="mt-2 flex flex-col gap-2">
-            <div>
-              <span className="font-semibold leading-relaxed">
-                {t("name")}:{" "}
-              </span>
-              {patientData?.name}
-            </div>
-            {patientData?.is_medical_worker && (
-              <div>
-                <span className="font-semibold leading-relaxed">
-                  {t("medical_worker")}:{" "}
-                </span>
-                <span className="badge badge-pill badge-primary">
-                  {t("yes")}
-                </span>
-              </div>
-            )}
-            <div>
-              <span className="font-semibold leading-relaxed">
-                {t("disease_status")}:{" "}
-              </span>
-              <span className="badge badge-pill badge-warning">
-                {patientData?.disease_status}
-              </span>
-            </div>
-
-            <div>
-              <span className="font-semibold leading-relaxed">
-                {t("srf_id")}:{" "}
-              </span>
-              {(patientData?.srf_id && patientData?.srf_id) || "-"}
-            </div>
-            <div>
-              <span className="font-semibold leading-relaxed">
-                {t("test_type")}:{" "}
-              </span>
-              {(patientData?.test_type && testType) || "-"}
-            </div>
-            <div>
-              <span className="font-semibold leading-relaxed">
-                {t("date_of_test")}:{" "}
-              </span>
-              {(patientData?.date_of_test &&
-                formatDateTime(patientData?.date_of_test)) ||
-                "-"}
-            </div>
-
-            <div>
-              <span className="font-semibold leading-relaxed">
-                {t("facility")}:{" "}
-              </span>
-              {patientData?.facility_object?.name || "-"}
-            </div>
-            {patientData?.date_of_birth ? (
-              <div>
-                <span className="font-semibold leading-relaxed">
-                  {t("date_of_birth")}:{" "}
-                </span>
-                {patientData?.date_of_birth}
-              </div>
-            ) : (
-              <div>
-                <span className="font-semibold leading-relaxed">
-                  {t("age")}:{" "}
-                </span>
-                {formatPatientAge(patientData)}
-              </div>
-            )}
-            <div>
-              <span className="font-semibold leading-relaxed">
-                {t("gender")}:{" "}
-              </span>
-              {patientGender}
-            </div>
-            <div>
-              <span className="font-semibold leading-relaxed">
-                {t("phone")}:{" "}
-              </span>
-              <a href={`tel:${patientData?.phone_number}`}>
-                {patientData?.phone_number || "-"}
-              </a>
-            </div>
-            <div>
-              <span className="font-semibold leading-relaxed">
-                {t("nationality")}:{" "}
-              </span>
-              {patientData?.nationality || "-"}
-            </div>
-          </div>
-          <div className="mt-2 flex flex-col gap-2">
-            <div>
-              <span className="font-semibold leading-relaxed">
-                {t("blood_group")}:{" "}
-              </span>
-              {patientData?.blood_group || "-"}
-            </div>
-            {patientData?.nationality !== "India" && (
-              <div>
-                <span className="font-semibold leading-relaxed">
-                  {t("passport_number")}:{" "}
-                </span>
-                {patientData?.passport_no || "-"}
-              </div>
-            )}
-            {patientData?.nationality === "India" && (
-              <>
-                <div>
-                  <span className="font-semibold leading-relaxed">
-                    {t("state")}:{" "}
-                  </span>
-                  {patientData?.state_object?.name}
-                </div>
-                <div>
-                  <span className="font-semibold leading-relaxed">
-                    {t("district")}:{" "}
-                  </span>
-                  {patientData?.district_object?.name || "-"}
-                </div>
-                <div>
-                  <span className="font-semibold leading-relaxed">
-                    {t("local_body")}:{" "}
-                  </span>
-                  {patientData?.local_body_object?.name || "-"}
-                </div>
-              </>
-            )}
-            <div>
-              <span className="font-semibold leading-relaxed">
-                {t("address")}:{" "}
-              </span>
-              {patientData?.address || "-"}
-            </div>
-            <div>
-              <span className="font-semibold leading-relaxed">
-                {t("contact_with_confirmed_carrier")}:{" "}
-              </span>
-              {yesOrNoBadge(patientData?.contact_with_confirmed_carrier)}
-            </div>
-            <div>
-              <span className="font-semibold leading-relaxed">
-                {t("contact_with_suspected_carrier")}:{" "}
-              </span>
-              {yesOrNoBadge(patientData?.contact_with_suspected_carrier)}
-            </div>
-            {patientData?.estimated_contact_date && (
-              <div>
-                <span className="font-semibold leading-relaxed">
-                  {t("estimated_contact_date")}:{" "}
-                </span>
-                {formatDateTime(patientData?.estimated_contact_date)}
-              </div>
-            )}
-            <div className="md:col-span-2">
-              <span className="font-semibold leading-relaxed">
-                {t("has_sari")}:{" "}
-              </span>
-              {yesOrNoBadge(patientData?.has_SARI)}
-            </div>
-            <div className="md:col-span-2">
-              <span className="font-semibold leading-relaxed">
-                {t("domestic_international_travel")}:{" "}
-              </span>
-              {yesOrNoBadge(patientData?.past_travel)}
-            </div>
-            {patientData?.countries_travelled &&
-              !!patientData?.countries_travelled.length && (
-                <div className="md:col-span-2">
-                  <span className="font-semibold leading-relaxed">
-                    {t("countries_travelled")}:{" "}
-                  </span>
-                  {patientData?.countries_travelled.join(", ")}
-                </div>
-              )}
-            {patientData?.ongoing_medication && (
-              <div className="md:col-span-2">
-                <span className="font-semibold leading-relaxed">
-                  {t("ongoing_medications")}{" "}
-                </span>
-                {patientData?.ongoing_medication}
-              </div>
-            )}
-            {patientData?.allergies && (
-              <div className="md:col-span-2">
-                <span className="font-semibold leading-relaxed">
-                  {t("allergies")}:{" "}
-                </span>
-                {patientData?.allergies}
-              </div>
-            )}
-            {!!patientData?.number_of_aged_dependents && (
-              <div>
-                <span className="font-semibold leading-relaxed">
-                  {t("number_of_aged_dependents")}:{" "}
-                </span>
-                {patientData?.number_of_aged_dependents}
-              </div>
-            )}
-            {!!patientData?.number_of_chronic_diseased_dependents && (
-              <div>
-                <span className="font-semibold leading-relaxed">
-                  {t("number_of_chronic_diseased_dependents")}:{" "}
-                </span>
-                {patientData?.number_of_chronic_diseased_dependents}
-              </div>
-            )}
-          </div>
-        </div>
-      </div>
-    );
-  };
-
-  const renderFlow = (flow: FlowModel) => {
-    return (
-      <Card key={flow.id}>
-        <div className="mr-3 p-4 text-black md:mr-8 grid grid-cols-1 gap-4 md:grid-cols-2">
-          <div>
-            <span className="font-semibold leading-relaxed">
-              {t("status")}:{" "}
-            </span>{" "}
-            <span>{t(`SAMPLE_TEST_HISTORY__${flow.status}`) || "Unknown"}</span>
-          </div>
-          <div>
-            <span className="font-semibold leading-relaxed">{t("label")}:</span>{" "}
-            <span className="capitalize">{flow.notes}</span>
-          </div>
-          <div>
-            <span className="font-semibold leading-relaxed">
-              {t("created_on")}:
-            </span>{" "}
-            {flow.created_date ? formatDateTime(flow.created_date) : "-"}
-          </div>
-          <div>
-            <span className="font-semibold leading-relaxed">
-              {t("modified_on")}:
-            </span>{" "}
-            {flow.modified_date ? formatDateTime(flow.modified_date) : "-"}
-          </div>
-        </div>
-      </Card>
-    );
-  };
-
-  if (isLoading || !sampleDetails) {
-    return <Loading />;
-  }
-
-  return (
-    <Page
-      title={t("sample_test_details")}
-      crumbsReplacements={{ [id]: { name: sampleDetails.patient_name } }}
-      backUrl="/sample"
-      options={
-        sampleDetails?.patient && (
-          <div className="my-2 flex justify-center md:justify-end">
-            <Button asChild variant={"primary"}>
-              <Link
-                href={`/patient/${sampleDetails.patient}/test_sample/${id}/icmr_sample`}
-              >
-                {t("icmr_specimen_referral_form")}
-              </Link>
-            </Button>
-          </div>
-        )
-      }
-    >
-      <Card className="my-2">
-        <CardHeader className="space-y-4">
-          <div className="flex flex-col sm:flex-row justify-between items-start sm:items-center gap-4">
-            <div className="space-y-1 flex gap-2 items-center">
-              <div className="text-sm text-muted-foreground">
-                {t("status")}:{" "}
-              </div>
-              <Badge variant="outline" className="font-semibold uppercase">
-                {t(`SAMPLE_TEST_HISTORY__${sampleDetails?.status}`)}
-              </Badge>
-            </div>
-            <div className="space-y-1 sm:text-right flex gap-2 items-center ">
-              <div className="text-sm text-muted-foreground">
-                {t("result")}:{" "}
-              </div>
-              <Badge variant="secondary" className="font-semibold uppercase">
-                {t(`SAMPLE_TEST_RESULT__${sampleDetails?.result}`)}
-              </Badge>
-            </div>
-          </div>
-        </CardHeader>
-        <CardContent className="space-y-6">
-          <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6">
-            <div className="space-y-1">
-              <div className="text-sm text-muted-foreground">
-                {t("patient")}:
-              </div>
-              <div id="patient_name" className="font-medium">
-                {sampleDetails?.patient_name || "-"}
-              </div>
-            </div>
-            {sampleDetails?.facility_object && (
-              <div className="space-y-1">
-                <div className="text-sm text-muted-foreground">
-                  {t("facility")}:{" "}
-                </div>
-                <div className="font-medium">
-                  {sampleDetails?.facility_object.name}
-                </div>
-              </div>
-            )}
-            <div className="space-y-1">
-              <div className="text-sm text-muted-foreground">
-                {t("tested_on")}:{" "}
-              </div>
-              <div className="font-medium">
-                {sampleDetails?.date_of_result
-                  ? formatDateTime(sampleDetails.date_of_result)
-                  : "-"}
-              </div>
-            </div>
-            <div className="space-y-1">
-              <div className="text-sm text-muted-foreground">
-                {t("result_on")}:{" "}
-              </div>
-              <div className="font-medium">
-                {sampleDetails?.date_of_result
-                  ? formatDateTime(sampleDetails.date_of_result)
-                  : "-"}
-              </div>
-            </div>
-          </div>
-
-          {sampleDetails?.doctor_name && (
-            <div className="space-y-1">
-              <div className="text-sm text-muted-foreground">
-                {t("doctors_name")}:
-              </div>
-              <div id="doctor_name" className="capitalize font-medium">
-                {sampleDetails.doctor_name}
-              </div>
-            </div>
-          )}
-          <div className="border-t border-gray-300 my-4"></div>
-          <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4">
-            {sampleDetails?.fast_track && (
-              <div
-                id="fast_track_reason"
-                className="flex justify-between items-center gap-2 p-3 bg-gray-100 rounded-lg"
-              >
-                <div className="font-medium text-sm">
-                  {t("fast_track_testing_reason")}:{" "}
-                </div>
-                <Badge variant={"secondary"}>{sampleDetails.fast_track}</Badge>
-              </div>
-            )}
-            {sampleDetails?.diagnosis && (
-              <div className="flex justify-between items-center gap-2 p-3 bg-gray-100 rounded-lg">
-                <div className="font-medium text-sm">{t("diagnosis")}: </div>
-                <Badge id="diagnosis" variant={"secondary"}>
-                  {" "}
-                  {sampleDetails.diagnosis}
-                </Badge>
-              </div>
-            )}
-            {sampleDetails?.diff_diagnosis && (
-              <div className="flex justify-between items-center gap-2 p-3 bg-gray-100 rounded-lg">
-                <div className="font-medium text-sm">
-                  {t("differential_diagnosis")}:{" "}
-                </div>
-                <Badge id="diff_diagnosis" variant={"secondary"}>
-                  {" "}
-                  {sampleDetails?.diff_diagnosis}
-                </Badge>
-              </div>
-            )}
-            {sampleDetails?.etiology_identified && (
-              <div className="flex justify-between items-center gap-2 p-3 bg-gray-100 rounded-lg">
-                <div className="font-medium text-sm">
-                  {t("etiology_identified")}:{" "}
-                </div>
-                <Badge id="etiology_identified" variant={"secondary"}>
-                  {" "}
-                  {sampleDetails.etiology_identified}
-                </Badge>
-              </div>
-            )}
-            <div className="flex justify-between items-center gap-2 p-3 bg-gray-100 rounded-lg">
-              <div className="font-medium text-sm">
-                {t("is_atypical_presentation")}
-              </div>
-              <Badge variant={"secondary"}>
-                {" "}
-                {yesOrNoBadge(sampleDetails?.is_atypical_presentation)}
-              </Badge>
-            </div>
-            <div className="flex justify-between items-center gap-2 p-3 bg-gray-100 rounded-lg">
-              <div className="font-medium text-sm">
-                {t("is_unusual_course")}
-              </div>
-              <Badge variant={"secondary"}>
-                {" "}
-                {yesOrNoBadge(sampleDetails?.is_unusual_course)}
-              </Badge>
-            </div>
-            {sampleDetails?.atypical_presentation && (
-              <div className="flex justify-between items-center gap-2 p-3 bg-gray-100 rounded-lg">
-                <div className="font-medium text-sm">
-                  {t("atypical_presentation_details")}:{" "}
-                </div>
-                <Badge variant={"secondary"}>
-                  {" "}
-                  {sampleDetails.atypical_presentation}
-                </Badge>
-              </div>
-            )}
-            <div className="flex justify-between items-center gap-2 p-3 bg-gray-100 rounded-lg">
-              <div className="font-medium text-sm">{t("sari")} </div>
-              <Badge variant={"secondary"}>
-                {" "}
-                {yesOrNoBadge(sampleDetails?.has_sari)}
-              </Badge>
-            </div>
-            <div className="flex justify-between items-center gap-2 p-3 bg-gray-100 rounded-lg">
-              <div className="font-medium text-sm">{t("ari")} </div>
-              <Badge variant={"secondary"}>
-                {" "}
-                {yesOrNoBadge(sampleDetails?.has_ari)}
-              </Badge>
-            </div>
-            <div className="flex justify-between items-center gap-2 p-3 bg-gray-100 rounded-lg">
-              <div className="font-medium text-sm">
-                {t("contact_with_confirmed_carrier")}{" "}
-              </div>
-              <Badge variant={"secondary"}>
-                {" "}
-                {yesOrNoBadge(sampleDetails?.patient_has_confirmed_contact)}
-              </Badge>
-            </div>
-            <div className="flex justify-between items-center gap-2 p-3 bg-gray-100 rounded-lg">
-              <div className="font-medium text-sm">
-                {t("contact_with_suspected_carrier")}{" "}
-              </div>
-              <Badge variant={"secondary"}>
-                {" "}
-                {yesOrNoBadge(sampleDetails?.patient_has_suspected_contact)}
-              </Badge>
-            </div>
-            {sampleDetails?.patient_travel_history &&
-              sampleDetails.patient_travel_history.length !== 0 && (
-                <div className="flex justify-between items-center gap-2 p-3 bg-gray-100 rounded-lg">
-                  <div className="font-medium text-sm">
-                    {t("countries_travelled")}:{" "}
-                  </div>
-                  <Badge variant={"secondary"}>
-                    {" "}
-                    {sampleDetails.patient_travel_history}
-                  </Badge>
-                </div>
-              )}
-          </div>
-          <div className="border-t border-gray-300 my-4"></div>
-          {sampleDetails?.sample_type && (
-            <div className="space-y-1">
-              <div className="text-sm text-muted-foreground">
-                {t("sample_type")}:{" "}
-              </div>
-              <span id="sample_type" className="font-medium capitalize">
-                {sampleDetails.sample_type}
-              </span>
-            </div>
-          )}
-          {sampleDetails?.sample_type === "OTHER TYPE" && (
-            <div className="space-y-1">
-              <div className="text-sm text-muted-foreground">
-                {t("sample_type_description")}:{" "}
-              </div>
-              <div className="font-medium">
-                {sampleDetails?.sample_type_other}
-              </div>
-            </div>
-          )}
-        </CardContent>
-      </Card>
-
-      <div>
-        <h4 className="mt-8">{t("details_of_patient")}</h4>
-        {showPatientCard(sampleDetails?.patient_object)}
-      </div>
-
-      <div className="mb-4">
-        <h4 className="mt-8">{t("sample_test_history")}</h4>
-        {sampleDetails?.flow &&
-          sampleDetails.flow.map((flow: FlowModel) => (
-            <div key={flow.id} className="mb-2 py-2">
-              {renderFlow(flow)}
-            </div>
-          ))}
-      </div>
-
-      <FileUpload
-        sampleId={id}
-        patientId=""
-        consultationId=""
-        type="SAMPLE_MANAGEMENT"
-        allowAudio={true}
-      />
-    </Page>
-  );
-};
diff --git a/src/components/Patient/SampleFilters.tsx b/src/components/Patient/SampleFilters.tsx
deleted file mode 100644
index 6ac3a4532b7..00000000000
--- a/src/components/Patient/SampleFilters.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import FiltersSlideover from "@/CAREUI/interactive/FiltersSlideover";
-
-import CircularProgress from "@/components/Common/CircularProgress";
-import { FacilitySelect } from "@/components/Common/FacilitySelect";
-import { FacilityModel } from "@/components/Facility/models";
-import { FieldLabel } from "@/components/Form/FormFields/FormField";
-import { SelectFormField } from "@/components/Form/FormFields/SelectFormField";
-import { FieldChangeEvent } from "@/components/Form/FormFields/Utils";
-
-import useMergeState from "@/hooks/useMergeState";
-
-import {
-  SAMPLE_TEST_RESULT,
-  SAMPLE_TEST_STATUS,
-  SAMPLE_TYPE_CHOICES,
-} from "@/common/constants";
-
-import routes from "@/Utils/request/api";
-import useTanStackQueryInstead from "@/Utils/request/useQuery";
-
-export default function UserFilter(props: any) {
-  const { filter, onChange, closeFilter, removeFilters } = props;
-
-  const [filterState, setFilterState] = useMergeState({
-    status: filter.status || "",
-    result: filter.result || "",
-    facility: filter.facility || "",
-    facility_ref: filter.facility_ref || null,
-    sample_type: filter.sample_type || "",
-  });
-
-  const handleChange = ({ name, value }: FieldChangeEvent<unknown>) => {
-    setFilterState({ ...filterState, [name]: value });
-  };
-
-  const applyFilter = () => {
-    const { status, result, facility, sample_type } = filterState;
-    const data = {
-      status: status || "",
-      result: result || "",
-      facility: facility || "",
-      sample_type: sample_type || "",
-    };
-    onChange(data);
-  };
-
-  const { loading: isFacilityLoading } = useTanStackQueryInstead(
-    routes.getAnyFacility,
-    {
-      pathParams: {
-        id: filter.facility,
-      },
-      prefetch: !!filter.facility,
-      onResponse: ({ data }) => {
-        setFilterState({ ...filterState, facility_ref: data });
-      },
-    },
-  );
-
-  return (
-    <FiltersSlideover
-      advancedFilter={props}
-      onApply={applyFilter}
-      onClear={() => {
-        removeFilters();
-        closeFilter();
-      }}
-    >
-      <SelectFormField
-        name="status"
-        label="Status"
-        value={filterState.status}
-        onChange={handleChange}
-        options={SAMPLE_TEST_STATUS.map(({ id, text }) => {
-          return { id, text: text.replaceAll("_", " ") };
-        })}
-        optionValue={(option) => option.id}
-        optionLabel={(option) => option.text}
-        labelClassName="text-sm"
-        errorClassName="hidden"
-      />
-
-      <SelectFormField
-        name="result"
-        label="Result"
-        value={filterState.result}
-        onChange={handleChange}
-        options={SAMPLE_TEST_RESULT}
-        optionValue={(option) => option.id}
-        optionLabel={(option) => option.text}
-        labelClassName="text-sm"
-        errorClassName="hidden"
-      />
-
-      <SelectFormField
-        name="sample_type"
-        label="Sample Test Type"
-        value={filterState.sample_type}
-        onChange={handleChange}
-        options={SAMPLE_TYPE_CHOICES}
-        optionValue={(option) => option.id}
-        optionLabel={(option) => option.text}
-        labelClassName="text-sm"
-        errorClassName="hidden"
-      />
-
-      <div className="w-full flex-none">
-        <FieldLabel className="text-sm">Facility</FieldLabel>
-        <div>
-          {isFacilityLoading ? (
-            <CircularProgress />
-          ) : (
-            <FacilitySelect
-              multiple={false}
-              name="facility"
-              selected={filterState.facility_ref}
-              showAll={true}
-              setSelected={(obj) =>
-                setFilterState({
-                  facility: (obj as FacilityModel)?.id,
-                  facility_ref: obj,
-                })
-              }
-              errors={""}
-            />
-          )}
-        </div>
-      </div>
-    </FiltersSlideover>
-  );
-}
diff --git a/src/components/Patient/SamplePreview.tsx b/src/components/Patient/SamplePreview.tsx
deleted file mode 100644
index 18862712533..00000000000
--- a/src/components/Patient/SamplePreview.tsx
+++ /dev/null
@@ -1,459 +0,0 @@
-import ButtonV2 from "@/components/Common/ButtonV2";
-import Loading from "@/components/Common/Loading";
-import Page from "@/components/Common/Page";
-
-import routes from "@/Utils/request/api";
-import useTanStackQueryInstead from "@/Utils/request/useQuery";
-import { classNames, formatDateTime, humanizeStrings } from "@/Utils/utils";
-
-interface ISamplePreviewProps {
-  id: string;
-  sampleId: string;
-}
-
-interface ISampleReportSectionProps {
-  title: string;
-  fields: {
-    title: string;
-    value: string | undefined | null;
-  }[];
-}
-
-function SampleReportSection({ title, fields }: ISampleReportSectionProps) {
-  return (
-    <>
-      <div className="flex justify-center border border-b-0 border-secondary-800 bg-secondary-700 py-2 font-medium text-white">
-        <h6 className="text-lg">{title}</h6>
-      </div>
-      <div className="grid grid-cols-2 border-b border-secondary-800">
-        {fields.map((field, i) => (
-          <div
-            className={classNames(
-              "flex border-b border-secondary-800",
-              i % 2 === 0 && "border-x",
-            )}
-          >
-            <div className="w-[65%] border-r border-secondary-800 py-2">
-              <p className="mr-2.5 pl-1 pr-2 text-right font-semibold">
-                {field.title}
-              </p>
-            </div>
-            <div className="w-[35%] py-2">
-              <p className="whitespace-pre-wrap break-words pl-2 pr-1 text-left">
-                {field.value}
-              </p>
-            </div>
-          </div>
-        ))}
-      </div>
-    </>
-  );
-}
-
-export default function SampleReport(props: ISamplePreviewProps) {
-  const { id, sampleId } = props;
-
-  let report: JSX.Element = <></>;
-  let reportData: JSX.Element = <></>;
-
-  const { loading: isLoading, data: sampleData } = useTanStackQueryInstead(
-    routes.sampleReport,
-    {
-      pathParams: {
-        id,
-        sampleId,
-      },
-    },
-  );
-
-  if (sampleData) {
-    reportData = (
-      <>
-        <div className="m-2 flex justify-end pt-2 print:hidden">
-          <ButtonV2 variant="primary" onClick={window.print}>
-            Print Report
-          </ButtonV2>
-        </div>
-        <div className="block h-screen" id="section-to-print">
-          <div className="flex flex-col">
-            <div className="flex items-center justify-between border border-secondary-800">
-              <div className="flex justify-start p-2"></div>
-              <div className="flex justify-end">
-                <div className="p-2">
-                  <img
-                    src="https://cdn.ohc.network/ohc_logo_green.png"
-                    className="h-[50px] max-w-[400px] object-contain"
-                    alt="Open HealthCare Network"
-                  />
-                </div>
-              </div>
-            </div>
-            <div className="flex justify-start border border-t-0 border-secondary-800">
-              <div className="w-full p-5 py-2 text-black">
-                <p className="text-lg font-bold">
-                  ICMR Specimen Referral Data for COVID-19 (SARS-CoV2)
-                </p>
-              </div>
-            </div>
-            <div className="flex justify-center border border-t-0 border-secondary-800 py-2">
-              <h6 className="text-lg font-semibold text-danger-500">
-                FOR INTERNAL USE ONLY
-              </h6>
-            </div>
-            <div className="flex flex-col">
-              <div className="flex justify-center border border-b-0 border-secondary-800 bg-black py-2 font-medium text-white">
-                <h6 className="text-lg">Sample Id : {sampleId}</h6>
-              </div>
-              <div className="flex justify-center border border-b-0 border-secondary-800 bg-black py-2 font-medium text-white">
-                <h6 className="text-lg">Patient Id : {id}</h6>
-              </div>
-              <div
-                className="border-4 border-black"
-                style={{ border: "solid 5px black" }}
-              >
-                <div className="flex justify-center border border-b-0 border-secondary-800 bg-secondary-900 py-2 font-medium text-white">
-                  <h6 className="text-lg">SECTION A - MANDATORY FIELDS</h6>
-                </div>
-                <SampleReportSection
-                  title="A.1 PERSON DETAILS"
-                  fields={[
-                    {
-                      title: "Patient Name",
-                      value: sampleData?.personal_details?.name,
-                    },
-                    {
-                      title: "Age",
-                      value: `${sampleData?.personal_details?.age_years} years ${sampleData?.personal_details?.age_months} Months`,
-                    },
-                    {
-                      title: "Present Patient Village or Town",
-                      value: sampleData?.personal_details?.local_body_name,
-                    },
-                    {
-                      title: "Gender",
-                      value: sampleData?.personal_details?.gender,
-                    },
-                    {
-                      title: "Mobile Number (Self)",
-                      value: sampleData?.personal_details?.phone_number,
-                    },
-                    {
-                      title: "District of Present Residence",
-                      value: sampleData?.personal_details?.district_name,
-                    },
-                    {
-                      title: "State Of Present Residence",
-                      value: sampleData?.personal_details?.state_name,
-                    },
-                    { title: "Nationality", value: "Indian" },
-                  ]}
-                />
-
-                <SampleReportSection
-                  title="A.2 SPECIMEN INFORMATION FROM REFERRING AGENCY"
-                  fields={[
-                    {
-                      title: "Collection Date",
-                      value: sampleData?.specimen_details?.created_date
-                        ? formatDateTime(
-                            sampleData?.specimen_details?.created_date,
-                          )
-                        : "NA",
-                    },
-                    {
-                      title: "Label",
-                      value: sampleData?.specimen_details?.icmr_label,
-                    },
-                    {
-                      title: "Sample Repeated",
-                      value:
-                        sampleData?.specimen_details?.is_repeated_sample !==
-                        null
-                          ? sampleData?.specimen_details?.is_repeated_sample
-                            ? "Yes"
-                            : "No"
-                          : "NA",
-                    },
-                    {
-                      title: "Sample Collection Facility Name",
-                      value: sampleData?.medical_conditions?.hospital_name,
-                    },
-                    {
-                      title: "Collection Facility Pin code",
-                      value: sampleData?.medical_conditions?.hospital_pincode,
-                    },
-                  ]}
-                />
-
-                <SampleReportSection
-                  title="A.3 Patient Category"
-                  fields={[
-                    {
-                      title:
-                        sampleData?.specimen_details?.icmr_category || "Cat 0",
-                      value: (() => {
-                        switch (sampleData?.specimen_details?.icmr_category) {
-                          case "Cat 0":
-                            return "Repeat Sample of Positive Case / Follow Up case";
-                          case "Cat 1":
-                            return "Symptomatic International Traveller in last 14 days";
-                          case "Cat 2":
-                            return "Symptomatic contact of lab confirmed Case";
-                          case "Cat 3":
-                            return "Symptomatic Healthcare Worker";
-                          case "Cat 4":
-                            return "Hospitalized SARI (Severe Acute Respiratory illness Patient)";
-                          case "Cat 5a":
-                            return "Asymptomatic Direct and High Risk contact of confirmed case - family Member";
-                          case "Cat 5b":
-                            return "Asymptomatic Healthcare worker in contact with confimred case without adequete protection";
-                        }
-                      })(),
-                    },
-                  ]}
-                />
-
-                <div className="flex justify-center border border-b-0 border-secondary-800 bg-secondary-900 py-2 font-medium text-white">
-                  <h6 className="text-lg">
-                    SECTION B - OTHER FIELDS TO BE UPDATED
-                  </h6>
-                </div>
-
-                <SampleReportSection
-                  title="B.1 PERSON DETAILS"
-                  fields={[
-                    {
-                      title: "Present Patient Address",
-                      value: sampleData?.personal_details?.address,
-                    },
-                    {
-                      title: "Pin code",
-                      value: sampleData?.personal_details?.pincode,
-                    },
-                    {
-                      title: "Email Id",
-                      value: sampleData?.personal_details?.email,
-                    },
-                    {
-                      title: "Date Of Birth",
-                      value: sampleData?.personal_details?.date_of_birth,
-                    },
-                    { title: "Patient Aadhar Number", value: "............." },
-                    {
-                      title: "Patient Passport Number",
-                      value: sampleData?.personal_details?.passport_no,
-                    },
-                  ]}
-                />
-
-                <SampleReportSection
-                  title="B.2 EXPOSURE HISTORY ( 2 WEEKS BEFORE THE ONSET OF SYMPTOMS )"
-                  fields={[
-                    {
-                      title: "Travel to foreign country in last 14 days",
-                      value:
-                        sampleData?.exposure_history
-                          ?.has_travel_to_foreign_last_14_days !== null
-                          ? sampleData?.exposure_history
-                              ?.has_travel_to_foreign_last_14_days
-                            ? "Yes"
-                            : "No"
-                          : "NA",
-                    },
-                    {
-                      title: "Places of travel",
-                      value:
-                        sampleData?.exposure_history?.places_of_travel?.join(
-                          ", ",
-                        ),
-                    },
-                    {
-                      title: "Travel Start Date",
-                      value: sampleData?.exposure_history?.travel_start_date,
-                    },
-                    {
-                      title: "Travel End Date",
-                      value: sampleData?.exposure_history?.travel_end_date,
-                    },
-                    {
-                      title: "In Contact with lab confimed Covid 19 Patient",
-                      value:
-                        sampleData?.exposure_history
-                          ?.contact_with_confirmed_case !== null
-                          ? sampleData.exposure_history
-                              ?.contact_with_confirmed_case
-                            ? "Yes"
-                            : "No"
-                          : "NA",
-                    },
-                    {
-                      title: "Name of Confirmed Contacted Covid Patient",
-                      value: sampleData?.exposure_history?.contact_case_name,
-                    },
-                    {
-                      title: "Quarantine Status",
-                      value:
-                        sampleData?.exposure_history?.was_quarantined !== null
-                          ? sampleData?.exposure_history?.was_quarantined
-                            ? "Yes"
-                            : "No"
-                          : "NA",
-                    },
-                    {
-                      title: "Quarantine Location",
-                      value: sampleData?.exposure_history?.quarantined_type,
-                    },
-                    {
-                      title:
-                        "Health care worker working in a hospital involved in managing patients",
-                      value:
-                        sampleData?.exposure_history?.healthcare_worker !== null
-                          ? sampleData?.exposure_history?.healthcare_worker
-                            ? "Yes"
-                            : "No"
-                          : "NA",
-                    },
-                  ]}
-                />
-
-                <SampleReportSection
-                  title="B.3 CLINICAL SYMPTOMS AND SIGNS"
-                  fields={[
-                    {
-                      title: "Date of Onset of Symptoms",
-                      value:
-                        sampleData?.medical_conditions
-                          ?.date_of_onset_of_symptoms,
-                    },
-                    {
-                      title: "Symptoms",
-                      value:
-                        sampleData?.medical_conditions?.symptoms &&
-                        humanizeStrings(sampleData.medical_conditions.symptoms),
-                    },
-                    { title: "First Symptom", value: "............." },
-                    {
-                      title: "Person has Severe Acute Respiratory illness",
-                      value:
-                        sampleData?.medical_conditions?.has_sari !== null
-                          ? sampleData?.medical_conditions?.has_sari
-                            ? "Yes"
-                            : "No"
-                          : "NA",
-                    },
-                    {
-                      title: "Person Has Acute Respiratory Illness",
-                      value:
-                        sampleData?.medical_conditions?.has_ari !== null
-                          ? sampleData?.medical_conditions?.has_ari
-                            ? "Yes"
-                            : "No"
-                          : "NA",
-                    },
-                  ]}
-                />
-
-                <SampleReportSection
-                  title="B.4 UNDERLYING MEDICAL CONDITIONS"
-                  fields={[
-                    {
-                      title: "Medical Conditions",
-                      value:
-                        sampleData?.medical_conditions?.medical_conditions_list?.join(
-                          ", ",
-                        ),
-                    },
-                  ]}
-                />
-
-                <SampleReportSection
-                  title="B.5 HOSPITALIZATION , TREATMENT AND INVESTIGATION"
-                  fields={[
-                    {
-                      title: "Hospitalization Date",
-                      value:
-                        sampleData?.medical_conditions?.hospitalization_date,
-                    },
-                    {
-                      title: "Diagnosis",
-                      value: sampleData?.medical_conditions?.diagnosis,
-                    },
-                    {
-                      title: "Differential diagnosis",
-                      value: sampleData?.medical_conditions?.diff_diagnosis,
-                    },
-                    {
-                      title: "Etiology Identified",
-                      value:
-                        sampleData?.medical_conditions?.etiology_identified,
-                    },
-                    {
-                      title: "Asypical Presentation",
-                      value:
-                        sampleData?.medical_conditions
-                          ?.is_atypical_presentation !== null
-                          ? sampleData?.medical_conditions
-                              ?.is_atypical_presentation
-                            ? "Yes"
-                            : "No"
-                          : "NA",
-                    },
-                    {
-                      title: "Unusual or Unexpected Course",
-                      value:
-                        sampleData?.medical_conditions?.is_unusual_course !==
-                        null
-                          ? sampleData?.medical_conditions?.is_unusual_course
-                            ? "Yes"
-                            : "No"
-                          : "NA",
-                    },
-                    {
-                      title: "Hospital Name / Address",
-                      value: sampleData?.medical_conditions?.hospital_name,
-                    },
-                    {
-                      title: "Hospital Phone Number",
-                      value:
-                        sampleData?.medical_conditions?.hospital_phone_number,
-                    },
-                    {
-                      title: "Name of Doctor",
-                      value: sampleData?.medical_conditions?.doctor_name,
-                    },
-                    {
-                      title: "Signature & Date",
-                      value: "",
-                    },
-                  ]}
-                />
-              </div>
-            </div>
-          </div>
-        </div>
-      </>
-    );
-  }
-  if (isLoading) {
-    report = (
-      <div className="flex h-screen justify-center print:hidden">
-        <Loading />
-      </div>
-    );
-  } else if (sampleData && reportData) {
-    report = reportData;
-  } else if (!sampleData) {
-    report = (
-      <div className="flex h-screen justify-center print:hidden">
-        <h5 className="self-center text-lg font-semibold">No Data Found</h5>
-      </div>
-    );
-  }
-  return (
-    <div className="w-full">
-      <Page title="Sample Report" backUrl={`/sample/${sampleId}`}>
-        {report}
-      </Page>
-    </div>
-  );
-}
diff --git a/src/components/Patient/SampleTest.tsx b/src/components/Patient/SampleTest.tsx
deleted file mode 100644
index 7025faf407e..00000000000
--- a/src/components/Patient/SampleTest.tsx
+++ /dev/null
@@ -1,350 +0,0 @@
-import { navigate } from "raviger";
-import { useReducer, useState } from "react";
-
-import { Cancel, Submit } from "@/components/Common/ButtonV2";
-import { FacilitySelect } from "@/components/Common/FacilitySelect";
-import Loading from "@/components/Common/Loading";
-import Page from "@/components/Common/Page";
-import CheckBoxFormField from "@/components/Form/FormFields/CheckBoxFormField";
-import { FieldLabel } from "@/components/Form/FormFields/FormField";
-import { SelectFormField } from "@/components/Form/FormFields/SelectFormField";
-import TextAreaFormField from "@/components/Form/FormFields/TextAreaFormField";
-import TextFormField from "@/components/Form/FormFields/TextFormField";
-import { FieldChangeEvent } from "@/components/Form/FormFields/Utils";
-import { SampleTestModel } from "@/components/Patient/models";
-
-import useAppHistory from "@/hooks/useAppHistory";
-
-import { ICMR_CATEGORY, SAMPLE_TYPE_CHOICES } from "@/common/constants";
-
-import * as Notification from "@/Utils/Notifications";
-import routes from "@/Utils/request/api";
-import request from "@/Utils/request/request";
-import useTanStackQueryInstead from "@/Utils/request/useQuery";
-
-const initForm: SampleTestModel = {
-  isFastTrack: false,
-  fast_track: "",
-  icmr_label: "",
-  atypical_presentation: "",
-  diagnosis: "",
-  diff_diagnosis: "",
-  doctor_name: "",
-  testing_facility: "",
-  etiology_identified: "",
-  has_ari: false,
-  has_sari: false,
-  is_atypical_presentation: false,
-  is_unusual_course: false,
-  sample_type: "0",
-  icmr_category: "Cat 0",
-  sample_type_other: "",
-};
-
-const initError = Object.assign(
-  {},
-  ...Object.keys(initForm).map((k) => ({ [k]: "" })),
-);
-
-const initialState = {
-  form: { ...initForm },
-  errors: { ...initError },
-};
-
-const sampleTestFormReducer = (state = initialState, action: any) => {
-  switch (action.type) {
-    case "set_form": {
-      return {
-        ...state,
-        form: action.form,
-      };
-    }
-    case "set_error": {
-      return {
-        ...state,
-        errors: action.errors,
-      };
-    }
-    default:
-      return state;
-  }
-};
-
-export const SampleTest = ({ facilityId, patientId }: any) => {
-  const { goBack } = useAppHistory();
-  const [state, dispatch] = useReducer(sampleTestFormReducer, initialState);
-  const [isLoading, setIsLoading] = useState(false);
-
-  const headerText = "Request Sample";
-  const buttonText = "Confirm your request to send sample for testing";
-
-  const { data } = useTanStackQueryInstead(routes.getPatient, {
-    pathParams: {
-      id: patientId,
-    },
-    prefetch: !!patientId,
-  });
-
-  const validateForm = () => {
-    const errors = { ...initError };
-    let invalidForm = false;
-    Object.keys(state.form).forEach((field) => {
-      switch (field) {
-        case "fast_track":
-          if (state.form.isFastTrack && !state.form[field]) {
-            errors[field] = "Please provide reasons for fast-track testing";
-            invalidForm = true;
-          }
-          break;
-        case "icmr_label":
-          if (!state.form[field]) {
-            errors[field] = "Please specify the label";
-            invalidForm = true;
-          }
-          break;
-        case "sample_type_other":
-          if (state.form.sample_type === "9" && !state.form[field]) {
-            errors[field] = "Please provide details of the sample type";
-            invalidForm = true;
-          }
-          break;
-        case "atypical_presentation":
-          if (state.form.is_atypical_presentation && !state.form[field]) {
-            errors[field] = "Please provide details of atypical presentation";
-            invalidForm = true;
-          }
-          break;
-        default:
-          return;
-      }
-    });
-    if (invalidForm) {
-      dispatch({ type: "set_error", errors });
-      return false;
-    }
-    dispatch({ type: "set_error", errors });
-    return true;
-  };
-
-  const handleSubmit = async (e: any) => {
-    e.preventDefault();
-    const validForm = validateForm();
-    if (validForm) {
-      setIsLoading(true);
-      const data: SampleTestModel = {
-        date_of_sample: new Date().toISOString(),
-        fast_track: state.form.isFastTrack ? state.form.fast_track : undefined,
-        icmr_label: state.form.icmr_label ? state.form.icmr_label : undefined,
-        facility: facilityId,
-        patient: patientId,
-        has_ari: state.form.has_ari,
-        has_sari: state.form.has_sari,
-        is_unusual_course: state.form.is_unusual_course,
-        is_atypical_presentation: state.form.is_atypical_presentation,
-        atypical_presentation: state.form.is_atypical_presentation
-          ? state.form.atypical_presentation
-          : undefined,
-        diagnosis: state.form.diagnosis ? state.form.diagnosis : undefined,
-        diff_diagnosis: state.form.diff_diagnosis
-          ? state.form.diff_diagnosis
-          : undefined,
-        testing_facility: state.form.testing_facility?.id,
-        doctor_name: state.form.doctor_name
-          ? state.form.doctor_name
-          : undefined,
-        etiology_identified: state.form.etiology_identified
-          ? state.form.etiology_identified
-          : undefined,
-        sample_type: state.form.sample_type,
-        icmr_category: state.form.icmr_category,
-        sample_type_other:
-          state.form.sample_type === "9"
-            ? state.form.sample_type_other
-            : undefined,
-      };
-
-      await request(routes.createSampleTest, {
-        pathParams: {
-          patientId,
-        },
-        body: data,
-        onResponse: ({ res, data }) => {
-          setIsLoading(false);
-          if (res?.ok && data) {
-            dispatch({ type: "set_form", form: initForm });
-            Notification.Success({
-              msg: "Sample test created successfully",
-            });
-            navigate(`/facility/${facilityId}/patient/${patientId}`);
-          }
-        },
-      });
-    }
-  };
-
-  const handleFormFieldChange = (e: FieldChangeEvent<unknown>) => {
-    dispatch({ type: "set_form", form: { ...state.form, [e.name]: e.value } });
-  };
-
-  const field = (name: string, label: string) => ({
-    name,
-    label,
-    value: state.form[name],
-    onChange: handleFormFieldChange,
-    error: state.errors[name],
-  });
-
-  if (isLoading) {
-    return <Loading />;
-  }
-  return (
-    <Page
-      title={headerText}
-      crumbsReplacements={{
-        [facilityId]: { name: data?.facility_object?.name || "" },
-        [patientId]: { name: data?.name || "" },
-      }}
-      backUrl={`/facility/${facilityId}/patient/${patientId}`}
-    >
-      <form
-        onSubmit={handleSubmit}
-        className="mx-auto w-full max-w-5xl rounded bg-white px-8 py-5 md:px-16 md:py-11"
-      >
-        <SelectFormField
-          {...field("sample_type", "Sample Test Type")}
-          required
-          options={SAMPLE_TYPE_CHOICES}
-          optionLabel={(option) => option.text}
-          optionValue={(option) => option.id}
-          id="sample-type"
-        />
-
-        {state.form.sample_type === "9" && (
-          <TextAreaFormField
-            {...field("sample_type_other", "Sample Test Type Details")}
-            required
-          />
-        )}
-
-        <SelectFormField
-          {...field("icmr_category", "ICMR Category (for COVID Test)")}
-          options={ICMR_CATEGORY}
-          optionLabel={(option) => option}
-          optionValue={(option) => option}
-          id="icmr-category"
-        />
-        <div className="mb-6 flex flex-col gap-1">
-          <p className="font-medium">
-            Refer below to know more about ICMR Categories
-          </p>
-          <span>
-            <li>Cat 0 - Repeat Sample of Positive Case / Follow Up case</li>
-            <li>Cat 1 - Symptomatic International Traveller in last 14 days</li>
-            <li>Cat 2 - Symptomatic contact of lab confirmed Case</li>
-            <li>Cat 3 - Symptomatic Healthcare Worker</li>
-            <li>
-              Cat 4 - Hospitalized SARI (Severe Acute Respiratory illness
-              Patient)
-            </li>
-            <li>
-              Cat 5a - Asymptomatic Direct and High Risk contact of confirmed
-              case - family Member
-            </li>
-            <li>
-              Cat 5b - Asymptomatic Healthcare worker in contact with confirmed
-              case without adequate protection
-            </li>
-          </span>
-        </div>
-
-        <TextFormField
-          {...field("icmr_label", "ICMR Label")}
-          required
-          id="icmr-label"
-        />
-        <div className="mb-6 w-full flex-none">
-          <FieldLabel>Testing Facility</FieldLabel>
-          <FacilitySelect
-            name="testing_facility"
-            setSelected={(selected) =>
-              dispatch({
-                type: "set_form",
-                form: { ...state.form, testing_facility: selected },
-              })
-            }
-            facilityType={950}
-            selected={state.form.testing_facility}
-            errors={state.errors.testing_facility}
-            showAll
-            multiple={false}
-          />
-        </div>
-        <CheckBoxFormField
-          id="is_fast_track"
-          {...field("isFastTrack", "Is fast-track testing required?")}
-        />
-        {state.form.isFastTrack && (
-          <TextAreaFormField
-            id="fast_track"
-            {...field("fast_track", "Reasons for fast-track testing")}
-            required
-          />
-        )}
-
-        <TextFormField
-          id="doctor_name"
-          {...field("doctor_name", "Doctor's Name")}
-        />
-        <CheckBoxFormField
-          id="is_atypical_presentation"
-          {...field("is_atypical_presentation", "Is atypical presentation?")}
-        />
-        {state.form.is_atypical_presentation && (
-          <div>
-            <TextAreaFormField
-              id="atypical_presentation"
-              {...field(
-                "atypical_presentation",
-                "Atypical presentation details",
-              )}
-              required
-            />
-          </div>
-        )}
-        <TextAreaFormField
-          id="diagnosis"
-          {...field("diagnosis", "Diagnosis")}
-        />
-        <TextAreaFormField
-          id="etiology_identified"
-          {...field("etiology_identified", "Etiology identified")}
-        />
-        <TextAreaFormField
-          id="diff_diagnosis"
-          {...field("diff_diagnosis", "Differential diagnosis")}
-        />
-
-        <CheckBoxFormField
-          id="has_sari"
-          {...field("has_sari", "Has SARI (Severe Acute Respiratory illness)?")}
-        />
-        <CheckBoxFormField
-          id="has_ari"
-          {...field("has_ari", "Has ARI (Acute Respiratory illness)?")}
-        />
-        <CheckBoxFormField
-          id="is_unusual_course"
-          {...field("is_unusual_course", "Is unusual course?")}
-        />
-        <div className="mt-4 flex flex-col justify-end gap-2 lg:flex-row">
-          <Cancel onClick={() => goBack()} />
-          <Submit
-            onClick={handleSubmit}
-            label={buttonText}
-            id="sample-test-submit-btn"
-          />
-        </div>
-      </form>
-    </Page>
-  );
-};
diff --git a/src/components/Patient/SampleTestCard.tsx b/src/components/Patient/SampleTestCard.tsx
deleted file mode 100644
index f1d59980c23..00000000000
--- a/src/components/Patient/SampleTestCard.tsx
+++ /dev/null
@@ -1,227 +0,0 @@
-import { navigate } from "raviger";
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-
-import ButtonV2 from "@/components/Common/ButtonV2";
-import RelativeDateUserMention from "@/components/Common/RelativeDateUserMention";
-import UpdateStatusDialog from "@/components/Patient/UpdateStatusDialog";
-import { SampleTestModel } from "@/components/Patient/models";
-
-import { SAMPLE_TEST_STATUS } from "@/common/constants";
-
-import { NonReadOnlyUsers } from "@/Utils/AuthorizeFor";
-import * as Notification from "@/Utils/Notifications";
-import routes from "@/Utils/request/api";
-import request from "@/Utils/request/request";
-import { formatDateTime } from "@/Utils/utils";
-
-interface SampleDetailsProps {
-  facilityId: string;
-  patientId: string;
-  itemData: SampleTestModel;
-  refetch: () => void;
-  handleApproval: (status: number, sample: SampleTestModel) => void;
-}
-
-export const SampleTestCard = (props: SampleDetailsProps) => {
-  const { t } = useTranslation();
-  const { itemData, handleApproval, facilityId, patientId, refetch } = props;
-
-  const [statusDialog, setStatusDialog] = useState<{
-    show: boolean;
-    sample: SampleTestModel;
-  }>({ show: false, sample: {} });
-
-  const handleApproval1 = async (
-    sample: SampleTestModel,
-    status: number,
-    result: number,
-  ) => {
-    const sampleData: any = {
-      id: sample.id,
-      status,
-      consultation: sample.consultation,
-    };
-    if (status === 7) {
-      sampleData.result = result;
-      sampleData.date_of_result = new Date().toISOString();
-    }
-    const statusName = SAMPLE_TEST_STATUS.find((i) => i.id === status)?.desc;
-    await request(routes.patchSample, {
-      pathParams: {
-        id: sample.id!,
-      },
-      body: sampleData,
-      onResponse: ({ res }) => {
-        if (res?.ok) {
-          refetch();
-          Notification.Success({
-            msg: `Success - ${statusName}`,
-          });
-        }
-        dismissUpdateStatus();
-      },
-    });
-  };
-
-  const showUpdateStatus = (sample: SampleTestModel) => {
-    setStatusDialog({
-      show: true,
-      sample,
-    });
-  };
-
-  const dismissUpdateStatus = () => {
-    setStatusDialog({
-      show: false,
-      sample: {},
-    });
-  };
-
-  return (
-    <div
-      id="sample-test-history"
-      className={`${
-        itemData.result === "POSITIVE"
-          ? "border-red-500 bg-red-100 hover:border-red-700"
-          : itemData.result === "NEGATIVE"
-            ? "border-primary-500 bg-primary-100 hover:border-primary-700"
-            : "bg-white hover:border-primary-500"
-      } mt-4 block cursor-pointer rounded-lg border bg-white p-4 text-black shadow`}
-    >
-      <div
-        onClick={(_e) =>
-          navigate(
-            `/facility/${facilityId}/patient/${patientId}/sample/${itemData.id}`,
-          )
-        }
-        className="ml-2 mt-2 grid grid-cols-1 gap-4 md:grid-cols-4"
-      >
-        <div>
-          <div className="sm:col-span-1">
-            <div className="text-sm font-semibold leading-5 text-zinc-400">
-              Status{" "}
-            </div>
-            <div
-              id="sample-test-status"
-              className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium capitalize leading-5"
-            >
-              {t(`SAMPLE_TEST_HISTORY__${itemData.status}`) || "Unknown"}
-            </div>
-          </div>
-        </div>
-        <div>
-          <div className="sm:col-span-1">
-            <div className="text-sm font-semibold leading-5 text-zinc-400">
-              Sample Type{" "}
-            </div>
-            <div
-              id="sample-test-type"
-              className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium capitalize leading-5"
-            >
-              {itemData.sample_type?.toLowerCase()}
-            </div>
-          </div>
-        </div>
-        {itemData.fast_track && (
-          <div>
-            <div className="sm:col-span-1">
-              <div className="text-sm font-semibold leading-5 text-zinc-400">
-                Fast-Track{" "}
-              </div>
-              <div
-                id="sample-test-fast-track"
-                className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium leading-5"
-              >
-                {itemData.fast_track}
-              </div>
-            </div>
-          </div>
-        )}
-        <div>
-          <div className="sm:col-span-1">
-            <div className="text-sm font-semibold leading-5 text-zinc-400">
-              Result{" "}
-            </div>
-            <div
-              id="sample-test-result"
-              className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium capitalize leading-5"
-            >
-              {t(`SAMPLE_TEST_RESULT__${itemData.result}`) || "Unknown"}
-            </div>
-          </div>
-        </div>
-      </div>
-      <div className="m-2 mt-4 flex flex-col justify-between md:flex-row lg:gap-4">
-        <div className="flex flex-col justify-between gap-4 md:flex-row">
-          <div>
-            <div className="mb-2 text-sm text-secondary-700">
-              <span className="font-medium text-black">Date of Sample:</span>{" "}
-              {itemData.date_of_sample
-                ? formatDateTime(itemData.date_of_sample)
-                : "Not Available"}
-            </div>
-            <div className="text-sm text-secondary-700">
-              <span className="font-medium text-black">Date of Result:</span>{" "}
-              {itemData.date_of_result
-                ? formatDateTime(itemData.date_of_result)
-                : "Not Available"}
-            </div>
-          </div>
-        </div>
-        <div className="flex flex-col gap-2">
-          <div className="flex flex-col flex-nowrap items-center justify-end text-sm text-secondary-700 md:flex-col md:items-start md:justify-start lg:flex-row lg:items-center">
-            <div className="font-medium text-black">Created: </div>
-
-            <RelativeDateUserMention
-              actionDate={itemData.created_date}
-              user={itemData.created_by}
-              tooltipPosition="left"
-            />
-          </div>
-          <div className="flex flex-col items-center justify-end text-sm text-secondary-700 md:flex-col md:items-start lg:flex-row lg:items-center">
-            <div className="font-medium text-black">Last Modified: </div>
-            <RelativeDateUserMention
-              actionDate={itemData.modified_date}
-              user={itemData.last_edited_by}
-              tooltipPosition="left"
-            />
-          </div>
-        </div>
-      </div>
-      <div className="mx-2 mt-4 flex flex-col justify-between gap-2 md:flex-row">
-        {itemData.status === "APPROVED" && (
-          <ButtonV2
-            onClick={(e) => {
-              e.stopPropagation();
-              handleApproval(4, itemData);
-            }}
-            className="border border-secondary-500 bg-white text-black hover:bg-secondary-300"
-          >
-            Send to Collection Centre
-          </ButtonV2>
-        )}
-        <ButtonV2
-          onClick={() => showUpdateStatus(itemData)}
-          className="border border-secondary-500 bg-white text-black hover:bg-secondary-300"
-          authorizeFor={NonReadOnlyUsers}
-        >
-          Update Sample Test Status
-        </ButtonV2>
-        <ButtonV2
-          onClick={(_e) => navigate(`/sample/${itemData.id}`)}
-          className="border border-secondary-500 bg-white text-black hover:bg-secondary-300"
-        >
-          Sample Report
-        </ButtonV2>
-      </div>
-      {statusDialog.show && (
-        <UpdateStatusDialog
-          sample={statusDialog.sample}
-          handleOk={handleApproval1}
-          handleCancel={dismissUpdateStatus}
-        />
-      )}
-    </div>
-  );
-};
diff --git a/src/components/Patient/SampleViewAdmin.tsx b/src/components/Patient/SampleViewAdmin.tsx
deleted file mode 100644
index cf86b582dd8..00000000000
--- a/src/components/Patient/SampleViewAdmin.tsx
+++ /dev/null
@@ -1,423 +0,0 @@
-import { navigate } from "raviger";
-import { useState } from "react";
-
-import CountBlock from "@/CAREUI/display/Count";
-import CareIcon from "@/CAREUI/icons/CareIcon";
-import { AdvancedFilterButton } from "@/CAREUI/interactive/FiltersSlideover";
-
-import { ExportButton } from "@/components/Common/Export";
-import Loading from "@/components/Common/Loading";
-import Page from "@/components/Common/Page";
-import SearchInput from "@/components/Form/SearchInput";
-import SampleFilter from "@/components/Patient/SampleFilters";
-import UpdateStatusDialog from "@/components/Patient/UpdateStatusDialog";
-import { SampleTestModel } from "@/components/Patient/models";
-
-import useFilters from "@/hooks/useFilters";
-
-import {
-  SAMPLE_FLOW_RULES,
-  SAMPLE_TEST_RESULT,
-  SAMPLE_TEST_STATUS,
-  SAMPLE_TYPE_CHOICES,
-} from "@/common/constants";
-
-import * as Notification from "@/Utils/Notifications";
-import routes from "@/Utils/request/api";
-import request from "@/Utils/request/request";
-import useTanStackQueryInstead from "@/Utils/request/useQuery";
-import { formatDateTime } from "@/Utils/utils";
-
-export default function SampleViewAdmin() {
-  const {
-    qParams,
-    updateQuery,
-    Pagination,
-    FilterBadges,
-    advancedFilter,
-    resultsPerPage,
-  } = useFilters({
-    limit: 10,
-    cacheBlacklist: ["patient_name", "district_name"],
-  });
-  let manageSamples: any = null;
-  const [statusDialog, setStatusDialog] = useState<{
-    show: boolean;
-    sample: SampleTestModel;
-  }>({ show: false, sample: {} });
-
-  const { data: facilityData } = useTanStackQueryInstead(
-    routes.getAnyFacility,
-    {
-      pathParams: {
-        id: qParams.facility,
-      },
-      prefetch: !!qParams.facility,
-    },
-  );
-
-  const {
-    loading: isLoading,
-    data: sampeleData,
-    refetch,
-  } = useTanStackQueryInstead(routes.getTestSampleList, {
-    query: {
-      limit: resultsPerPage,
-      offset: (qParams.page ? qParams.page - 1 : 0) * resultsPerPage,
-      patient_name: qParams.patient_name || undefined,
-      district_name: qParams.district_name || undefined,
-      status: qParams.status || undefined,
-      result: qParams.result || undefined,
-      facility: qParams.facility || undefined,
-      sample_type: qParams.sample_type || undefined,
-    },
-  });
-
-  const handleApproval = async (
-    sample: SampleTestModel,
-    status: number,
-    result: number,
-  ) => {
-    const sampleData: any = {
-      id: sample.id,
-      status,
-      consultation: sample.consultation,
-    };
-    if (status === 7) {
-      sampleData.result = result;
-      sampleData.date_of_result = new Date().toISOString();
-    }
-    const statusName = SAMPLE_TEST_STATUS.find((i) => i.id === status)?.desc;
-
-    await request(routes.patchSample, {
-      pathParams: {
-        id: sample.id || 0,
-      },
-      body: sampleData,
-      onResponse: ({ res }) => {
-        if (res?.ok) {
-          Notification.Success({
-            msg: `Success - ${statusName}`,
-          });
-          refetch();
-        }
-        dismissUpdateStatus();
-      },
-    });
-  };
-
-  const showUpdateStatus = (sample: SampleTestModel) => {
-    setStatusDialog({
-      show: true,
-      sample,
-    });
-  };
-
-  const dismissUpdateStatus = () => {
-    setStatusDialog({
-      show: false,
-      sample: {},
-    });
-  };
-
-  const parseExportData = (data: string) => {
-    const [header, ...rows] = data.trim().split("\n");
-    const headerColumns = header.split(",").map((col) => col.trim());
-
-    return [
-      header,
-      ...rows.map((row) => {
-        const columns = row.split(",").map((field, index) => {
-          const header = headerColumns[index];
-
-          if (header === "Patient Age") {
-            return field.trim();
-          }
-
-          if (["Date of Sample", "Date of Result"].includes(header)) {
-            const formattedDate = formatDateTime(field.trim());
-            return formattedDate === "Invalid Date" ? "" : formattedDate;
-          }
-          return field.includes(",") ? `"${field.trim()}"` : field.trim();
-        });
-
-        return columns.join(",");
-      }),
-    ].join("\n");
-  };
-
-  let sampleList: any[] = [];
-  if (sampeleData?.count) {
-    sampleList = sampeleData.results.map((item) => {
-      const status = String(item.status) as keyof typeof SAMPLE_FLOW_RULES;
-      const statusText = SAMPLE_TEST_STATUS.find(
-        (i) => i.text === status,
-      )?.desc;
-      return (
-        <div key={`usr_${item.id}`} className="mt-6 w-full lg:w-1/2 lg:px-4">
-          <div
-            className={`block h-full rounded-lg border text-black shadow hover:border-black ${
-              item.result === "POSITIVE"
-                ? "border-red-700 bg-red-100"
-                : item.result === "NEGATIVE"
-                  ? "border-primary-700 bg-primary-100"
-                  : "bg-white"
-            }`}
-          >
-            <div className="flex h-full flex-col justify-between px-6 py-4">
-              <div>
-                <div className="flex flex-col md:flex-row md:justify-between">
-                  <div
-                    id="sample-test-patient-name"
-                    className="mb-2 text-xl font-bold capitalize"
-                  >
-                    {item.patient_name}
-                  </div>
-                  <div>
-                    {item.sample_type && (
-                      <span className="mx-1 truncate text-wrap rounded-md bg-blue-200 px-2 py-1 text-sm font-bold text-blue-800">
-                        Type: {item.sample_type}
-                      </span>
-                    )}
-                  </div>
-                </div>
-                {item.result !== "AWAITING" && (
-                  <div className="capitalize">
-                    <span className="font-semibold leading-relaxed">
-                      Result:{" "}
-                    </span>
-                    {item.result ? item.result.toLocaleLowerCase() : "-"}
-                  </div>
-                )}
-                <div>
-                  <span className="font-semibold leading-relaxed">
-                    Status:{" "}
-                  </span>
-                  {statusText}
-                </div>
-                {item.facility_object && (
-                  <div>
-                    <span className="font-semibold leading-relaxed">
-                      Facility:{" "}
-                    </span>
-                    {item.facility_object.name}
-                  </div>
-                )}
-                {item.fast_track && (
-                  <div>
-                    <span className="font-semibold leading-relaxed">
-                      Fast track:{" "}
-                    </span>
-                    {item.fast_track}
-                  </div>
-                )}
-                {item.patient_has_confirmed_contact && (
-                  <div>
-                    <span className="font-semibold leading-relaxed">
-                      Contact:{" "}
-                    </span>
-                    Confirmed carrier
-                    <CareIcon
-                      icon="l-exclamation-triangle"
-                      className="text-xl font-bold text-red-500"
-                    />
-                  </div>
-                )}
-                {item.patient_has_suspected_contact &&
-                  !item.patient_has_confirmed_contact && (
-                    <div>
-                      <span className="font-semibold leading-relaxed">
-                        Contact:{" "}
-                      </span>
-                      Suspected carrier
-                      <CareIcon
-                        icon="l-exclamation-triangle"
-                        className="text-xl font-bold text-yellow-500"
-                      />
-                    </div>
-                  )}
-                {item.has_sari && (
-                  <div>
-                    <span className="font-semibold leading-relaxed">
-                      SARI:{" "}
-                    </span>
-                    Severe Acute Respiratory illness
-                    <CareIcon
-                      icon="l-exclamation-triangle"
-                      className="text-xl font-bold text-orange-500"
-                    />
-                  </div>
-                )}
-                {item.has_ari && !item.has_sari && (
-                  <div>
-                    <span className="font-semibold leading-relaxed">ARI: </span>
-                    Acute Respiratory illness
-                    <CareIcon
-                      icon="l-exclamation-triangle"
-                      className="text-xl font-bold text-yellow-500"
-                    />
-                  </div>
-                )}
-              </div>
-
-              <div className="mt-4">
-                <div className="text-sm font-bold text-secondary-600">
-                  <span className="text-secondary-800">Date of Sample:</span>{" "}
-                  {item.date_of_sample
-                    ? formatDateTime(item.date_of_sample)
-                    : "Not Available"}
-                </div>
-
-                <div className="text-sm font-bold text-secondary-600">
-                  <span className="text-secondary-800">Date of Result:</span>{" "}
-                  {item.date_of_result
-                    ? formatDateTime(item.date_of_result)
-                    : "Not Available"}
-                </div>
-              </div>
-
-              <div className="mt-2">
-                {item.result === "AWAITING" && (
-                  <div className="mt-2">
-                    <button
-                      onClick={() => showUpdateStatus(item)}
-                      className="w-full rounded border border-secondary-400 bg-primary-500 px-4 py-2 text-center text-sm font-semibold text-white shadow hover:bg-primary-700"
-                    >
-                      UPDATE SAMPLE TEST STATUS
-                    </button>
-                  </div>
-                )}
-
-                <button
-                  id="sample-details-btn"
-                  onClick={() => navigate(`/sample/${item.id}`)}
-                  className="mt-2 w-full rounded border border-secondary-400 bg-white px-4 py-2 text-center text-sm font-semibold text-secondary-800 shadow hover:bg-secondary-400"
-                >
-                  Sample Details
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-      );
-    });
-  }
-
-  if (isLoading || !sampeleData) {
-    manageSamples = (
-      <div className="flex w-full justify-center">
-        <Loading />
-      </div>
-    );
-  } else if (sampeleData?.count) {
-    manageSamples = (
-      <>
-        {sampleList}
-        <Pagination totalCount={sampeleData?.count} />
-      </>
-    );
-  } else if (sampeleData?.count === 0) {
-    manageSamples = (
-      <div className="w-full rounded-lg bg-white p-3">
-        <div className="mt-4 flex w-full justify-center text-2xl font-bold text-secondary-600">
-          No Sample Tests Found
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <Page
-      title="Sample Management System"
-      hideBack={true}
-      breadcrumbs={false}
-      componentRight={
-        <ExportButton
-          action={async () => {
-            const { data } = await request(routes.getTestSampleList, {
-              query: { ...qParams, csv: true },
-            });
-            return data ?? null;
-          }}
-          parse={parseExportData}
-          filenamePrefix="samples"
-        />
-      }
-    >
-      {statusDialog.show && (
-        <UpdateStatusDialog
-          sample={statusDialog.sample}
-          handleOk={handleApproval}
-          handleCancel={dismissUpdateStatus}
-        />
-      )}
-      <div className="mt-5 gap-5 lg:grid lg:grid-cols-1">
-        <div className="flex flex-col justify-between gap-6 lg:flex-row">
-          <div className="w-full">
-            <CountBlock
-              text="Total Samples Taken"
-              count={sampeleData?.count || 0}
-              loading={isLoading}
-              icon="d-microscope"
-              className="flex-1"
-            />
-          </div>
-
-          <div className="flex w-full flex-col gap-3">
-            <SearchInput
-              name="patient_name"
-              id="search_patient_name"
-              value={qParams.patient_name}
-              onChange={(e) => updateQuery({ [e.name]: e.value })}
-              placeholder="Search patient"
-            />
-            <SearchInput
-              name="district_name"
-              value={qParams.district_name}
-              onChange={(e) => updateQuery({ [e.name]: e.value })}
-              placeholder="Search by district"
-              secondary
-            />
-          </div>
-
-          <AdvancedFilterButton onClick={() => advancedFilter.setShow(true)} />
-          <SampleFilter {...advancedFilter} key={window.location.search} />
-        </div>
-        <FilterBadges
-          badges={({ badge, value }) => [
-            badge("Patient Name", "patient_name"),
-            badge("District Name", "district_name"),
-            value(
-              "Status",
-              "status",
-              SAMPLE_TEST_STATUS.find(
-                (status) => status.id == qParams.status,
-              )?.text.replaceAll("_", " ") || "",
-            ),
-            value(
-              "Result",
-              "result",
-              SAMPLE_TEST_RESULT.find((result) => result.id == qParams.result)
-                ?.text || "",
-            ),
-            value(
-              "Sample Test Type",
-              "sample_type",
-              SAMPLE_TYPE_CHOICES.find(
-                (type) => type.id === qParams.sample_type,
-              )?.text || "",
-            ),
-            value(
-              "Facility",
-              "facility",
-              qParams.facility ? facilityData?.name || "" : "",
-            ),
-          ]}
-        />
-      </div>
-      <div className="md:px-2">
-        <div className="flex flex-wrap md:-mx-2 lg:-mx-6">{manageSamples}</div>
-      </div>
-    </Page>
-  );
-}
diff --git a/src/components/Patient/UpdateStatusDialog.tsx b/src/components/Patient/UpdateStatusDialog.tsx
deleted file mode 100644
index e9a767847aa..00000000000
--- a/src/components/Patient/UpdateStatusDialog.tsx
+++ /dev/null
@@ -1,230 +0,0 @@
-import { useEffect, useReducer } from "react";
-import { useTranslation } from "react-i18next";
-
-import CareIcon from "@/CAREUI/icons/CareIcon";
-
-import { Button } from "@/components/ui/button";
-
-import ConfirmDialog from "@/components/Common/ConfirmDialog";
-import { LinearProgressWithLabel } from "@/components/Files/FileUpload";
-import CheckBoxFormField from "@/components/Form/FormFields/CheckBoxFormField";
-import { SelectFormField } from "@/components/Form/FormFields/SelectFormField";
-import TextFormField from "@/components/Form/FormFields/TextFormField";
-import { FieldChangeEvent } from "@/components/Form/FormFields/Utils";
-
-import useFileUpload from "@/hooks/useFileUpload";
-
-import {
-  SAMPLE_FLOW_RULES,
-  SAMPLE_TEST_RESULT,
-  SAMPLE_TEST_STATUS,
-} from "@/common/constants";
-
-import * as Notification from "@/Utils/Notifications";
-
-import { SampleTestModel } from "./models";
-
-interface Props {
-  sample: SampleTestModel;
-  handleOk: (sample: SampleTestModel, status: number, result: number) => void;
-  handleCancel: () => void;
-}
-
-const statusChoices = [...SAMPLE_TEST_STATUS];
-const statusFlow = { ...SAMPLE_FLOW_RULES };
-
-const initForm: any = {
-  confirm: false,
-  status: 0,
-  result: 0,
-  disabled: true,
-};
-
-const initialState = {
-  form: { ...initForm },
-};
-
-const updateStatusReducer = (state = initialState, action: any) => {
-  switch (action.type) {
-    case "set_form": {
-      return {
-        ...state,
-        form: action.form,
-      };
-    }
-    default:
-      return state;
-  }
-};
-const UpdateStatusDialog = (props: Props) => {
-  const { t } = useTranslation();
-  const { sample, handleOk, handleCancel } = props;
-  const [state, dispatch] = useReducer(updateStatusReducer, initialState);
-
-  const fileUpload = useFileUpload({
-    type: "SAMPLE_MANAGEMENT",
-    allowedExtensions: ["pdf", "jpg", "jpeg", "png"],
-    allowNameFallback: true,
-  });
-  const currentStatus = SAMPLE_TEST_STATUS.find(
-    (i) => i.text === sample.status,
-  );
-
-  const status = String(sample.status) as keyof typeof SAMPLE_FLOW_RULES;
-  const validStatusChoices = statusChoices.filter(
-    (i) => status && statusFlow[status] && statusFlow[status].includes(i.text),
-  );
-
-  useEffect(() => {
-    const form = { ...state.form };
-    form.status = 0;
-    dispatch({ type: "set_form", form });
-  }, []);
-
-  const okClicked = () => {
-    handleOk(sample, state.form.status, state.form.result);
-    dispatch({ type: "set_form", form: initForm });
-  };
-
-  const cancelClicked = () => {
-    handleCancel();
-    dispatch({ type: "set_form", form: initForm });
-  };
-
-  const handleChange = ({ name, value }: FieldChangeEvent<unknown>) => {
-    const form = { ...state.form };
-    form[name] = name === "status" || name === "result" ? Number(value) : value;
-    form.disabled =
-      !form.status || !form.confirm || (form.status === 7 && !form.result);
-    dispatch({ type: "set_form", form });
-  };
-
-  const handleUpload = async () => {
-    if (fileUpload.files.length > 0) {
-      if (!fileUpload.fileNames[0]) {
-        Notification.Error({
-          msg: "Please enter a file name before uploading",
-        });
-        return;
-      }
-      if (sample.id) {
-        await fileUpload.handleFileUpload(sample.id);
-        if (!fileUpload.error) {
-          return;
-        } else {
-          Notification.Error({ msg: `Upload failed: ${fileUpload.error}` });
-        }
-      } else {
-        Notification.Error({ msg: "Sample ID is missing" });
-      }
-    } else {
-      Notification.Error({ msg: "No file selected for upload" });
-    }
-  };
-
-  return (
-    <ConfirmDialog
-      title="Update Sample Test Status"
-      show
-      onClose={cancelClicked}
-      onConfirm={okClicked}
-      disabled={state.form.disabled}
-      action="Update Status"
-    >
-      <div className="mt-4 flex flex-col">
-        <TextFormField
-          label="Current Status"
-          name="currentStatus"
-          value={currentStatus?.desc}
-          disabled
-          onChange={handleChange}
-        />
-        <SelectFormField
-          label="New Status"
-          name="status"
-          value={state.form.status}
-          options={validStatusChoices}
-          optionLabel={(i) => i.desc}
-          optionValue={(i) => i.id}
-          onChange={handleChange}
-        />
-        {Number(state.form.status) === 7 && (
-          <>
-            <SelectFormField
-              label="Result"
-              name="result"
-              value={state.form.result}
-              options={SAMPLE_TEST_RESULT}
-              optionLabel={(i) => i.text}
-              optionValue={(i) => i.id}
-              onChange={handleChange}
-            />
-            <span className="font-semibold leading-relaxed">
-              {t("upload_report")}:
-            </span>
-            {fileUpload.files[0] ? (
-              <div className="mb-8 rounded-lg border border-secondary-300 bg-white p-4">
-                <div className="mb-4 flex items-center justify-between gap-2 rounded-md bg-secondary-300 px-4 py-2">
-                  <span>
-                    <CareIcon icon="l-paperclip" className="mr-2" />
-                    {fileUpload.files[0].name}
-                  </span>
-                </div>
-                <TextFormField
-                  name="sample_file_name"
-                  type="text"
-                  label={t("enter_file_name")}
-                  id="upload-file-name"
-                  value={fileUpload.fileNames[0] || ""}
-                  disabled={fileUpload.uploading}
-                  onChange={(e) => fileUpload.setFileName(e.value)}
-                  error={fileUpload.error || undefined}
-                  required
-                />
-                <div className="flex items-center gap-2">
-                  <Button
-                    onClick={handleUpload}
-                    disabled={fileUpload.uploading}
-                    className="w-full"
-                    id="upload_file_button"
-                    variant={"primary"}
-                  >
-                    <CareIcon icon="l-check" className="mr-2" />
-                    {t("upload")}
-                  </Button>
-                  <Button
-                    variant={"destructive"}
-                    onClick={fileUpload.clearFiles}
-                    disabled={fileUpload.uploading}
-                  >
-                    <CareIcon icon="l-trash-alt" className="mr-2" />
-                    {t("discard")}
-                  </Button>
-                </div>
-                {!!fileUpload.progress && (
-                  <LinearProgressWithLabel value={fileUpload.progress} />
-                )}
-              </div>
-            ) : (
-              <div className="mt-5 mb-8 flex w-full flex-col items-center gap-4 md:flex-row">
-                <label className="flex w-full cursor-pointer items-center justify-center gap-2 rounded-lg border border-dashed border-primary-500/20 bg-primary-500/10 p-3 text-primary-700 transition-all hover:bg-primary-500/20 md:p-6">
-                  <CareIcon icon={"l-file-upload-alt"} className="text-2xl" />
-                  <div className="text-lg">{t("choose_file")}</div>
-                  <fileUpload.Input />
-                </label>
-              </div>
-            )}
-          </>
-        )}
-        <CheckBoxFormField
-          label="I agree to update the sample test status."
-          name="confirm"
-          value={state.form.confirm}
-          onChange={handleChange}
-        />
-      </div>
-    </ConfirmDialog>
-  );
-};
-
-export default UpdateStatusDialog;
diff --git a/src/components/Patient/models.tsx b/src/components/Patient/models.tsx
index 2b1c3c84d0c..dc3a0f5f681 100644
--- a/src/components/Patient/models.tsx
+++ b/src/components/Patient/models.tsx
@@ -143,137 +143,6 @@ export interface PatientModel {
   age?: string;
 }
 
-export interface SampleTestModel {
-  patient_object?: PatientModel;
-  atypical_presentation?: string;
-  diagnosis?: string;
-  diff_diagnosis?: string;
-  testing_facility?: string;
-  doctor_name?: string;
-  etiology_identified?: string;
-  has_ari?: boolean;
-  has_sari?: boolean;
-  is_atypical_presentation?: boolean;
-  is_unusual_course?: boolean;
-  sample_type?: string;
-  sample_type_other?: string;
-  id?: string;
-  status?: string;
-  result?: string;
-  icmr_category?: string;
-  icmr_label?: string;
-  date_of_sample?: string;
-  date_of_result?: string;
-  consultation?: number;
-  patient_name?: string;
-  patient_has_sari?: boolean;
-  patient_has_confirmed_contact?: boolean;
-  patient_has_suspected_contact?: boolean;
-  patient_travel_history?: string[];
-  facility?: number;
-  facility_object?: {
-    id: number;
-    name: string;
-    facility_type?: { id: number; name: string };
-  };
-  patient?: number;
-  fast_track?: string;
-  isFastTrack?: boolean;
-  flow?: Array<FlowModel>;
-  created_by?: any;
-  last_edited_by?: any;
-  created_date?: string;
-  modified_date?: string;
-}
-
-export interface SampleReportModel {
-  id?: number;
-  personal_details?: {
-    name?: string;
-    gender?: string;
-    age_years?: number;
-    age_months?: number;
-    date_of_birth?: string;
-    phone_number?: string;
-    email?: string;
-    address?: string;
-    pincode?: string;
-    passport_no?: string;
-    aadhaar_no?: string;
-    local_body_name?: string;
-    district_name?: string;
-    state_name?: string;
-  };
-  specimen_details?: {
-    created_date?: string;
-    sample_type?: string;
-    collection_type?: string;
-    icmr_category?: string;
-    icmr_label?: string;
-    is_repeated_sample?: boolean;
-    lab_name?: string;
-    lab_pincode?: string;
-  };
-  patient_category?: {
-    symptomatic_international_traveller?: boolean;
-    symptomatic_contact_of_confirmed_case?: boolean;
-    symptomatic_healthcare_worker?: boolean;
-    hospitalized_sari_patient?: boolean;
-    asymptomatic_family_member_of_confirmed_case?: boolean;
-    asymptomatic_healthcare_worker_without_protection?: boolean;
-  };
-  exposure_history?: {
-    has_travel_to_foreign_last_14_days?: boolean;
-    places_of_travel?: Array<string>;
-    travel_start_date?: string;
-    travel_end_date?: string;
-    contact_with_confirmed_case?: boolean;
-    contact_case_name?: string;
-    was_quarantined?: boolean;
-    quarantined_type?: string;
-    healthcare_worker?: boolean;
-  };
-  medical_conditions?: {
-    date_of_onset_of_symptoms?: string;
-    symptoms?: Array<any>;
-    has_sari?: boolean;
-    has_ari?: boolean;
-    medical_conditions_list?: Array<any>;
-    hospitalization_date?: string;
-    diagnosis?: string;
-    diff_diagnosis?: string;
-    etiology_identified?: string;
-    is_atypical_presentation?: boolean;
-    is_unusual_course?: boolean;
-    hospital_phone_number?: string;
-    hospital_name?: string;
-    doctor_name?: string;
-    hospital_pincode?: string;
-  };
-}
-
-export interface SampleListModel {
-  id?: number;
-  patient_name?: string;
-  patient_has_sari?: boolean;
-  patient_has_confirmed_contact?: boolean;
-  patient_has_suspected_contact?: boolean;
-  patient_travel_history?: string;
-  facility?: number;
-  facility_object?: {
-    id: number;
-    name: string;
-    facility_type?: { id: number; name: string };
-  };
-  status?: string;
-  result?: string;
-  patient?: number;
-  consultation?: number;
-  date_of_sample?: string;
-  date_of_result?: string;
-  fast_track?: string;
-}
-
 export const DailyRoundTypes = [
   "NORMAL",
   "COMMUNITY_NURSES_LOG",
diff --git a/src/components/Users/UserViewDetails.tsx b/src/components/Users/UserViewDetails.tsx
index 8b6fb40a1d3..9f4c78fbacf 100644
--- a/src/components/Users/UserViewDetails.tsx
+++ b/src/components/Users/UserViewDetails.tsx
@@ -1,5 +1,7 @@
 import { useTranslation } from "react-i18next";
 
+import { formatDate } from "@/Utils/utils";
+
 import { UserModel } from "./models";
 
 interface UserViewDetailsProps {
@@ -77,11 +79,7 @@ export const BasicInfoDetails = ({ user }: UserViewDetailsProps) => {
         <LabelValue
           id="date_of_birth"
           label={t("date_of_birth")}
-          value={
-            user.date_of_birth
-              ? new Date(user.date_of_birth).toLocaleDateString()
-              : null
-          }
+          value={user.date_of_birth ? formatDate(user.date_of_birth) : null}
         />
       </div>
     </div>
diff --git a/src/hooks/useActiveLink.ts b/src/hooks/useActiveLink.ts
index b52b15600dd..609a518bc6d 100644
--- a/src/hooks/useActiveLink.ts
+++ b/src/hooks/useActiveLink.ts
@@ -12,7 +12,6 @@ const activeLinkPriority = {
   "/patient/": "/patients",
   "/death_report": "/patients",
   "/assets": "/assets",
-  "/sample": "/sample",
   "/shifting": "/shifting",
   "/resource": "/resource",
   "/users": "/users",