From 758d431d3c6a3de10eed290e32eb07de5ba6d9d9 Mon Sep 17 00:00:00 2001
From: Rugute <rrugute@gmail.com>
Date: Tue, 23 Jul 2024 15:26:03 +0300
Subject: [PATCH 1/2] sorted Defaulter Tracing

---
 packages/esm-patient-clinical-view-app/src/config-schema.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/esm-patient-clinical-view-app/src/config-schema.ts b/packages/esm-patient-clinical-view-app/src/config-schema.ts
index d05df70..88aa59b 100755
--- a/packages/esm-patient-clinical-view-app/src/config-schema.ts
+++ b/packages/esm-patient-clinical-view-app/src/config-schema.ts
@@ -16,7 +16,7 @@ export const configSchema = {
       antenatal: 'e8f98494-af35-4bb8-9fc7-c409c8fed843',
       postNatal: '72aa78e0-ee4b-47c3-9073-26f3b9ecc4a7',
       labourAndDelivery: '496c7cc3-0eea-4e84-a04c-2292949e2f7f',
-      defaulterTracingFormUuid: 'a1a62d1e-2def-11e9-b210-d663bd873d93',
+      defaulterTracingFormUuid: 'f3ba9242-9bbb-4284-a0c0-56ac6f0cec65',
       htsScreening: '7a16a346-0991-48ac-b339-aacd463a7845',
       htsInitialTest: 'edb264d4-91fc-4d16-bb34-a413eef2b865',
       htsRetest: 'ef3d58b9-7186-40f2-b601-3d568259d392',
@@ -28,7 +28,7 @@ export const configSchema = {
   defaulterTracingEncounterUuid: {
     _type: Type.String,
     _description: 'Encounter UUID for defaulter tracing',
-    _default: '1495edf8-2df2-11e9-b210-d663bd873d93',
+    _default: 'df5547bc-1350-11df-a1f1-0026b9348838',
   },
   clinicalEncounterUuid: {
     _type: Type.String,

From 31b343653fc360f8bc0aa55cfbe7ca83ef4b6603 Mon Sep 17 00:00:00 2001
From: Rugute <rrugute@gmail.com>
Date: Wed, 24 Jul 2024 11:29:28 +0300
Subject: [PATCH 2/2] sorted HTS Encounters

---
 .DS_Store                                     |  Bin 6148 -> 6148 bytes
 package.json                                  |    7 +-
 packages/esm-ampath-core-app/jest.config.js   |    3 -
 packages/esm-ampath-core-app/package.json     |   55 -
 .../ampath-dashboard.component.tsx            |   80 --
 .../ampath-dashboard/ampath-dashboard.scss    |   47 -
 .../ampath-dashboard-side-nav.component.tsx   |   22 -
 .../side-menu/ampath-dashboard-side-nav.scss  |   35 -
 .../stock-management-dashboard.component.tsx  |    8 -
 packages/esm-ampath-core-app/src/api/api.ts   |    0
 packages/esm-ampath-core-app/src/api/type.ts  |    0
 .../src/clinical-view-section.component.tsx   |   36 -
 .../src/clinical-view-section.scss            |   20 -
 .../esm-ampath-core-app/src/config-schema.ts  |   12 -
 .../src/dashboard-group.component.tsx         |   39 -
 .../src/dashboard-group.scss                  |   21 -
 .../src/dashboard.meta.tsx                    |    9 -
 .../esm-ampath-core-app/src/declarations.d.ts |    4 -
 packages/esm-ampath-core-app/src/index.ts     |   27 -
 .../src/root.component.tsx                    |   15 -
 packages/esm-ampath-core-app/src/root.scss    |    0
 packages/esm-ampath-core-app/src/root.tsx     |   15 -
 packages/esm-ampath-core-app/src/routes.json  |   17 -
 .../esm-ampath-core-app/translations/en.json  |    5 -
 packages/esm-ampath-core-app/tsconfig.json    |    5 -
 .../esm-ampath-core-app/webpack.config.js     |    1 -
 packages/esm-billing-app/README.md            |    5 -
 .../esm-billing-app/__mocks__/visit.mock.ts   |  151 ---
 packages/esm-billing-app/jest.config.js       |    8 -
 packages/esm-billing-app/package.json         |   54 -
 .../bill-history/bill-history.component.tsx   |  210 ---
 .../src/bill-history/bill-history.scss        |  165 ---
 ...ble-services-admin-card-link.component.tsx |   24 -
 .../bill-waiver/bill-selection.component.tsx  |   74 --
 .../bill-waiver-form.component.tsx            |  105 --
 .../bill-waiver/bill-waiver-form.scss         |   34 -
 .../bill-waiver/bill-waiver.component.tsx     |   33 -
 .../bill-waiver/bill-waiver.scss              |   10 -
 .../bill-waiver/patient-bills.component.tsx   |  135 --
 .../billable-service.resource.tsx             |   55 -
 .../billable-services-home.component.tsx      |   59 -
 .../billable-services.component.tsx           |  255 ----
 .../billable-services/billable-services.scss  |  219 ----
 .../drug-order/drug-order.component.tsx       |   64 -
 .../billiable-item/drug-order/drug-order.scss |   31 -
 .../test-order/imaging-order.component.tsx    |   33 -
 .../test-order/lab-order.component.tsx        |   33 -
 .../test-order/price-info-order.componet.tsx  |   62 -
 .../test-order/price-info-order.scss          |   20 -
 .../test-order/procedure-order.component.tsx  |   33 -
 .../test-order-action.component.tsx           |   50 -
 .../test-order/test-order-action.resource.tsx |   54 -
 .../billiable-item/useBillableItem.tsx        |   49 -
 .../add-billing-tariffs-service.scss          |  164 ---
 ...add-billings-tariffs-service.component.tsx |  183 ---
 .../billing-tariffs-admin-card.tsx            |    0
 .../billing-tariffs-services.scss             |  219 ----
 .../billing-tariffs.component.tsx             |  286 ----
 .../billing-tariffs.resource.tsx              |   55 -
 .../add-billable-service.component.tsx        |  354 -----
 .../create-edit/add-billable-service.scss     |  164 ---
 .../dashboard/dashboard.component.tsx         |   18 -
 .../dashboard/dashboard.scss                  |   27 -
 .../dashboard/service-metrics.component.tsx   |   40 -
 .../billing-dashboard.component.tsx           |   19 -
 .../billing-dashboard/billing-dashboard.scss  |   27 -
 .../billing-checkin-form.component.tsx        |  137 --
 .../billing-form/billing-checkin-form.scss    |   14 -
 .../billing-form/billing-form.component.tsx   |  301 -----
 .../src/billing-form/billing-form.scss        |   28 -
 .../src/billing-form/helper.ts                |    2 -
 .../sha-number-validity.component.tsx         |   77 --
 .../visit-attributes-form.component.tsx       |  206 ---
 .../visit-attributes-form.scss                |   18 -
 .../billing-header.component.tsx              |   43 -
 .../src/billing-header/billing-header.scss    |   83 --
 .../billing-illustration.component.tsx        |   30 -
 .../billing-prompt.resource.tsx               |   45 -
 .../src/billing-tabs/billing-tab.scss         |    0
 .../billing-tabs/billling-tabs.component.tsx  |   38 -
 .../esm-billing-app/src/billing.resource.ts   |  225 ----
 .../src/bills-table/bills-table.component.tsx |  288 ----
 .../src/bills-table/bills-table.scss          |  181 ---
 .../claims-wrap/claims-main-component.tsx     |   35 -
 .../src/claims/claims-wrap/claims-main.scss   |   25 -
 .../claims-breakdown.component.tsx            |   19 -
 .../claims-breakdown/claims-breakdown.scss    |   35 -
 .../dashboard/claims-dashboard.component.tsx  |   41 -
 .../dashboard/form/claims-form.component.tsx  |  396 ------
 .../dashboard/form/claims-form.resource.ts    |   49 -
 .../claims/dashboard/form/claims-form.scss    |  145 ---
 .../header/claims-header.component.tsx        |   23 -
 .../dashboard/header/claims-header.scss       |   23 -
 .../table/claims-table.component.tsx          |  212 ---
 .../claims/dashboard/table/claims-table.scss  |  108 --
 .../src/claims/make-claims.component.tsx      |   28 -
 .../src/claims/make-claims.scss               |    7 -
 .../claims/metrics/metrics-card.component.tsx |   36 -
 .../src/claims/metrics/metrics-card.scss      |   76 --
 .../metrics/metrics-header.component.tsx      |   16 -
 .../src/claims/metrics/metrics-header.scss    |   16 -
 .../src/claims/metrics/metrics.component.tsx  |   47 -
 .../src/claims/metrics/metrics.scss           |   10 -
 packages/esm-billing-app/src/config-schema.ts |  133 --
 packages/esm-billing-app/src/constants.ts     |    3 -
 .../esm-billing-app/src/dashboard.meta.ts     |    6 -
 .../esm-billing-app/src/declarations.d.ts     |    4 -
 .../esm-billing-app/src/helpers/functions.ts  |   97 --
 packages/esm-billing-app/src/helpers/index.ts |    1 -
 .../esm-billing-app/src/hooks/getMflCode.tsx  |   19 -
 .../src/hooks/usePatientAttributes.tsx        |   26 -
 .../src/hooks/useRequestStatus.tsx            |   55 -
 packages/esm-billing-app/src/index.ts         |   62 -
 .../src/invoice/invoice-table.component.tsx   |  193 ---
 .../src/invoice/invoice-table.scss            |   91 --
 .../src/invoice/invoice.component.tsx         |  168 ---
 .../esm-billing-app/src/invoice/invoice.scss  |  111 --
 .../initiate-payment.component.tsx            |  159 ---
 .../initiate-payment/initiate-payment.scss    |   38 -
 .../invoice-breakdown.component.tsx           |   17 -
 .../invoice-breakdown/invoice-breakdown.scss  |   29 -
 .../payment-form/payment-form.component.tsx   |  125 --
 .../payments/payment-form/payment-form.scss   |   54 -
 .../payment-history.component.tsx             |   64 -
 .../invoice/payments/payments.component.tsx   |  129 --
 .../src/invoice/payments/payments.resource.ts |   35 -
 .../src/invoice/payments/payments.scss        |   46 -
 .../src/invoice/payments/utils.ts             |   83 --
 .../visit-tags/visit-attribute.component.tsx  |   21 -
 .../print-receipt.component.tsx               |   28 -
 .../printable-invoice/print-receipt.scss      |   10 -
 .../printable-footer.component.tsx            |   33 -
 .../printable-invoice/printable-footer.scss   |   24 -
 .../printable-footer.test.tsx                 |   19 -
 .../printable-invoice-header.component.tsx    |   63 -
 .../printable-invoice-header.scss             |   61 -
 .../printable-invoice-header.test.tsx         |   56 -
 .../printable-invoice.component.tsx           |  134 --
 .../printable-invoice/printable-invoice.scss  |   60 -
 .../src/left-panel-link.component.tsx         |   40 -
 .../src/m-pesa/mpesa-resource.tsx             |   81 --
 .../src/metrics-cards/card.component.tsx      |   11 -
 .../src/metrics-cards/card.scss               |   20 -
 .../metrics-cards/metrics-cards.component.tsx |   42 -
 .../src/metrics-cards/metrics-cards.scss      |   12 -
 .../src/metrics-cards/metrics.resource.ts     |   45 -
 .../modal/require-payment-modal.component.tsx |  112 --
 .../src/modal/require-payment.scss            |   18 -
 .../filtered-patient-bills.component.tsx      |  119 --
 .../patient-bills-dashboard.scss              |   11 -
 .../patient-bills-dashboard.tsx               |   34 -
 .../src/past-patient-bills/patient-bills.scss |   11 -
 .../esm-billing-app/src/root.component.tsx    |   21 -
 packages/esm-billing-app/src/root.scss        |   30 -
 packages/esm-billing-app/src/routes.json      |  114 --
 packages/esm-billing-app/src/types/index.ts   |  278 ----
 packages/esm-billing-app/src/utils.ts         |   87 --
 packages/esm-billing-app/translations/en.json |  166 ---
 packages/esm-billing-app/tsconfig.json        |    5 -
 packages/esm-billing-app/webpack.config.js    |    1 -
 packages/esm-hts-app/jest.config.js           |    3 -
 packages/esm-hts-app/package.json             |   54 -
 packages/esm-hts-app/src/config-schema.ts     |   12 -
 packages/esm-hts-app/src/dashboard.meta.tsx   |   37 -
 packages/esm-hts-app/src/dashboard.scss       |   27 -
 packages/esm-hts-app/src/declarations.d.ts    |    4 -
 .../src/header/hts-header.component.tsx       |   32 -
 .../esm-hts-app/src/header/hts-header.scss    |   68 -
 .../src/header/hts-illustration.component.tsx |   13 -
 packages/esm-hts-app/src/hts.component.tsx    |   31 -
 packages/esm-hts-app/src/hts.scss             |    9 -
 packages/esm-hts-app/src/index.ts             |   67 -
 .../src/left-panel-link.component.tsx         |   32 -
 packages/esm-hts-app/src/root.component.tsx   |   17 -
 packages/esm-hts-app/src/root.scss            |    3 -
 packages/esm-hts-app/src/routes.json          |   94 --
 .../src/views/dashboard/common.scss           |   34 -
 .../hts-program-services/common.scss          |   34 -
 .../hts-initial.component.tsx                 |   17 -
 .../hts-linkage.component.tsx                 |   17 -
 .../hts-program-services.tsx                  |   39 -
 .../hts-program-services/hts-program.scss     |   34 -
 .../hts-referred.component.tsx                |   17 -
 .../hts-retest.component.tsx                  |   17 -
 .../hts-screening.component.tsx               |   17 -
 .../empty-data-illustration.component.tsx     |   39 -
 .../empty-state/empty-state.component.tsx     |   44 -
 .../empty-state/empty-state.scss              |   70 -
 .../due-for-linkage.component.tsx             |   55 -
 .../due-for-retest.component.tsx              |   55 -
 .../eligible.component.tsx                    |   76 --
 .../hts-screening.component.tsx               |   84 --
 .../invalid-result.component.tsx              |   55 -
 .../module-uptake.component.tsx               |  120 --
 .../tested.component.tsx                      |   55 -
 .../hts-patient-list-tabs.component.tsx       |   56 -
 .../hts-patient-list-tabs.scss                |    3 -
 .../patient-summary/hts-patientsummary.scss   |   24 -
 .../patient-summary.component.tsx             |   23 -
 .../summary-tiles/hts-summary-tile.scss       |   34 -
 ...summary-tiles-overall-uptake.component.tsx |   28 -
 .../hts-summary-tiles.component.tsx           |   28 -
 packages/esm-hts-app/translations/en.json     |   36 -
 packages/esm-hts-app/tsconfig.json            |    5 -
 packages/esm-hts-app/webpack.config.js        |    1 -
 .../esm-lab-order-manifest-app/jest.config.js |    3 -
 .../esm-lab-order-manifest-app/package.json   |   55 -
 .../src/config-schema.ts                      |    8 -
 .../src/declarations.d.ts                     |    4 -
 .../esm-lab-order-manifest-app/src/index.ts   |   32 -
 .../dialog/post-orde-to-eid-dialog.scss       |   14 -
 .../dialog/post-to-eid-dialog.component.tsx   |  110 --
 .../dialog/post-to-eid-dialog.resource.ts     |   14 -
 .../dialog/verification-modal.scss            |   20 -
 .../dialog/verification.component.tsx         |   48 -
 .../manifest-orders-list-resource.ts          |  130 --
 .../manifest-orders-list.tsx                  |  230 ----
 .../manifest-orders.component.tsx             |   33 -
 .../lab-order-manifest/manifest-styles.scss   |  212 ---
 .../post-to-eid-action.component.tsx          |   33 -
 .../lab-order-manifest/pre-appointment.scss   |   12 -
 .../src/root.component.tsx                    |    8 -
 .../esm-lab-order-manifest-app/src/root.scss  |    0
 .../src/routes.json                           |   29 -
 .../src/types/index.ts                        |    0
 .../src/utils/function.ts                     |    9 -
 .../translations/en.json                      |   14 -
 .../esm-lab-order-manifest-app/tsconfig.json  |    5 -
 .../webpack.config.js                         |    1 -
 packages/esm-otz-app/jest.config.js           |    3 -
 packages/esm-otz-app/package.json             |   54 -
 packages/esm-otz-app/src/config-schema.ts     |   12 -
 packages/esm-otz-app/src/dashboard.meta.tsx   |   37 -
 packages/esm-otz-app/src/dashboard.scss       |   27 -
 packages/esm-otz-app/src/declarations.d.ts    |    4 -
 .../src/header/otz-header.component.tsx       |   32 -
 .../esm-otz-app/src/header/otz-header.scss    |   68 -
 .../src/header/otz-illustration.component.tsx |   13 -
 packages/esm-otz-app/src/index.ts             |   67 -
 .../src/left-panel-link.component.tsx         |   32 -
 packages/esm-otz-app/src/otz.component.tsx    |   26 -
 packages/esm-otz-app/src/otz.scss             |    9 -
 packages/esm-otz-app/src/root.component.tsx   |   17 -
 packages/esm-otz-app/src/root.scss            |    3 -
 packages/esm-otz-app/src/routes.json          |   95 --
 .../src/views/dashboard/common.scss           |   34 -
 .../otz-program-services/common.scss          |   34 -
 .../otz-enrolment.component.tsx               |   16 -
 .../otz-program-services.tsx                  |   27 -
 .../otz-program-services/otz-program.scss     |   34 -
 .../empty-data-illustration.component.tsx     |   39 -
 .../empty-state/empty-state.component.tsx     |   44 -
 .../empty-state/empty-state.scss              |   70 -
 .../eligible-for-vl-testing.component.tsx     |   76 --
 .../eligible-not-enrolled.component.tsx       |   55 -
 .../missed-appointments.component.tsx         |   84 --
 .../total-active.component.tsx                |   55 -
 .../total-enrolled.component.tsx              |   55 -
 .../otz-patient-list-tabs.component.tsx       |   46 -
 .../otz-patient-list-tabs.scss                |    3 -
 .../patient-summary/otz-patientsummary.scss   |   24 -
 .../patient-summary.component.tsx             |   23 -
 .../summary-tiles/otz-summary-tile.scss       |   34 -
 .../otz-summary-tiles.component.tsx           |   28 -
 packages/esm-otz-app/translations/en.json     |   22 -
 packages/esm-otz-app/tsconfig.json            |    5 -
 packages/esm-otz-app/webpack.config.js        |    1 -
 .../hiv-testing-services/constants.ts         |   28 +-
 .../hiv-testing/hiv-screening-constants.ts    |    2 +-
 .../hiv-testing/hiv-testing-constants.ts      |    4 +-
 yarn.lock                                     | 1153 ++---------------
 271 files changed, 150 insertions(+), 15631 deletions(-)
 delete mode 100755 packages/esm-ampath-core-app/jest.config.js
 delete mode 100755 packages/esm-ampath-core-app/package.json
 delete mode 100755 packages/esm-ampath-core-app/src/ampath-dashboard/ampath-dashboard.component.tsx
 delete mode 100755 packages/esm-ampath-core-app/src/ampath-dashboard/ampath-dashboard.scss
 delete mode 100755 packages/esm-ampath-core-app/src/ampath-dashboard/side-menu/ampath-dashboard-side-nav.component.tsx
 delete mode 100755 packages/esm-ampath-core-app/src/ampath-dashboard/side-menu/ampath-dashboard-side-nav.scss
 delete mode 100755 packages/esm-ampath-core-app/src/ampath-dashboard/stock-management/stock-management-dashboard.component.tsx
 delete mode 100755 packages/esm-ampath-core-app/src/api/api.ts
 delete mode 100755 packages/esm-ampath-core-app/src/api/type.ts
 delete mode 100755 packages/esm-ampath-core-app/src/clinical-view-section.component.tsx
 delete mode 100755 packages/esm-ampath-core-app/src/clinical-view-section.scss
 delete mode 100755 packages/esm-ampath-core-app/src/config-schema.ts
 delete mode 100755 packages/esm-ampath-core-app/src/dashboard-group.component.tsx
 delete mode 100755 packages/esm-ampath-core-app/src/dashboard-group.scss
 delete mode 100755 packages/esm-ampath-core-app/src/dashboard.meta.tsx
 delete mode 100755 packages/esm-ampath-core-app/src/declarations.d.ts
 delete mode 100755 packages/esm-ampath-core-app/src/index.ts
 delete mode 100755 packages/esm-ampath-core-app/src/root.component.tsx
 delete mode 100755 packages/esm-ampath-core-app/src/root.scss
 delete mode 100755 packages/esm-ampath-core-app/src/root.tsx
 delete mode 100755 packages/esm-ampath-core-app/src/routes.json
 delete mode 100755 packages/esm-ampath-core-app/translations/en.json
 delete mode 100755 packages/esm-ampath-core-app/tsconfig.json
 delete mode 100755 packages/esm-ampath-core-app/webpack.config.js
 delete mode 100755 packages/esm-billing-app/README.md
 delete mode 100755 packages/esm-billing-app/__mocks__/visit.mock.ts
 delete mode 100755 packages/esm-billing-app/jest.config.js
 delete mode 100755 packages/esm-billing-app/package.json
 delete mode 100755 packages/esm-billing-app/src/bill-history/bill-history.component.tsx
 delete mode 100755 packages/esm-billing-app/src/bill-history/bill-history.scss
 delete mode 100755 packages/esm-billing-app/src/billable-services-admin-card-link.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/bill-waiver/bill-selection.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/bill-waiver/bill-waiver-form.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/bill-waiver/bill-waiver-form.scss
 delete mode 100755 packages/esm-billing-app/src/billable-services/bill-waiver/bill-waiver.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/bill-waiver/bill-waiver.scss
 delete mode 100755 packages/esm-billing-app/src/billable-services/bill-waiver/patient-bills.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/billable-service.resource.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/billable-services-home.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/billable-services.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/billable-services.scss
 delete mode 100755 packages/esm-billing-app/src/billable-services/billiable-item/drug-order/drug-order.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/billiable-item/drug-order/drug-order.scss
 delete mode 100755 packages/esm-billing-app/src/billable-services/billiable-item/test-order/imaging-order.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/billiable-item/test-order/lab-order.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/billiable-item/test-order/price-info-order.componet.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/billiable-item/test-order/price-info-order.scss
 delete mode 100755 packages/esm-billing-app/src/billable-services/billiable-item/test-order/procedure-order.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/billiable-item/test-order/test-order-action.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/billiable-item/test-order/test-order-action.resource.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/billiable-item/useBillableItem.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/billing-tariffs/add-billing-tariffs-service.scss
 delete mode 100755 packages/esm-billing-app/src/billable-services/billing-tariffs/add-billings-tariffs-service.component.tsx
 delete mode 100644 packages/esm-billing-app/src/billable-services/billing-tariffs/billing-tariffs-admin-card.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/billing-tariffs/billing-tariffs-services.scss
 delete mode 100755 packages/esm-billing-app/src/billable-services/billing-tariffs/billing-tariffs.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/billing-tariffs/billing-tariffs.resource.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/create-edit/add-billable-service.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/create-edit/add-billable-service.scss
 delete mode 100755 packages/esm-billing-app/src/billable-services/dashboard/dashboard.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billable-services/dashboard/dashboard.scss
 delete mode 100755 packages/esm-billing-app/src/billable-services/dashboard/service-metrics.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billing-dashboard/billing-dashboard.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billing-dashboard/billing-dashboard.scss
 delete mode 100755 packages/esm-billing-app/src/billing-form/billing-checkin-form.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billing-form/billing-checkin-form.scss
 delete mode 100755 packages/esm-billing-app/src/billing-form/billing-form.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billing-form/billing-form.scss
 delete mode 100755 packages/esm-billing-app/src/billing-form/helper.ts
 delete mode 100755 packages/esm-billing-app/src/billing-form/social-health-authority/sha-number-validity.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billing-form/visit-attributes/visit-attributes-form.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billing-form/visit-attributes/visit-attributes-form.scss
 delete mode 100755 packages/esm-billing-app/src/billing-header/billing-header.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billing-header/billing-header.scss
 delete mode 100755 packages/esm-billing-app/src/billing-header/billing-illustration.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billing-prompt/billing-prompt.resource.tsx
 delete mode 100755 packages/esm-billing-app/src/billing-tabs/billing-tab.scss
 delete mode 100755 packages/esm-billing-app/src/billing-tabs/billling-tabs.component.tsx
 delete mode 100755 packages/esm-billing-app/src/billing.resource.ts
 delete mode 100755 packages/esm-billing-app/src/bills-table/bills-table.component.tsx
 delete mode 100755 packages/esm-billing-app/src/bills-table/bills-table.scss
 delete mode 100755 packages/esm-billing-app/src/claims/claims-wrap/claims-main-component.tsx
 delete mode 100755 packages/esm-billing-app/src/claims/claims-wrap/claims-main.scss
 delete mode 100755 packages/esm-billing-app/src/claims/dashboard/claims-breakdown/claims-breakdown.component.tsx
 delete mode 100755 packages/esm-billing-app/src/claims/dashboard/claims-breakdown/claims-breakdown.scss
 delete mode 100755 packages/esm-billing-app/src/claims/dashboard/claims-dashboard.component.tsx
 delete mode 100755 packages/esm-billing-app/src/claims/dashboard/form/claims-form.component.tsx
 delete mode 100755 packages/esm-billing-app/src/claims/dashboard/form/claims-form.resource.ts
 delete mode 100755 packages/esm-billing-app/src/claims/dashboard/form/claims-form.scss
 delete mode 100755 packages/esm-billing-app/src/claims/dashboard/header/claims-header.component.tsx
 delete mode 100755 packages/esm-billing-app/src/claims/dashboard/header/claims-header.scss
 delete mode 100755 packages/esm-billing-app/src/claims/dashboard/table/claims-table.component.tsx
 delete mode 100755 packages/esm-billing-app/src/claims/dashboard/table/claims-table.scss
 delete mode 100755 packages/esm-billing-app/src/claims/make-claims.component.tsx
 delete mode 100755 packages/esm-billing-app/src/claims/make-claims.scss
 delete mode 100755 packages/esm-billing-app/src/claims/metrics/metrics-card.component.tsx
 delete mode 100755 packages/esm-billing-app/src/claims/metrics/metrics-card.scss
 delete mode 100755 packages/esm-billing-app/src/claims/metrics/metrics-header.component.tsx
 delete mode 100755 packages/esm-billing-app/src/claims/metrics/metrics-header.scss
 delete mode 100755 packages/esm-billing-app/src/claims/metrics/metrics.component.tsx
 delete mode 100755 packages/esm-billing-app/src/claims/metrics/metrics.scss
 delete mode 100755 packages/esm-billing-app/src/config-schema.ts
 delete mode 100755 packages/esm-billing-app/src/constants.ts
 delete mode 100755 packages/esm-billing-app/src/dashboard.meta.ts
 delete mode 100755 packages/esm-billing-app/src/declarations.d.ts
 delete mode 100755 packages/esm-billing-app/src/helpers/functions.ts
 delete mode 100755 packages/esm-billing-app/src/helpers/index.ts
 delete mode 100755 packages/esm-billing-app/src/hooks/getMflCode.tsx
 delete mode 100755 packages/esm-billing-app/src/hooks/usePatientAttributes.tsx
 delete mode 100755 packages/esm-billing-app/src/hooks/useRequestStatus.tsx
 delete mode 100755 packages/esm-billing-app/src/index.ts
 delete mode 100755 packages/esm-billing-app/src/invoice/invoice-table.component.tsx
 delete mode 100755 packages/esm-billing-app/src/invoice/invoice-table.scss
 delete mode 100755 packages/esm-billing-app/src/invoice/invoice.component.tsx
 delete mode 100755 packages/esm-billing-app/src/invoice/invoice.scss
 delete mode 100755 packages/esm-billing-app/src/invoice/payments/initiate-payment/initiate-payment.component.tsx
 delete mode 100755 packages/esm-billing-app/src/invoice/payments/initiate-payment/initiate-payment.scss
 delete mode 100755 packages/esm-billing-app/src/invoice/payments/invoice-breakdown/invoice-breakdown.component.tsx
 delete mode 100755 packages/esm-billing-app/src/invoice/payments/invoice-breakdown/invoice-breakdown.scss
 delete mode 100755 packages/esm-billing-app/src/invoice/payments/payment-form/payment-form.component.tsx
 delete mode 100755 packages/esm-billing-app/src/invoice/payments/payment-form/payment-form.scss
 delete mode 100755 packages/esm-billing-app/src/invoice/payments/payment-history/payment-history.component.tsx
 delete mode 100755 packages/esm-billing-app/src/invoice/payments/payments.component.tsx
 delete mode 100755 packages/esm-billing-app/src/invoice/payments/payments.resource.ts
 delete mode 100755 packages/esm-billing-app/src/invoice/payments/payments.scss
 delete mode 100755 packages/esm-billing-app/src/invoice/payments/utils.ts
 delete mode 100755 packages/esm-billing-app/src/invoice/payments/visit-tags/visit-attribute.component.tsx
 delete mode 100755 packages/esm-billing-app/src/invoice/printable-invoice/print-receipt.component.tsx
 delete mode 100755 packages/esm-billing-app/src/invoice/printable-invoice/print-receipt.scss
 delete mode 100755 packages/esm-billing-app/src/invoice/printable-invoice/printable-footer.component.tsx
 delete mode 100755 packages/esm-billing-app/src/invoice/printable-invoice/printable-footer.scss
 delete mode 100755 packages/esm-billing-app/src/invoice/printable-invoice/printable-footer.test.tsx
 delete mode 100755 packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice-header.component.tsx
 delete mode 100755 packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice-header.scss
 delete mode 100755 packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice-header.test.tsx
 delete mode 100755 packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice.component.tsx
 delete mode 100755 packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice.scss
 delete mode 100755 packages/esm-billing-app/src/left-panel-link.component.tsx
 delete mode 100755 packages/esm-billing-app/src/m-pesa/mpesa-resource.tsx
 delete mode 100755 packages/esm-billing-app/src/metrics-cards/card.component.tsx
 delete mode 100755 packages/esm-billing-app/src/metrics-cards/card.scss
 delete mode 100755 packages/esm-billing-app/src/metrics-cards/metrics-cards.component.tsx
 delete mode 100755 packages/esm-billing-app/src/metrics-cards/metrics-cards.scss
 delete mode 100755 packages/esm-billing-app/src/metrics-cards/metrics.resource.ts
 delete mode 100755 packages/esm-billing-app/src/modal/require-payment-modal.component.tsx
 delete mode 100755 packages/esm-billing-app/src/modal/require-payment.scss
 delete mode 100755 packages/esm-billing-app/src/past-patient-bills/filtered-patient-bills.component.tsx
 delete mode 100755 packages/esm-billing-app/src/past-patient-bills/patient-bills-dashboard/patient-bills-dashboard.scss
 delete mode 100755 packages/esm-billing-app/src/past-patient-bills/patient-bills-dashboard/patient-bills-dashboard.tsx
 delete mode 100755 packages/esm-billing-app/src/past-patient-bills/patient-bills.scss
 delete mode 100755 packages/esm-billing-app/src/root.component.tsx
 delete mode 100755 packages/esm-billing-app/src/root.scss
 delete mode 100755 packages/esm-billing-app/src/routes.json
 delete mode 100755 packages/esm-billing-app/src/types/index.ts
 delete mode 100755 packages/esm-billing-app/src/utils.ts
 delete mode 100755 packages/esm-billing-app/translations/en.json
 delete mode 100755 packages/esm-billing-app/tsconfig.json
 delete mode 100755 packages/esm-billing-app/webpack.config.js
 delete mode 100755 packages/esm-hts-app/jest.config.js
 delete mode 100755 packages/esm-hts-app/package.json
 delete mode 100755 packages/esm-hts-app/src/config-schema.ts
 delete mode 100755 packages/esm-hts-app/src/dashboard.meta.tsx
 delete mode 100755 packages/esm-hts-app/src/dashboard.scss
 delete mode 100755 packages/esm-hts-app/src/declarations.d.ts
 delete mode 100755 packages/esm-hts-app/src/header/hts-header.component.tsx
 delete mode 100755 packages/esm-hts-app/src/header/hts-header.scss
 delete mode 100755 packages/esm-hts-app/src/header/hts-illustration.component.tsx
 delete mode 100755 packages/esm-hts-app/src/hts.component.tsx
 delete mode 100755 packages/esm-hts-app/src/hts.scss
 delete mode 100755 packages/esm-hts-app/src/index.ts
 delete mode 100755 packages/esm-hts-app/src/left-panel-link.component.tsx
 delete mode 100755 packages/esm-hts-app/src/root.component.tsx
 delete mode 100755 packages/esm-hts-app/src/root.scss
 delete mode 100755 packages/esm-hts-app/src/routes.json
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/common.scss
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/hts-program-services/common.scss
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-initial.component.tsx
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-linkage.component.tsx
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-program-services.tsx
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-program.scss
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-referred.component.tsx
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-retest.component.tsx
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-screening.component.tsx
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/patient-list-tabs/empty-state/empty-data-illustration.component.tsx
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/patient-list-tabs/empty-state/empty-state.component.tsx
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/patient-list-tabs/empty-state/empty-state.scss
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/due-for-linkage.component.tsx
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/due-for-retest.component.tsx
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/eligible.component.tsx
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/hts-screening.component.tsx
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/invalid-result.component.tsx
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/module-uptake.component.tsx
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/tested.component.tsx
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tabs.component.tsx
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tabs.scss
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/patient-summary/hts-patientsummary.scss
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/patient-summary/patient-summary.component.tsx
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/summary-tiles/hts-summary-tile.scss
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/summary-tiles/hts-summary-tiles-overall-uptake.component.tsx
 delete mode 100755 packages/esm-hts-app/src/views/dashboard/summary-tiles/hts-summary-tiles.component.tsx
 delete mode 100755 packages/esm-hts-app/translations/en.json
 delete mode 100755 packages/esm-hts-app/tsconfig.json
 delete mode 100755 packages/esm-hts-app/webpack.config.js
 delete mode 100755 packages/esm-lab-order-manifest-app/jest.config.js
 delete mode 100755 packages/esm-lab-order-manifest-app/package.json
 delete mode 100755 packages/esm-lab-order-manifest-app/src/config-schema.ts
 delete mode 100755 packages/esm-lab-order-manifest-app/src/declarations.d.ts
 delete mode 100755 packages/esm-lab-order-manifest-app/src/index.ts
 delete mode 100755 packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/post-orde-to-eid-dialog.scss
 delete mode 100755 packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/post-to-eid-dialog.component.tsx
 delete mode 100755 packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/post-to-eid-dialog.resource.ts
 delete mode 100755 packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/verification-modal.scss
 delete mode 100755 packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/verification.component.tsx
 delete mode 100755 packages/esm-lab-order-manifest-app/src/lab-order-manifest/manifest-orders-list-resource.ts
 delete mode 100755 packages/esm-lab-order-manifest-app/src/lab-order-manifest/manifest-orders-list.tsx
 delete mode 100755 packages/esm-lab-order-manifest-app/src/lab-order-manifest/manifest-orders.component.tsx
 delete mode 100755 packages/esm-lab-order-manifest-app/src/lab-order-manifest/manifest-styles.scss
 delete mode 100755 packages/esm-lab-order-manifest-app/src/lab-order-manifest/order-actions/post-to-eid-action.component.tsx
 delete mode 100755 packages/esm-lab-order-manifest-app/src/lab-order-manifest/pre-appointment.scss
 delete mode 100755 packages/esm-lab-order-manifest-app/src/root.component.tsx
 delete mode 100755 packages/esm-lab-order-manifest-app/src/root.scss
 delete mode 100755 packages/esm-lab-order-manifest-app/src/routes.json
 delete mode 100755 packages/esm-lab-order-manifest-app/src/types/index.ts
 delete mode 100755 packages/esm-lab-order-manifest-app/src/utils/function.ts
 delete mode 100755 packages/esm-lab-order-manifest-app/translations/en.json
 delete mode 100755 packages/esm-lab-order-manifest-app/tsconfig.json
 delete mode 100755 packages/esm-lab-order-manifest-app/webpack.config.js
 delete mode 100755 packages/esm-otz-app/jest.config.js
 delete mode 100755 packages/esm-otz-app/package.json
 delete mode 100755 packages/esm-otz-app/src/config-schema.ts
 delete mode 100755 packages/esm-otz-app/src/dashboard.meta.tsx
 delete mode 100755 packages/esm-otz-app/src/dashboard.scss
 delete mode 100755 packages/esm-otz-app/src/declarations.d.ts
 delete mode 100755 packages/esm-otz-app/src/header/otz-header.component.tsx
 delete mode 100755 packages/esm-otz-app/src/header/otz-header.scss
 delete mode 100755 packages/esm-otz-app/src/header/otz-illustration.component.tsx
 delete mode 100755 packages/esm-otz-app/src/index.ts
 delete mode 100755 packages/esm-otz-app/src/left-panel-link.component.tsx
 delete mode 100755 packages/esm-otz-app/src/otz.component.tsx
 delete mode 100755 packages/esm-otz-app/src/otz.scss
 delete mode 100755 packages/esm-otz-app/src/root.component.tsx
 delete mode 100755 packages/esm-otz-app/src/root.scss
 delete mode 100755 packages/esm-otz-app/src/routes.json
 delete mode 100755 packages/esm-otz-app/src/views/dashboard/common.scss
 delete mode 100755 packages/esm-otz-app/src/views/dashboard/otz-program-services/common.scss
 delete mode 100755 packages/esm-otz-app/src/views/dashboard/otz-program-services/otz-enrolment.component.tsx
 delete mode 100755 packages/esm-otz-app/src/views/dashboard/otz-program-services/otz-program-services.tsx
 delete mode 100755 packages/esm-otz-app/src/views/dashboard/otz-program-services/otz-program.scss
 delete mode 100755 packages/esm-otz-app/src/views/dashboard/patient-list-tabs/empty-state/empty-data-illustration.component.tsx
 delete mode 100755 packages/esm-otz-app/src/views/dashboard/patient-list-tabs/empty-state/empty-state.component.tsx
 delete mode 100755 packages/esm-otz-app/src/views/dashboard/patient-list-tabs/empty-state/empty-state.scss
 delete mode 100755 packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/eligible-for-vl-testing.component.tsx
 delete mode 100755 packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/eligible-not-enrolled.component.tsx
 delete mode 100755 packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/missed-appointments.component.tsx
 delete mode 100755 packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/total-active.component.tsx
 delete mode 100755 packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/total-enrolled.component.tsx
 delete mode 100755 packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tabs.component.tsx
 delete mode 100755 packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tabs.scss
 delete mode 100755 packages/esm-otz-app/src/views/dashboard/patient-summary/otz-patientsummary.scss
 delete mode 100755 packages/esm-otz-app/src/views/dashboard/patient-summary/patient-summary.component.tsx
 delete mode 100755 packages/esm-otz-app/src/views/dashboard/summary-tiles/otz-summary-tile.scss
 delete mode 100755 packages/esm-otz-app/src/views/dashboard/summary-tiles/otz-summary-tiles.component.tsx
 delete mode 100755 packages/esm-otz-app/translations/en.json
 delete mode 100755 packages/esm-otz-app/tsconfig.json
 delete mode 100755 packages/esm-otz-app/webpack.config.js
 mode change 100755 => 100644 yarn.lock

diff --git a/.DS_Store b/.DS_Store
index a821b6129e0e94e2b6ee75a7df0c232271fbc912..2fd35c1b30583e982379cac75123db02affc3a7e 100755
GIT binary patch
delta 31
ncmZoMXfc@J&&azmU^g=(?_?g9$(xU`I5SUdP~FVV@s}R}pkxXj

delta 61
zcmZoMXfc@J&&aniU^g=(-(((^$qIQ4`3xxxsSNQ9xnNc)Lk^HvoKl>ela!yI!?<}C
MiwE;&c8<UN00iX`HUIzs

diff --git a/package.json b/package.json
index e6f0b32..25919b3 100755
--- a/package.json
+++ b/package.json
@@ -9,7 +9,6 @@
   "scripts": {
     "start": "openmrs develop --backend http://10.50.80.110:8084 --sources packages/esm-*-app  --api-url  /amrs --spa-path /amrs/spa/ --port 8040",
     "dev": "openmrs develop --backend http://10.50.80.110:8084 --sources packages/esm-report-app  --api-url  /amrs --spa-path /amrs/spa/ --port 8040",
-    "dev:core": "openmrs develop --backend http://10.50.80.110:8084 --sources packages/esm-ampath-core-app --api-url  /amrs --spa-path /amrs/spa/ --port 8030",
     "ci:publish": "yarn workspaces foreach --all --topological --exclude @ampath/esm-3.x-app npm publish --access public --tag latest",
     "ci:prepublish": "yarn workspaces foreach --all --topological --exclude @ampath/esm-3.x-app npm publish --access public --tag next",
     "release": "yarn workspaces foreach --all --topological version",
@@ -36,9 +35,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.11.6",
-    "@carbon/react": "~1.37.0",
-    "@ohri/openmrs-esm-ohri-commons-lib": "next",
-    "@openmrs/esm-framework": "^5.7.1-pre.2076",
+    "@openmrs/esm-framework": "^5.7.2-pre.2101",
     "@openmrs/esm-patient-common-lib": "next",
     "@playwright/test": "1.40.1",
     "@swc/core": "^1.2.165",
@@ -75,7 +72,7 @@
     "jest-cli": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "lint-staged": "^15.2.1",
-    "openmrs": "^5.7.1-pre.2076",
+    "openmrs": "^5.7.2-pre.2101",
     "prettier": "^3.1.1",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
diff --git a/packages/esm-ampath-core-app/jest.config.js b/packages/esm-ampath-core-app/jest.config.js
deleted file mode 100755
index 0352f62..0000000
--- a/packages/esm-ampath-core-app/jest.config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const rootConfig = require('../../jest.config.js');
-
-module.exports = rootConfig;
diff --git a/packages/esm-ampath-core-app/package.json b/packages/esm-ampath-core-app/package.json
deleted file mode 100755
index ef58e28..0000000
--- a/packages/esm-ampath-core-app/package.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "name": "@ampath/esm-ampath-core-app",
-  "version": "1.1.0",
-  "description": "AMPATH Core App",
-  "browser": "dist/ampath-esm-core-app.js",
-  "main": "src/index.ts",
-  "source": true,
-  "license": "MPL-2.0",
-  "homepage": "https://github.com/AMPATH/ampath-esm-3.x#readme",
-  "scripts": {
-    "start": "openmrs develop",
-    "serve": "webpack serve --mode=development",
-    "debug": "npm run serve",
-    "build": "webpack --mode production",
-    "analyze": "webpack --mode=production --env.analyze=true",
-    "lint": "cross-env TIMING=1 eslint src --ext ts,tsx",
-    "test": "cross-env TZ=UTC jest --config jest.config.js --verbose false --passWithNoTests --color",
-    "test:watch": "cross-env TZ=UTC jest --watch --config jest.config.js --color",
-    "coverage": "yarn test --coverage",
-    "typescript": "tsc",
-    "extract-translations": "i18next 'src/**/*.component.tsx'"
-  },
-  "browserslist": [
-    "extends browserslist-config-openmrs"
-  ],
-  "keywords": [
-    "openmrs",
-    "ampath"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/AMPATH/ampath-esm-3.x.git"
-  },
-  "bugs": {
-    "url": "https://github.com/AMPATH/ampath-esm-3.x/issues"
-  },
-  "dependencies": {
-    "@carbon/react": "~1.37.0",
-    "lodash-es": "^4.17.15"
-  },
-  "peerDependencies": {
-    "@ohri/openmrs-esm-ohri-commons-lib": "2.x",
-    "@openmrs/esm-framework": "5.x",
-    "react": "^18.1.0",
-    "react-i18next": "11.x",
-    "react-router-dom": "6.x",
-    "swr": "2.x"
-  },
-  "devDependencies": {
-    "webpack": "^5.74.0"
-  }
-}
diff --git a/packages/esm-ampath-core-app/src/ampath-dashboard/ampath-dashboard.component.tsx b/packages/esm-ampath-core-app/src/ampath-dashboard/ampath-dashboard.component.tsx
deleted file mode 100755
index d7a13e3..0000000
--- a/packages/esm-ampath-core-app/src/ampath-dashboard/ampath-dashboard.component.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import React, { useEffect, useMemo, useState } from 'react';
-import { attach, detach, ExtensionSlot, isDesktop, useExtensionSlotMeta, useLayoutType } from '@openmrs/esm-framework';
-import styles from './ampath-dashboard.scss';
-import { useParams } from 'react-router-dom';
-
-const AmpathDashboard = () => {
-  const { view } = useParams();
-  const [dashboards, setDashboards] = useState([]);
-  const metaLinks = useExtensionSlotMeta('dashboard-links-slot') as Record<string, any>;
-  const metaFolders = useExtensionSlotMeta('dashboard-slot') as Record<string, any>;
-  const [currentDashboard, setCurrentDashboard] = useState(null);
-  const layout = useLayoutType();
-
-  useEffect(() => {
-    if (view) {
-      setCurrentDashboard(dashboards.find((db) => db.name == view));
-    } else if (!currentDashboard) {
-      setCurrentDashboard(dashboards[0]);
-    }
-  }, [view, dashboards]);
-
-  useEffect(() => {
-    if (!isDesktop(layout)) {
-      attach('nav-menu-slot', 'ampath-nav-items-ext');
-    }
-    return () => detach('nav-menu-slot', 'ampath-nav-items-ext');
-  }, [layout]);
-
-  useEffect(() => {
-    const programSpecificLinks = metaFolders ? Object.values(metaFolders).filter((link) => link.isLink) : [];
-    const linksWithDashboardMeta = [
-      ...Object.values(metaLinks).filter((link) => Object.keys(link).length),
-      ...programSpecificLinks,
-    ];
-    if (linksWithDashboardMeta.length) {
-      setDashboards([...dashboards, ...linksWithDashboardMeta]);
-    }
-  }, [metaLinks, metaFolders]);
-
-  const state = useMemo(() => {
-    if (currentDashboard) {
-      return { programme: currentDashboard?.config?.programme, dashboardTitle: currentDashboard.title };
-    }
-    return null;
-  }, [currentDashboard]);
-
-  return (
-    <div className={styles.dashboardContainer}>
-      {Object.values(metaFolders).map((f, index) => {
-        return (
-          <GroupAbleMenuItem
-            groupSlot={f.slot}
-            dashboards={dashboards}
-            setDashboards={setDashboards}
-            updateDashboardState={index == Object.keys(metaFolders).length - 1}
-            key={index}
-          />
-        );
-      })}
-      {isDesktop(layout) && <ExtensionSlot name="ampath-nav-items-slot" key={layout} />}
-      <div className={` ${styles.dashboardContent}`}>
-        {currentDashboard && <ExtensionSlot name={currentDashboard.slot} state={state} />}
-      </div>
-    </div>
-  );
-};
-
-const GroupAbleMenuItem = ({ groupSlot, dashboards, setDashboards, updateDashboardState }) => {
-  const meta = useExtensionSlotMeta(groupSlot);
-  useEffect(() => {
-    if (meta && Object.keys(meta).length) {
-      dashboards.push(...Object.values(meta).filter((entry) => Object.keys(entry).length));
-      updateDashboardState && setDashboards([...dashboards]);
-    }
-  }, [meta]);
-
-  return <></>;
-};
-
-export default AmpathDashboard;
diff --git a/packages/esm-ampath-core-app/src/ampath-dashboard/ampath-dashboard.scss b/packages/esm-ampath-core-app/src/ampath-dashboard/ampath-dashboard.scss
deleted file mode 100755
index fc50a90..0000000
--- a/packages/esm-ampath-core-app/src/ampath-dashboard/ampath-dashboard.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-@import '../root.scss';
-
-.dashboardContainer {
-  display: -webkit-flex;
-  height: 90vh;
-  position: relative;
-  overflow-y: hidden;
-}
-
-.dashboardContent {
-  margin: 0;
-  flex-basis: 75%;
-  flex-grow: 1;
-  flex-shrink: 1;
-  position: relative;
-  overflow-y: auto;
-  margin-left: 16rem;
-  padding-left: 0;
-  padding-right: 0;
-  max-width: 100% !important;
-}
-
-.noMarker {
-  list-style-type: none;
-}
-
-.noMarker ul li a {
-  padding-left: 40px !important;
-  font: lighter;
-}
-
-.currentNavItem > a {
-  background-color: #cecece !important;
-  color: #161616 !important;
-  border-left-color: var(--brand-01) !important;
-  font: bolder;
-}
-
-.hide {
-  display: none;
-}
-
-@media (max-width: 1200px) {
-  .dashboardContent {
-    margin-left: 0;
-  }
-}
diff --git a/packages/esm-ampath-core-app/src/ampath-dashboard/side-menu/ampath-dashboard-side-nav.component.tsx b/packages/esm-ampath-core-app/src/ampath-dashboard/side-menu/ampath-dashboard-side-nav.component.tsx
deleted file mode 100755
index e38e2ce..0000000
--- a/packages/esm-ampath-core-app/src/ampath-dashboard/side-menu/ampath-dashboard-side-nav.component.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from 'react';
-import { SideNav, SideNavItems } from '@carbon/react';
-import styles from './ampath-dashboard-side-nav.scss';
-import { ExtensionSlot } from '@openmrs/esm-framework';
-import { useTranslation } from 'react-i18next';
-
-const AMPATHDashboardSideNav = () => {
-  const { t } = useTranslation();
-  return (
-    <SideNav isFixedNav expanded={true} isChildOfHeader={false} aria-label="Side navigation" className={styles.sideNav}>
-      <SideNavItems>
-        <ExtensionSlot name="dashboard-links-slot" />
-
-        <p className={styles.sideNavTextHeader}>{t('programmes', 'Programmes')}</p>
-
-        <ExtensionSlot name="dashboard-slot" />
-      </SideNavItems>
-    </SideNav>
-  );
-};
-
-export default AMPATHDashboardSideNav;
diff --git a/packages/esm-ampath-core-app/src/ampath-dashboard/side-menu/ampath-dashboard-side-nav.scss b/packages/esm-ampath-core-app/src/ampath-dashboard/side-menu/ampath-dashboard-side-nav.scss
deleted file mode 100755
index 3fa02b2..0000000
--- a/packages/esm-ampath-core-app/src/ampath-dashboard/side-menu/ampath-dashboard-side-nav.scss
+++ /dev/null
@@ -1,35 +0,0 @@
-@import '../../root.scss';
-
-.sideNav {
-  width: 16rem;
-  // padding-top: 2rem;
-  min-height: 8rem;
-  overscroll-behavior: contain;
-  margin: 48px 13px 15px 0;
-  border-right: 1px #e0e0e0;
-}
-
-.sideNavTextHeader {
-  font-size: 14px;
-  padding: 0.5rem 1rem 0.5rem;
-}
-
-.sideNav :global(a.cds--side-nav__link[aria-current='page']:before),
-.sideNav :global(.cds--side-nav__submenu[aria-expanded='false']:before) {
-  // background-color: $brand-teal-01;
-}
-
-.sideNav :global(ul.cds--side-nav__items) {
-  border-style: solid !important;
-  border-right: 1px #e0e0e0;
-}
-
-@media (max-width: 1200px) {
-  .sideNav :global(.cds--side-nav) {
-    z-index: -100 !important;
-  }
-
-  .sideNav :global(.cds--side-nav__items) {
-    padding: 0 !important;
-  }
-}
diff --git a/packages/esm-ampath-core-app/src/ampath-dashboard/stock-management/stock-management-dashboard.component.tsx b/packages/esm-ampath-core-app/src/ampath-dashboard/stock-management/stock-management-dashboard.component.tsx
deleted file mode 100755
index 2a9a6c4..0000000
--- a/packages/esm-ampath-core-app/src/ampath-dashboard/stock-management/stock-management-dashboard.component.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import React, { useEffect } from 'react';
-import { ExtensionSlot } from '@openmrs/esm-framework';
-
-const StockManagementDashboard = () => {
-  return <ExtensionSlot name="ampath-dashboard-stock-management-slot" state={{}} />;
-};
-
-export default StockManagementDashboard;
diff --git a/packages/esm-ampath-core-app/src/api/api.ts b/packages/esm-ampath-core-app/src/api/api.ts
deleted file mode 100755
index e69de29..0000000
diff --git a/packages/esm-ampath-core-app/src/api/type.ts b/packages/esm-ampath-core-app/src/api/type.ts
deleted file mode 100755
index e69de29..0000000
diff --git a/packages/esm-ampath-core-app/src/clinical-view-section.component.tsx b/packages/esm-ampath-core-app/src/clinical-view-section.component.tsx
deleted file mode 100755
index 48b4204..0000000
--- a/packages/esm-ampath-core-app/src/clinical-view-section.component.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import React, { useEffect } from 'react';
-import styles from './clinical-view-section.scss';
-import { useTranslation } from 'react-i18next';
-import { Information } from '@carbon/react/icons';
-import { Tooltip } from '@carbon/react';
-import { ExtensionSlot } from '@openmrs/esm-framework';
-import { type DashboardGroupExtensionProps } from './dashboard-group.component';
-import { registerNavGroup } from '@openmrs/esm-patient-common-lib';
-
-export const ClinicalViewSection: React.FC<DashboardGroupExtensionProps> = ({ title, basePath }) => {
-  const slotName = 'clinical-view-section';
-  const { t } = useTranslation();
-  useEffect(() => {
-    registerNavGroup(slotName);
-  }, [slotName]);
-  return (
-    <>
-      <div className={styles.container}>
-        <span className={styles.dividerText}>{t('clinicalViews', 'Clinical views')}</span>
-        <Tooltip
-          align="top"
-          label={t(
-            'customViews',
-            "In this section, you'll find custom clinical views tailored to patients' conditions and enrolled care programs.",
-          )}>
-          <button style={{ border: 'none' }} className="sb-tooltip-trigger" type="button">
-            <Information />
-          </button>
-        </Tooltip>
-      </div>
-      <ExtensionSlot style={{ width: '100%', minWidth: '15rem' }} name={slotName ?? title} state={{ basePath }} />
-    </>
-  );
-};
-
-export default ClinicalViewSection;
diff --git a/packages/esm-ampath-core-app/src/clinical-view-section.scss b/packages/esm-ampath-core-app/src/clinical-view-section.scss
deleted file mode 100755
index 2dc4fa0..0000000
--- a/packages/esm-ampath-core-app/src/clinical-view-section.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.container {
-  height: layout.$layout-03;
-  display: flex;
-  align-items: center;
-  padding: layout.$layout-02 layout.$layout-01;
-  @include type.type-style('label-02');
-  color: colors.$gray-70;
-  column-gap: layout.$layout-01;
-  background-color: colors.$gray-10;
-  margin-top: layout.$layout-05;
-}
-
-.dividerText {
-  font-size: 1rem;
-  font-weight: 650;
-}
diff --git a/packages/esm-ampath-core-app/src/config-schema.ts b/packages/esm-ampath-core-app/src/config-schema.ts
deleted file mode 100755
index 11a9cc5..0000000
--- a/packages/esm-ampath-core-app/src/config-schema.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Type } from '@openmrs/esm-framework';
-export const configSchema = {
-  basicAuthBase64: {
-    _type: Type.String,
-    _description: 'Basic auth base64 string for the API call e.g Basic someBase64String==',
-    _default: '',
-  },
-};
-
-export type PreAppointmentsConfig = {
-  basicAuthBase64: string;
-};
diff --git a/packages/esm-ampath-core-app/src/dashboard-group.component.tsx b/packages/esm-ampath-core-app/src/dashboard-group.component.tsx
deleted file mode 100755
index 38dcc33..0000000
--- a/packages/esm-ampath-core-app/src/dashboard-group.component.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, { useEffect } from 'react';
-import { ExtensionSlot, useLayoutType } from '@openmrs/esm-framework';
-import { SideNavItems, SideNavMenu, SideNavDivider } from '@carbon/react';
-import { Add } from '@carbon/react/icons';
-import { registerNavGroup } from '@openmrs/esm-patient-common-lib';
-import styles from './dashboard-group.scss';
-
-export interface DashboardGroupExtensionProps {
-  title: string;
-  slotName?: string;
-  basePath: string;
-  isExpanded?: boolean;
-  isChild?: boolean;
-}
-
-export const DashboardGroupExtension: React.FC<DashboardGroupExtensionProps> = ({
-  title,
-  slotName,
-  basePath,
-  isExpanded,
-  isChild,
-}) => {
-  const isTablet = useLayoutType() === 'tablet';
-  useEffect(() => {
-    registerNavGroup(slotName);
-  }, [slotName]);
-
-  return (
-    <SideNavItems className={styles.sideMenuItems} isSideNavExpanded={true}>
-      <SideNavMenu
-        className={isChild && styles.sideNavMenu}
-        large={isTablet}
-        defaultExpanded={isExpanded ?? true}
-        title={title}>
-        <ExtensionSlot style={{ width: '100%', minWidth: '15rem' }} name={slotName ?? title} state={{ basePath }} />
-      </SideNavMenu>
-    </SideNavItems>
-  );
-};
diff --git a/packages/esm-ampath-core-app/src/dashboard-group.scss b/packages/esm-ampath-core-app/src/dashboard-group.scss
deleted file mode 100755
index d153724..0000000
--- a/packages/esm-ampath-core-app/src/dashboard-group.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-@use '@carbon/layout';
-@use '@carbon/colors';
-@use '@carbon/type';
-
-.sideMenuItems {
-  padding: 0;
-
-  :global(.cds--side-nav__link.active-left-nav-link) {
-    padding: 0 1.75rem;
-  }
-}
-
-.childMenuItems {
-  padding-left: layout.$spacing-02;
-}
-
-.sideNavMenu {
-  :global(.cds--side-nav__submenu) {
-    padding-left: layout.$spacing-06;
-  }
-}
diff --git a/packages/esm-ampath-core-app/src/dashboard.meta.tsx b/packages/esm-ampath-core-app/src/dashboard.meta.tsx
deleted file mode 100755
index cb723b3..0000000
--- a/packages/esm-ampath-core-app/src/dashboard.meta.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import { InventoryManagement } from '@carbon/react/icons';
-
-export const stockManagementDashboardMeta = {
-  name: 'stock-management',
-  slot: 'ampath-dashboard-stock-management-slot',
-  config: { columns: 1, type: 'grid', icon: InventoryManagement },
-  isLink: true,
-  title: 'Stock Management',
-};
diff --git a/packages/esm-ampath-core-app/src/declarations.d.ts b/packages/esm-ampath-core-app/src/declarations.d.ts
deleted file mode 100755
index 8539186..0000000
--- a/packages/esm-ampath-core-app/src/declarations.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare module '@carbon/react';
-declare module '*.css';
-declare module '*.scss';
-declare type SideNavProps = {};
diff --git a/packages/esm-ampath-core-app/src/index.ts b/packages/esm-ampath-core-app/src/index.ts
deleted file mode 100755
index edaeee5..0000000
--- a/packages/esm-ampath-core-app/src/index.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework';
-import { configSchema } from './config-schema';
-import ClinicalViewSection from './clinical-view-section.component';
-
-const moduleName = '@ampath/esm-ampath-core-app';
-
-const options = {
-  featureName: 'esm-ampath-core-app',
-  moduleName,
-};
-export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');
-
-export function startupApp() {
-  defineConfigSchema(moduleName, configSchema);
-}
-
-export const dashboard = getAsyncLifecycle(() => import('./root'), options);
-
-export const ampathNavItems = getAsyncLifecycle(
-  () => import('./ampath-dashboard/side-menu/ampath-dashboard-side-nav.component'),
-  {
-    featureName: 'nav-items',
-    moduleName,
-  },
-);
-
-export const clinicalViewPatientDashboard = getSyncLifecycle(ClinicalViewSection, options);
diff --git a/packages/esm-ampath-core-app/src/root.component.tsx b/packages/esm-ampath-core-app/src/root.component.tsx
deleted file mode 100755
index 65db3f5..0000000
--- a/packages/esm-ampath-core-app/src/root.component.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom';
-import AmpathDashboard from './ampath-dashboard/ampath-dashboard.component';
-
-export default function Root() {
-  return (
-    <BrowserRouter basename={window['getOpenmrsSpaBase']()}>
-      <Routes>
-        <Route path="/dashboard" element={<AmpathDashboard />} />
-        <Route path="/dashboard/:view" element={<AmpathDashboard />} />
-        <Route path="/home" element={<Navigate to={'/dashboard/home'} replace />} />
-      </Routes>
-    </BrowserRouter>
-  );
-}
diff --git a/packages/esm-ampath-core-app/src/root.scss b/packages/esm-ampath-core-app/src/root.scss
deleted file mode 100755
index e69de29..0000000
diff --git a/packages/esm-ampath-core-app/src/root.tsx b/packages/esm-ampath-core-app/src/root.tsx
deleted file mode 100755
index 193dab0..0000000
--- a/packages/esm-ampath-core-app/src/root.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom';
-import AMPATHDashboard from './ampath-dashboard/ampath-dashboard.component';
-
-export default function Root() {
-  return (
-    <BrowserRouter basename={window['getOpenmrsSpaBase']()}>
-      <Routes>
-        <Route path="/dashboard" element={<AMPATHDashboard />} />
-        <Route path="/dashboard/:view" element={<AMPATHDashboard />} />
-        <Route path="/home" element={<Navigate to={'/dashboard/home'} replace />} />
-      </Routes>
-    </BrowserRouter>
-  );
-}
diff --git a/packages/esm-ampath-core-app/src/routes.json b/packages/esm-ampath-core-app/src/routes.json
deleted file mode 100755
index 2bfa533..0000000
--- a/packages/esm-ampath-core-app/src/routes.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "$schema": "https://json.openmrs.org/routes.schema.json",
-    "backendDependencies": {
-      "webservices.rest": "^2.24.0"
-    },
-    "pages": [
-
-    ],
-    "extensions": [
-      {
-        "name": "clinical-view-section",
-        "component": "clinicalViewPatientDashboard",
-        "slot": "patient-chart-dashboard-slot",
-        "order": 20
-      }
-    ]
-  }
diff --git a/packages/esm-ampath-core-app/translations/en.json b/packages/esm-ampath-core-app/translations/en.json
deleted file mode 100755
index dcbe419..0000000
--- a/packages/esm-ampath-core-app/translations/en.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "clinicalViews": "Clinical views",
-  "customViews": "In this section, you'll find custom clinical views tailored to patients' conditions and enrolled care programs.",
-  "programmes": "Programmes"
-}
diff --git a/packages/esm-ampath-core-app/tsconfig.json b/packages/esm-ampath-core-app/tsconfig.json
deleted file mode 100755
index 54ce28c..0000000
--- a/packages/esm-ampath-core-app/tsconfig.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "include": ["src/**/*"],
-  "exclude": ["src/**/*.test.tsx"]
-}
diff --git a/packages/esm-ampath-core-app/webpack.config.js b/packages/esm-ampath-core-app/webpack.config.js
deleted file mode 100755
index 2c74029..0000000
--- a/packages/esm-ampath-core-app/webpack.config.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('openmrs/default-webpack-config');
diff --git a/packages/esm-billing-app/README.md b/packages/esm-billing-app/README.md
deleted file mode 100755
index 00dc2c0..0000000
--- a/packages/esm-billing-app/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-![Node.js CI](https://github.com/palladiumkenya/kenyaemr-esm-3.x/workflows/Node.js%20CI/badge.svg)
-
-# ESM Billing App
-
-This is a frontend module that provides billing functionality.
diff --git a/packages/esm-billing-app/__mocks__/visit.mock.ts b/packages/esm-billing-app/__mocks__/visit.mock.ts
deleted file mode 100755
index 1d1b0e8..0000000
--- a/packages/esm-billing-app/__mocks__/visit.mock.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-export const mockCurrentVisit = {
-  uuid: 'ee527f74-7373-4494-98bc-002c979971d1',
-  encounters: [],
-  patient: { uuid: '0b25b92a-add3-4d52-8491-778bec556e02' },
-  visitType: { uuid: '3371a4d4-f66f-4454-a86d-92c7b3da990c', name: 'Outpatient', display: 'Outpatient' },
-  attributes: [
-    {
-      uuid: 'e1522ecb-d027-4c30-aa25-38698ba18020',
-      display: 'Source form: 13',
-      attributeType: {
-        name: 'Source form',
-        datatypeClassname: 'org.openmrs.module.kenyaemr.datatype.FormDatatype',
-        uuid: '8bfab185-6947-4958-b7ab-dfafae1a3e3d',
-      },
-      value: {
-        uuid: '23b4ebbd-29ad-455e-be0e-04aa6bc30798',
-        display: 'MOH 257 Visit Summary',
-        name: 'MOH 257 Visit Summary',
-        description: null,
-        encounterType: {
-          uuid: 'a0034eee-1940-4e35-847f-97537a35d05e',
-          display: 'HIV Consultation',
-        },
-        version: '1',
-        build: null,
-        published: true,
-        formFields: [],
-        retired: false,
-        resourceVersion: '1.9',
-      },
-    },
-    {
-      uuid: '5dbb093d-b377-4684-9583-05074ae7187a',
-      display: 'Payment Method: 28989582-e8c3-46b0-96d0-c249cb06d5c6',
-      attributeType: {
-        name: 'Payment Method',
-        datatypeClassname: 'org.openmrs.customdatatype.datatype.FreeTextDatatype',
-        uuid: 'e6cb0c3b-04b0-4117-9bc6-ce24adbda802',
-      },
-      value: '28989582-e8c3-46b0-96d0-c249cb06d5c6',
-    },
-    {
-      uuid: '85abc096-8524-4c2e-863c-b44c99c144f7',
-      display: 'Patient Type: false',
-      attributeType: {
-        name: 'Patient Type',
-        datatypeClassname: 'org.openmrs.customdatatype.datatype.FreeTextDatatype',
-        uuid: '3b9dfac8-9e4d-11ee-8c90-0242ac120002',
-      },
-      value: 'false',
-    },
-    {
-      uuid: '7eb402bb-2bf8-43b7-91aa-ee3f5c753de1',
-      display: 'Visit queue number: CLI-090',
-      attributeType: {
-        name: 'Visit queue number',
-        datatypeClassname: 'org.openmrs.customdatatype.datatype.FreeTextDatatype',
-        uuid: 'c61ce16f-272a-41e7-9924-4c555d0932c5',
-      },
-      value: 'CLI-090',
-    },
-  ],
-  location: {
-    uuid: '233de33e-2778-4f9a-a398-fa09da9daa14',
-    name: 'Wamagana Health Centre',
-    display: 'Wamagana Health Centre',
-  },
-  startDatetime: '2024-05-29T15:19:00.000+0300',
-  stopDatetime: '',
-};
-
-export const mockBills = [
-  {
-    id: 1888,
-    uuid: '3b784fa7-c124-4710-9152-cad3dbaa19e8',
-    patientName: ' Test Unit patient',
-    identifier: 'MGTKYE ',
-    patientUuid: '0b25b92a-add3-4d52-8491-778bec556e02',
-    status: 'PENDING',
-    receiptNumber: '1916-6',
-    cashier: {
-      uuid: '693acc9b-734f-488d-b6d2-60368d02cec0',
-      display: '23797304 - Test Patient',
-    },
-    cashPointUuid: '54065383-b4d4-42d2-af4d-d250a1fd2590',
-    cashPointName: 'OPD Cash Point',
-    cashPointLocation: 'Moi Teaching Refferal Hospital',
-    dateCreated: '29 — May — 2024',
-    lineItems: [
-      {
-        uuid: '528c3411-b3b8-41dc-bf88-174b4adc1b5b',
-        display: 'BillLineItem',
-        voided: false,
-        voidReason: null,
-        item: '',
-        billableService: '3f5d0684-a280-477e-a67b-2a956a1f6dca:Registration Revist',
-        quantity: 1,
-        price: 50,
-        priceName: 'Default',
-        priceUuid: '',
-        lineItemOrder: 0,
-        paymentStatus: 'PENDING',
-        order: null,
-        resourceVersion: '1.8',
-      },
-    ],
-    billingService: '3f5d0684-a280-477e-a67b-2a956a1f6dca:Registration Revist',
-    payments: [],
-    display: '1916-6',
-    totalAmount: 50,
-  },
-  {
-    id: 1213,
-    uuid: '5b633220-9a99-4517-bcdf-c06a7d38dd23',
-    patientName: ' peter ndungu mairo',
-    identifier: 'MGTKYE ',
-    patientUuid: '0b25b92a-add3-4d52-8491-778bec556e02',
-    status: 'PENDING',
-    receiptNumber: '1228-6',
-    cashier: {
-      uuid: '48b55692-e061-4ffa-b1f2-fd4aaf506224',
-      display: 'admin - Super User',
-    },
-    cashPointUuid: '54065383-b4d4-42d2-af4d-d250a1fd2590',
-    cashPointName: 'OPD Cash Point',
-    cashPointLocation: 'Moi Teaching Refferal Hospital',
-    dateCreated: '15 — May — 2024',
-    lineItems: [
-      {
-        uuid: '16cc8b90-f2d4-4907-a3d5-0f57486e5dcf',
-        display: 'BillLineItem',
-        voided: false,
-        voidReason: null,
-        item: '',
-        billableService: '3f5d0684-a280-477e-a67b-2a956a1f6dca:Registration Revist',
-        quantity: 1,
-        price: 50,
-        priceName: 'Default',
-        priceUuid: '',
-        lineItemOrder: 0,
-        paymentStatus: 'PENDING',
-        order: null,
-        resourceVersion: '1.8',
-      },
-    ],
-    billingService: '3f5d0684-a280-477e-a67b-2a956a1f6dca:Registration Revist',
-    payments: [],
-    display: '1228-6',
-    totalAmount: 50,
-  },
-];
diff --git a/packages/esm-billing-app/jest.config.js b/packages/esm-billing-app/jest.config.js
deleted file mode 100755
index e53fc90..0000000
--- a/packages/esm-billing-app/jest.config.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const rootConfig = require('../../jest.config.js');
-
-const packageConfig = {
-  ...rootConfig,
-  collectCoverage: false,
-};
-
-module.exports = packageConfig;
diff --git a/packages/esm-billing-app/package.json b/packages/esm-billing-app/package.json
deleted file mode 100755
index bb437e5..0000000
--- a/packages/esm-billing-app/package.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "name": "@ampath/esm-billing-app",
-  "version": "5.2.0",
-  "description": "Billing app for AMPATH",
-  "browser": "dist/ampath-esm-billing-app.js",
-  "main": "src/index.ts",
-  "source": true,
-  "license": "MPL-2.0",
-  "homepage": "https://github.com/palladiumkenya/ampath-esm-core#readme",
-  "scripts": {
-    "start": "openmrs develop",
-    "serve": "webpack serve --mode=development",
-    "debug": "npm run serve",
-    "build": "webpack --mode production",
-    "analyze": "webpack --mode=production --env.analyze=true",
-    "lint": "eslint src --ext ts,tsx",
-    "typescript": "tsc",
-    "extract-translations": "i18next 'src/**/*.component.tsx' 'src/index.ts' --config ../../tools/i18next-parser.config.js",
-    "test": "cross-env TZ=UTC jest --config jest.config.js --verbose false --passWithNoTests",
-    "test:watch": "cross-env TZ=UTC jest --watch --config jest.config.js",
-    "coverage": "yarn test --coverage"
-  },
-  "browserslist": [
-    "extends browserslist-config-openmrs"
-  ],
-  "keywords": [
-    "openmrs"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/palladiumkenya/kenyaemr-esm-core#readme"
-  },
-  "bugs": {
-    "url": "https://github.com/palladiumkenya/kenyaemr-esm-core/issues"
-  },
-  "dependencies": {
-    "@carbon/react": "^1.42.1",
-    "lodash-es": "^4.17.15",
-    "react-to-print": "^2.14.13"
-  },
-  "peerDependencies": {
-    "@openmrs/esm-framework": "5.x",
-    "react": "^18.1.0",
-    "react-i18next": "11.x",
-    "react-router-dom": "6.x",
-    "swr": "2.x"
-  },
-  "devDependencies": {
-    "webpack": "^5.74.0"
-  }
-}
diff --git a/packages/esm-billing-app/src/bill-history/bill-history.component.tsx b/packages/esm-billing-app/src/bill-history/bill-history.component.tsx
deleted file mode 100755
index 811daa8..0000000
--- a/packages/esm-billing-app/src/bill-history/bill-history.component.tsx
+++ /dev/null
@@ -1,210 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  DataTableSkeleton,
-  Layer,
-  DataTable,
-  TableContainer,
-  Table,
-  TableHead,
-  TableHeader,
-  TableRow,
-  TableBody,
-  TableCell,
-  Tile,
-  Pagination,
-  TableExpandHeader,
-  TableExpandRow,
-  TableExpandedRow,
-  Button,
-} from '@carbon/react';
-import { Add } from '@carbon/react/icons';
-import { isDesktop, useLayoutType, usePagination } from '@openmrs/esm-framework';
-import {
-  EmptyDataIllustration,
-  ErrorState,
-  usePaginationInfo,
-  CardHeader,
-  useLaunchWorkspaceRequiringVisit,
-} from '@openmrs/esm-patient-common-lib';
-import { useBills } from '../billing.resource';
-import InvoiceTable from '../invoice/invoice-table.component';
-import styles from './bill-history.scss';
-
-interface BillHistoryProps {
-  patientUuid: string;
-}
-
-const BillHistory: React.FC<BillHistoryProps> = ({ patientUuid }) => {
-  const { t } = useTranslation();
-  const { bills, isLoading, error } = useBills(patientUuid);
-  const launchPatientWorkspace = useLaunchWorkspaceRequiringVisit('billing-form');
-  const layout = useLayoutType();
-  const [pageSize, setPageSize] = React.useState(10);
-  const responsiveSize = isDesktop(layout) ? 'sm' : 'lg';
-  const { paginated, goTo, results, currentPage } = usePagination(bills, pageSize);
-  const { pageSizes } = usePaginationInfo(pageSize, bills?.length, currentPage, results?.length);
-
-  const handleLaunchBillForm = () => {
-    launchPatientWorkspace({ workspaceTitle: t('billingForm', 'Billing Form') });
-  };
-
-  const headerData = [
-    {
-      header: t('visitTime', 'Visit time'),
-      key: 'visitTime',
-    },
-    {
-      header: t('identifier', 'Identifier'),
-      key: 'identifier',
-    },
-    {
-      header: t('billedItems', 'Billed Items'),
-      key: 'billedItems',
-    },
-    {
-      header: t('billTotal', 'Bill total'),
-      key: 'billTotal',
-    },
-  ];
-
-  const setBilledItems = (bill) =>
-    bill.lineItems?.reduce(
-      (acc, item) => acc + (acc ? ' & ' : '') + (item.billableService?.split(':')[1] || item.item?.split(':')[1] || ''),
-      '',
-    );
-
-  const rowData = results?.map((bill) => ({
-    id: bill.uuid,
-    uuid: bill.uuid,
-    billTotal: bill.totalAmount,
-    visitTime: bill.dateCreated,
-    identifier: bill.identifier,
-    billedItems: setBilledItems(bill),
-  }));
-
-  if (isLoading) {
-    return (
-      <div className={styles.loaderContainer}>
-        <DataTableSkeleton showHeader={false} showToolbar={false} zebra size={responsiveSize} />
-      </div>
-    );
-  }
-
-  if (error) {
-    return (
-      <div className={styles.errorContainer}>
-        <Layer>
-          <ErrorState error={error} headerTitle={t('billsList', 'Bill list')} />
-        </Layer>
-      </div>
-    );
-  }
-
-  if (bills.length === 0) {
-    return (
-      <>
-        <CardHeader title={t('patientBilling', 'Patient billing')}>
-          <></>
-        </CardHeader>
-        <Layer>
-          <Tile className={styles.tile}>
-            <div className={styles.illo}>
-              <EmptyDataIllustration />
-            </div>
-            <p className={styles.content}>There are no bills to display.</p>
-            <Button onClick={handleLaunchBillForm} kind="ghost">
-              {t('launchBillForm', 'Launch bill form')}
-            </Button>
-          </Tile>
-        </Layer>
-      </>
-    );
-  }
-
-  return (
-    <div>
-      <CardHeader title={t('patientBilling', 'Patient billing')}>
-        <Button renderIcon={Add} onClick={handleLaunchBillForm} kind="ghost">
-          {t('addBill', 'Add bill item(s)')}
-        </Button>
-      </CardHeader>
-      <div className={styles.billHistoryContainer}>
-        <DataTable isSortable rows={rowData} headers={headerData} size={responsiveSize} useZebraStyles>
-          {({
-            rows,
-            headers,
-            getExpandHeaderProps,
-            getTableProps,
-            getTableContainerProps,
-            getHeaderProps,
-            getRowProps,
-          }) => (
-            <TableContainer {...getTableContainerProps}>
-              <Table className={styles.table} {...getTableProps()} aria-label="Bill list">
-                <TableHead>
-                  <TableRow>
-                    <TableExpandHeader enableToggle {...getExpandHeaderProps()} />
-                    {headers.map((header, i) => (
-                      <TableHeader
-                        key={i}
-                        {...getHeaderProps({
-                          header,
-                        })}>
-                        {header.header}
-                      </TableHeader>
-                    ))}
-                  </TableRow>
-                </TableHead>
-                <TableBody>
-                  {rows.map((row, i) => {
-                    const currentBill = bills?.find((bill) => bill.uuid === row.id);
-
-                    return (
-                      <React.Fragment key={row.id}>
-                        <TableExpandRow {...getRowProps({ row })}>
-                          {row.cells.map((cell) => (
-                            <TableCell key={cell.id}>{cell.value}</TableCell>
-                          ))}
-                        </TableExpandRow>
-                        {row.isExpanded ? (
-                          <TableExpandedRow className={styles.expandedRow} colSpan={headers.length + 1}>
-                            <div className={styles.container} key={i}>
-                              <InvoiceTable bill={currentBill} isSelectable={false} />
-                            </div>
-                          </TableExpandedRow>
-                        ) : (
-                          <TableExpandedRow className={styles.hiddenRow} colSpan={headers.length + 2} />
-                        )}
-                      </React.Fragment>
-                    );
-                  })}
-                </TableBody>
-              </Table>
-            </TableContainer>
-          )}
-        </DataTable>
-        {paginated && (
-          <Pagination
-            forwardText={t('nextPage', 'Next page')}
-            backwardText={t('previousPage', 'Previous page')}
-            page={currentPage}
-            pageSize={pageSize}
-            pageSizes={pageSizes}
-            totalItems={bills.length}
-            className={styles.pagination}
-            size={responsiveSize}
-            onChange={({ page: newPage, pageSize }) => {
-              if (newPage !== currentPage) {
-                goTo(newPage);
-              }
-              setPageSize(pageSize);
-            }}
-          />
-        )}
-      </div>
-    </div>
-  );
-};
-
-export default BillHistory;
diff --git a/packages/esm-billing-app/src/bill-history/bill-history.scss b/packages/esm-billing-app/src/bill-history/bill-history.scss
deleted file mode 100755
index 786f905..0000000
--- a/packages/esm-billing-app/src/bill-history/bill-history.scss
+++ /dev/null
@@ -1,165 +0,0 @@
-@use '@carbon/layout';
-@use '@carbon/type';
-@import '~@openmrs/esm-styleguide/src/vars';
-
-.container {
-  margin: 2rem 0;
-}
-
-.billHistoryContainer {
-  background-color: $ui-02;
-  border: 1px solid $ui-03;
-  border-bottom: none;
-  width: 100%;
-  margin: 0 auto;
-  max-width: 95vw;
-  padding-bottom: 0;
-}
-
-.headerContainer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: layout.$spacing-04 0 layout.$spacing-04 layout.$spacing-05;
-  background-color: $ui-02;
-}
-
-.backgroundDataFetchingIndicator {
-  align-items: center;
-  display: flex;
-  flex: 1 1 0%;
-  justify-content: center;
-}
-
-.tableContainer section {
-  position: relative;
-}
-
-.tableContainer a {
-  text-decoration: none;
-}
-
-.pagination {
-  overflow: hidden;
-
-  &:global(.cds--pagination) {
-    border-top: none;
-  }
-}
-
-.hiddenRow {
-  display: none;
-}
-
-.emptyRow {
-  padding: 0 1rem;
-  display: flex;
-  align-items: center;
-}
-
-.visitSummaryContainer {
-  width: 100%;
-  max-width: 768px;
-  margin: 1rem auto;
-}
-
-.expandedActiveVisitRow > td > div {
-  max-height: max-content !important;
-}
-
-.expandedActiveVisitRow td {
-  padding: 0 2rem;
-}
-
-.expandedActiveVisitRow th[colspan] td[colspan] > div:first-child {
-  padding: 0 1rem;
-}
-
-.action {
-  margin-bottom: layout.$spacing-03;
-}
-
-.illo {
-  margin-top: layout.$spacing-05;
-}
-
-.content {
-  @include type.type-style('heading-compact-01');
-  color: $text-02;
-  margin-top: layout.$spacing-05;
-  margin-bottom: layout.$spacing-03;
-}
-
-.desktopHeading,
-.tabletHeading {
-  text-align: left;
-  text-transform: capitalize;
-
-  h4 {
-    @include type.type-style('heading-compact-02');
-    color: $text-02;
-
-    &:after {
-      content: '';
-      display: block;
-      width: 2rem;
-      padding-top: 3px;
-      border-bottom: 0.375rem solid;
-      @include brand-03(border-bottom-color);
-    }
-  }
-}
-
-.tile {
-  text-align: center;
-  // border: 1px solid $ui-03;
-}
-
-.filterEmptyState {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: layout.$spacing-05;
-  margin: layout.$spacing-09;
-  text-align: center;
-}
-
-.filterEmptyStateTile {
-  margin: auto;
-}
-
-.filterEmptyStateContent {
-  @include type.type-style('heading-compact-02');
-  color: $text-02;
-  margin-bottom: 0.5rem;
-}
-
-.filterEmptyStateHelper {
-  @include type.type-style('body-compact-01');
-  color: $text-02;
-}
-
-.table {
-  tr[data-child-row] td {
-    padding-left: 2rem !important;
-  }
-}
-
-.billingHeading {
-  position: relative;
-  max-width: 400px;
-  text-align: 'left';
-  margin-bottom: 40px;
-}
-
-.billingHeading::after {
-  position: absolute;
-  bottom: -10px;
-  width: 50px;
-  height: 5px;
-  background: green;
-  content: '';
-  display: block;
-  left: 6%;
-  transform: translatex(-50%);
-}
diff --git a/packages/esm-billing-app/src/billable-services-admin-card-link.component.tsx b/packages/esm-billing-app/src/billable-services-admin-card-link.component.tsx
deleted file mode 100755
index b385dd3..0000000
--- a/packages/esm-billing-app/src/billable-services-admin-card-link.component.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { Layer, ClickableTile } from '@carbon/react';
-import { ArrowRight } from '@carbon/react/icons';
-
-const BillableServicesCardLink: React.FC = () => {
-  const { t } = useTranslation();
-  const header = t('manageBillableServices', 'Manage billable services');
-  return (
-    <Layer>
-      <ClickableTile href={`${window.spaBase}/billable-services`} target="_blank" rel="noopener noreferrer">
-        <div>
-          <div className="heading">{header}</div>
-          <div className="content">{t('billableServices', 'Billable Services')}</div>
-        </div>
-        <div className="iconWrapper">
-          <ArrowRight size={16} />
-        </div>
-      </ClickableTile>
-    </Layer>
-  );
-};
-
-export default BillableServicesCardLink;
diff --git a/packages/esm-billing-app/src/billable-services/bill-waiver/bill-selection.component.tsx b/packages/esm-billing-app/src/billable-services/bill-waiver/bill-selection.component.tsx
deleted file mode 100755
index 65f2301..0000000
--- a/packages/esm-billing-app/src/billable-services/bill-waiver/bill-selection.component.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import React from 'react';
-import {
-  StructuredListHead,
-  StructuredListRow,
-  StructuredListCell,
-  StructuredListBody,
-  StructuredListWrapper,
-  Layer,
-  Checkbox,
-} from '@carbon/react';
-import { useTranslation } from 'react-i18next';
-import { convertToCurrency, extractString } from '../../helpers';
-import { type MappedBill, type LineItem } from '../../types';
-import styles from './bill-waiver.scss';
-import BillWaiverForm from './bill-waiver-form.component';
-
-const PatientBillsSelections: React.FC<{ bills: MappedBill; setPatientUuid: (patientUuid) => void }> = ({
-  bills,
-  setPatientUuid,
-}) => {
-  const { t } = useTranslation();
-  const [selectedBills, setSelectedBills] = React.useState<Array<LineItem>>([]);
-
-  const checkBoxLabel = (lineItem) => {
-    return `${lineItem.item === '' ? lineItem.billableService : lineItem.item} ${convertToCurrency(lineItem.price)}`;
-  };
-
-  const handleOnCheckBoxChange = (event, { checked, id }) => {
-    const selectedLineItem = bills.lineItems.find((lineItem) => lineItem.uuid === id);
-    if (checked) {
-      setSelectedBills([...selectedBills, selectedLineItem]);
-    } else {
-      setSelectedBills(selectedBills.filter((lineItem) => lineItem.uuid !== id));
-    }
-  };
-  return (
-    <Layer>
-      <StructuredListWrapper className={styles.billListContainer} isCondensed selection={true}>
-        <StructuredListHead>
-          <StructuredListRow head>
-            <StructuredListCell head>{t('billItem', 'Bill item')}</StructuredListCell>
-            <StructuredListCell head>{t('quantity', 'Quantity')}</StructuredListCell>
-            <StructuredListCell head>{t('unitPrice', 'Unit Price')}</StructuredListCell>
-            <StructuredListCell head>{t('total', 'Total')}</StructuredListCell>
-            <StructuredListCell head>{t('actions', 'Actions')}</StructuredListCell>
-          </StructuredListRow>
-        </StructuredListHead>
-        <StructuredListBody>
-          {bills?.lineItems.map((lineItem) => (
-            <StructuredListRow>
-              <StructuredListCell>
-                {lineItem.item === '' ? extractString(lineItem.billableService) : extractString(lineItem.item)}
-              </StructuredListCell>
-              <StructuredListCell>{lineItem.quantity}</StructuredListCell>
-              <StructuredListCell>{convertToCurrency(lineItem.price)}</StructuredListCell>
-              <StructuredListCell>{convertToCurrency(lineItem.price * lineItem.quantity)}</StructuredListCell>
-              <StructuredListCell>
-                <Checkbox
-                  hideLabel
-                  onChange={(event, { checked, id }) => handleOnCheckBoxChange(event, { checked, id })}
-                  labelText={checkBoxLabel(lineItem)}
-                  id={lineItem.uuid}
-                />
-              </StructuredListCell>
-            </StructuredListRow>
-          ))}
-        </StructuredListBody>
-      </StructuredListWrapper>
-      <BillWaiverForm bill={bills} lineItems={selectedBills} setPatientUuid={setPatientUuid} />
-    </Layer>
-  );
-};
-
-export default PatientBillsSelections;
diff --git a/packages/esm-billing-app/src/billable-services/bill-waiver/bill-waiver-form.component.tsx b/packages/esm-billing-app/src/billable-services/bill-waiver/bill-waiver-form.component.tsx
deleted file mode 100755
index 5c0dd52..0000000
--- a/packages/esm-billing-app/src/billable-services/bill-waiver/bill-waiver-form.component.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import React, { useState } from 'react';
-import { Form, Stack, FormGroup, Layer, Button, NumberInput } from '@carbon/react';
-import { TaskAdd } from '@carbon/react/icons';
-import { useTranslation } from 'react-i18next';
-import styles from './bill-waiver-form.scss';
-import { type LineItem, type MappedBill } from '../../types';
-import { createBillWaiverPayload, extractErrorMessagesFromResponse } from '../../utils';
-import { convertToCurrency, extractString } from '../../helpers';
-import { processBillPayment, usePaymentModes } from '../../billing.resource';
-import { showSnackbar } from '@openmrs/esm-framework';
-import { mutate } from 'swr';
-
-type BillWaiverFormProps = {
-  bill: MappedBill;
-  lineItems: Array<LineItem>;
-  setPatientUuid: (patientUuid) => void;
-};
-
-const BillWaiverForm: React.FC<BillWaiverFormProps> = ({ bill, lineItems, setPatientUuid }) => {
-  const { t } = useTranslation();
-  const [waiverAmount, setWaiverAmount] = useState(0);
-
-  const totalAmount = lineItems.reduce((acc, curr) => acc + curr.price * curr.quantity, 0);
-  const { paymentModes } = usePaymentModes(false);
-
-  if (lineItems?.length === 0) {
-    return null;
-  }
-
-  const handleProcessPayment = () => {
-    const waiverEndPointPayload = createBillWaiverPayload(bill, waiverAmount, totalAmount, lineItems, paymentModes);
-
-    processBillPayment(waiverEndPointPayload, bill.uuid).then(
-      (resp) => {
-        showSnackbar({
-          title: t('billWaiver', 'Bill waiver'),
-          subtitle: t('billWaiverSuccess', 'Bill waiver successful'),
-          kind: 'success',
-          timeoutInMs: 3500,
-          isLowContrast: true,
-        });
-        setPatientUuid('');
-        mutate((key) => typeof key === 'string' && key.startsWith('/ws/rest/v1/cashier/bill?v=full'), undefined, {
-          revalidate: true,
-        });
-      },
-      (error) => {
-        showSnackbar({
-          title: t('billWaiver', 'Bill waiver'),
-          subtitle: t('billWaiverError', 'Bill waiver failed {{error}}', {
-            error: extractErrorMessagesFromResponse(error?.responseBody),
-          }),
-          kind: 'error',
-          timeoutInMs: 3500,
-          isLowContrast: true,
-        });
-      },
-    );
-  };
-
-  return (
-    <Form className={styles.billWaiverForm} aria-label={t('waiverForm', 'Waiver form')}>
-      <hr />
-      <Stack gap={7}>
-        <FormGroup legendText={t('waiverForm', 'Waiver form')}>
-          <section className={styles.billWaiverDescription}>
-            <label className={styles.label}>{t('billItems', 'Bill Items')}</label>
-            <p className={styles.value}>
-              {t('billName', ' {{billName}} ', {
-                billName: lineItems.map((item) => extractString(item.item || item.billableService)).join(', ') ?? '--',
-              })}
-            </p>
-          </section>
-          <section className={styles.billWaiverDescription}>
-            <label className={styles.label}>{t('billTotal', 'Bill total')}</label>
-            <p className={styles.value}>{convertToCurrency(totalAmount)}</p>
-          </section>
-
-          <Layer className={styles.formControlLayer}>
-            <NumberInput
-              id="waiverAmount"
-              label={t('amountToWaiveLabel', 'Amount to Waive')}
-              helperText={t('amountToWaiveHelper', 'Specify the amount to be deducted from the bill')}
-              aria-label={t('amountToWaiveAriaLabel', 'Enter amount to waive')}
-              hideSteppers
-              disableWheel
-              min={0}
-              max={totalAmount}
-              invalidText={t('invalidWaiverAmountMessage', 'Amount to waive cannot be greater than total amount')}
-              value={waiverAmount}
-              onChange={(event) => setWaiverAmount(event.target.value)}
-            />
-          </Layer>
-        </FormGroup>
-        <div className={styles.buttonContainer}>
-          <Button kind="tertiary" renderIcon={TaskAdd} onClick={handleProcessPayment}>
-            {t('postWaiver', 'Post waiver')}
-          </Button>
-        </div>
-      </Stack>
-    </Form>
-  );
-};
-
-export default BillWaiverForm;
diff --git a/packages/esm-billing-app/src/billable-services/bill-waiver/bill-waiver-form.scss b/packages/esm-billing-app/src/billable-services/bill-waiver/bill-waiver-form.scss
deleted file mode 100755
index 36742cb..0000000
--- a/packages/esm-billing-app/src/billable-services/bill-waiver/bill-waiver-form.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.billWaiverForm {
-  margin-top: layout.$spacing-05;
-  padding: 0 layout.$spacing-05;
-}
-
-.buttonContainer {
-  display: flex;
-  justify-content: flex-end;
-  margin-top: -1rem;
-}
-
-.formControlLayer {
-  padding: layout.$spacing-05 0;
-}
-
-.billWaiverDescription {
-  display: grid;
-  grid-template-columns: 5rem 1fr;
-  column-gap: 1rem;
-  align-items: center;
-  margin-top: 0.125rem;
-  margin-bottom: 0.5rem;
-}
-
-.label {
-  @include type.type-style('heading-compact-01');
-}
-
-.value {
-  @include type.type-style('body-01');
-}
diff --git a/packages/esm-billing-app/src/billable-services/bill-waiver/bill-waiver.component.tsx b/packages/esm-billing-app/src/billable-services/bill-waiver/bill-waiver.component.tsx
deleted file mode 100755
index ec8b2d1..0000000
--- a/packages/esm-billing-app/src/billable-services/bill-waiver/bill-waiver.component.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from 'react';
-import { ExtensionSlot, UserHasAccess } from '@openmrs/esm-framework';
-import PatientBills from './patient-bills.component';
-import styles from './bill-waiver.scss';
-import BillWaiverForm from './bill-waiver-form.component';
-import { useBills } from '../../billing.resource';
-
-type BillWaiverProps = {};
-
-const BillWaiver: React.FC<BillWaiverProps> = () => {
-  const [patientUuid, setPatientUuid] = React.useState<string>('');
-  const { bills } = useBills(patientUuid);
-  const filterBills = bills.filter((bill) => bill.status !== 'PAID' && patientUuid === bill.patientUuid) ?? [];
-  return (
-    <UserHasAccess privilege="coreapps.systemAdministration">
-      <div className={styles.billWaiverContainer}>
-        <ExtensionSlot
-          name="patient-search-bar-slot"
-          state={{
-            selectPatientAction: (patientUuid) => setPatientUuid(patientUuid),
-            buttonProps: {
-              kind: 'primary',
-            },
-          }}
-        />
-
-        <PatientBills patientUuid={patientUuid} bills={filterBills} setPatientUuid={setPatientUuid} />
-      </div>
-    </UserHasAccess>
-  );
-};
-
-export default BillWaiver;
diff --git a/packages/esm-billing-app/src/billable-services/bill-waiver/bill-waiver.scss b/packages/esm-billing-app/src/billable-services/bill-waiver/bill-waiver.scss
deleted file mode 100755
index f2e4a57..0000000
--- a/packages/esm-billing-app/src/billable-services/bill-waiver/bill-waiver.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-@use '@carbon/layout';
-
-.billWaiverContainer {
-  margin: layout.$layout-01;
-  row-gap: layout.$layout-01;
-}
-
-.billListContainer {
-  background-color: white;
-}
diff --git a/packages/esm-billing-app/src/billable-services/bill-waiver/patient-bills.component.tsx b/packages/esm-billing-app/src/billable-services/bill-waiver/patient-bills.component.tsx
deleted file mode 100755
index 93070d0..0000000
--- a/packages/esm-billing-app/src/billable-services/bill-waiver/patient-bills.component.tsx
+++ /dev/null
@@ -1,135 +0,0 @@
-import React from 'react';
-import {
-  Layer,
-  DataTable,
-  TableContainer,
-  Table,
-  TableHead,
-  TableRow,
-  TableExpandHeader,
-  TableHeader,
-  TableBody,
-  TableExpandRow,
-  TableCell,
-  TableExpandedRow,
-  Tile,
-} from '@carbon/react';
-import { convertToCurrency, extractString } from '../../helpers';
-import { useTranslation } from 'react-i18next';
-import { EmptyDataIllustration } from '@openmrs/esm-patient-common-lib';
-import PatientBillsSelections from './bill-selection.component';
-import { type MappedBill } from '../../types';
-import styles from '../../bills-table/bills-table.scss';
-
-type PatientBillsProps = {
-  patientUuid: string;
-  bills: Array<MappedBill>;
-  setPatientUuid: (patientUuid: string) => void;
-};
-
-const PatientBills: React.FC<PatientBillsProps> = ({ patientUuid, bills, setPatientUuid }) => {
-  const { t } = useTranslation();
-
-  if (!patientUuid) {
-    return;
-  }
-
-  const tableHeaders = [
-    { header: 'Date', key: 'date' },
-    { header: 'Billable Service', key: 'billableService' },
-    { header: 'Total Amount', key: 'totalAmount' },
-  ];
-
-  const tableRows = bills.map((bill) => ({
-    id: `${bill.uuid}`,
-    date: bill.dateCreated,
-    billableService: extractString(bill.billingService),
-    totalAmount: convertToCurrency(bill.totalAmount),
-  }));
-
-  if (bills.length === 0 && patientUuid !== '') {
-    return (
-      <>
-        <div style={{ marginTop: '0.625rem' }}>
-          <Layer className={styles.emptyStateContainer}>
-            <Tile className={styles.tile}>
-              <div className={styles.illo}>
-                <EmptyDataIllustration />
-              </div>
-              <p className={styles.content}>{t('noBillDisplay', 'There are no bills to display for this patient')}</p>
-            </Tile>
-          </Layer>
-        </div>
-      </>
-    );
-  }
-
-  return (
-    <div style={{ marginTop: '1rem' }}>
-      <DataTable
-        rows={tableRows}
-        headers={tableHeaders}
-        size="sm"
-        useZebraStyles
-        render={({
-          rows,
-          headers,
-          getHeaderProps,
-          getExpandHeaderProps,
-          getRowProps,
-          getExpandedRowProps,
-          getTableProps,
-          getTableContainerProps,
-        }) => (
-          <TableContainer
-            title={t('patientBills', 'Patient bill')}
-            description={t('patientBillsDescription', 'List of patient bills')}
-            {...getTableContainerProps()}>
-            <Table {...getTableProps()} aria-label="sample table">
-              <TableHead>
-                <TableRow>
-                  <TableExpandHeader enableToggle={true} {...getExpandHeaderProps()} />
-                  {headers.map((header, i) => (
-                    <TableHeader
-                      key={i}
-                      {...getHeaderProps({
-                        header,
-                      })}>
-                      {header.header}
-                    </TableHeader>
-                  ))}
-                </TableRow>
-              </TableHead>
-              <TableBody>
-                {rows.map((row, index) => (
-                  <React.Fragment key={row.id}>
-                    <TableExpandRow
-                      {...getRowProps({
-                        row,
-                      })}>
-                      {row.cells.map((cell) => (
-                        <TableCell key={cell.id}>{cell.value}</TableCell>
-                      ))}
-                    </TableExpandRow>
-                    <TableExpandedRow
-                      colSpan={headers.length + 1}
-                      className="demo-expanded-td"
-                      {...getExpandedRowProps({
-                        row,
-                      })}>
-                      <div>
-                        <PatientBillsSelections bills={bills[index]} setPatientUuid={setPatientUuid} />
-                      </div>
-                    </TableExpandedRow>
-                  </React.Fragment>
-                ))}
-              </TableBody>
-            </Table>
-          </TableContainer>
-        )}
-      />
-    </div>
-  );
-};
-
-export default PatientBills;
diff --git a/packages/esm-billing-app/src/billable-services/billable-service.resource.tsx b/packages/esm-billing-app/src/billable-services/billable-service.resource.tsx
deleted file mode 100755
index c19a27f..0000000
--- a/packages/esm-billing-app/src/billable-services/billable-service.resource.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { type OpenmrsResource, openmrsFetch } from '@openmrs/esm-framework';
-import useSWR from 'swr';
-import { type ServiceConcept } from '../types';
-
-type ResponseObject = {
-  results: Array<OpenmrsResource>;
-};
-
-type ServiceTypesResponse = {
-  setMembers: { uuid: string; display: string }[];
-};
-
-export const useBillableServices = () => {
-  const url = `/ws/rest/v1/cashier/billableService?v=custom:(uuid,name,shortName,serviceStatus,serviceType:(display),servicePrices:(uuid,name,price))`;
-  const { data, isLoading, isValidating, error, mutate } = useSWR<{ data: ResponseObject }>(url, openmrsFetch, {});
-  return { billableServices: data?.data.results ?? [], isLoading, isValidating, error, mutate };
-};
-
-export function useServiceTypes() {
-  const url = `/ws/rest/v1/concept/d2ece9e9-3907-440d-b5c3-5d3b148594f5?v=custom:(setMembers:(uuid,display))`;
-  const { data, error, isLoading } = useSWR<{ data: ServiceTypesResponse }>(url, openmrsFetch, {});
-  return { serviceTypes: data?.data.setMembers ?? [], error, isLoading };
-}
-
-export const usePaymentModes = () => {
-  const url = `/ws/rest/v1/cashier/paymentMode`;
-  const { data, error, isLoading } = useSWR<{ data: ResponseObject }>(url, openmrsFetch, {});
-  return { paymentModes: data?.data.results ?? [], error, isLoading };
-};
-
-export const createBillableService = (payload: any) => {
-  const url = `/ws/rest/v1/cashier/api/billable-service`;
-  return openmrsFetch(url, {
-    method: 'POST',
-    body: payload,
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  });
-};
-
-export function useConceptsSearch(conceptToLookup: string) {
-  const conditionsSearchUrl = `/ws/rest/v1/conceptsearch?q=${conceptToLookup}`;
-
-  const { data, error, isLoading } = useSWR<{ data: { results: Array<ServiceConcept> } }, Error>(
-    conceptToLookup ? conditionsSearchUrl : null,
-    openmrsFetch,
-  );
-
-  return {
-    searchResults: data?.data?.results ?? [],
-    error: error,
-    isSearching: isLoading,
-  };
-}
diff --git a/packages/esm-billing-app/src/billable-services/billable-services-home.component.tsx b/packages/esm-billing-app/src/billable-services/billable-services-home.component.tsx
deleted file mode 100755
index ee6c885..0000000
--- a/packages/esm-billing-app/src/billable-services/billable-services-home.component.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import React from 'react';
-import { BrowserRouter, Routes, Route } from 'react-router-dom';
-import { useTranslation } from 'react-i18next';
-import { BillableServicesDashboard } from './dashboard/dashboard.component';
-import AddBillableService from './create-edit/add-billable-service.component';
-import { SideNav, SideNavItems, SideNavLink } from '@carbon/react';
-import styles from './billable-services.scss';
-import BillingHeader from '../billing-header/billing-header.component';
-import { Wallet, Money } from '@carbon/react/icons';
-import { UserHasAccess, navigate } from '@openmrs/esm-framework';
-import BillWaiver from './bill-waiver/bill-waiver.component';
-import BillingTariffs from './billing-tariffs/billing-tariffs.component';
-import AddTariffsService from './billing-tariffs/add-billings-tariffs-service.component';
-const basePath = `${window.spaBase}/billable-services`;
-const BillableServiceHome: React.FC = () => {
-  const { t } = useTranslation();
-
-  const handleNavigation = (path: string) => {
-    navigate({ to: `${basePath}/${path}` });
-  };
-
-  return (
-    <BrowserRouter basename={`${window.spaBase}/billable-services`}>
-      <main className={styles.mainSection}>
-        <section>
-          <SideNav>
-            <SideNavItems>
-              <SideNavLink onClick={() => handleNavigation('')} renderIcon={Wallet} isActive>
-                {t('billableServices', 'Billable Services')}
-              </SideNavLink>
-              <UserHasAccess privilege="coreapps.systemAdministration">
-                <SideNavLink onClick={() => handleNavigation('waive-bill')} renderIcon={Money}>
-                  {t('billWaiver', 'Bill Waiver')}
-                </SideNavLink>
-              </UserHasAccess>
-              <UserHasAccess privilege="coreapps.systemAdministration">
-                <SideNavLink onClick={() => handleNavigation('bill-tariffs')} renderIcon={Money}>
-                  {t('billTariffs', 'Insurance Tariffs')}
-                </SideNavLink>
-              </UserHasAccess>
-            </SideNavItems>
-          </SideNav>
-        </section>
-        <section>
-          <BillingHeader title={t('billServicesManagement', 'Bill services management')} />
-          <Routes>
-            <Route path="/" element={<BillableServicesDashboard />} />
-            <Route path="/add-service" element={<AddBillableService />} />
-            <Route path="/waive-bill" element={<BillWaiver />} />
-            <Route path="/bill-tariffs" element={<BillingTariffs />} />
-            <Route path="/add-tariffs" element={<AddTariffsService />} />
-          </Routes>
-        </section>
-      </main>
-    </BrowserRouter>
-  );
-};
-
-export default BillableServiceHome;
diff --git a/packages/esm-billing-app/src/billable-services/billable-services.component.tsx b/packages/esm-billing-app/src/billable-services/billable-services.component.tsx
deleted file mode 100755
index c0c3bb2..0000000
--- a/packages/esm-billing-app/src/billable-services/billable-services.component.tsx
+++ /dev/null
@@ -1,255 +0,0 @@
-import React, { useCallback, useMemo, useState } from 'react';
-import classNames from 'classnames';
-import {
-  DataTable,
-  InlineLoading,
-  Layer,
-  Pagination,
-  Search,
-  Table,
-  TableBody,
-  TableCell,
-  TableContainer,
-  TableHead,
-  TableHeader,
-  TableRow,
-  Tile,
-  Button,
-} from '@carbon/react';
-import { useLayoutType, isDesktop, useConfig, usePagination, ErrorState, navigate } from '@openmrs/esm-framework';
-import { EmptyState } from '@openmrs/esm-patient-common-lib';
-import styles from './billable-services.scss';
-import { useTranslation } from 'react-i18next';
-import { useBillableServices } from './billable-service.resource';
-import { ArrowRight } from '@carbon/react/icons';
-
-const BillableServices = () => {
-  const { t } = useTranslation();
-  const { billableServices, isLoading, isValidating, error, mutate } = useBillableServices();
-  const layout = useLayoutType();
-  const config = useConfig();
-  const [searchString, setSearchString] = useState('');
-  const responsiveSize = isDesktop(layout) ? 'lg' : 'sm';
-  const pageSizes = config?.billableServices?.pageSizes ?? [10, 20, 30, 40, 50];
-  const [pageSize, setPageSize] = useState(config?.billableServices?.pageSize ?? 10);
-
-  //creating service state
-  const [showOverlay, setShowOverlay] = useState(false);
-  const [overlayHeader, setOverlayTitle] = useState('');
-
-  const headerData = [
-    {
-      header: t('serviceName', 'Service Name'),
-      key: 'serviceName',
-    },
-    {
-      header: t('shortName', 'Short Name'),
-      key: 'shortName',
-    },
-    {
-      header: t('serviceType', 'Service Type'),
-      key: 'serviceType',
-    },
-    {
-      header: t('status', 'Service Status'),
-      key: 'status',
-    },
-    {
-      header: t('prices', 'Prices'),
-      key: 'prices',
-    },
-    {
-      header: t('actions', 'Actions'),
-      key: 'actions',
-    },
-  ];
-
-  const launchBillableServiceForm = useCallback(() => {
-    navigate({ to: window.getOpenmrsSpaBase() + 'billable-services/add-service' });
-  }, []);
-
-  const searchResults = useMemo(() => {
-    if (billableServices !== undefined && billableServices.length > 0) {
-      if (searchString && searchString.trim() !== '') {
-        const search = searchString.toLowerCase();
-        return billableServices?.filter((service) =>
-          Object.entries(service).some(([header, value]) => {
-            return header === 'uuid' ? false : `${value}`.toLowerCase().includes(search);
-          }),
-        );
-      }
-    }
-    return billableServices;
-  }, [searchString, billableServices]);
-
-  const { paginated, goTo, results, currentPage } = usePagination(searchResults, pageSize);
-
-  let rowData = [];
-  if (results) {
-    results.forEach((service, index) => {
-      const s = {
-        id: `${index}`,
-        uuid: service.uuid,
-        serviceName: service.name,
-        shortName: service.shortName,
-        serviceType: service?.serviceType?.display,
-        status: service.serviceStatus,
-        prices: '--',
-        actions: '--',
-      };
-      let cost = '';
-      service.servicePrices.forEach((price) => {
-        cost += `${price.name} (${price.price}) `;
-      });
-      s.prices = cost;
-      rowData.push(s);
-    });
-  }
-
-  const handleSearch = useCallback(
-    (e) => {
-      goTo(1);
-      setSearchString(e.target.value);
-    },
-    [goTo, setSearchString],
-  );
-
-  if (isLoading) {
-    <InlineLoading status="active" iconDescription="Loading" description="Loading data..." />;
-  }
-  if (error) {
-    <ErrorState headerTitle={t('billableService', 'Billable Service')} error={error} />;
-  }
-  if (billableServices.length === 0) {
-    <EmptyState
-      displayText={t('billableService', 'Billable Service')}
-      headerTitle={t('billableService', 'Billable Service')}
-      launchForm={launchBillableServiceForm}
-    />;
-  }
-
-  return (
-    <>
-      {billableServices?.length > 0 ? (
-        <div className={styles.serviceContainer}>
-          <FilterableTableHeader
-            handleSearch={handleSearch}
-            isValidating={isValidating}
-            layout={layout}
-            responsiveSize={responsiveSize}
-            t={t}
-          />
-          <DataTable
-            isSortable
-            rows={rowData}
-            headers={headerData}
-            size={responsiveSize}
-            useZebraStyles={rowData?.length > 1 ? true : false}>
-            {({ rows, headers, getRowProps, getTableProps }) => (
-              <TableContainer>
-                <Table {...getTableProps()} aria-label="service list">
-                  <TableHead>
-                    <TableRow>
-                      {headers.map((header) => (
-                        <TableHeader key={header.key}>{header.header}</TableHeader>
-                      ))}
-                    </TableRow>
-                  </TableHead>
-                  <TableBody>
-                    {rows.map((row) => (
-                      <TableRow
-                        key={row.id}
-                        {...getRowProps({
-                          row,
-                        })}>
-                        {row.cells.map((cell) => (
-                          <TableCell key={cell.id}>{cell.value}</TableCell>
-                        ))}
-                      </TableRow>
-                    ))}
-                  </TableBody>
-                </Table>
-              </TableContainer>
-            )}
-          </DataTable>
-          {searchResults?.length === 0 && (
-            <div className={styles.filterEmptyState}>
-              <Layer level={0}>
-                <Tile className={styles.filterEmptyStateTile}>
-                  <p className={styles.filterEmptyStateContent}>
-                    {t('noMatchingServicesToDisplay', 'No matching services to display')}
-                  </p>
-                  <p className={styles.filterEmptyStateHelper}>{t('checkFilters', 'Check the filters above')}</p>
-                </Tile>
-              </Layer>
-            </div>
-          )}
-          {paginated && (
-            <Pagination
-              forwardText="Next page"
-              backwardText="Previous page"
-              page={currentPage}
-              pageSize={pageSize}
-              pageSizes={pageSizes}
-              totalItems={searchResults?.length}
-              className={styles.pagination}
-              size={responsiveSize}
-              onChange={({ pageSize: newPageSize, page: newPage }) => {
-                if (newPageSize !== pageSize) {
-                  setPageSize(newPageSize);
-                }
-                if (newPage !== currentPage) {
-                  goTo(newPage);
-                }
-              }}
-            />
-          )}
-        </div>
-      ) : (
-        <EmptyState
-          launchForm={launchBillableServiceForm}
-          displayText={t('noServicesToDisplay', 'There are no services to display')}
-          headerTitle={t('billableService', 'Billable service')}
-        />
-      )}
-    </>
-  );
-};
-
-function FilterableTableHeader({ layout, handleSearch, isValidating, responsiveSize, t }) {
-  return (
-    <>
-      <div className={styles.headerContainer}>
-        <div
-          className={classNames({
-            [styles.tabletHeading]: !isDesktop(layout),
-            [styles.desktopHeading]: isDesktop(layout),
-          })}>
-          <h4>{t('servicesList', 'Services list')}</h4>
-        </div>
-        <div className={styles.backgroundDataFetchingIndicator}>
-          <span>{isValidating ? <InlineLoading /> : null}</span>
-        </div>
-      </div>
-      <div className={styles.actionsContainer}>
-        <Search
-          labelText=""
-          placeholder={t('filterTable', 'Filter table')}
-          onChange={handleSearch}
-          size={responsiveSize}
-        />
-        <Button
-          size={responsiveSize}
-          kind="primary"
-          renderIcon={(props) => <ArrowRight size={16} {...props} />}
-          onClick={() => {
-            navigate({ to: window.getOpenmrsSpaBase() + 'billable-services/add-service' });
-          }}
-          iconDescription={t('addNewBillableService', 'Add new billable service')}>
-          {t('addNewService', 'Add new service')}
-        </Button>
-      </div>
-    </>
-  );
-}
-export default BillableServices;
diff --git a/packages/esm-billing-app/src/billable-services/billable-services.scss b/packages/esm-billing-app/src/billable-services/billable-services.scss
deleted file mode 100755
index 2f2691f..0000000
--- a/packages/esm-billing-app/src/billable-services/billable-services.scss
+++ /dev/null
@@ -1,219 +0,0 @@
-@use '@carbon/layout';
-@use '@carbon/type';
-@use '@carbon/styles/scss/spacing';
-@import '~@openmrs/esm-styleguide/src/vars';
-
-.container {
-  margin: 2rem 0;
-}
-
-.emptyStateContainer,
-.loaderContainer {
-  @extend .container;
-}
-
-.serviceContainer {
-  background-color: $ui-02;
-  border: 1px solid $ui-03;
-  width: 100%;
-  margin: 0 auto;
-  max-width: 95vw;
-  padding-bottom: 0;
-
-  :has(.filterEmptyState) {
-    border-bottom: none;
-  }
-}
-.left-justified-items {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  cursor: pointer;
-  align-items: center;
-}
-
-.filterContainer {
-  flex: 1;
-
-  :global(.cds--dropdown__wrapper--inline) {
-    gap: 0;
-  }
-
-  :global(.cds--list-box__menu-icon) {
-    height: 1rem;
-  }
-
-  :global(.cds--list-box__menu) {
-    min-width: max-content;
-  }
-
-  :global(.cds--list-box) {
-    margin-left: layout.$spacing-03;
-  }
-}
-
-.menu {
-  margin-left: layout.$spacing-03;
-}
-
-.headerContainer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: layout.$spacing-04 layout.$spacing-05;
-  background-color: $ui-02;
-}
-
-.backgroundDataFetchingIndicator {
-  align-items: center;
-  display: flex;
-  flex: 1;
-  justify-content: space-between;
-
-  &:global(.cds--inline-loading) {
-    max-height: 1rem;
-  }
-}
-
-.tableContainer section {
-  position: relative;
-}
-
-.tableContainer a {
-  text-decoration: none;
-}
-
-.pagination {
-  overflow: hidden;
-
-  &:global(.cds--pagination) {
-    border-top: none;
-  }
-}
-
-.hiddenRow {
-  display: none;
-}
-
-.emptyRow {
-  padding: 0 1rem;
-  display: flex;
-  align-items: center;
-}
-
-.visitSummaryContainer {
-  width: 100%;
-  max-width: 768px;
-  margin: 1rem auto;
-}
-
-.expandedActiveVisitRow > td > div {
-  max-height: max-content !important;
-}
-
-.expandedActiveVisitRow td {
-  padding: 0 2rem;
-}
-
-.expandedActiveVisitRow th[colspan] td[colspan] > div:first-child {
-  padding: 0 1rem;
-}
-
-.action {
-  margin-bottom: layout.$spacing-03;
-}
-
-.illo {
-  margin-top: layout.$spacing-05;
-}
-
-.content {
-  @include type.type-style('heading-compact-01');
-  color: $text-02;
-  margin-top: layout.$spacing-05;
-  margin-bottom: layout.$spacing-03;
-}
-
-.desktopHeading,
-.tabletHeading {
-  text-align: left;
-  text-transform: capitalize;
-  flex: 1;
-
-  h4 {
-    @include type.type-style('heading-compact-02');
-    color: $text-02;
-
-    &:after {
-      content: '';
-      display: block;
-      width: 2rem;
-      padding-top: 3px;
-      border-bottom: 0.375rem solid;
-      @include brand-03(border-bottom-color);
-    }
-  }
-}
-
-.tile {
-  text-align: center;
-  border: 1px solid $ui-03;
-}
-
-.menuitem {
-  max-width: none;
-}
-
-.filterEmptyState {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: layout.$spacing-05;
-  margin: layout.$spacing-09;
-  text-align: center;
-}
-
-.filterEmptyStateTile {
-  margin: auto;
-}
-
-.filterEmptyStateContent {
-  @include type.type-style('heading-compact-02');
-  color: $text-02;
-  margin-bottom: 0.5rem;
-}
-
-.filterEmptyStateHelper {
-  @include type.type-style('body-compact-01');
-  color: $text-02;
-}
-
-.metricsContainer {
-  display: flex;
-  justify-content: space-between;
-  background-color: $ui-02;
-  height: spacing.$spacing-10;
-  align-items: center;
-  padding: 0 spacing.$spacing-05;
-}
-
-.metricsTitle {
-  @include type.type-style('heading-03');
-  color: $ui-05;
-}
-
-.actionsContainer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  background-color: $ui-02;
-}
-.actionBtn {
-  display: flex;
-  column-gap: 0.5rem;
-}
-
-.mainSection {
-  display: grid;
-  grid-template-columns: 16rem 1fr;
-}
diff --git a/packages/esm-billing-app/src/billable-services/billiable-item/drug-order/drug-order.component.tsx b/packages/esm-billing-app/src/billable-services/billiable-item/drug-order/drug-order.component.tsx
deleted file mode 100755
index 66cd0c6..0000000
--- a/packages/esm-billing-app/src/billable-services/billiable-item/drug-order/drug-order.component.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import React from 'react';
-import { type Drug } from '@openmrs/esm-patient-common-lib';
-import { type DosingUnit, type MedicationFrequency, type MedicationRoute, type QuantityUnit } from '../../../types';
-import { useBillableItem, useSockItemInventory } from '../useBillableItem';
-import { useTranslation } from 'react-i18next';
-import styles from './drug-order.scss';
-import { convertToCurrency } from '../../../helpers';
-
-type DrugOrderProps = {
-  order: {
-    drug: Drug;
-    unit: DosingUnit;
-    commonMedicationName: string;
-    dosage: number;
-    frequency: MedicationFrequency;
-    route: MedicationRoute;
-    quantityUnits: QuantityUnit;
-    patientInstructions: string;
-    asNeeded: boolean;
-    asNeededCondition: string;
-  };
-};
-
-const DrugOrder: React.FC<DrugOrderProps> = ({ order }) => {
-  const { t } = useTranslation();
-  const { stockItem, isLoading: isLoadingInventory } = useSockItemInventory(order?.drug?.uuid);
-  const { billableItem, isLoading } = useBillableItem(order?.drug.concept.uuid);
-  if (isLoading || isLoadingInventory) {
-    return null;
-  }
-
-  return (
-    <div className={styles.drugOrderContainer}>
-      {stockItem && stockItem.length > 0 ? (
-        <>
-          <div className={styles.bold}>{'In Stock'}</div>
-          {stockItem.map((item, index) => (
-            <div key={index} className={styles.itemContainer}>
-              <span>{item.partyName}</span>
-              <span>
-                {' '}
-                {Math.round(item.quantity)} {item.quantityUoM}(s){' '}
-              </span>
-            </div>
-          ))}
-        </>
-      ) : (
-        <div className={styles.red}>{'Drug Is Not Available  / Out of Stock'}</div>
-      )}
-
-      <div>
-        {billableItem &&
-          billableItem?.servicePrices.map((item) => (
-            <div key={item.uuid} className={styles.itemContainer}>
-              <span className={styles.bold}>{t('unitPrice', 'Unit price ')}</span>
-              <span>{convertToCurrency(item.price)}</span>
-            </div>
-          ))}
-      </div>
-    </div>
-  );
-};
-
-export default DrugOrder;
diff --git a/packages/esm-billing-app/src/billable-services/billiable-item/drug-order/drug-order.scss b/packages/esm-billing-app/src/billable-services/billiable-item/drug-order/drug-order.scss
deleted file mode 100755
index d969ad7..0000000
--- a/packages/esm-billing-app/src/billable-services/billiable-item/drug-order/drug-order.scss
+++ /dev/null
@@ -1,31 +0,0 @@
-@use '@carbon/type';
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/styles/scss/spacing';
-
-.drugOrderContainer {
-  margin: spacing.$spacing-03 0;
-
-  & > div {
-    margin: spacing.$spacing-03 0;
-  }
-}
-
-.bold {
-  font-weight: bold;
-}
-
-.itemInfo {
-  @include type.type-style('body-01');
-}
-
-.itemContainer {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  padding-left: spacing.$spacing-03;
-}
-
-.red {
-  color: red;
-  font-weight: normal;
-}
diff --git a/packages/esm-billing-app/src/billable-services/billiable-item/test-order/imaging-order.component.tsx b/packages/esm-billing-app/src/billable-services/billiable-item/test-order/imaging-order.component.tsx
deleted file mode 100755
index 1cb5534..0000000
--- a/packages/esm-billing-app/src/billable-services/billiable-item/test-order/imaging-order.component.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from 'react';
-import { useBillableItem } from '../useBillableItem';
-import { useTranslation } from 'react-i18next';
-import { InlineLoading } from '@carbon/react';
-import PriceInfoOrder from './price-info-order.componet';
-
-type ImagingOrderProps = {
-  order: {
-    testType?: {
-      label: string;
-      conceptUuid: string;
-    };
-  };
-};
-
-const ImagingOrder: React.FC<ImagingOrderProps> = ({ order }) => {
-  const { t } = useTranslation();
-  const { billableItem, isLoading, error } = useBillableItem(order?.testType?.conceptUuid);
-
-  if (isLoading) {
-    return (
-      <InlineLoading
-        status="active"
-        iconDescription={t('loading', 'Loading')}
-        description={t('loadingData', 'Loading data...')}
-      />
-    );
-  }
-
-  return <PriceInfoOrder billableItem={billableItem} error={error} />;
-};
-
-export default ImagingOrder;
diff --git a/packages/esm-billing-app/src/billable-services/billiable-item/test-order/lab-order.component.tsx b/packages/esm-billing-app/src/billable-services/billiable-item/test-order/lab-order.component.tsx
deleted file mode 100755
index 4a0003b..0000000
--- a/packages/esm-billing-app/src/billable-services/billiable-item/test-order/lab-order.component.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from 'react';
-import { useBillableItem } from '../useBillableItem';
-import { useTranslation } from 'react-i18next';
-import { InlineLoading } from '@carbon/react';
-import PriceInfoOrder from './price-info-order.componet';
-
-type LabOrderProps = {
-  order: {
-    testType?: {
-      label: string;
-      conceptUuid: string;
-    };
-  };
-};
-
-const LabOrder: React.FC<LabOrderProps> = ({ order }) => {
-  const { t } = useTranslation();
-  const { billableItem, isLoading, error } = useBillableItem(order?.testType?.conceptUuid);
-
-  if (isLoading) {
-    return (
-      <InlineLoading
-        status="active"
-        iconDescription={t('loading', 'Loading')}
-        description={t('loadingData', 'Loading data...')}
-      />
-    );
-  }
-
-  return <PriceInfoOrder billableItem={billableItem} error={error} />;
-};
-
-export default LabOrder;
diff --git a/packages/esm-billing-app/src/billable-services/billiable-item/test-order/price-info-order.componet.tsx b/packages/esm-billing-app/src/billable-services/billiable-item/test-order/price-info-order.componet.tsx
deleted file mode 100755
index 658cc99..0000000
--- a/packages/esm-billing-app/src/billable-services/billiable-item/test-order/price-info-order.componet.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import React from 'react';
-import { convertToCurrency } from '../../../helpers';
-import { useTranslation } from 'react-i18next';
-import styles from './price-info-order.scss';
-import {
-  StructuredListWrapper,
-  StructuredListHead,
-  StructuredListRow,
-  StructuredListCell,
-  StructuredListBody,
-  Tile,
-  InlineNotification,
-} from '@carbon/react';
-
-type PriceInfoOrderProps = {
-  billableItem: any;
-  error?: boolean;
-};
-
-const PriceInfoOrder: React.FC<PriceInfoOrderProps> = ({ billableItem, error }) => {
-  const { t } = useTranslation();
-
-  if (error || !billableItem) {
-    return (
-      <InlineNotification
-        kind="info"
-        title={t('noprice', 'No price found')}
-        subtitle={t('noInfo', 'Please contact the cashier')}
-        lowContrast
-      />
-    );
-  }
-
-  return (
-    <Tile id="" className={styles.prices}>
-      <div className={styles.listContainer}>
-        <StructuredListWrapper isCondensed>
-          <StructuredListHead>
-            <StructuredListRow head>
-              <StructuredListCell head className={styles.cell}>
-                {t('paymentMethods', 'Payment methods')}
-              </StructuredListCell>
-              <StructuredListCell head className={styles.cell}>
-                {t('prices', 'Prices(Ksh)')}
-              </StructuredListCell>
-            </StructuredListRow>
-          </StructuredListHead>
-          <StructuredListBody>
-            {billableItem.servicePrices.map((priceItem) => (
-              <StructuredListRow key={priceItem.uuid}>
-                <StructuredListCell className={styles.cell}>{priceItem.paymentMode.name}</StructuredListCell>
-                <StructuredListCell className={styles.cell}>{convertToCurrency(priceItem.price)}</StructuredListCell>
-              </StructuredListRow>
-            ))}
-          </StructuredListBody>
-        </StructuredListWrapper>
-      </div>
-    </Tile>
-  );
-};
-
-export default PriceInfoOrder;
diff --git a/packages/esm-billing-app/src/billable-services/billiable-item/test-order/price-info-order.scss b/packages/esm-billing-app/src/billable-services/billiable-item/test-order/price-info-order.scss
deleted file mode 100755
index 00a745b..0000000
--- a/packages/esm-billing-app/src/billable-services/billiable-item/test-order/price-info-order.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-@use '@carbon/styles/scss/type';
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/layout';
-@use '@carbon/colors';
-
-.prices {
-  justify-content: center;
-  align-items: center;
-  margin: layout.$spacing-03;
-}
-
-.listContainer {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-.cell {
-  padding: spacing.$spacing-05;
-}
diff --git a/packages/esm-billing-app/src/billable-services/billiable-item/test-order/procedure-order.component.tsx b/packages/esm-billing-app/src/billable-services/billiable-item/test-order/procedure-order.component.tsx
deleted file mode 100755
index 92291e0..0000000
--- a/packages/esm-billing-app/src/billable-services/billiable-item/test-order/procedure-order.component.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from 'react';
-import { useBillableItem } from '../useBillableItem';
-import { useTranslation } from 'react-i18next';
-import { InlineLoading } from '@carbon/react';
-import PriceInfoOrder from './price-info-order.componet';
-
-type ProcedureOrderProps = {
-  order: {
-    testType?: {
-      label: string;
-      conceptUuid: string;
-    };
-  };
-};
-
-const ProcedureOrder: React.FC<ProcedureOrderProps> = ({ order }) => {
-  const { t } = useTranslation();
-  const { billableItem, isLoading, error } = useBillableItem(order?.testType?.conceptUuid);
-
-  if (isLoading) {
-    return (
-      <InlineLoading
-        status="active"
-        iconDescription={t('loading', 'Loading')}
-        description={t('loadingData', 'Loading data...')}
-      />
-    );
-  }
-
-  return <PriceInfoOrder billableItem={billableItem} error={error} />;
-};
-
-export default ProcedureOrder;
diff --git a/packages/esm-billing-app/src/billable-services/billiable-item/test-order/test-order-action.component.tsx b/packages/esm-billing-app/src/billable-services/billiable-item/test-order/test-order-action.component.tsx
deleted file mode 100755
index 1e8b4ee..0000000
--- a/packages/esm-billing-app/src/billable-services/billiable-item/test-order/test-order-action.component.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { OverflowMenuItem } from '@carbon/react';
-import { type Order } from '@openmrs/esm-patient-common-lib';
-import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useTestOrderBillStatus } from './test-order-action.resource';
-import { showModal } from '@openmrs/esm-framework';
-
-type TestOrderProps = { order: Order };
-
-enum FulfillerStatus {
-  IN_PROGRESS = 'IN_PROGRESS',
-}
-
-const TestOrderAction: React.FC<TestOrderProps> = ({ order }) => {
-  const { t } = useTranslation();
-  const { isLoading, hasPendingPayment } = useTestOrderBillStatus(order.uuid, order.patient.uuid);
-
-  const launchModal = useCallback(() => {
-    const dispose = showModal('pickup-lab-request-modal', {
-      closeModal: () => dispose(),
-      order,
-    });
-  }, [order]);
-
-  // Show the test order if the following conditions are met:
-  // 1. The current visit is in-patient
-  // 2. The test order has been paid in full
-  // 3. The patient is an emergency patient
-
-  // If the order is in progress, do not show the action
-  if (order.fulfillerStatus === FulfillerStatus.IN_PROGRESS) {
-    return null;
-  }
-
-  if (isLoading) {
-    return <OverflowMenuItem itemText={t('loading', 'Loading...')} />;
-  }
-
-  return (
-    <OverflowMenuItem
-      onClick={launchModal}
-      disabled={hasPendingPayment}
-      itemText={
-        hasPendingPayment ? t('unsettledBill', 'Unsettled bill for test.') : t('pickLabRequest', 'Pick Lab Request')
-      }
-    />
-  );
-};
-
-export default TestOrderAction;
diff --git a/packages/esm-billing-app/src/billable-services/billiable-item/test-order/test-order-action.resource.tsx b/packages/esm-billing-app/src/billable-services/billiable-item/test-order/test-order-action.resource.tsx
deleted file mode 100755
index 7a23f55..0000000
--- a/packages/esm-billing-app/src/billable-services/billiable-item/test-order/test-order-action.resource.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { openmrsFetch, restBaseUrl, useConfig, useVisit } from '@openmrs/esm-framework';
-import useSWR from 'swr';
-import { type LineItem, type QueueEntry } from '../../../types';
-import { type BillingConfig } from '../../../config-schema';
-
-export const useTestOrderBillStatus = (orderUuid: string, patientUuid: string) => {
-  const config = useConfig<BillingConfig>();
-  const { currentVisit } = useVisit(patientUuid);
-  const { isEmergencyPatient, isLoading: isLoadingQueue } = usePatientQueue(patientUuid);
-  const { isLoading: isLoadingBill, hasPendingPayment } = usePatientBill(orderUuid);
-
-  if (isLoadingQueue || isLoadingBill) {
-    return { hasPendingPayment: false, isLoading: true };
-  }
-
-  // If current visit type is inpatient or the patient is in the emergency queue, we should allow the patient to receive services without paying the bill
-  if (currentVisit?.visitType?.uuid === config?.inPatientVisitTypeUuid || isEmergencyPatient) {
-    return { hasPendingPayment: false, isLoading: false };
-  }
-
-  // If the patient is not in the queue then we should check if the patient has a pending bill
-  return { hasPendingPayment, isLoading: false };
-};
-
-export const usePatientQueue = (patientUuid: string) => {
-  const config = useConfig({ externalModuleName: '@ampath/esm-service-queues-app' });
-  const url = `${restBaseUrl}/visit-queue-entry?patient=${patientUuid}`;
-  const { data, isLoading, error } = useSWR<{
-    data: { results: Array<QueueEntry> };
-  }>(url, openmrsFetch);
-
-  const isEmergencyPatient =
-    data?.data?.results?.[0]?.queueEntry?.priority?.uuid === config?.concepts?.emergencyPriorityConceptUuid;
-  const isInQueue = data?.data?.results?.length > 0;
-  return { isInQueue, isLoading, error, isEmergencyPatient };
-};
-
-export const usePatientBill = (orderUuid: string) => {
-  const { billingStatusQueryUrl } = useConfig<BillingConfig>();
-  const billUrl = createUrl(restBaseUrl, orderUuid, billingStatusQueryUrl);
-  const { data, isLoading, error } = useSWR<{
-    data: { results: Array<LineItem> };
-  }>(billUrl, openmrsFetch);
-
-  const hasPendingPayment = data?.data?.results?.some(
-    (lineItem) => lineItem.paymentStatus === 'PENDING' || lineItem.paymentStatus === 'POSTED',
-  );
-
-  return { hasPendingPayment, isLoading, error };
-};
-
-function createUrl(restBaseUrl: string, orderUuid: string, templateUrl: string): string {
-  return templateUrl.replace('${restBaseUrl}', restBaseUrl).replace('${orderUuid}', orderUuid);
-}
diff --git a/packages/esm-billing-app/src/billable-services/billiable-item/useBillableItem.tsx b/packages/esm-billing-app/src/billable-services/billiable-item/useBillableItem.tsx
deleted file mode 100755
index 44eaa26..0000000
--- a/packages/esm-billing-app/src/billable-services/billiable-item/useBillableItem.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import useSWRImmutable from 'swr/immutable';
-import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import useSWR from 'swr';
-import first from 'lodash-es/first';
-
-type BillableItemResponse = {
-  uuid: string;
-  name: string;
-  concept: {
-    uuid: string;
-    display: string;
-  };
-  servicePrices: Array<{
-    uuid: string;
-    price: number;
-    paymentMode: {
-      uuid: string;
-      name: string;
-    };
-  }>;
-};
-
-export const useBillableItem = (billableItemId: string) => {
-  const customRepresentation = `v=custom:(uuid,name,concept:(uuid,display),servicePrices:(uuid,price,paymentMode:(uuid,name)))`;
-  const { data, error, isLoading } = useSWRImmutable<{ data: { results: Array<BillableItemResponse> } }>(
-    `${restBaseUrl}/cashier/billableService?${customRepresentation}`,
-    openmrsFetch,
-  );
-  const billableItem = data?.data?.results?.find((item) => item?.concept?.uuid === billableItemId);
-
-  return {
-    billableItem: billableItem,
-    isLoading: isLoading,
-    error,
-  };
-};
-
-export const useSockItemInventory = (stockItemId: string) => {
-  const url = `/ws/rest/v1/stockmanagement/stockiteminventory?v=default&limit=10&totalCount=true&drugUuid=${stockItemId}`;
-  const { data, error, isLoading } = useSWR<{
-    data: { results: Array<{ quantityUoM: string; quantity: number; partyName: string }> };
-  }>(url, openmrsFetch);
-
-  return {
-    stockItem: (data?.data?.results as Array<any>) ?? [],
-    isLoading: isLoading,
-    error,
-  };
-};
diff --git a/packages/esm-billing-app/src/billable-services/billing-tariffs/add-billing-tariffs-service.scss b/packages/esm-billing-app/src/billable-services/billing-tariffs/add-billing-tariffs-service.scss
deleted file mode 100755
index 5c52a1c..0000000
--- a/packages/esm-billing-app/src/billable-services/billing-tariffs/add-billing-tariffs-service.scss
+++ /dev/null
@@ -1,164 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@use '@carbon/colors';
-@use '@carbon/layout';
-@import '~@openmrs/esm-styleguide/src/vars';
-
-.form {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  height: 100%;
-  padding: spacing.$spacing-06;
-}
-
-.subTitle {
-  font-weight: 600;
-  font-size: 14px;
-}
-
-.sectionTitle {
-  @include type.type-style('heading-compact-02');
-  color: $text-02;
-  margin-bottom: spacing.$spacing-04;
-}
-
-.modalBody {
-  padding-bottom: spacing.$spacing-05;
-}
-
-.container {
-  margin: 1rem;
-}
-
-.paymentContainer {
-  margin: layout.$layout-01;
-  padding: layout.$layout-01;
-  width: 70%;
-  border-right: 1px solid colors.$cool-gray-40;
-}
-
-.paymentButtons {
-  margin: layout.$layout-01 0;
-}
-
-.paymentMethodContainer {
-  display: grid;
-  grid-template-columns: repeat(4, minmax(auto, 1fr));
-  column-gap: 1rem;
-  margin: 0.625rem 0;
-  width: 100%;
-}
-
-.paymentTotals {
-  margin-top: layout.$spacing-01;
-}
-
-.processPayments {
-  display: flex;
-  justify-content: flex-end;
-  margin: layout.$spacing-05;
-  column-gap: layout.$spacing-04;
-}
-
-.errorPaymentContainer {
-  margin: layout.$spacing-04;
-  min-height: layout.$spacing-09;
-}
-
-.removeButtonContainer {
-  display: flex;
-  align-self: center;
-  cursor: pointer;
-  margin-left: layout.$spacing-07;
-}
-
-.removeButton {
-  color: colors.$red-60;
-}
-
-.service {
-  padding: 1rem 0.75rem;
-}
-
-.conceptsList {
-  background-color: $ui-02;
-  max-height: 14rem;
-  overflow-y: auto;
-  border: 1px solid $ui-03;
-
-  li:hover {
-    background-color: $ui-03;
-  }
-}
-
-.emptyResults {
-  @include type.type-style('body-compact-01');
-  color: $text-02;
-  min-height: 1rem;
-  border: 1px solid $ui-03;
-}
-
-.conceptLabel {
-  @include type.type-style('label-02');
-  margin-bottom: 0.6rem;
-}
-
-.errorContainer {
-  margin: 1rem;
-}
-
-.serviceError {
-  :global(.cds--search-input):focus {
-    outline: 2.5px solid $danger;
-  }
-
-  :global(.cds--search-magnifier) {
-    svg {
-      fill: $danger;
-    }
-  }
-}
-
-.errorMessage {
-  @include type.type-style('label-02');
-  color: $danger;
-  margin-top: 0.5rem;
-}
-
-.spinner {
-  &:global(.cds--inline-loading) {
-    min-height: 1rem;
-  }
-}
-
-.loader {
-  margin-top: 1rem;
-  margin-bottom: 1rem;
-  margin-left: auto;
-  margin-right: auto;
-  width: max-content;
-}
-
-.searchWrapper {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-items: center;
-}
-
-.nameSection {
-  display: flex;
-  gap: 20px;
-  align-items: flex-start;
-}
-
-.secondSection {
-  display: flex;
-  gap: 20px;
-  align-items: flex-start;
-}
-
-.serviceName {
-  width: 50%;
-}
diff --git a/packages/esm-billing-app/src/billable-services/billing-tariffs/add-billings-tariffs-service.component.tsx b/packages/esm-billing-app/src/billable-services/billing-tariffs/add-billings-tariffs-service.component.tsx
deleted file mode 100755
index 9379553..0000000
--- a/packages/esm-billing-app/src/billable-services/billing-tariffs/add-billings-tariffs-service.component.tsx
+++ /dev/null
@@ -1,183 +0,0 @@
-import React, { useCallback, useRef, useState } from 'react';
-import styles from './add-billing-tariffs-service.scss';
-import {
-  Form,
-  Button,
-  TextInput,
-  ComboBox,
-  Dropdown,
-  Layer,
-  InlineLoading,
-  Search,
-  Tile,
-  FormLabel,
-  NumberInput,
-} from '@carbon/react';
-import { useTranslation } from 'react-i18next';
-import {
-  createBillableService,
-  useConceptsSearch,
-  usePaymentModes,
-  useServiceTypes,
-} from '../billable-service.resource';
-import { Controller, useFieldArray, useForm } from 'react-hook-form';
-import { Add, TrashCan, WarningFilled } from '@carbon/react/icons';
-import { z } from 'zod';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { navigate, showSnackbar, useDebounce, useLayoutType } from '@openmrs/esm-framework';
-import { type ServiceConcept } from '../../types';
-import { extractErrorMessagesFromResponse } from '../../utils';
-
-const servicePriceSchema = z.object({
-  paymentMode: z.string({ required_error: 'Payment method is required' }),
-  price: z
-    .string()
-    .refine((value) => !isNaN(Number(value)), 'Value must be a number')
-    .refine((value) => parseInt(value) > 0, 'Price should be a number more than zero')
-    .refine((value) => !!value, 'Price is required'),
-});
-
-const paymentFormSchema = z.object({
-  payment: z.array(servicePriceSchema).min(1, 'At least one payment method is required'),
-  serviceName: z.string({
-    required_error: 'Service name is required',
-  }),
-  shortName: z.string({ required_error: 'A valid short name is required.' }),
-  serviceTypeName: z.string({ required_error: 'A service type is required' }),
-  concept: z.string({ required_error: 'Concept search is required.' }),
-});
-
-type FormData = z.infer<typeof paymentFormSchema>;
-const DEFAULT_PAYMENT_OPTION = { paymentMode: '', price: '1' };
-
-const AddTariffsService: React.FC = () => {
-  const { t } = useTranslation();
-
-  const { paymentModes, isLoading: isLoadingPaymentModes } = usePaymentModes();
-  const { serviceTypes, isLoading: isLoadingServicesTypes } = useServiceTypes();
-
-  const {
-    control,
-    handleSubmit,
-    formState: { errors, isValid },
-  } = useForm<FormData>({
-    mode: 'all',
-    defaultValues: {},
-    resolver: zodResolver(paymentFormSchema),
-  });
-
-  const { fields, remove, append } = useFieldArray({ name: 'payment', control: control });
-
-  const handleAppendPaymentMode = useCallback(() => append(DEFAULT_PAYMENT_OPTION), [append]);
-  const handleRemovePaymentMode = useCallback((index) => remove(index), [remove]);
-
-  const isTablet = useLayoutType() === 'tablet';
-  const searchInputRef = useRef(null);
-  const handleSearchTermChange = (event: React.ChangeEvent<HTMLInputElement>) => setSearchTerm(event.target.value);
-
-  const [selectedConcept, setSelectedConcept] = useState<ServiceConcept>(null);
-  const [searchTerm, setSearchTerm] = useState('');
-  const debouncedSearchTerm = useDebounce(searchTerm);
-  const { searchResults, isSearching } = useConceptsSearch(debouncedSearchTerm);
-
-  const handleConceptChange = useCallback((selectedConcept: ServiceConcept) => {
-    setSelectedConcept(selectedConcept);
-  }, []);
-
-  const handleNavigateToServiceDashboard = () =>
-    navigate({
-      to: window.getOpenmrsSpaBase() + 'billable-services',
-    });
-
-  const onSubmit = (data: FormData) => {
-    const payload: any = {};
-
-    let servicePrices = data.payment.map((element) => {
-      return {
-        name: paymentModes.filter((p) => p.uuid === element.paymentMode)[0].name,
-        price: element.price,
-        paymentMode: element.paymentMode,
-      };
-    });
-
-    payload.name = data.serviceName;
-    payload.shortName = data.shortName;
-    payload.serviceType = data.serviceTypeName;
-    payload.servicePrices = servicePrices;
-    payload.serviceStatus = 'ENABLED';
-    payload.concept = selectedConcept?.concept?.uuid;
-
-    createBillableService(payload).then(
-      (resp) => {
-        showSnackbar({
-          title: t('billableService', 'Billable service'),
-          subtitle: 'Billable service created successfully',
-          kind: 'success',
-          isLowContrast: true,
-          timeoutInMs: 3000,
-        });
-        handleNavigateToServiceDashboard();
-      },
-      (error) => {
-        showSnackbar({
-          title: 'Error adding billable service',
-          kind: 'error',
-          subtitle: extractErrorMessagesFromResponse(error.responseBody),
-          isLowContrast: true,
-        });
-      },
-    );
-  };
-
-  if (isLoadingServicesTypes || isLoadingPaymentModes) {
-    return (
-      <div className={styles.searchWrapper}>
-        <InlineLoading className={styles.loader} description={t('searching', 'Searching') + '...'} />
-      </div>
-    );
-  }
-
-  return (
-    <Form className={styles.form}>
-      <h4 className={styles.subTitle}>{t('addTariffsServices', 'Add Insurance Tariffs')}</h4>
-
-      <section className={styles.secondSection}>
-        <div className={styles.serviceName}>
-          <Controller
-            control={control}
-            name="serviceTypeName"
-            render={({ field }) => (
-              <ComboBox
-                id="serviceType"
-                items={serviceTypes ?? []}
-                titleText={t('availableTariffs', 'Available Tariffs')}
-                itemToString={(item: { display: string }) => (item ? item.display : '')}
-                placeholder="Select service type"
-                required
-                {...field}
-                onChange={({ selectedItem }) => field.onChange(selectedItem ? selectedItem.display : '')}
-                invalidText={errors.serviceTypeName?.message || ''}
-                invalid={!!errors.serviceTypeName}
-              />
-            )}
-          />
-        </div>
-      </section>
-
-      <section>
-        <Button kind="secondary" onClick={handleNavigateToServiceDashboard}>
-          {t('cancel', 'Cancel')}
-        </Button>
-        <Button type="submit" onClick={handleSubmit(onSubmit)}>
-          {t('addTariffsave', 'Add Tariff')}
-        </Button>
-      </section>
-    </Form>
-  );
-};
-
-function ResponsiveWrapper({ children, isTablet }: { children: React.ReactNode; isTablet: boolean }) {
-  return isTablet ? <Layer>{children} </Layer> : <>{children}</>;
-}
-
-export default AddTariffsService;
diff --git a/packages/esm-billing-app/src/billable-services/billing-tariffs/billing-tariffs-admin-card.tsx b/packages/esm-billing-app/src/billable-services/billing-tariffs/billing-tariffs-admin-card.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/packages/esm-billing-app/src/billable-services/billing-tariffs/billing-tariffs-services.scss b/packages/esm-billing-app/src/billable-services/billing-tariffs/billing-tariffs-services.scss
deleted file mode 100755
index 2f2691f..0000000
--- a/packages/esm-billing-app/src/billable-services/billing-tariffs/billing-tariffs-services.scss
+++ /dev/null
@@ -1,219 +0,0 @@
-@use '@carbon/layout';
-@use '@carbon/type';
-@use '@carbon/styles/scss/spacing';
-@import '~@openmrs/esm-styleguide/src/vars';
-
-.container {
-  margin: 2rem 0;
-}
-
-.emptyStateContainer,
-.loaderContainer {
-  @extend .container;
-}
-
-.serviceContainer {
-  background-color: $ui-02;
-  border: 1px solid $ui-03;
-  width: 100%;
-  margin: 0 auto;
-  max-width: 95vw;
-  padding-bottom: 0;
-
-  :has(.filterEmptyState) {
-    border-bottom: none;
-  }
-}
-.left-justified-items {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  cursor: pointer;
-  align-items: center;
-}
-
-.filterContainer {
-  flex: 1;
-
-  :global(.cds--dropdown__wrapper--inline) {
-    gap: 0;
-  }
-
-  :global(.cds--list-box__menu-icon) {
-    height: 1rem;
-  }
-
-  :global(.cds--list-box__menu) {
-    min-width: max-content;
-  }
-
-  :global(.cds--list-box) {
-    margin-left: layout.$spacing-03;
-  }
-}
-
-.menu {
-  margin-left: layout.$spacing-03;
-}
-
-.headerContainer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: layout.$spacing-04 layout.$spacing-05;
-  background-color: $ui-02;
-}
-
-.backgroundDataFetchingIndicator {
-  align-items: center;
-  display: flex;
-  flex: 1;
-  justify-content: space-between;
-
-  &:global(.cds--inline-loading) {
-    max-height: 1rem;
-  }
-}
-
-.tableContainer section {
-  position: relative;
-}
-
-.tableContainer a {
-  text-decoration: none;
-}
-
-.pagination {
-  overflow: hidden;
-
-  &:global(.cds--pagination) {
-    border-top: none;
-  }
-}
-
-.hiddenRow {
-  display: none;
-}
-
-.emptyRow {
-  padding: 0 1rem;
-  display: flex;
-  align-items: center;
-}
-
-.visitSummaryContainer {
-  width: 100%;
-  max-width: 768px;
-  margin: 1rem auto;
-}
-
-.expandedActiveVisitRow > td > div {
-  max-height: max-content !important;
-}
-
-.expandedActiveVisitRow td {
-  padding: 0 2rem;
-}
-
-.expandedActiveVisitRow th[colspan] td[colspan] > div:first-child {
-  padding: 0 1rem;
-}
-
-.action {
-  margin-bottom: layout.$spacing-03;
-}
-
-.illo {
-  margin-top: layout.$spacing-05;
-}
-
-.content {
-  @include type.type-style('heading-compact-01');
-  color: $text-02;
-  margin-top: layout.$spacing-05;
-  margin-bottom: layout.$spacing-03;
-}
-
-.desktopHeading,
-.tabletHeading {
-  text-align: left;
-  text-transform: capitalize;
-  flex: 1;
-
-  h4 {
-    @include type.type-style('heading-compact-02');
-    color: $text-02;
-
-    &:after {
-      content: '';
-      display: block;
-      width: 2rem;
-      padding-top: 3px;
-      border-bottom: 0.375rem solid;
-      @include brand-03(border-bottom-color);
-    }
-  }
-}
-
-.tile {
-  text-align: center;
-  border: 1px solid $ui-03;
-}
-
-.menuitem {
-  max-width: none;
-}
-
-.filterEmptyState {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: layout.$spacing-05;
-  margin: layout.$spacing-09;
-  text-align: center;
-}
-
-.filterEmptyStateTile {
-  margin: auto;
-}
-
-.filterEmptyStateContent {
-  @include type.type-style('heading-compact-02');
-  color: $text-02;
-  margin-bottom: 0.5rem;
-}
-
-.filterEmptyStateHelper {
-  @include type.type-style('body-compact-01');
-  color: $text-02;
-}
-
-.metricsContainer {
-  display: flex;
-  justify-content: space-between;
-  background-color: $ui-02;
-  height: spacing.$spacing-10;
-  align-items: center;
-  padding: 0 spacing.$spacing-05;
-}
-
-.metricsTitle {
-  @include type.type-style('heading-03');
-  color: $ui-05;
-}
-
-.actionsContainer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  background-color: $ui-02;
-}
-.actionBtn {
-  display: flex;
-  column-gap: 0.5rem;
-}
-
-.mainSection {
-  display: grid;
-  grid-template-columns: 16rem 1fr;
-}
diff --git a/packages/esm-billing-app/src/billable-services/billing-tariffs/billing-tariffs.component.tsx b/packages/esm-billing-app/src/billable-services/billing-tariffs/billing-tariffs.component.tsx
deleted file mode 100755
index e1923f9..0000000
--- a/packages/esm-billing-app/src/billable-services/billing-tariffs/billing-tariffs.component.tsx
+++ /dev/null
@@ -1,286 +0,0 @@
-import React, { useCallback, useMemo, useState } from 'react';
-import classNames from 'classnames';
-import {
-  DataTable,
-  InlineLoading,
-  Layer,
-  Pagination,
-  Search,
-  Table,
-  TableBody,
-  TableCell,
-  TableContainer,
-  TableHead,
-  TableHeader,
-  TableRow,
-  Tile,
-  Button,
-} from '@carbon/react';
-import { useLayoutType, isDesktop, useConfig, usePagination, ErrorState, navigate } from '@openmrs/esm-framework';
-import { EmptyState } from '@openmrs/esm-patient-common-lib';
-import styles from './billing-tariffs-services.scss';
-import { useTranslation } from 'react-i18next';
-import { useBillableServices } from './billing-tariffs.resource';
-import { ArrowRight, RadioButton } from '@carbon/react/icons';
-import { RadioButtonGroup } from '@carbon/react';
-import { OverflowMenu, OverflowMenuItem } from '@carbon/react';
-
-const BillingTariffs = () => {
-  const { t } = useTranslation();
-  const { billableServices, isLoading, isValidating, error, mutate } = useBillableServices();
-  const layout = useLayoutType();
-  const config = useConfig();
-  const [searchString, setSearchString] = useState('');
-  const responsiveSize = isDesktop(layout) ? 'lg' : 'sm';
-  const pageSizes = config?.billableServices?.pageSizes ?? [10, 20, 30, 40, 50];
-  const [pageSize, setPageSize] = useState(config?.billableServices?.pageSize ?? 10);
-
-  //creating service state
-  const [showOverlay, setShowOverlay] = useState(false);
-  const [overlayHeader, setOverlayTitle] = useState('');
-  const [category, setCategory] = useState('');
-
-  const toggleSearch = (choiceSelected) => {
-    (document.getElementById('searchField') as HTMLInputElement).disabled = false;
-
-    if (choiceSelected == 'Stock Item') {
-      setCategory('Stock Item');
-    } else {
-      setCategory('Service');
-    }
-  };
-
-  const headerData = [
-    {
-      header: t('serviceName', 'Service Name'),
-      key: 'serviceName',
-    },
-    {
-      header: t('shortName', 'Short Name'),
-      key: 'shortName',
-    },
-    {
-      header: t('serviceType', 'Service Type'),
-      key: 'serviceType',
-    },
-    {
-      header: t('status', 'Service Status'),
-      key: 'status',
-    },
-    {
-      header: t('prices', 'Prices'),
-      key: 'prices',
-    },
-    {
-      header: t('tariffs', 'Tariffs'),
-      key: 'tariffs',
-    },
-    {
-      header: t('actions', 'Actions'),
-      key: 'actions',
-    },
-  ];
-
-  const launchBillableServiceForm = useCallback(() => {
-    navigate({ to: window.getOpenmrsSpaBase() + 'billable-services/add-service' });
-  }, []);
-
-  const searchResults = useMemo(() => {
-    if (billableServices !== undefined && billableServices.length > 0) {
-      if (searchString && searchString.trim() !== '') {
-        const search = searchString.toLowerCase();
-        return billableServices?.filter((service) =>
-          Object.entries(service).some(([header, value]) => {
-            return header === 'uuid' ? false : `${value}`.toLowerCase().includes(search);
-          }),
-        );
-      }
-    }
-    return billableServices;
-  }, [searchString, billableServices]);
-
-  const { paginated, goTo, results, currentPage } = usePagination(searchResults, pageSize);
-
-  let rowData = [];
-  if (results) {
-    results.forEach((service, index) => {
-      const s = {
-        id: `${index}`,
-        uuid: service.uuid,
-        serviceName: service.name,
-        shortName: service.shortName,
-        serviceType: service?.serviceType?.display,
-        status: service.serviceStatus,
-        prices: '--',
-        tariffs: 'T1, T2, T3',
-        actions: (
-          <OverflowMenu flipped={document?.dir === 'rtl'} aria-label="overflow-menu">
-            <OverflowMenuItem href="/add-tariffs" itemText="Add/Edit Tariffs" />
-            <OverflowMenuItem hasDivider isDelete itemText="Delete Tariffs" />
-          </OverflowMenu>
-        ),
-      };
-      let cost = '';
-      service.servicePrices.forEach((price) => {
-        cost += `${price.name} (${price.price}) `;
-      });
-      s.prices = cost;
-      rowData.push(s);
-    });
-  }
-
-  const handleSearch = useCallback(
-    (e) => {
-      goTo(1);
-      setSearchString(e.target.value);
-    },
-    [goTo, setSearchString],
-  );
-
-  if (isLoading) {
-    <InlineLoading status="active" iconDescription="Loading" description="Loading data..." />;
-  }
-  if (error) {
-    <ErrorState headerTitle={t('billableService', 'Billable Service')} error={error} />;
-  }
-  if (billableServices.length === 0) {
-    <EmptyState
-      displayText={t('billableService', 'Billable Service')}
-      headerTitle={t('billableService', 'Billable Service')}
-      launchForm={launchBillableServiceForm}
-    />;
-  }
-
-  function filterItems(value: any) {
-    throw new Error('Function not implemented.');
-  }
-
-  return (
-    <>
-      {billableServices?.length > 0 ? (
-        <div className={styles.serviceContainer}>
-          <RadioButtonGroup
-            legendText={t('selectCategory', 'Select category')}
-            name="radio-button-group"
-            defaultSelected="radio-1"
-            className={styles.billingItem}
-            onChange={toggleSearch}>
-            <RadioButton title={t('stockItem', 'Stock Item')} values="Stock Item" id="radio-1" />
-            <RadioButton title={t('service', 'Service')} values="Service" id="radio-2" />
-          </RadioButtonGroup>
-
-          <div></div>
-          <DataTable
-            isSortable
-            rows={rowData}
-            headers={headerData}
-            size={responsiveSize}
-            useZebraStyles={rowData?.length > 1 ? true : false}>
-            {({ rows, headers, getRowProps, getTableProps }) => (
-              <TableContainer>
-                <Table {...getTableProps()} aria-label="service list">
-                  <TableHead>
-                    <TableRow>
-                      {headers.map((header) => (
-                        <TableHeader key={header.key}>{header.header}</TableHeader>
-                      ))}
-                    </TableRow>
-                  </TableHead>
-                  <TableBody>
-                    {rows.map((row) => (
-                      <TableRow
-                        key={row.id}
-                        {...getRowProps({
-                          row,
-                        })}>
-                        {row.cells.map((cell) => (
-                          <TableCell key={cell.id}>{cell.value}</TableCell>
-                        ))}
-                      </TableRow>
-                    ))}
-                  </TableBody>
-                </Table>
-              </TableContainer>
-            )}
-          </DataTable>
-          {searchResults?.length === 0 && (
-            <div className={styles.filterEmptyState}>
-              <Layer level={0}>
-                <Tile className={styles.filterEmptyStateTile}>
-                  <p className={styles.filterEmptyStateContent}>
-                    {t('noMatchingServicesToDisplay', 'No matching services to display')}
-                  </p>
-                  <p className={styles.filterEmptyStateHelper}>{t('checkFilters', 'Check the filters above')}</p>
-                </Tile>
-              </Layer>
-            </div>
-          )}
-          {paginated && (
-            <Pagination
-              forwardText="Next page"
-              backwardText="Previous page"
-              page={currentPage}
-              pageSize={pageSize}
-              pageSizes={pageSizes}
-              totalItems={searchResults?.length}
-              className={styles.pagination}
-              size={responsiveSize}
-              onChange={({ pageSize: newPageSize, page: newPage }) => {
-                if (newPageSize !== pageSize) {
-                  setPageSize(newPageSize);
-                }
-                if (newPage !== currentPage) {
-                  goTo(newPage);
-                }
-              }}
-            />
-          )}
-        </div>
-      ) : (
-        <EmptyState
-          launchForm={launchBillableServiceForm}
-          displayText={t('noServicesToDisplay', 'There are no services to display')}
-          headerTitle={t('billableService', 'Billing Tariffs')}
-        />
-      )}
-    </>
-  );
-};
-
-function FilterableTableHeader({ layout, handleSearch, isValidating, responsiveSize, t }) {
-  return (
-    <>
-      <div className={styles.headerContainer}>
-        <div
-          className={classNames({
-            [styles.tabletHeading]: !isDesktop(layout),
-            [styles.desktopHeading]: isDesktop(layout),
-          })}>
-          <h4>{t('servicesList', 'Services list')}</h4>
-        </div>
-        <div className={styles.backgroundDataFetchingIndicator}>
-          <span>{isValidating ? <InlineLoading /> : null}</span>
-        </div>
-      </div>
-      <div className={styles.actionsContainer}>
-        <Search
-          labelText=""
-          placeholder={t('filterTable', 'Filter table')}
-          onChange={handleSearch}
-          size={responsiveSize}
-        />
-        <Button
-          size={responsiveSize}
-          kind="primary"
-          renderIcon={(props) => <ArrowRight size={16} {...props} />}
-          onClick={() => {
-            navigate({ to: window.getOpenmrsSpaBase() + 'billable-services/add-service' });
-          }}
-          iconDescription={t('addNewBillableService', 'Add new billable service')}>
-          {t('addNewService', 'Add new service')}
-        </Button>
-      </div>
-    </>
-  );
-}
-export default BillingTariffs;
diff --git a/packages/esm-billing-app/src/billable-services/billing-tariffs/billing-tariffs.resource.tsx b/packages/esm-billing-app/src/billable-services/billing-tariffs/billing-tariffs.resource.tsx
deleted file mode 100755
index 90cba6e..0000000
--- a/packages/esm-billing-app/src/billable-services/billing-tariffs/billing-tariffs.resource.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { type OpenmrsResource, openmrsFetch } from '@openmrs/esm-framework';
-import useSWR from 'swr';
-import { type ServiceConcept } from '../../types';
-
-type ResponseObject = {
-  results: Array<OpenmrsResource>;
-};
-
-type ServiceTypesResponse = {
-  setMembers: { uuid: string; display: string }[];
-};
-
-export const useBillableServices = () => {
-  const url = `/ws/rest/v1/cashier/billableService?v=custom:(uuid,name,shortName,serviceStatus,serviceType:(display),servicePrices:(uuid,name,price))`;
-  const { data, isLoading, isValidating, error, mutate } = useSWR<{ data: ResponseObject }>(url, openmrsFetch, {});
-  return { billableServices: data?.data.results ?? [], isLoading, isValidating, error, mutate };
-};
-
-export function useServiceTypes() {
-  const url = `/ws/rest/v1/concept/d7bd4cc0-90b1-4f22-90f2-ab7fde936727?v=custom:(setMembers:(uuid,display))`;
-  const { data, error, isLoading } = useSWR<{ data: ServiceTypesResponse }>(url, openmrsFetch, {});
-  return { serviceTypes: data?.data.setMembers ?? [], error, isLoading };
-}
-
-export const usePaymentModes = () => {
-  const url = `/ws/rest/v1/cashier/paymentMode`;
-  const { data, error, isLoading } = useSWR<{ data: ResponseObject }>(url, openmrsFetch, {});
-  return { paymentModes: data?.data.results ?? [], error, isLoading };
-};
-
-export const createBillableService = (payload: any) => {
-  const url = `/ws/rest/v1/cashier/api/billable-service`;
-  return openmrsFetch(url, {
-    method: 'POST',
-    body: payload,
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  });
-};
-
-export function useConceptsSearch(conceptToLookup: string) {
-  const conditionsSearchUrl = `/ws/rest/v1/conceptsearch?q=${conceptToLookup}`;
-
-  const { data, error, isLoading } = useSWR<{ data: { results: Array<ServiceConcept> } }, Error>(
-    conceptToLookup ? conditionsSearchUrl : null,
-    openmrsFetch,
-  );
-
-  return {
-    searchResults: data?.data?.results ?? [],
-    error: error,
-    isSearching: isLoading,
-  };
-}
diff --git a/packages/esm-billing-app/src/billable-services/create-edit/add-billable-service.component.tsx b/packages/esm-billing-app/src/billable-services/create-edit/add-billable-service.component.tsx
deleted file mode 100755
index aaed930..0000000
--- a/packages/esm-billing-app/src/billable-services/create-edit/add-billable-service.component.tsx
+++ /dev/null
@@ -1,354 +0,0 @@
-import React, { useCallback, useRef, useState } from 'react';
-import styles from './add-billable-service.scss';
-import {
-  Form,
-  Button,
-  TextInput,
-  ComboBox,
-  Dropdown,
-  Layer,
-  InlineLoading,
-  Search,
-  Tile,
-  FormLabel,
-  NumberInput,
-} from '@carbon/react';
-import { useTranslation } from 'react-i18next';
-import {
-  createBillableService,
-  useConceptsSearch,
-  usePaymentModes,
-  useServiceTypes,
-} from '../billable-service.resource';
-import { Controller, useFieldArray, useForm } from 'react-hook-form';
-import { Add, TrashCan, WarningFilled } from '@carbon/react/icons';
-import { z } from 'zod';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { navigate, showSnackbar, useDebounce, useLayoutType } from '@openmrs/esm-framework';
-import { type ServiceConcept } from '../../types';
-import { extractErrorMessagesFromResponse } from '../../utils';
-
-const servicePriceSchema = z.object({
-  paymentMode: z.string({ required_error: 'Payment method is required' }),
-  price: z
-    .string()
-    .refine((value) => !isNaN(Number(value)), 'Value must be a number')
-    .refine((value) => parseInt(value) > 0, 'Price should be a number more than zero')
-    .refine((value) => !!value, 'Price is required'),
-});
-
-const paymentFormSchema = z.object({
-  payment: z.array(servicePriceSchema).min(1, 'At least one payment method is required'),
-  serviceName: z.string({
-    required_error: 'Service name is required',
-  }),
-  shortName: z.string({ required_error: 'A valid short name is required.' }),
-  serviceTypeName: z.string({ required_error: 'A service type is required' }),
-  concept: z.string({ required_error: 'Concept search is required.' }),
-});
-
-type FormData = z.infer<typeof paymentFormSchema>;
-const DEFAULT_PAYMENT_OPTION = { paymentMode: '', price: '1' };
-
-const AddBillableService: React.FC = () => {
-  const { t } = useTranslation();
-
-  const { paymentModes, isLoading: isLoadingPaymentModes } = usePaymentModes();
-  const { serviceTypes, isLoading: isLoadingServicesTypes } = useServiceTypes();
-
-  const {
-    control,
-    handleSubmit,
-    formState: { errors, isValid },
-  } = useForm<FormData>({
-    mode: 'all',
-    defaultValues: {},
-    resolver: zodResolver(paymentFormSchema),
-  });
-
-  const { fields, remove, append } = useFieldArray({ name: 'payment', control: control });
-
-  const handleAppendPaymentMode = useCallback(() => append(DEFAULT_PAYMENT_OPTION), [append]);
-  const handleRemovePaymentMode = useCallback((index) => remove(index), [remove]);
-
-  const isTablet = useLayoutType() === 'tablet';
-  const searchInputRef = useRef(null);
-  const handleSearchTermChange = (event: React.ChangeEvent<HTMLInputElement>) => setSearchTerm(event.target.value);
-
-  const [selectedConcept, setSelectedConcept] = useState<ServiceConcept>(null);
-  const [searchTerm, setSearchTerm] = useState('');
-  const debouncedSearchTerm = useDebounce(searchTerm);
-  const { searchResults, isSearching } = useConceptsSearch(debouncedSearchTerm);
-
-  const handleConceptChange = useCallback((selectedConcept: ServiceConcept) => {
-    setSelectedConcept(selectedConcept);
-  }, []);
-
-  const handleNavigateToServiceDashboard = () =>
-    navigate({
-      to: window.getOpenmrsSpaBase() + 'billable-services',
-    });
-
-  const onSubmit = (data: FormData) => {
-    const payload: any = {};
-
-    let servicePrices = data.payment.map((element) => {
-      return {
-        name: paymentModes.filter((p) => p.uuid === element.paymentMode)[0].name,
-        price: element.price,
-        paymentMode: element.paymentMode,
-      };
-    });
-
-    payload.name = data.serviceName;
-    payload.shortName = data.shortName;
-    payload.serviceType = data.serviceTypeName;
-    payload.servicePrices = servicePrices;
-    payload.serviceStatus = 'ENABLED';
-    payload.concept = selectedConcept?.concept?.uuid;
-
-    createBillableService(payload).then(
-      (resp) => {
-        showSnackbar({
-          title: t('billableService', 'Billable service'),
-          subtitle: 'Billable service created successfully',
-          kind: 'success',
-          isLowContrast: true,
-          timeoutInMs: 3000,
-        });
-        handleNavigateToServiceDashboard();
-      },
-      (error) => {
-        showSnackbar({
-          title: 'Error adding billable service',
-          kind: 'error',
-          subtitle: extractErrorMessagesFromResponse(error.responseBody),
-          isLowContrast: true,
-        });
-      },
-    );
-  };
-
-  if (isLoadingServicesTypes || isLoadingPaymentModes) {
-    return (
-      <div className={styles.searchWrapper}>
-        <InlineLoading className={styles.loader} description={t('searching', 'Searching') + '...'} />
-      </div>
-    );
-  }
-
-  return (
-    <Form className={styles.form}>
-      <h4 className={styles.subTitle}>{t('addBillableServices', 'Add Billable Services')}</h4>
-      <section className={styles.nameSection}>
-        <div className={styles.serviceName}>
-          <Controller
-            control={control}
-            name="serviceName"
-            render={({ field }) => (
-              <Layer>
-                <TextInput
-                  {...field}
-                  id="serviceName"
-                  type="text"
-                  labelText={t('serviceName', 'Service Name')}
-                  size="md"
-                  placeholder="Enter service name"
-                  invalidText={errors.serviceName?.message || ''}
-                  invalid={!!errors.serviceName}
-                />
-              </Layer>
-            )}
-          />
-        </div>
-        <div className={styles.serviceName}>
-          <Controller
-            control={control}
-            name="shortName"
-            render={({ field }) => (
-              <Layer>
-                <TextInput
-                  id="serviceShortName"
-                  {...field}
-                  type="text"
-                  labelText={t('serviceShortName', 'Short Name')}
-                  size="md"
-                  placeholder="Enter service short name"
-                  invalidText={errors.shortName?.message}
-                  invalid={!!errors.shortName}
-                />
-              </Layer>
-            )}
-          />
-        </div>
-      </section>
-      <section className={styles.secondSection}>
-        <div className={styles.serviceName}>
-          <FormLabel className={styles.conceptLabel}>Associated Concept</FormLabel>
-          <Controller
-            name="concept"
-            control={control}
-            render={({ field: { onChange, value, onBlur } }) => (
-              <ResponsiveWrapper isTablet={isTablet}>
-                <Search
-                  ref={searchInputRef}
-                  size="md"
-                  id="conceptsSearch"
-                  labelText={t('enterConcept', 'Associated concept')}
-                  placeholder={t('searchConcepts', 'Search associated concept')}
-                  className={errors?.concept && styles.serviceError}
-                  onChange={(e) => {
-                    onChange(e);
-                    handleSearchTermChange(e);
-                  }}
-                  renderIcon={errors?.concept && <WarningFilled />}
-                  onBlur={onBlur}
-                  onClear={() => {
-                    setSearchTerm('');
-                    setSelectedConcept(null);
-                  }}
-                  value={(() => {
-                    if (selectedConcept) {
-                      return selectedConcept.display;
-                    }
-                    if (debouncedSearchTerm) {
-                      return value;
-                    }
-                  })()}
-                />
-              </ResponsiveWrapper>
-            )}
-          />
-          {(() => {
-            if (!debouncedSearchTerm || selectedConcept) {
-              return null;
-            }
-            if (isSearching) {
-              return (
-                <div className={styles.searchWrapper}>
-                  <InlineLoading className={styles.loader} description={t('searching', 'Searching') + '...'} />
-                </div>
-              );
-            }
-            if (searchResults && searchResults.length) {
-              return (
-                <ul className={styles.conceptsList}>
-                  {searchResults?.map((searchResult, index) => (
-                    <li
-                      role="menuitem"
-                      className={styles.service}
-                      key={searchResult.concept.uuid}
-                      onClick={() => handleConceptChange(searchResult)}>
-                      {searchResult.display}
-                    </li>
-                  ))}
-                </ul>
-              );
-            }
-            return (
-              <Layer>
-                <Tile className={styles.emptyResults}>
-                  <span>
-                    {t('noResultsFor', 'No results for')} <strong>"{debouncedSearchTerm}"</strong>
-                  </span>
-                </Tile>
-              </Layer>
-            );
-          })()}
-        </div>
-        <div className={styles.serviceName}>
-          <Controller
-            control={control}
-            name="serviceTypeName"
-            render={({ field }) => (
-              <ComboBox
-                id="serviceType"
-                items={serviceTypes ?? []}
-                titleText={t('serviceType', 'Service Type')}
-                itemToString={(item: { display: string }) => (item ? item.display : '')}
-                placeholder="Select service type"
-                required
-                {...field}
-                onChange={({ selectedItem }) => field.onChange(selectedItem ? selectedItem.display : '')}
-                invalidText={errors.serviceTypeName?.message || ''}
-                invalid={!!errors.serviceTypeName}
-              />
-            )}
-          />
-        </div>
-      </section>
-      <div>
-        {fields.map((field, index) => (
-          <div key={field.id} className={styles.paymentMethodContainer}>
-            <Controller
-              control={control}
-              name={`payment.${index}.paymentMode`}
-              render={({ field }) => (
-                <Layer>
-                  <Dropdown
-                    id={`paymentMode-${index}`}
-                    onChange={({ selectedItem }) => field.onChange(selectedItem?.uuid)}
-                    titleText={t('paymentMode', 'Payment Mode')}
-                    label={t('selectPaymentMethod', 'Select payment method')}
-                    items={paymentModes ?? []}
-                    itemToString={(item) => (item ? item.name : '')}
-                    invalid={!!errors?.payment?.[index]?.paymentMode}
-                    invalidText={errors?.payment?.[index]?.paymentMode?.message}
-                  />
-                </Layer>
-              )}
-            />
-            <Controller
-              control={control}
-              name={`payment.${index}.price`}
-              render={({ field }) => (
-                <Layer>
-                  <TextInput
-                    id={`price-${index}`}
-                    {...field}
-                    invalid={!!errors?.payment?.[index]?.price}
-                    invalidText={errors?.payment?.[index]?.price?.message}
-                    labelText={t('sellingPrice', 'Selling Price')}
-                    placeholder={t('sellingAmount', 'Enter selling price')}
-                  />
-                </Layer>
-              )}
-            />
-            <div className={styles.removeButtonContainer}>
-              <TrashCan
-                aria-label={`delete_${index}`}
-                id={`delete_${index}`}
-                onClick={() => handleRemovePaymentMode(index)}
-                className={styles.removeButton}
-                size={20}
-              />
-            </div>
-          </div>
-        ))}
-
-        <Button
-          size="md"
-          onClick={handleAppendPaymentMode}
-          className={styles.paymentButtons}
-          renderIcon={(props) => <Add size={24} {...props} />}
-          iconDescription="Add">
-          {t('addPaymentOptions', 'Add payment option')}
-        </Button>
-      </div>
-      <section>
-        <Button kind="secondary" onClick={handleNavigateToServiceDashboard}>
-          {t('cancel', 'Cancel')}
-        </Button>
-        <Button type="submit" onClick={handleSubmit(onSubmit)} disabled={!isValid || !selectedConcept}>
-          {t('save', 'Save')}
-        </Button>
-      </section>
-    </Form>
-  );
-};
-
-function ResponsiveWrapper({ children, isTablet }: { children: React.ReactNode; isTablet: boolean }) {
-  return isTablet ? <Layer>{children} </Layer> : <>{children}</>;
-}
-
-export default AddBillableService;
diff --git a/packages/esm-billing-app/src/billable-services/create-edit/add-billable-service.scss b/packages/esm-billing-app/src/billable-services/create-edit/add-billable-service.scss
deleted file mode 100755
index 5c52a1c..0000000
--- a/packages/esm-billing-app/src/billable-services/create-edit/add-billable-service.scss
+++ /dev/null
@@ -1,164 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@use '@carbon/colors';
-@use '@carbon/layout';
-@import '~@openmrs/esm-styleguide/src/vars';
-
-.form {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  height: 100%;
-  padding: spacing.$spacing-06;
-}
-
-.subTitle {
-  font-weight: 600;
-  font-size: 14px;
-}
-
-.sectionTitle {
-  @include type.type-style('heading-compact-02');
-  color: $text-02;
-  margin-bottom: spacing.$spacing-04;
-}
-
-.modalBody {
-  padding-bottom: spacing.$spacing-05;
-}
-
-.container {
-  margin: 1rem;
-}
-
-.paymentContainer {
-  margin: layout.$layout-01;
-  padding: layout.$layout-01;
-  width: 70%;
-  border-right: 1px solid colors.$cool-gray-40;
-}
-
-.paymentButtons {
-  margin: layout.$layout-01 0;
-}
-
-.paymentMethodContainer {
-  display: grid;
-  grid-template-columns: repeat(4, minmax(auto, 1fr));
-  column-gap: 1rem;
-  margin: 0.625rem 0;
-  width: 100%;
-}
-
-.paymentTotals {
-  margin-top: layout.$spacing-01;
-}
-
-.processPayments {
-  display: flex;
-  justify-content: flex-end;
-  margin: layout.$spacing-05;
-  column-gap: layout.$spacing-04;
-}
-
-.errorPaymentContainer {
-  margin: layout.$spacing-04;
-  min-height: layout.$spacing-09;
-}
-
-.removeButtonContainer {
-  display: flex;
-  align-self: center;
-  cursor: pointer;
-  margin-left: layout.$spacing-07;
-}
-
-.removeButton {
-  color: colors.$red-60;
-}
-
-.service {
-  padding: 1rem 0.75rem;
-}
-
-.conceptsList {
-  background-color: $ui-02;
-  max-height: 14rem;
-  overflow-y: auto;
-  border: 1px solid $ui-03;
-
-  li:hover {
-    background-color: $ui-03;
-  }
-}
-
-.emptyResults {
-  @include type.type-style('body-compact-01');
-  color: $text-02;
-  min-height: 1rem;
-  border: 1px solid $ui-03;
-}
-
-.conceptLabel {
-  @include type.type-style('label-02');
-  margin-bottom: 0.6rem;
-}
-
-.errorContainer {
-  margin: 1rem;
-}
-
-.serviceError {
-  :global(.cds--search-input):focus {
-    outline: 2.5px solid $danger;
-  }
-
-  :global(.cds--search-magnifier) {
-    svg {
-      fill: $danger;
-    }
-  }
-}
-
-.errorMessage {
-  @include type.type-style('label-02');
-  color: $danger;
-  margin-top: 0.5rem;
-}
-
-.spinner {
-  &:global(.cds--inline-loading) {
-    min-height: 1rem;
-  }
-}
-
-.loader {
-  margin-top: 1rem;
-  margin-bottom: 1rem;
-  margin-left: auto;
-  margin-right: auto;
-  width: max-content;
-}
-
-.searchWrapper {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-items: center;
-}
-
-.nameSection {
-  display: flex;
-  gap: 20px;
-  align-items: flex-start;
-}
-
-.secondSection {
-  display: flex;
-  gap: 20px;
-  align-items: flex-start;
-}
-
-.serviceName {
-  width: 50%;
-}
diff --git a/packages/esm-billing-app/src/billable-services/dashboard/dashboard.component.tsx b/packages/esm-billing-app/src/billable-services/dashboard/dashboard.component.tsx
deleted file mode 100755
index 15540d4..0000000
--- a/packages/esm-billing-app/src/billable-services/dashboard/dashboard.component.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import styles from './dashboard.scss';
-import ServiceMetrics from './service-metrics.component';
-import BillableServices from '../billable-services.component';
-
-export function BillableServicesDashboard() {
-  const { t } = useTranslation();
-
-  return (
-    <main className={styles.container}>
-      <ServiceMetrics />
-      <main className={styles.servicesTableContainer}>
-        <BillableServices />
-      </main>
-    </main>
-  );
-}
diff --git a/packages/esm-billing-app/src/billable-services/dashboard/dashboard.scss b/packages/esm-billing-app/src/billable-services/dashboard/dashboard.scss
deleted file mode 100755
index cd10b1b..0000000
--- a/packages/esm-billing-app/src/billable-services/dashboard/dashboard.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.container {
-  height: calc(100vh - 3rem);
-}
-
-.servicesTableContainer {
-  margin: 2rem 1rem;
-}
-
-.illo {
-  margin-top: layout.$spacing-05;
-}
-
-.content {
-  @include type.type-style('heading-compact-01');
-  color: colors.$gray-70;
-  margin-top: layout.$spacing-05;
-}
-
-.tile {
-  border: 1px solid colors.$gray-20;
-  padding: 1.5rem 0;
-  text-align: center;
-}
diff --git a/packages/esm-billing-app/src/billable-services/dashboard/service-metrics.component.tsx b/packages/esm-billing-app/src/billable-services/dashboard/service-metrics.component.tsx
deleted file mode 100755
index 8d5dbbc..0000000
--- a/packages/esm-billing-app/src/billable-services/dashboard/service-metrics.component.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import React, { useMemo } from 'react';
-import Card from '../../metrics-cards/card.component';
-import styles from '../../metrics-cards/metrics-cards.scss';
-import { useTranslation } from 'react-i18next';
-import { ErrorState } from '@openmrs/esm-patient-common-lib';
-import { InlineLoading } from '@carbon/react';
-import { useBillableServices } from '../billable-service.resource';
-
-export default function ServiceMetrics() {
-  const { t } = useTranslation();
-  const { isLoading, error } = useBillableServices();
-
-  const cards = useMemo(
-    () => [
-      { title: 'Cash Revenue', count: '--' },
-      { title: 'Insurance Revenue', count: '--' },
-      { title: 'Pending Claims', count: '--' },
-    ],
-    [],
-  );
-
-  if (isLoading) {
-    return (
-      <section className={styles.container}>
-        <InlineLoading status="active" iconDescription="Loading" description="Loading service metrics..." />
-      </section>
-    );
-  }
-
-  if (error) {
-    return <ErrorState headerTitle={t('serviceMetrics', 'Service Metrics')} error={error} />;
-  }
-  return (
-    <section className={styles.container}>
-      {cards.map((card) => (
-        <Card key={card.title} title={card.title} count={card.count} />
-      ))}
-    </section>
-  );
-}
diff --git a/packages/esm-billing-app/src/billing-dashboard/billing-dashboard.component.tsx b/packages/esm-billing-app/src/billing-dashboard/billing-dashboard.component.tsx
deleted file mode 100755
index 6008d2a..0000000
--- a/packages/esm-billing-app/src/billing-dashboard/billing-dashboard.component.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import BillingHeader from '../billing-header/billing-header.component';
-import MetricsCards from '../metrics-cards/metrics-cards.component';
-import BillsTable from '../bills-table/bills-table.component';
-import styles from './billing-dashboard.scss';
-import BillingTabs from '../billing-tabs/billling-tabs.component';
-
-export function BillingDashboard() {
-  const { t } = useTranslation();
-
-  return (
-    <main className={styles.container}>
-      <BillingHeader title={t('home', 'Home')} />
-      <MetricsCards />
-      <BillingTabs />
-    </main>
-  );
-}
diff --git a/packages/esm-billing-app/src/billing-dashboard/billing-dashboard.scss b/packages/esm-billing-app/src/billing-dashboard/billing-dashboard.scss
deleted file mode 100755
index 3155807..0000000
--- a/packages/esm-billing-app/src/billing-dashboard/billing-dashboard.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.container {
-  height: calc(100vh - 3rem);
-}
-
-.billsTableContainer {
-  margin: 2rem 1rem;
-}
-
-.illo {
-  margin-top: layout.$spacing-05;
-}
-
-.content {
-  @include type.type-style('heading-compact-01');
-  color: colors.$gray-70;
-  margin-top: layout.$spacing-05;
-}
-
-.tile {
-  border: 1px solid colors.$gray-20;
-  padding: 1.5rem 0;
-  text-align: center;
-}
diff --git a/packages/esm-billing-app/src/billing-form/billing-checkin-form.component.tsx b/packages/esm-billing-app/src/billing-form/billing-checkin-form.component.tsx
deleted file mode 100755
index 24595d9..0000000
--- a/packages/esm-billing-app/src/billing-form/billing-checkin-form.component.tsx
+++ /dev/null
@@ -1,137 +0,0 @@
-import React, { useCallback, useEffect, useState } from 'react';
-import { InlineLoading, InlineNotification, FilterableMultiSelect } from '@carbon/react';
-import { useTranslation } from 'react-i18next';
-import { showSnackbar, useConfig } from '@openmrs/esm-framework';
-import styles from './billing-checkin-form.scss';
-import VisitAttributesForm from './visit-attributes/visit-attributes-form.component';
-import { type BillingConfig } from '../config-schema';
-import { hasPatientBeenExempted } from './helper';
-import { EXEMPTED_PAYMENT_STATUS, PENDING_PAYMENT_STATUS } from '../constants';
-import { type BillingService } from '../types';
-import SHANumberValidity from './social-health-authority/sha-number-validity.component';
-import { createPatientBill, useBillableItems, useCashPoint } from '../billing.resource';
-
-type BillingCheckInFormProps = {
-  patientUuid: string;
-  setExtraVisitInfo: (state) => void;
-};
-
-const BillingCheckInForm: React.FC<BillingCheckInFormProps> = ({ patientUuid, setExtraVisitInfo }) => {
-  const { t } = useTranslation();
-  const {
-    visitAttributeTypes: { isPatientExempted },
-  } = useConfig<BillingConfig>();
-  const { cashPoints, isLoading: isLoadingCashPoints, error: cashError } = useCashPoint();
-  const { lineItems, isLoading: isLoadingLineItems, error: lineError } = useBillableItems();
-  const [attributes, setAttributes] = useState([]);
-  const [paymentMethod, setPaymentMethod] = useState<any>();
-  const [isPatientExemptedValue, setIsPatientExemptedValue] = useState<string | null>(null);
-
-  const handleCreateBill = useCallback((createBillPayload) => {
-    createPatientBill(createBillPayload).then(
-      () => {
-        showSnackbar({ title: 'Patient Bill', subtitle: 'Patient has been billed successfully', kind: 'success' });
-      },
-      (error) => {
-        const errorMessage = JSON.stringify(error?.responseBody?.error?.message?.replace(/\[/g, '').replace(/\]/g, ''));
-        showSnackbar({
-          title: 'Patient Bill Error',
-          subtitle: `An error has occurred while creating patient bill, Contact system administrator quoting this error ${errorMessage}`,
-          kind: 'error',
-          isLowContrast: true,
-        });
-      },
-    );
-  }, []);
-
-  const handleBillingService = (selectedItems: Array<BillingService>) => {
-    const cashPointUuid = cashPoints?.[0]?.uuid ?? '';
-    const billStatus = hasPatientBeenExempted(attributes, isPatientExempted)
-      ? EXEMPTED_PAYMENT_STATUS
-      : PENDING_PAYMENT_STATUS;
-
-    const lineItems = selectedItems.map((item, index) => {
-      const priceForPaymentMode =
-        item.servicePrices.find((p) => p.paymentMode?.uuid === paymentMethod) || item?.servicePrices[0];
-      return {
-        billableService: item?.uuid ?? '',
-        quantity: 1,
-        price: priceForPaymentMode ? priceForPaymentMode.price : '0.000',
-        priceName: 'Default',
-        priceUuid: priceForPaymentMode ? priceForPaymentMode.uuid : '',
-        lineItemOrder: index,
-        paymentStatus: billStatus,
-      };
-    });
-
-    const billPayload = {
-      lineItems: lineItems,
-      cashPoint: cashPointUuid,
-      patient: patientUuid,
-      status: billStatus,
-      payments: [],
-    };
-
-    setExtraVisitInfo({
-      handleCreateExtraVisitInfo: () => handleCreateBill(billPayload),
-      attributes,
-    });
-  };
-
-  useEffect(() => {
-    setExtraVisitInfo({
-      handleCreateExtraVisitInfo: () => {},
-      attributes,
-    });
-  }, [attributes, setExtraVisitInfo]);
-
-  if (isLoadingLineItems || isLoadingCashPoints) {
-    return (
-      <InlineLoading
-        status="active"
-        iconDescription={t('loading', 'Loading')}
-        description={t('loadingBillingServices', 'Loading billing services...')}
-      />
-    );
-  }
-
-  if (cashError || lineError) {
-    return (
-      <InlineNotification
-        kind="error"
-        lowContrast
-        title={t('billErrorService', 'Bill service error')}
-        subtitle={t('errorLoadingBillServices', 'Error loading bill services')}
-      />
-    );
-  }
-
-  return (
-    <>
-      <VisitAttributesForm
-        setAttributes={setAttributes}
-        setPaymentMethod={setPaymentMethod}
-        setIsPatientExempted={setIsPatientExemptedValue}
-      />
-      <SHANumberValidity paymentMethod={paymentMethod} />
-      {paymentMethod && (
-        <section className={styles.sectionContainer}>
-          <div className={styles.sectionTitle}>{t('billing', 'Billing')}</div>
-          <div className={styles.sectionField}>
-            <FilterableMultiSelect
-              key={isPatientExemptedValue}
-              id="billing-service"
-              titleText={t('searchServices', 'Search services')}
-              items={lineItems ?? []}
-              itemToString={(item) => (item ? item?.name : '')}
-              onChange={({ selectedItems }) => handleBillingService(selectedItems)}
-              disabled={isPatientExemptedValue === ''}
-            />
-          </div>
-        </section>
-      )}
-    </>
-  );
-};
-
-export default React.memo(BillingCheckInForm);
diff --git a/packages/esm-billing-app/src/billing-form/billing-checkin-form.scss b/packages/esm-billing-app/src/billing-form/billing-checkin-form.scss
deleted file mode 100755
index 3cf04ff..0000000
--- a/packages/esm-billing-app/src/billing-form/billing-checkin-form.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-@use '@carbon/layout';
-@use '@carbon/type';
-@use '@carbon/colors';
-
-.sectionTitle {
-  @include type.type-style('heading-compact-02');
-  color: colors.$gray-70;
-  margin: 0 0 layout.$spacing-03 0;
-  flex-basis: 30%;
-}
-
-.sectionField {
-  flex-basis: 70%;
-}
diff --git a/packages/esm-billing-app/src/billing-form/billing-form.component.tsx b/packages/esm-billing-app/src/billing-form/billing-form.component.tsx
deleted file mode 100755
index cbeb959..0000000
--- a/packages/esm-billing-app/src/billing-form/billing-form.component.tsx
+++ /dev/null
@@ -1,301 +0,0 @@
-import React, { useState } from 'react';
-import {
-  ButtonSet,
-  Button,
-  RadioButtonGroup,
-  RadioButton,
-  Search,
-  Table,
-  TableHead,
-  TableBody,
-  TableHeader,
-  TableRow,
-  TableCell,
-} from '@carbon/react';
-import styles from './billing-form.scss';
-import { useTranslation } from 'react-i18next';
-import { useFetchSearchResults, processBillItems } from '../billing.resource';
-import { getPatientUuidFromUrl } from '@openmrs/esm-patient-common-lib';
-import { showSnackbar } from '@openmrs/esm-framework';
-import { mutate } from 'swr';
-
-type BillingFormProps = {
-  patientUuid: string;
-  closeWorkspace: () => void;
-};
-
-const BillingForm: React.FC<BillingFormProps> = ({ closeWorkspace }) => {
-  const { t } = useTranslation();
-  const patientUuid = getPatientUuidFromUrl();
-
-  const [GrandTotal, setGrandTotal] = useState(0);
-
-  const [searchOptions, setsearchOptions] = useState([]);
-  const [defaultSearchItems, setdefaultSearchItems] = useState([]);
-
-  const [BillItems, setBillItems] = useState([]);
-
-  const [searchVal, setsearchVal] = useState('');
-  const [category, setCategory] = useState('');
-
-  const toggleSearch = (choiceSelected) => {
-    (document.getElementById('searchField') as HTMLInputElement).disabled = false;
-
-    if (choiceSelected == 'Stock Item') {
-      setCategory('Stock Item');
-    } else {
-      setCategory('Service');
-    }
-  };
-
-  const calculateTotal = (event, itemName) => {
-    const Qnty = event.target.value;
-    const price = (document.getElementById(event.target.id + 'Price') as HTMLInputElement).innerHTML;
-    const total = parseInt(price) * Qnty;
-    (document.getElementById(event.target.id + 'Total') as HTMLInputElement).innerHTML = total.toString();
-
-    const updateItem = BillItems.filter((o) => o.Item.toLowerCase().includes(itemName.toLowerCase()));
-
-    updateItem.map((o) => (o.Qnty = Qnty));
-    updateItem.map((o) => (o.Total = total));
-
-    const totals = Array.from(document.querySelectorAll('[id$="Total"]'));
-
-    let addUpTotals = 0;
-    totals.forEach((tot) => {
-      let getTot = (tot as HTMLInputElement).innerHTML;
-      addUpTotals += parseInt(getTot);
-    });
-    setGrandTotal(addUpTotals);
-  };
-
-  const CalculateTotalAfteraddBillItem = () => {
-    let sum = 0;
-    BillItems.map((o) => (sum += o.Price));
-
-    setGrandTotal(sum);
-  };
-
-  const addItemToBill = (event, itemid, itemname, itemcategory, itemPrice) => {
-    BillItems.push({
-      uuid: itemid,
-      Item: itemname,
-      Qnty: 1,
-      Price: itemPrice,
-      Total: itemPrice,
-      category: itemcategory,
-    });
-    setBillItems(BillItems);
-    setsearchOptions([]);
-    CalculateTotalAfteraddBillItem();
-    (document.getElementById('searchField') as HTMLInputElement).value = '';
-  };
-
-  //  filter items
-  const { data, error, isLoading, isValidating } = useFetchSearchResults(searchVal, category);
-
-  const filterItems = (val) => {
-    setsearchVal(val);
-
-    if (isLoading) {
-      /* empty */
-    } else {
-      if (typeof data !== 'undefined') {
-        //set to null then repopulate
-        while (searchOptions.length > 0) {
-          searchOptions.pop();
-        }
-
-        const res = data as { results: any[] };
-
-        res.results.map((o) => {
-          if (
-            o.commonName &&
-            (o.commonName != '' || o.commonName != null) &&
-            (o.purchasePrice != '' || o.purchasePrice != null)
-          ) {
-            searchOptions.push({
-              uuid: o.uuid,
-              Item: o.commonName,
-              Qnty: 1,
-              Price: o?.purchasePrice,
-              Total: o?.purchasePrice,
-              category: 'StockItem',
-            });
-          } else {
-            if (o.name.toLowerCase().includes(searchVal.toLowerCase())) {
-              searchOptions.push({
-                uuid: o.uuid,
-                Item: o.name,
-                Qnty: 1,
-                Price: o.servicePrices[0]?.price,
-                Total: o.servicePrices[0]?.price,
-                category: 'Service',
-              });
-            }
-          }
-          setsearchOptions(searchOptions);
-        });
-      }
-    }
-  };
-
-  const postBillItems = () => {
-    const bill = {
-      cashPoint: '54065383-b4d4-42d2-af4d-d250a1fd2590',
-      cashier: 'f9badd80-ab76-11e2-9e96-0800200c9a66',
-      lineItems: [],
-      payments: [],
-      patient: patientUuid,
-      status: 'PENDING',
-    };
-
-    BillItems.map((o) => {
-      if (o.category == 'StockItem') {
-        bill.lineItems.push({
-          item: o.uuid,
-          quantity: parseInt(o.Qnty),
-          price: o.Price,
-          priceName: 'Default',
-          priceUuid: '7b9171ac-d3c1-49b4-beff-c9902aee5245',
-          lineItemOrder: 0,
-          paymentStatus: 'PENDING',
-        });
-      } else {
-        bill.lineItems.push({
-          billableService: o.uuid,
-          quantity: parseInt(o.Qnty),
-          price: o.Price,
-          priceName: 'Default',
-          priceUuid: '7b9171ac-d3c1-49b4-beff-c9902aee5245',
-          lineItemOrder: 0,
-          paymentStatus: 'PENDING',
-        });
-      }
-    });
-
-    const url = `/ws/rest/v1/cashier/bill`;
-    processBillItems(bill).then(
-      (resp) => {
-        closeWorkspace();
-        mutate((key) => typeof key === 'string' && key.startsWith(url), undefined, { revalidate: true });
-        showSnackbar({
-          title: t('billItems', 'Save Bill'),
-          subtitle: 'Bill processing has been successful',
-          kind: 'success',
-          timeoutInMs: 3000,
-        });
-      },
-      (error) => {
-        showSnackbar({ title: 'Bill processing error', kind: 'error', subtitle: error });
-      },
-    );
-  };
-
-  return (
-    <div className={styles.billingFormContainer}>
-      <RadioButtonGroup
-        legendText={t('selectCategory', 'Select category')}
-        name="radio-button-group"
-        defaultSelected="radio-1"
-        className={styles.billingItem}
-        onChange={toggleSearch}>
-        <RadioButton labelText={t('stockItem', 'Stock Item')} value="Stock Item" id="radio-1" />
-        <RadioButton labelText={t('service', 'Service')} value="Service" id="radio-2" />
-      </RadioButtonGroup>
-      <div></div>
-
-      <div>
-        <Search
-          id="searchField"
-          size="lg"
-          placeholder="Find your drugs here..."
-          labelText="Search"
-          disabled
-          closeButtonLabelText="Clear search input"
-          onChange={() => {}}
-          className={styles.billingItem}
-          onKeyUp={(e) => {
-            filterItems(e.target.value);
-          }}
-        />
-
-        <ul className={styles.searchContent}>
-          {searchOptions.map((row) => (
-            <li className={styles.searchItem}>
-              <Button
-                id={row.uuid}
-                onClick={(e) => addItemToBill(e, row.uuid, row.Item, row.category, row.Price)}
-                style={{ background: 'inherit', color: 'black' }}>
-                {row.Item} Qnty.{row.Qnty} Ksh.{row.Price}
-              </Button>
-            </li>
-          ))}
-        </ul>
-      </div>
-
-      {/* <NumberInput id="carbon-number" min={0} max={100} value={50} ref={numberRef}
-      onChange={(e)=> alert((numberRef.current as HTMLInputElement).value)}
-      className="testingNumberInput" label="NumberInput label" helperText="Optional helper text." invalidText="Number is not valid" /> */}
-
-      <Table aria-label="sample table" className={styles.billingItem}>
-        <TableHead>
-          <TableRow>
-            <TableHeader>Item</TableHeader>
-            <TableHeader>Quantity</TableHeader>
-            <TableHeader>Price</TableHeader>
-            <TableHeader>Total</TableHeader>
-          </TableRow>
-        </TableHead>
-        <TableBody>
-          {BillItems && Array.isArray(BillItems) ? (
-            BillItems.map((row) => (
-              <TableRow>
-                <TableCell>{row.Item}</TableCell>
-                <TableCell>
-                  <input
-                    type="number"
-                    className="form-control"
-                    id={row.Item}
-                    min={0}
-                    max={100}
-                    value={row.Qnty}
-                    onChange={(e) => {
-                      calculateTotal(e, row.Item);
-                      row.Qnty = e.target.value;
-                    }}
-                  />
-                  {/* <NumberInput id={row.Item} min={0} max={100} value={row.Qnty} ref={numberRef}
-                    onChange={(e)=> alert((numberRef.current as HTMLInputElement).value)} /> */}
-                </TableCell>
-                <TableCell id={row.Item + 'Price'}>{row.Price}</TableCell>
-                <TableCell id={row.Item + 'Total'} className="totalValue">
-                  {row.Total}
-                </TableCell>
-              </TableRow>
-            ))
-          ) : (
-            <p>Loading...</p>
-          )}
-          <TableRow>
-            <TableCell></TableCell>
-            <TableCell></TableCell>
-            <TableCell style={{ fontWeight: 'bold' }}>Grand Total:</TableCell>
-            <TableCell id="GrandTotalSum">{GrandTotal}</TableCell>
-          </TableRow>
-        </TableBody>
-      </Table>
-
-      <ButtonSet className={styles.billingItem}>
-        <Button kind="secondary" onClick={closeWorkspace}>
-          Discard
-        </Button>
-        <Button kind="primary" onClick={postBillItems}>
-          Save & Close
-        </Button>
-      </ButtonSet>
-    </div>
-  );
-};
-
-export default BillingForm;
diff --git a/packages/esm-billing-app/src/billing-form/billing-form.scss b/packages/esm-billing-app/src/billing-form/billing-form.scss
deleted file mode 100755
index b8719c1..0000000
--- a/packages/esm-billing-app/src/billing-form/billing-form.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-@use '@carbon/layout';
-
-.billingFormContainer {
-  padding: layout.$spacing-05;
-}
-
-.billingItem {
-  // padding: layout.$spacing-05;
-  margin-top: 30px;
-}
-
-.searchContent {
-  // display: none;
-  position: absolute;
-  background-color: #fff;
-  min-width: 230px;
-  overflow: auto;
-  border: 1px solid #ddd;
-  z-index: 1;
-  width: 92%;
-}
-
-.searchItem {
-  border-bottom: 0.1rem solid;
-  border-bottom-color: silver;
-  // padding: 10px;
-  cursor: pointer;
-}
diff --git a/packages/esm-billing-app/src/billing-form/helper.ts b/packages/esm-billing-app/src/billing-form/helper.ts
deleted file mode 100755
index 55edb5a..0000000
--- a/packages/esm-billing-app/src/billing-form/helper.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export const hasPatientBeenExempted = (attributes: Array<any>, isPatientExempted: string): boolean =>
-  attributes.find(({ attributeType }) => attributeType === isPatientExempted)?.value === true;
diff --git a/packages/esm-billing-app/src/billing-form/social-health-authority/sha-number-validity.component.tsx b/packages/esm-billing-app/src/billing-form/social-health-authority/sha-number-validity.component.tsx
deleted file mode 100755
index 8a238bf..0000000
--- a/packages/esm-billing-app/src/billing-form/social-health-authority/sha-number-validity.component.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Form, TextInput, Button, InlineLoading, InlineNotification } from '@carbon/react';
-
-type SHANumberValidityProps = {
-  paymentMethod: any;
-};
-
-const SHANumberValidity: React.FC<SHANumberValidityProps> = ({ paymentMethod }) => {
-  const { t } = useTranslation();
-  const [shaNumber, setNumber] = useState('');
-  const [message, setMessage] = useState('');
-  const [isLoading, setIsLoading] = useState(false);
-  const [validity, setValidity] = useState(false); // TODO: set validity based on api response
-  const isSHA = paymentMethod?.name === 'Social Health Insurance Fund (SHA)';
-
-  const handleValidateSHANumber = () => {
-    setIsLoading(true);
-    const randomNumber = Math.floor(Math.random() * 10) + 1;
-    // TODO call api to validate sha number
-    setTimeout(() => {
-      // TODO: set validity based on api response and update the expiry date based on the response as visit attribute
-      randomNumber % 2 === 0 ? setValidity(false) : setValidity(true);
-      setMessage(
-        randomNumber % 2 === 0
-          ? t('invalidSHANumber', 'SHA number is invalid, advice patient to update payment or contact SHA')
-          : t('validSHANumber', 'SHA number is valid, proceed with care'),
-      );
-      setIsLoading(false);
-    }, 1500);
-  };
-
-  if (!isSHA) {
-    return null;
-  }
-
-  return (
-    <Form>
-      <TextInput
-        id="sha-number"
-        onChange={(e) => setNumber(e.target.value)}
-        labelText={t('shaNumber', 'SHA Number')}
-        placeholder={t('enterSHANumber', 'Enter SHA Number')}
-      />
-      {isLoading ? (
-        <InlineLoading
-          style={{ minHeight: '3rem', marginTop: '0.625rem' }}
-          status="active"
-          iconDescription="Loading"
-          description={t('validatingSHANumber', 'Validating SHA Number')}
-        />
-      ) : (
-        <Button
-          disabled={shaNumber.length === 0}
-          kind="tertiary"
-          style={{ marginTop: '0.625rem' }}
-          onClick={handleValidateSHANumber}>
-          {t('checkValidity', 'Check Validity')}
-        </Button>
-      )}
-      {message !== '' && (
-        <p style={{ marginTop: '0.625rem' }}>
-          <InlineNotification
-            aria-label="closes notification"
-            kind={validity ? 'success' : 'error'}
-            statusIconDescription="notification"
-            subtitle={message}
-            title={validity ? t('valid', 'Valid SHA Number') : t('shaNotValid', 'Invalid SHA Number')}
-            lowContrast={true}
-          />
-        </p>
-      )}
-    </Form>
-  );
-};
-
-export default SHANumberValidity;
diff --git a/packages/esm-billing-app/src/billing-form/visit-attributes/visit-attributes-form.component.tsx b/packages/esm-billing-app/src/billing-form/visit-attributes/visit-attributes-form.component.tsx
deleted file mode 100755
index 71db914..0000000
--- a/packages/esm-billing-app/src/billing-form/visit-attributes/visit-attributes-form.component.tsx
+++ /dev/null
@@ -1,206 +0,0 @@
-import React, { useCallback, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
-import { TextInput, InlineLoading, ComboBox, RadioButtonGroup, RadioButton } from '@carbon/react';
-import { Controller, useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { z } from 'zod';
-import { useConfig } from '@openmrs/esm-framework';
-import { type BillingConfig } from '../../config-schema';
-import { usePaymentModes } from '../../billing.resource';
-import styles from './visit-attributes-form.scss';
-
-type VisitAttributesFormProps = {
-  setAttributes: (state) => void;
-  setPaymentMethod?: (value: any) => void;
-  setIsPatientExempted: (value: string) => void;
-};
-
-type VisitAttributesFormValue = {
-  isPatientExempted: string;
-  paymentMethods: { uuid: string; name: string } | null;
-  insuranceScheme: string;
-  policyNumber: string;
-  exemptionCategory: string;
-};
-
-const visitAttributesFormSchema = z.object({
-  isPatientExempted: z.string(),
-  paymentMethods: z.object({ uuid: z.string(), name: z.string() }).nullable(),
-  insuranceScheme: z.string().optional(),
-  policyNumber: z.string().optional(),
-  exemptionCategory: z.string().optional(),
-});
-
-const VisitAttributesForm: React.FC<VisitAttributesFormProps> = ({
-  setAttributes,
-  setPaymentMethod,
-  setIsPatientExempted,
-}) => {
-  const { t } = useTranslation();
-  const { visitAttributeTypes, patientExemptionCategories } = useConfig<BillingConfig>();
-  const { control, getValues, watch, setValue } = useForm<VisitAttributesFormValue>({
-    mode: 'all',
-    defaultValues: {
-      isPatientExempted: '',
-      paymentMethods: null,
-      insuranceScheme: '',
-      policyNumber: '',
-      exemptionCategory: '',
-    },
-    resolver: zodResolver(visitAttributesFormSchema),
-  });
-
-  const { paymentModes, isLoading: isLoadingPaymentModes } = usePaymentModes();
-  const [isPatientExempted, paymentMethods] = watch(['isPatientExempted', 'paymentMethods']);
-
-  const resetFormFieldsForNonExemptedPatients = useCallback(() => {
-    setValue('insuranceScheme', '');
-    setValue('policyNumber', '');
-    setValue('exemptionCategory', '');
-    setValue('paymentMethods', null);
-  }, [setValue]);
-
-  useEffect(() => {
-    if (isPatientExempted === 'true') {
-      resetFormFieldsForNonExemptedPatients();
-    }
-    setIsPatientExempted(isPatientExempted);
-  }, [isPatientExempted, resetFormFieldsForNonExemptedPatients, setIsPatientExempted]);
-
-  const createVisitAttributesPayload = useCallback(() => {
-    const values = getValues();
-    setPaymentMethod?.(values.paymentMethods);
-    const formPayload = [
-      { uuid: visitAttributeTypes.isPatientExempted, value: values.isPatientExempted },
-      { uuid: visitAttributeTypes.paymentMethods, value: values.paymentMethods?.uuid },
-      { uuid: visitAttributeTypes.policyNumber, value: values.policyNumber },
-      { uuid: visitAttributeTypes.insuranceScheme, value: values.insuranceScheme },
-      { uuid: visitAttributeTypes.exemptionCategory, value: values.exemptionCategory },
-    ];
-    const visitAttributesPayload = formPayload.filter(
-      (item) => item.value !== undefined && item.value !== null && item.value !== '',
-    );
-    return visitAttributesPayload.map(({ uuid, value }) => ({
-      attributeType: uuid,
-      value,
-    }));
-  }, [getValues, visitAttributeTypes, setPaymentMethod]);
-
-  useEffect(() => {
-    setAttributes(createVisitAttributesPayload());
-  }, [isPatientExempted, paymentMethods, getValues, createVisitAttributesPayload, setAttributes]);
-
-  if (isLoadingPaymentModes) {
-    return (
-      <InlineLoading
-        status="active"
-        iconDescription={t('loadingDescription', 'Loading')}
-        description={t('loading', 'Loading data...')}
-      />
-    );
-  }
-
-  return (
-    <section>
-      <div className={styles.sectionTitle}>{t('billing', 'Billing')}</div>
-      <div className={styles.sectionField}>
-        <div className={styles.sectionFieldLayer}>
-          <Controller
-            name="isPatientExempted"
-            control={control}
-            render={({ field }) => (
-              <RadioButtonGroup
-                onChange={(selected) => {
-                  field.onChange(selected);
-                  setValue('isPatientExempted', selected);
-                }}
-                orientation="horizontal"
-                legendText={t('isPatientExemptedLegend', 'Is patient exempted from payment?')}
-                name="patientExemption">
-                <RadioButton labelText={t('yes', 'Yes')} value="true" id="Yes" />
-                <RadioButton labelText={t('no', 'No')} value="false" id="No" />
-              </RadioButtonGroup>
-            )}
-          />
-        </div>
-
-        {isPatientExempted === 'true' && (
-          <div className={styles.sectionFieldLayer}>
-            <Controller
-              control={control}
-              name="exemptionCategory"
-              render={({ field }) => (
-                <ComboBox
-                  className={styles.sectionField}
-                  onChange={({ selectedItem }) => field.onChange(selectedItem?.uuid)}
-                  id="exemptionCategory"
-                  items={patientExemptionCategories}
-                  itemToString={(item) => (item ? item.label : '')}
-                  titleText={t('exemptionCategory', 'Exemption category')}
-                  placeholder={t('selectExemptionCategory', 'Select exemption category')}
-                />
-              )}
-            />
-          </div>
-        )}
-
-        {isPatientExempted === 'false' && (
-          <div className={styles.sectionFieldLayer}>
-            <Controller
-              control={control}
-              name="paymentMethods"
-              render={({ field }) => (
-                <ComboBox
-                  className={styles.sectionField}
-                  onChange={({ selectedItem }) => field.onChange(selectedItem)}
-                  id="paymentMethods"
-                  items={paymentModes}
-                  itemToString={(item) => (item ? item.name : '')}
-                  titleText={t('paymentMethodsTitle', 'Payment method')}
-                  placeholder={t('selectPaymentMethod', 'Select payment method')}
-                />
-              )}
-            />
-          </div>
-        )}
-
-        {paymentMethods?.name?.toLowerCase() === 'insurance' && isPatientExempted === 'false' && (
-          <>
-            <div className={styles.sectionFieldLayer}>
-              <Controller
-                control={control}
-                name="insuranceScheme"
-                render={({ field }) => (
-                  <TextInput
-                    className={styles.sectionField}
-                    onChange={(e) => field.onChange(e.target.value)}
-                    id="insurance-scheme"
-                    type="text"
-                    labelText={t('insuranceScheme', 'Insurance scheme')}
-                  />
-                )}
-              />
-            </div>
-            <div className={styles.sectionFieldLayer}>
-              <Controller
-                control={control}
-                name="policyNumber"
-                render={({ field }) => (
-                  <TextInput
-                    className={styles.sectionField}
-                    onChange={(e) => field.onChange(e.target.value)}
-                    id="policy-number"
-                    type="text"
-                    labelText={t('policyNumber', 'Policy number')}
-                  />
-                )}
-              />
-            </div>
-          </>
-        )}
-      </div>
-    </section>
-  );
-};
-
-export default VisitAttributesForm;
diff --git a/packages/esm-billing-app/src/billing-form/visit-attributes/visit-attributes-form.scss b/packages/esm-billing-app/src/billing-form/visit-attributes/visit-attributes-form.scss
deleted file mode 100755
index 47c7f7e..0000000
--- a/packages/esm-billing-app/src/billing-form/visit-attributes/visit-attributes-form.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-@use '@carbon/layout';
-@use '@carbon/type';
-@use '@carbon/colors';
-
-.sectionTitle {
-  @include type.type-style('heading-compact-02');
-  color: colors.$gray-70;
-  margin: 0 0 layout.$spacing-03 0;
-  flex-basis: 30%;
-}
-
-.sectionField {
-  flex-basis: 70%;
-}
-
-.sectionFieldLayer {
-  margin-bottom: 0.5rem;
-}
diff --git a/packages/esm-billing-app/src/billing-header/billing-header.component.tsx b/packages/esm-billing-app/src/billing-header/billing-header.component.tsx
deleted file mode 100755
index 99fb9f5..0000000
--- a/packages/esm-billing-app/src/billing-header/billing-header.component.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { Calendar, Location, UserFollow } from '@carbon/react/icons';
-import { formatDate, useSession } from '@openmrs/esm-framework';
-import BillingIllustration from './billing-illustration.component';
-import styles from './billing-header.scss';
-
-interface BillingHeaderProps {
-  title: string;
-}
-
-const BillingHeader: React.FC<BillingHeaderProps> = ({ title }) => {
-  const { t } = useTranslation();
-  const session = useSession();
-  const location = session?.sessionLocation?.display;
-
-  return (
-    <div className={styles.header} data-testid="billing-header">
-      <div className={styles['left-justified-items']}>
-        <BillingIllustration />
-        <div className={styles['page-labels']}>
-          <p>{t('billing', 'Billing')}</p>
-          <p className={styles['page-name']}>{title}</p>
-        </div>
-      </div>
-      <div className={styles['right-justified-items']}>
-        <div className={styles.userContainer}>
-          <p>{session?.user?.person?.display}</p>
-          <UserFollow size={16} className={styles.userIcon} />
-        </div>
-        <div className={styles['date-and-location']}>
-          <Location size={16} />
-          <span className={styles.value}>{location}</span>
-          <span className={styles.middot}>&middot;</span>
-          <Calendar size={16} />
-          <span className={styles.value}>{formatDate(new Date(), { mode: 'standard' })}</span>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default BillingHeader;
diff --git a/packages/esm-billing-app/src/billing-header/billing-header.scss b/packages/esm-billing-app/src/billing-header/billing-header.scss
deleted file mode 100755
index 78916f3..0000000
--- a/packages/esm-billing-app/src/billing-header/billing-header.scss
+++ /dev/null
@@ -1,83 +0,0 @@
-@use '@carbon/layout';
-@use '@carbon/type';
-@import '~@openmrs/esm-styleguide/src/vars';
-
-.header {
-  @include type.type-style('body-compact-02');
-  color: $text-02;
-  height: layout.$spacing-12;
-  background-color: $ui-02;
-  border-bottom: 1px solid $ui-03;
-  display: flex;
-  justify-content: space-between;
-  padding: layout.$spacing-05;
-}
-
-.left-justified-items {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  cursor: pointer;
-  align-items: center;
-}
-
-.right-justified-items {
-  @include type.type-style('body-compact-02');
-  color: $text-02;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-}
-
-.page-name {
-  @include type.type-style('heading-04');
-}
-
-.page-labels {
-  margin: layout.$spacing-05;
-
-  p:first-of-type {
-    margin-bottom: layout.$spacing-02;
-  }
-}
-
-.date-and-location {
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-}
-
-.userContainer {
-  display: flex;
-  justify-content: flex-end;
-  gap: layout.$spacing-05;
-}
-
-.value {
-  margin-left: layout.$spacing-02;
-}
-
-.middot {
-  margin: 0 layout.$spacing-03;
-}
-
-.view {
-  @include type.type-style('label-01');
-}
-
-// Overriding styles for RTL support
-html[dir='rtl'] {
-  .date-and-location {
-    & > svg {
-      order: -1;
-    }
-    & > span:nth-child(2) {
-      order: -2;
-    }
-  }
-}
-
-.userIcon {
-  fill: $ui-05;
-  margin: layout.$spacing-01;
-}
diff --git a/packages/esm-billing-app/src/billing-header/billing-illustration.component.tsx b/packages/esm-billing-app/src/billing-header/billing-illustration.component.tsx
deleted file mode 100755
index 8c67cb6..0000000
--- a/packages/esm-billing-app/src/billing-header/billing-illustration.component.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-
-const BillingIllustration: React.FC = () => {
-  return (
-    <svg width="64" height="64" viewBox="10 10 60 60.02">
-      <title>Billing module illustration</title>
-      <g fill="none" fillRule="evenodd">
-        <path
-          opacity="0.5"
-          d="M58.75 68.639C60.8886 66.8242 64.1114 66.8242 66.25 68.639C67.703 69.8719 70 68.8873 70 67.0314V12.9686C70 11.1128 67.703 10.1281 66.25 11.3611C64.1114 13.1758 60.8886 13.1758 58.75 11.3611C56.6114 9.54632 53.3886 9.54632 51.25 11.3611C49.1114 13.1758 45.8886 13.1758 43.75 11.3611C41.6114 9.54632 38.3886 9.54632 36.25 11.3611C34.1114 13.1758 30.8886 13.1758 28.75 11.3611C26.6114 9.54632 23.3886 9.54632 21.25 11.3611C19.1114 13.1758 15.8886 13.1758 13.75 11.3611C12.297 10.1281 10 11.1128 10 12.9686V67.0314C10 68.8873 12.297 69.8719 13.75 68.639C15.8886 66.8242 19.1114 66.8242 21.25 68.639C23.3886 70.4537 26.6114 70.4537 28.75 68.639C30.8886 66.8242 34.1114 66.8242 36.25 68.639C38.3886 70.4537 41.6114 70.4537 43.75 68.639C45.8886 66.8242 49.1114 66.8242 51.25 68.639C53.3886 70.4537 56.6114 70.4537 58.75 68.639Z"
-          fill="#CEE6E5"
-        />
-        <path
-          d="M22.5 51.6666C22.5 50.2859 23.6193 49.1666 25 49.1666H55C56.3807 49.1666 57.5 50.2859 57.5 51.6666C57.5 53.0474 56.3807 54.1666 55 54.1666H25C23.6193 54.1666 22.5 53.0474 22.5 51.6666Z"
-          fill="#7BBCB9"
-        />
-        <path
-          d="M22.5 40C22.5 38.6193 23.6193 37.5 25 37.5H55C56.3807 37.5 57.5 38.6193 57.5 40C57.5 41.3807 56.3807 42.5 55 42.5H25C23.6193 42.5 22.5 41.3807 22.5 40Z"
-          fill="#7BBCB9"
-        />
-        <path
-          d="M22.5 28.3333C22.5 26.9526 23.6193 25.8333 25 25.8333H55C56.3807 25.8333 57.5 26.9526 57.5 28.3333C57.5 29.714 56.3807 30.8333 55 30.8333H25C23.6193 30.8333 22.5 29.714 22.5 28.3333Z"
-          fill="#7BBCB9"
-        />
-      </g>
-    </svg>
-  );
-};
-
-export default BillingIllustration;
diff --git a/packages/esm-billing-app/src/billing-prompt/billing-prompt.resource.tsx b/packages/esm-billing-app/src/billing-prompt/billing-prompt.resource.tsx
deleted file mode 100755
index 1d216bf..0000000
--- a/packages/esm-billing-app/src/billing-prompt/billing-prompt.resource.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { type Visit, useConfig, useVisit } from '@openmrs/esm-framework';
-import { useBills } from '../billing.resource';
-import { type BillingConfig } from '../config-schema';
-
-const INPATIENT_VISIT_TYPE = 'a73e2ac6-263b-47fc-99fc-e0f2c09fc914';
-const INSURANCE_PAYMENT_METHOD = 'beac329b-f1dc-4a33-9e7c-d95821a137a6';
-
-// helper functions
-const isCurrentVisitInPatient = (currentVisit: Visit) => currentVisit?.visitType?.uuid === INPATIENT_VISIT_TYPE;
-const isPaymentMethodInsurance = (currentVisit: Visit, insurancePaymentMethod: string) =>
-  currentVisit?.attributes.find((attr) => attr.attributeType.uuid === insurancePaymentMethod)?.value ===
-  INSURANCE_PAYMENT_METHOD;
-
-export const useBillingPrompt = (patientUuid: string) => {
-  const {
-    visitAttributeTypes: { paymentMethods },
-  } = useConfig<BillingConfig>();
-  const { currentVisit, isLoading: isLoadingVisit } = useVisit(patientUuid);
-  const { bills, isLoading, error } = useBills(patientUuid);
-
-  const flattenBills = bills
-    .flatMap((bill) => bill.lineItems)
-    .filter((lineItem) => lineItem.paymentStatus !== 'EXEMPTED');
-  const flattenPayments = bills.flatMap((bill) => bill.payments);
-
-  const totalBill = flattenBills.reduce((acc, curr) => acc + curr.price * curr.quantity, 0);
-  const totalPayments = flattenPayments.reduce((acc, curr) => acc + curr.amountTendered, 0);
-  const patientBillBalance = totalBill - totalPayments;
-
-  // Should show billing prompt if the following conditions are met:
-  // 1. The current visit is not an inpatient visit
-  // 2. The patient has a bill balance
-  // 3. The payment method is not insurances
-
-  return {
-    shouldShowBillingPrompt:
-      !isCurrentVisitInPatient(currentVisit) &&
-      patientBillBalance > 0 &&
-      !isPaymentMethodInsurance(currentVisit, paymentMethods),
-    isLoading: isLoading || isLoadingVisit,
-    error,
-    currentVisit,
-    bills,
-  };
-};
diff --git a/packages/esm-billing-app/src/billing-tabs/billing-tab.scss b/packages/esm-billing-app/src/billing-tabs/billing-tab.scss
deleted file mode 100755
index e69de29..0000000
diff --git a/packages/esm-billing-app/src/billing-tabs/billling-tabs.component.tsx b/packages/esm-billing-app/src/billing-tabs/billling-tabs.component.tsx
deleted file mode 100755
index 3adf271..0000000
--- a/packages/esm-billing-app/src/billing-tabs/billling-tabs.component.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Tab, TabList, Tabs, TabPanel, TabPanels } from '@carbon/react';
-import styles from './billing-tab.scss';
-import PatientBillsScreen from '../past-patient-bills/patient-bills-dashboard/patient-bills-dashboard';
-import BillsTable from '../bills-table/bills-table.component';
-
-const BillingTabs = () => {
-  const { t } = useTranslation();
-  const [activeTabIndex, setActiveTabIndex] = useState<number>(0);
-
-  const handleTabChange = ({ selectedIndex }: { selectedIndex: number }) => {
-    setActiveTabIndex(selectedIndex);
-  };
-
-  return (
-    <div className={styles.referralsList} data-testid="BillingsList-list">
-      <Tabs selectedIndex={activeTabIndex} onChange={handleTabChange} className={styles.tabs}>
-        <div style={{ display: 'flex' }}>
-          <TabList style={{ paddingLeft: '1rem' }} aria-label="Billing tabs" contained>
-            <Tab className={styles.tab}>{"Today's bills"}</Tab>
-            <Tab className={styles.tab}>{t('patientBills', 'Patient Bill')}</Tab>
-          </TabList>
-        </div>
-        <TabPanels>
-          <TabPanel className={styles.tabPanel}>
-            <BillsTable />
-          </TabPanel>
-          <TabPanel className={styles.tabPanel}>
-            <PatientBillsScreen />
-          </TabPanel>
-        </TabPanels>
-      </Tabs>
-    </div>
-  );
-};
-
-export default BillingTabs;
diff --git a/packages/esm-billing-app/src/billing.resource.ts b/packages/esm-billing-app/src/billing.resource.ts
deleted file mode 100755
index d9c3c1c..0000000
--- a/packages/esm-billing-app/src/billing.resource.ts
+++ /dev/null
@@ -1,225 +0,0 @@
-import useSWR from 'swr';
-import {
-  formatDate,
-  parseDate,
-  openmrsFetch,
-  useSession,
-  useVisit,
-  useConfig,
-  type OpenmrsResource,
-} from '@openmrs/esm-framework';
-import { type FacilityDetail, type MappedBill, type PatientInvoice, type PaymentMethod } from './types';
-import isEmpty from 'lodash-es/isEmpty';
-import sortBy from 'lodash-es/sortBy';
-import dayjs from 'dayjs';
-import { type BillingConfig } from './config-schema';
-import { useState } from 'react';
-
-export const useBills = (patientUuid: string = '', billStatus: string = '') => {
-  // TODO: Should be provided from the UI
-  const defaultCreatedOnOrAfterDateTime = dayjs().startOf('day').toISOString();
-  const url = `/ws/rest/v1/cashier/bill?status=${billStatus}&v=custom:(uuid,display,voided,voidReason,adjustedBy,cashPoint:(uuid,name),cashier:(uuid,display),dateCreated,lineItems,patient:(uuid,display))&createdOnOrAfter=${defaultCreatedOnOrAfterDateTime}`;
-
-  const { data, error, isLoading, isValidating, mutate } = useSWR<{ data: { results: Array<PatientInvoice> } }>(
-    patientUuid ? `${url}&patientUuid=${patientUuid}` : url,
-    openmrsFetch,
-    {
-      errorRetryCount: 2,
-    },
-  );
-
-  const mapBillProperties = (bill: PatientInvoice): MappedBill => {
-    // create base object
-    const mappedBill: MappedBill = {
-      id: bill?.id,
-      uuid: bill?.uuid,
-      patientName: bill?.patient?.display.split('-')?.[1],
-      identifier: bill?.patient?.display.split('-')?.[0],
-      patientUuid: bill?.patient?.uuid,
-      status: bill.lineItems.some((item) => item.paymentStatus === 'PENDING') ? 'PENDING' : 'PAID',
-      receiptNumber: bill?.receiptNumber,
-      cashier: bill?.cashier,
-      cashPointUuid: bill?.cashPoint?.uuid,
-      cashPointName: bill?.cashPoint?.name,
-      cashPointLocation: bill?.cashPoint?.location?.display,
-      dateCreated: bill?.dateCreated ? formatDate(parseDate(bill.dateCreated), { mode: 'wide' }) : '--',
-      lineItems: bill.lineItems,
-      billingService: bill.lineItems.map((bill) => bill.item || bill.billableService || '--').join('  '),
-      payments: bill.payments,
-      display: bill.display,
-      totalAmount: bill?.lineItems?.map((item) => item.price * item.quantity).reduce((prev, curr) => prev + curr, 0),
-    };
-
-    return mappedBill;
-  };
-
-  const sortBills = sortBy(data?.data?.results ?? [], ['dateCreated']).reverse();
-  const filteredBills = billStatus === '' ? sortBills : sortBills?.filter((bill) => bill.status === billStatus);
-  const mappedResults = filteredBills?.map((bill) => mapBillProperties(bill));
-  const filteredResults = mappedResults?.filter((res) => res.patientUuid === patientUuid);
-  const formattedBills = isEmpty(patientUuid) ? mappedResults : filteredResults || [];
-
-  return {
-    bills: formattedBills,
-    error,
-    isLoading,
-    isValidating,
-    mutate,
-  };
-};
-
-export const useBill = (billUuid: string) => {
-  const url = `/ws/rest/v1/cashier/bill/${billUuid}`;
-  const { data, error, isLoading, isValidating, mutate } = useSWR<{ data: PatientInvoice }>(
-    billUuid ? url : null,
-    openmrsFetch,
-    {
-      errorRetryCount: 2,
-    },
-  );
-
-  const mapBillProperties = (bill: PatientInvoice): MappedBill => {
-    // create base object
-    const mappedBill: MappedBill = {
-      id: bill?.id,
-      uuid: bill?.uuid,
-      patientName: bill?.patient?.display.split('-')?.[1],
-      identifier: bill?.patient?.display.split('-')?.[0],
-      patientUuid: bill?.patient?.uuid,
-      status:
-        bill.lineItems.length > 1
-          ? bill.lineItems.some((item) => item.paymentStatus === 'PENDING')
-            ? 'PENDING'
-            : 'PAID'
-          : bill.status,
-      receiptNumber: bill?.receiptNumber,
-      cashier: bill?.cashier,
-      cashPointUuid: bill?.cashPoint?.uuid,
-      cashPointName: bill?.cashPoint?.name,
-      cashPointLocation: bill?.cashPoint?.location?.display,
-      dateCreated: bill?.dateCreated ?? '--',
-      lineItems: bill.lineItems,
-      billingService: bill.lineItems.map((bill) => bill.item).join(' '),
-      payments: bill.payments,
-      totalAmount: bill?.lineItems?.map((item) => item.price * item.quantity).reduce((prev, curr) => prev + curr, 0),
-      tenderedAmount: bill?.payments?.map((item) => item.amountTendered).reduce((prev, curr) => prev + curr, 0),
-    };
-
-    return mappedBill;
-  };
-
-  const formattedBill = data?.data ? mapBillProperties(data?.data) : ({} as MappedBill);
-
-  return {
-    bill: formattedBill,
-    error,
-    isLoading,
-    isValidating,
-    mutate,
-  };
-};
-
-export const processBillPayment = (payload, billUuid: string) => {
-  const url = `/ws/rest/v1/cashier/bill/${billUuid}`;
-  return openmrsFetch(url, {
-    method: 'POST',
-    body: payload,
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  });
-};
-
-export function useDefaultFacility() {
-  const { authenticated } = useSession();
-  const url = '/ws/rest/v1/kenyaemr/default-facility';
-  const { data, isLoading } = useSWR<{ data: FacilityDetail }>(authenticated ? url : null, openmrsFetch, {});
-  return { data: data?.data, isLoading: isLoading };
-}
-
-export function useFetchSearchResults(searchVal, category) {
-  let url = ``;
-  if (category == 'Stock Item') {
-    url = `/ws/rest/v1/stockmanagement/stockitem?v=default&limit=10&q=${searchVal}`;
-  } else {
-    url = `/ws/rest/v1/cashier/billableService?v=custom:(uuid,name,shortName,serviceStatus,serviceType:(display),servicePrices:(uuid,name,price,paymentMode))`;
-  }
-  const { data, error, isLoading, isValidating } = useSWR(searchVal ? url : null, openmrsFetch, {});
-
-  return { data: data?.data, error, isLoading: isLoading, isValidating };
-}
-
-export const usePatientPaymentInfo = (patientUuid: string) => {
-  const { currentVisit } = useVisit(patientUuid);
-  const attributes = currentVisit?.attributes ?? [];
-  const paymentInformation = attributes
-    .map((attribute) => ({
-      name: attribute.attributeType.name,
-      value: attribute.value,
-    }))
-    .filter(({ name }) => name === 'Insurance scheme' || name === 'Policy Number');
-
-  return paymentInformation;
-};
-
-export const processBillItems = (payload) => {
-  const url = `/ws/rest/v1/cashier/bill`;
-  return openmrsFetch(url, {
-    method: 'POST',
-    body: payload,
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  });
-};
-
-export const usePaymentModes = (excludeWaiver: boolean = true) => {
-  const { excludedPaymentMode } = useConfig<BillingConfig>();
-  const url = `/ws/rest/v1/cashier/paymentMode`;
-  const { data, isLoading, error, mutate } = useSWR<{ data: { results: Array<PaymentMethod> } }>(url, openmrsFetch, {
-    errorRetryCount: 2,
-  });
-  const allowedPaymentModes =
-    excludedPaymentMode?.length > 0
-      ? (data?.data?.results.filter((mode) => !excludedPaymentMode.some((excluded) => excluded.uuid === mode.uuid)) ??
-        [])
-      : (data?.data?.results ?? []);
-  return {
-    paymentModes: excludeWaiver ? allowedPaymentModes : data?.data?.results,
-    isLoading,
-    mutate,
-    error,
-  };
-};
-
-export const useBillableItems = () => {
-  const url = `/ws/rest/v1/cashier/billableService?v=custom:(uuid,name,shortName,serviceStatus,serviceType:(display),servicePrices:(uuid,name,price,paymentMode))`;
-  const { data, isLoading, error } = useSWR<{ data: { results: Array<OpenmrsResource> } }>(url, openmrsFetch);
-  const [searchTerm, setSearchTerm] = useState('');
-  const filteredItems =
-    data?.data?.results?.filter((item) => item.name.toLowerCase().includes(searchTerm.toLowerCase())) ?? [];
-  return {
-    lineItems: filteredItems,
-    isLoading,
-    error,
-    searchTerm,
-    setSearchTerm,
-  };
-};
-export const useCashPoint = () => {
-  const url = `/ws/rest/v1/cashier/cashPoint`;
-  const { data, isLoading, error } = useSWR<{ data: { results: Array<OpenmrsResource> } }>(url, openmrsFetch);
-
-  return { isLoading, error, cashPoints: data?.data?.results ?? [] };
-};
-
-export const createPatientBill = (payload) => {
-  const postUrl = `/ws/rest/v1/cashier/bill`;
-  return openmrsFetch(postUrl, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: payload });
-};
-
-export const useConceptAnswers = (conceptUuid: string) => {
-  const url = `/ws/rest/v1/concept/${conceptUuid}`;
-  const { data, isLoading, error } = useSWR<{ data: { answers: Array<OpenmrsResource> } }>(url, openmrsFetch);
-  return { conceptAnswers: data?.data?.answers, isLoading, error };
-};
diff --git a/packages/esm-billing-app/src/bills-table/bills-table.component.tsx b/packages/esm-billing-app/src/bills-table/bills-table.component.tsx
deleted file mode 100755
index 7ea7559..0000000
--- a/packages/esm-billing-app/src/bills-table/bills-table.component.tsx
+++ /dev/null
@@ -1,288 +0,0 @@
-import React, { useCallback, useId, useMemo, useState } from 'react';
-import classNames from 'classnames';
-import {
-  DataTable,
-  DataTableSkeleton,
-  Dropdown,
-  InlineLoading,
-  Layer,
-  Pagination,
-  Search,
-  Table,
-  TableBody,
-  TableCell,
-  TableContainer,
-  TableHead,
-  TableHeader,
-  TableRow,
-  Tile,
-} from '@carbon/react';
-import { useTranslation } from 'react-i18next';
-import {
-  useLayoutType,
-  isDesktop,
-  useConfig,
-  usePagination,
-  ErrorState,
-  ConfigurableLink,
-} from '@openmrs/esm-framework';
-import { EmptyDataIllustration } from '@openmrs/esm-patient-common-lib';
-import { useBills } from '../billing.resource';
-import styles from './bills-table.scss';
-
-const filterItems = [
-  { id: '', text: 'All bills' },
-  { id: 'PENDING', text: 'Pending bills' },
-  { id: 'PAID', text: 'Paid bills' },
-  { id: 'POSTED', text: 'Posted bills' },
-];
-
-type BillTableProps = {
-  defaultBillPaymentStatus?: string;
-};
-
-const BillsTable: React.FC<BillTableProps> = ({ defaultBillPaymentStatus = '' }) => {
-  const { t } = useTranslation();
-  const id = useId();
-  const config = useConfig();
-  const layout = useLayoutType();
-  const responsiveSize = isDesktop(layout) ? 'sm' : 'lg';
-  const [billPaymentStatus, setBillPaymentStatus] = useState(defaultBillPaymentStatus);
-  const pageSizes = config?.bills?.pageSizes ?? [10, 20, 30, 40, 50];
-  const [pageSize, setPageSize] = useState(config?.bills?.pageSize ?? 10);
-  const { bills, isLoading, isValidating, error } = useBills('', billPaymentStatus);
-  const [searchString, setSearchString] = useState('');
-
-  const headerData = [
-    {
-      header: t('visitTime', 'Visit time'),
-      key: 'visitTime',
-    },
-    {
-      header: t('identifier', 'Identifier'),
-      key: 'identifier',
-    },
-    {
-      header: t('name', 'Name'),
-      key: 'patientName',
-    },
-    {
-      header: t('billedItems', 'Billed Items'),
-      key: 'billedItems',
-    },
-  ];
-
-  const searchResults = useMemo(() => {
-    if (bills !== undefined && bills.length > 0) {
-      if (searchString && searchString.trim() !== '') {
-        const search = searchString.toLowerCase();
-        return bills?.filter((activeBillRow) =>
-          Object.entries(activeBillRow).some(([header, value]) => {
-            if (header === 'patientUuid') {
-              return false;
-            }
-            return `${value}`.toLowerCase().includes(search);
-          }),
-        );
-      }
-    }
-
-    return bills;
-  }, [searchString, bills]);
-
-  const { paginated, goTo, results, currentPage } = usePagination(searchResults, pageSize);
-
-  const setBilledItems = (bill) =>
-    bill?.lineItems?.reduce(
-      (acc, item) => acc + (acc ? ' & ' : '') + (item.billableService.split(':')[1] || item.item.split(':')[1] || ''),
-      '',
-    );
-
-  const billingUrl = '${openmrsSpaBase}/home/billing/patient/${patientUuid}/${uuid}';
-
-  const rowData = results?.map((bill, index) => ({
-    id: `${index}`,
-    uuid: bill.uuid,
-    patientName: (
-      <ConfigurableLink
-        style={{ textDecoration: 'none', maxWidth: '50%' }}
-        to={billingUrl}
-        templateParams={{ patientUuid: bill.patientUuid, uuid: bill.uuid }}>
-        {bill.patientName}
-      </ConfigurableLink>
-    ),
-    visitTime: bill.dateCreated,
-    identifier: bill.identifier,
-    department: '--',
-    billedItems: setBilledItems(bill),
-    billingPrice: '--',
-  }));
-
-  const handleSearch = useCallback(
-    (e) => {
-      goTo(1);
-      setSearchString(e.target.value);
-    },
-    [goTo, setSearchString],
-  );
-
-  const handleFilterChange = ({ selectedItem }) => setBillPaymentStatus(selectedItem.id);
-
-  if (isLoading) {
-    return (
-      <div className={styles.loaderContainer}>
-        <DataTableSkeleton
-          rowCount={pageSize}
-          showHeader={false}
-          showToolbar={false}
-          zebra
-          columnCount={headerData?.length}
-          size={responsiveSize}
-        />
-      </div>
-    );
-  }
-
-  if (error) {
-    return (
-      <div className={styles.errorContainer}>
-        <Layer>
-          <ErrorState error={error} headerTitle={t('billsList', 'Bill list')} />
-        </Layer>
-      </div>
-    );
-  }
-
-  return (
-    <>
-      <div className={styles.filterContainer}>
-        <Dropdown
-          className={styles.filterDropdown}
-          direction="bottom"
-          id={`filter-${id}`}
-          initialSelectedItem={filterItems.find((item) => item.id === billPaymentStatus)}
-          items={filterItems}
-          itemToString={(item) => (item ? item.text : '')}
-          label=""
-          onChange={handleFilterChange}
-          size={responsiveSize}
-          titleText={t('filterBy', 'Filter by') + ':'}
-          type="inline"
-        />
-      </div>
-
-      {bills?.length > 0 ? (
-        <div className={styles.billListContainer}>
-          <FilterableTableHeader
-            handleSearch={handleSearch}
-            isValidating={isValidating}
-            layout={layout}
-            responsiveSize={responsiveSize}
-            t={t}
-          />
-          <DataTable
-            isSortable
-            rows={rowData}
-            headers={headerData}
-            size={responsiveSize}
-            useZebraStyles={rowData?.length > 1 ? true : false}>
-            {({ rows, headers, getRowProps, getTableProps }) => (
-              <TableContainer>
-                <Table {...getTableProps()} aria-label="bill list">
-                  <TableHead>
-                    <TableRow>
-                      {headers.map((header) => (
-                        <TableHeader key={header.key}>{header.header}</TableHeader>
-                      ))}
-                    </TableRow>
-                  </TableHead>
-                  <TableBody>
-                    {rows.map((row) => (
-                      <TableRow
-                        key={row.id}
-                        {...getRowProps({
-                          row,
-                        })}>
-                        {row.cells.map((cell) => (
-                          <TableCell key={cell.id}>{cell.value}</TableCell>
-                        ))}
-                      </TableRow>
-                    ))}
-                  </TableBody>
-                </Table>
-              </TableContainer>
-            )}
-          </DataTable>
-          {searchResults?.length === 0 && (
-            <div className={styles.filterEmptyState}>
-              <Layer level={0}>
-                <Tile className={styles.filterEmptyStateTile}>
-                  <p className={styles.filterEmptyStateContent}>
-                    {t('noMatchingBillsToDisplay', 'No matching bills to display')}
-                  </p>
-                  <p className={styles.filterEmptyStateHelper}>{t('checkFilters', 'Check the filters above')}</p>
-                </Tile>
-              </Layer>
-            </div>
-          )}
-          {paginated && (
-            <Pagination
-              forwardText="Next page"
-              backwardText="Previous page"
-              page={currentPage}
-              pageSize={pageSize}
-              pageSizes={pageSizes}
-              totalItems={searchResults?.length}
-              className={styles.pagination}
-              size={responsiveSize}
-              onChange={({ pageSize: newPageSize, page: newPage }) => {
-                if (newPageSize !== pageSize) {
-                  setPageSize(newPageSize);
-                }
-                if (newPage !== currentPage) {
-                  goTo(newPage);
-                }
-              }}
-            />
-          )}
-        </div>
-      ) : (
-        <Layer className={styles.emptyStateContainer}>
-          <Tile className={styles.tile}>
-            <div className={styles.illo}>
-              <EmptyDataIllustration />
-            </div>
-            <p className={styles.content}>There are no bills to display.</p>
-          </Tile>
-        </Layer>
-      )}
-    </>
-  );
-};
-
-function FilterableTableHeader({ layout, handleSearch, isValidating, responsiveSize, t }) {
-  return (
-    <>
-      <div className={styles.headerContainer}>
-        <div
-          className={classNames({
-            [styles.tabletHeading]: !isDesktop(layout),
-            [styles.desktopHeading]: isDesktop(layout),
-          })}>
-          <h4>{t('billList', 'Bill list')}</h4>
-        </div>
-        <div className={styles.backgroundDataFetchingIndicator}>
-          <span>{isValidating ? <InlineLoading /> : null}</span>
-        </div>
-      </div>
-      <Search
-        labelText=""
-        placeholder={t('filterTable', 'Filter table')}
-        onChange={handleSearch}
-        size={responsiveSize}
-      />
-    </>
-  );
-}
-
-export default BillsTable;
diff --git a/packages/esm-billing-app/src/bills-table/bills-table.scss b/packages/esm-billing-app/src/bills-table/bills-table.scss
deleted file mode 100755
index bbb9af0..0000000
--- a/packages/esm-billing-app/src/bills-table/bills-table.scss
+++ /dev/null
@@ -1,181 +0,0 @@
-@use '@carbon/layout';
-@use '@carbon/type';
-@import '~@openmrs/esm-styleguide/src/vars';
-
-.container {
-  margin: 2rem 0;
-}
-
-.emptyStateContainer,
-.loaderContainer {
-  @extend .container;
-}
-
-.billListContainer {
-  background-color: $ui-02;
-  border: 1px solid $ui-03;
-  width: 100%;
-  margin: 0 auto;
-  max-width: 95vw;
-  padding-bottom: 0;
-
-  :has(.filterEmptyState) {
-    border-bottom: none;
-  }
-}
-
-.filterContainer {
-  flex: 1;
-
-  :global(.cds--dropdown__wrapper--inline) {
-    gap: 0;
-  }
-
-  :global(.cds--list-box__menu-icon) {
-    height: 1rem;
-  }
-
-  :global(.cds--list-box__menu) {
-    min-width: max-content;
-  }
-
-  :global(.cds--list-box) {
-    margin-left: layout.$spacing-03;
-  }
-}
-
-.menu {
-  margin-left: layout.$spacing-03;
-}
-
-.headerContainer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: layout.$spacing-04 layout.$spacing-05;
-  background-color: $ui-02;
-}
-
-.backgroundDataFetchingIndicator {
-  align-items: center;
-  display: flex;
-  flex: 1;
-  justify-content: space-between;
-
-  &:global(.cds--inline-loading) {
-    max-height: 1rem;
-  }
-}
-
-.tableContainer section {
-  position: relative;
-}
-
-.tableContainer a {
-  text-decoration: none;
-}
-
-.pagination {
-  overflow: hidden;
-
-  &:global(.cds--pagination) {
-    border-top: none;
-  }
-}
-
-.hiddenRow {
-  display: none;
-}
-
-.emptyRow {
-  padding: 0 1rem;
-  display: flex;
-  align-items: center;
-}
-
-.visitSummaryContainer {
-  width: 100%;
-  max-width: 768px;
-  margin: 1rem auto;
-}
-
-.expandedActiveVisitRow > td > div {
-  max-height: max-content !important;
-}
-
-.expandedActiveVisitRow td {
-  padding: 0 2rem;
-}
-
-.expandedActiveVisitRow th[colspan] td[colspan] > div:first-child {
-  padding: 0 1rem;
-}
-
-.action {
-  margin-bottom: layout.$spacing-03;
-}
-
-.illo {
-  margin-top: layout.$spacing-05;
-}
-
-.content {
-  @include type.type-style('heading-compact-01');
-  color: $text-02;
-  margin-top: layout.$spacing-05;
-  margin-bottom: layout.$spacing-03;
-}
-
-.desktopHeading,
-.tabletHeading {
-  text-align: left;
-  text-transform: capitalize;
-  flex: 1;
-
-  h4 {
-    @include type.type-style('heading-compact-02');
-    color: $text-02;
-
-    &:after {
-      content: '';
-      display: block;
-      width: 2rem;
-      padding-top: 3px;
-      border-bottom: 0.375rem solid;
-      @include brand-03(border-bottom-color);
-    }
-  }
-}
-
-.tile {
-  text-align: center;
-  border: 1px solid $ui-03;
-}
-
-.menuitem {
-  max-width: none;
-}
-
-.filterEmptyState {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: layout.$spacing-05;
-  margin: layout.$spacing-09;
-  text-align: center;
-}
-
-.filterEmptyStateTile {
-  margin: auto;
-}
-
-.filterEmptyStateContent {
-  @include type.type-style('heading-compact-02');
-  color: $text-02;
-  margin-bottom: 0.5rem;
-}
-
-.filterEmptyStateHelper {
-  @include type.type-style('body-compact-01');
-  color: $text-02;
-}
diff --git a/packages/esm-billing-app/src/claims/claims-wrap/claims-main-component.tsx b/packages/esm-billing-app/src/claims/claims-wrap/claims-main-component.tsx
deleted file mode 100755
index 65b5fd6..0000000
--- a/packages/esm-billing-app/src/claims/claims-wrap/claims-main-component.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import styles from './claims-main.scss';
-import { type LineItem, type MappedBill } from '../../types';
-import ClaimsTable from '../dashboard/table/claims-table.component';
-import { useBill } from '../../billing.resource';
-import { useTranslation } from 'react-i18next';
-import ClaimsForm from '../dashboard/form/claims-form.component';
-import MainMetrics from '../metrics/metrics.component';
-
-interface ClaimsMainProps {
-  bill: MappedBill;
-}
-
-const ClaimMainComponent: React.FC<ClaimsMainProps> = ({ bill }) => {
-  const [selectedLineItems, setSelectedLineItems] = useState<LineItem[]>([]);
-  const { isLoading: isLoadingBill, error } = useBill(bill.uuid);
-
-  const handleSelectItem = (lineItems: Array<LineItem>) => {
-    setSelectedLineItems(lineItems);
-  };
-
-  return (
-    <>
-      <MainMetrics selectedLineItems={selectedLineItems} bill={bill} />
-      <div className={styles.mainContainer}>
-        <div className={styles.content}>
-          <ClaimsTable bill={bill} isLoadingBill={isLoadingBill} onSelectItem={handleSelectItem} />
-          <ClaimsForm bill={bill} selectedLineItems={selectedLineItems} />
-        </div>
-      </div>
-    </>
-  );
-};
-
-export default ClaimMainComponent;
diff --git a/packages/esm-billing-app/src/claims/claims-wrap/claims-main.scss b/packages/esm-billing-app/src/claims/claims-wrap/claims-main.scss
deleted file mode 100755
index 001553f..0000000
--- a/packages/esm-billing-app/src/claims/claims-wrap/claims-main.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-.mainContainer {
-  display: flex;
-  margin: 0 auto;
-  padding: 0 1rem;
-}
-
-.content {
-  display: flex;
-  width: 100%;
-}
-
-:global(.omrs-breakpoint-lt-desktop) {
-  .mainContainer {
-    flex-direction: column;
-  }
-
-  .content {
-    flex-direction: column;
-  }
-}
-
-.claimContainer,
-.form {
-  flex: 1;
-}
diff --git a/packages/esm-billing-app/src/claims/dashboard/claims-breakdown/claims-breakdown.component.tsx b/packages/esm-billing-app/src/claims/dashboard/claims-breakdown/claims-breakdown.component.tsx
deleted file mode 100755
index bd43261..0000000
--- a/packages/esm-billing-app/src/claims/dashboard/claims-breakdown/claims-breakdown.component.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import styles from './claims-breakdown.scss';
-
-type ClaimsBreakDownProps = {
-  label: string;
-  value: string;
-  hasBalance?: Boolean;
-};
-
-export const ClaimsBreakDown: React.FC<ClaimsBreakDownProps> = ({ label, value, hasBalance }) => {
-  return (
-    <div className={styles.claimsBreakdownContainer}>
-      <div className={styles.claimsBreakdown}>
-        <span className={hasBalance ? styles.extendedLabel : styles.label}>{label}: </span>
-        <span className={styles.value}>{value}</span>
-      </div>
-    </div>
-  );
-};
diff --git a/packages/esm-billing-app/src/claims/dashboard/claims-breakdown/claims-breakdown.scss b/packages/esm-billing-app/src/claims/dashboard/claims-breakdown/claims-breakdown.scss
deleted file mode 100755
index 086d74c..0000000
--- a/packages/esm-billing-app/src/claims/dashboard/claims-breakdown/claims-breakdown.scss
+++ /dev/null
@@ -1,35 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.claimsBreakdownContainer {
-  display: flex;
-  justify-content: flex-end;
-  padding: layout.$spacing-09 !important;
-}
-
-.claimsBreakdown {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  align-items: flex-end;
-  margin-right: auto;
-}
-
-.label {
-  @include type.type-style('heading-03');
-  color: colors.$gray-100;
-  text-align: end;
-}
-
-.value {
-  @extend .label;
-  font-weight: bold;
-  margin-left: layout.$spacing-03;
-  text-align: start;
-}
-
-.extendedLabel {
-  @extend .label;
-  font-weight: bold;
-  color: crimson;
-}
diff --git a/packages/esm-billing-app/src/claims/dashboard/claims-dashboard.component.tsx b/packages/esm-billing-app/src/claims/dashboard/claims-dashboard.component.tsx
deleted file mode 100755
index dc87cbe..0000000
--- a/packages/esm-billing-app/src/claims/dashboard/claims-dashboard.component.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import { useParams } from 'react-router-dom';
-import { useTranslation } from 'react-i18next';
-import { usePatient, ErrorState } from '@openmrs/esm-framework';
-import styles from './header/claims-header.scss';
-import { InlineLoading } from '@carbon/react';
-import { useBill } from '../../billing.resource';
-import ClaimsHeader from './header/claims-header.component';
-
-const ClaimScreen: React.FC = () => {
-  const { billUuid, patientUuid } = useParams();
-  const { t } = useTranslation();
-
-  const { patient, isLoading: isLoadingPatient } = usePatient(patientUuid);
-  const { bill, isLoading: isLoadingBill, error } = useBill(billUuid);
-
-  if (isLoadingPatient && isLoadingBill) {
-    return (
-      <div className={styles.invoiceContainer}>
-        <InlineLoading
-          className={styles.loader}
-          status="active"
-          iconDescription="Loading"
-          description="Loading patient header..."
-        />
-      </div>
-    );
-  }
-
-  if (error) {
-    return (
-      <div className={styles.errorContainer}>
-        <ErrorState headerTitle={t('createClaimError', 'Create Claim error')} error={error} />
-      </div>
-    );
-  }
-
-  return <ClaimsHeader patient={patient} bill={bill} />;
-};
-
-export default ClaimScreen;
diff --git a/packages/esm-billing-app/src/claims/dashboard/form/claims-form.component.tsx b/packages/esm-billing-app/src/claims/dashboard/form/claims-form.component.tsx
deleted file mode 100755
index 8c315d9..0000000
--- a/packages/esm-billing-app/src/claims/dashboard/form/claims-form.component.tsx
+++ /dev/null
@@ -1,396 +0,0 @@
-import React, { useEffect, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  Column,
-  TextArea,
-  Form,
-  Layer,
-  Stack,
-  TextInput,
-  Row,
-  ButtonSet,
-  Button,
-  FilterableMultiSelect,
-  MultiSelect,
-  InlineLoading,
-} from '@carbon/react';
-import styles from './claims-form.scss';
-import { type MappedBill, type LineItem } from '../../../types';
-import { navigate, showSnackbar } from '@openmrs/esm-framework';
-import { useSystemSetting } from '../../../hooks/getMflCode';
-import { useParams } from 'react-router-dom';
-import { processClaims, useProviders, useVisit } from './claims-form.resource';
-import { useForm, Controller } from 'react-hook-form';
-import { z } from 'zod';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { extractNameString, formatDate } from '../../../helpers/functions';
-
-type ClaimsFormProps = {
-  bill: MappedBill;
-  selectedLineItems: LineItem[];
-};
-
-const ClaimsFormSchema = z.object({
-  claimCode: z.string().nonempty({ message: 'Claim code is required' }),
-  guaranteeId: z.string().nonempty({ message: 'Guarantee Id is required' }),
-  claimExplanation: z.string().nonempty({ message: 'Claim explanation is required' }),
-  claimJustification: z.string().nonempty({ message: 'Claim justification is required' }),
-  providerName: z
-    .array(
-      z.object({
-        id: z.string(),
-        text: z.string(),
-      }),
-    )
-    .nonempty({ message: 'At least one provider is required' }),
-  diagnoses: z
-    .array(
-      z.object({
-        id: z.string(),
-        text: z.string(),
-      }),
-    )
-    .nonempty({ message: 'At least one diagnosis is required' }),
-  visitType: z.string().nonempty({ message: 'Visit type is required' }),
-  facility: z.string().nonempty({ message: 'Facility is required' }),
-  treatmentStart: z.string().nonempty({ message: 'Treatment start date is required' }),
-  treatmentEnd: z.string().nonempty({ message: 'Treatment end date is required' }),
-});
-
-const ClaimsForm: React.FC<ClaimsFormProps> = ({ bill, selectedLineItems }) => {
-  const { t } = useTranslation();
-  const { mflCodeValue } = useSystemSetting('facility.mflcode');
-  const { patientUuid, billUuid } = useParams();
-  const { visits: recentVisit } = useVisit(patientUuid);
-  const visitUuid = recentVisit?.visitType.uuid;
-
-  const { data } = useProviders();
-  const [loading, setLoading] = useState(false);
-  const providers = data?.data.results.map((provider) => ({ id: provider.uuid, text: provider.display })) || [];
-
-  const handleNavigateToBillingOptions = () =>
-    navigate({
-      to: window.getOpenmrsSpaBase() + `home/billing/patient/${patientUuid}/${billUuid}`,
-    });
-
-  const diagnoses = useMemo(() => {
-    return (
-      recentVisit?.encounters?.flatMap(
-        (encounter) =>
-          encounter.diagnoses.map((diagnosis) => ({
-            id: diagnosis.diagnosis.coded.uuid,
-            text: diagnosis.display,
-            certainty: diagnosis.certainty,
-          })) || [],
-      ) || []
-    );
-  }, [recentVisit]);
-
-  const confirmedDiagnoses = useMemo(() => {
-    return diagnoses.filter((diagnosis) => diagnosis.certainty === 'CONFIRMED');
-  }, [diagnoses]);
-
-  const {
-    control,
-    handleSubmit,
-    formState: { errors, isValid },
-    setValue,
-    reset,
-  } = useForm({
-    mode: 'all',
-    resolver: zodResolver(ClaimsFormSchema),
-    defaultValues: {
-      claimCode: '',
-      guaranteeId: '',
-      claimExplanation: '',
-      claimJustification: '',
-      providerName: [],
-      diagnoses: [],
-      visitType: recentVisit?.visitType?.display || '',
-      facility: `${recentVisit?.location?.display || ''} - ${mflCodeValue || ''}`,
-      treatmentStart: recentVisit?.startDatetime ? formatDate(recentVisit.startDatetime) : '',
-      treatmentEnd: recentVisit?.stopDatetime ? formatDate(recentVisit.stopDatetime) : '',
-    },
-  });
-
-  const onSubmit = async (data) => {
-    setLoading(true);
-    const providedItems = selectedLineItems.reduce((acc, item) => {
-      acc[item.uuid] = {
-        items: [
-          {
-            uuid: item.itemOrServiceConceptUuid,
-            price: item.price,
-            quantity: item.quantity,
-          },
-        ],
-        explanation: data.claimExplanation,
-        justification: data.claimJustification,
-      };
-      return acc;
-    }, {});
-
-    const payload = {
-      providedItems,
-      claimExplanation: data.claimExplanation,
-      claimJustification: data.claimJustification,
-      startDate: data.treatmentStart,
-      endDate: data.treatmentEnd,
-      location: mflCodeValue,
-      diagnoses: data.diagnoses.map((diagnosis) => diagnosis.id),
-      paidInFacility: true,
-      patient: patientUuid,
-      visitType: visitUuid,
-      guaranteeId: data.guaranteeId,
-      providers: data.providerName.map((provider) => provider.id),
-      claimCode: data.claimCode,
-      use: 'claim',
-      insurer: 'SHA',
-      billNumber: billUuid,
-    };
-    try {
-      await processClaims(payload);
-      showSnackbar({
-        kind: 'success',
-        title: t('processClaim', 'Process Claim'),
-        subtitle: t('sendClaim', 'Claim sent successfully'),
-        timeoutInMs: 3000,
-        isLowContrast: true,
-      });
-      reset();
-      setTimeout(() => {
-        navigate({
-          to: window.getOpenmrsSpaBase() + `home/billing/`,
-        });
-      }, 2000);
-    } catch (err) {
-      console.error(err);
-      showSnackbar({
-        kind: 'error',
-        title: t('claimError', 'Claim Error'),
-        subtitle: t('sendClaimError', 'Request Failed, Please try later........'),
-        timeoutInMs: 2500,
-        isLowContrast: true,
-      });
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  useEffect(() => {
-    setValue('diagnoses', confirmedDiagnoses);
-    setValue('visitType', recentVisit?.visitType?.display || '');
-    setValue('facility', `${recentVisit?.location?.display || ''} - ${mflCodeValue || ''}`);
-    setValue('treatmentStart', recentVisit?.startDatetime ? formatDate(recentVisit.startDatetime) : '');
-    setValue('treatmentEnd', recentVisit?.stopDatetime ? formatDate(recentVisit.stopDatetime) : '');
-  }, [confirmedDiagnoses, recentVisit, mflCodeValue, setValue]);
-  return (
-    <Form className={styles.form} onSubmit={handleSubmit(onSubmit)}>
-      <Stack gap={4} className={styles.grid}>
-        <span className={styles.claimFormTitle}>{t('formTitle', 'Fill in the form details')}</span>
-        <Row className={styles.formClaimRow}>
-          <Column className={styles.formClaimColumn}>
-            <Layer className={styles.input}>
-              <Controller
-                control={control}
-                name="visitType"
-                render={({ field }) => (
-                  <TextInput
-                    {...field}
-                    id="visittype"
-                    labelText={t('visittype', 'Visit Type')}
-                    readOnly
-                    value={field.value}
-                  />
-                )}
-              />
-            </Layer>
-          </Column>
-          <Column className={styles.formClaimColumn}>
-            <Layer className={styles.input}>
-              <Controller
-                control={control}
-                name="facility"
-                render={({ field }) => (
-                  <TextInput
-                    {...field}
-                    id="facility"
-                    labelText={t('facility', 'Facility')}
-                    readOnly
-                    value={field.value}
-                  />
-                )}
-              />
-            </Layer>
-          </Column>
-        </Row>
-        <Row className={styles.formClaimRow}>
-          <Column className={styles.formClaimColumn}>
-            <Layer className={styles.input}>
-              <Controller
-                control={control}
-                name="treatmentStart"
-                render={({ field }) => (
-                  <TextInput
-                    {...field}
-                    id="treatmentStart"
-                    labelText={t('treatmentstart', 'Treatment Start')}
-                    readOnly
-                    value={field.value}
-                  />
-                )}
-              />
-            </Layer>
-          </Column>
-          <Column className={styles.formClaimColumn}>
-            <Layer className={styles.input}>
-              <Controller
-                control={control}
-                name="treatmentEnd"
-                render={({ field }) => (
-                  <TextInput
-                    {...field}
-                    id="treatmentEnd"
-                    labelText={t('treatmentend', 'Treatment End')}
-                    readOnly
-                    value={field.value}
-                  />
-                )}
-              />
-            </Layer>
-          </Column>
-        </Row>
-        <Column>
-          <Layer className={styles.input}>
-            <Controller
-              control={control}
-              name="diagnoses"
-              render={({ field }) => (
-                <MultiSelect
-                  {...field}
-                  id="diagnoses"
-                  titleText={t('diagnoses', 'Diagnoses')}
-                  items={diagnoses}
-                  itemToString={(item) => (item ? item.text : '')}
-                  selectionFeedback="top-after-reopen"
-                  selectedItems={field.value}
-                  onChange={({ selectedItems }) => field.onChange(selectedItems)}
-                />
-              )}
-            />
-          </Layer>
-        </Column>
-        <Column>
-          <Layer className={styles.input}>
-            <Controller
-              control={control}
-              name="providerName"
-              render={({ field }) => (
-                <FilterableMultiSelect
-                  {...field}
-                  id="provider_name"
-                  titleText={t('provider_name', 'Provider Name')}
-                  items={providers}
-                  itemToString={(item) => (item ? extractNameString(item.text) : '')}
-                  selectionFeedback="top-after-reopen"
-                  selectedItems={field.value}
-                  onChange={({ selectedItems }) => field.onChange(selectedItems)}
-                />
-              )}
-            />
-          </Layer>
-        </Column>
-        <Row className={styles.formClaimRow}>
-          <Column className={styles.formClaimColumn}>
-            <Layer className={styles.input}>
-              <Controller
-                control={control}
-                name="guaranteeId"
-                render={({ field }) => (
-                  <TextInput
-                    {...field}
-                    id="guaranteeId"
-                    placeholder="Guarantee Id"
-                    labelText={t('guaranteeId', 'Guarantee Id')}
-                    invalid={!!errors.guaranteeId}
-                    invalidText={errors.guaranteeId?.message}
-                  />
-                )}
-              />
-            </Layer>
-          </Column>
-          <Column className={styles.formClaimColumn}>
-            <Layer className={styles.input}>
-              <Controller
-                control={control}
-                name="claimCode"
-                render={({ field }) => (
-                  <TextInput
-                    {...field}
-                    id="claimcode"
-                    placeholder="Claim Code"
-                    labelText={t('claimcode', 'Claim Code')}
-                    invalid={!!errors.claimCode}
-                    invalidText={errors.claimCode?.message}
-                  />
-                )}
-              />
-            </Layer>
-          </Column>
-        </Row>
-        <Column>
-          <Layer className={styles.input}>
-            <Controller
-              control={control}
-              name="claimExplanation"
-              render={({ field }) => (
-                <TextArea
-                  {...field}
-                  labelText={t('claimExplanation', 'Claim Explanation')}
-                  rows={3}
-                  placeholder="Claim Explanation"
-                  id="claimExplanation"
-                  invalid={!!errors.claimExplanation}
-                  invalidText={errors.claimExplanation?.message}
-                />
-              )}
-            />
-          </Layer>
-        </Column>
-        <Column>
-          <Layer className={styles.input}>
-            <Controller
-              control={control}
-              name="claimJustification"
-              render={({ field }) => (
-                <TextArea
-                  {...field}
-                  labelText={t('claimJustification', 'Claim Justification')}
-                  rows={3}
-                  placeholder="Claim Justification"
-                  id="claimJustification"
-                  invalid={!!errors.claimJustification}
-                  invalidText={errors.claimJustification?.message}
-                />
-              )}
-            />
-          </Layer>
-        </Column>
-        <ButtonSet className={styles.buttonSet}>
-          <Button className={styles.button} kind="secondary" onClick={handleNavigateToBillingOptions}>
-            {t('discardClaim', 'Discard Claim')}
-          </Button>
-          <Button className={styles.button} kind="primary" type="submit" disabled={!isValid || loading}>
-            {loading ? (
-              <InlineLoading description={t('processing', 'Processing...')} />
-            ) : (
-              t('processClaim', 'Process Claim')
-            )}
-          </Button>
-        </ButtonSet>
-      </Stack>
-    </Form>
-  );
-};
-
-export default ClaimsForm;
diff --git a/packages/esm-billing-app/src/claims/dashboard/form/claims-form.resource.ts b/packages/esm-billing-app/src/claims/dashboard/form/claims-form.resource.ts
deleted file mode 100755
index a4e5355..0000000
--- a/packages/esm-billing-app/src/claims/dashboard/form/claims-form.resource.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import useSWR from 'swr';
-import { FetchResponse, openmrsFetch, restBaseUrl, type Visit } from '@openmrs/esm-framework';
-import useSWRImmutable from 'swr/immutable';
-
-interface Provider {
-  uuid: string;
-  display: string;
-}
-
-interface ProvidersResponse {
-  results: Provider[];
-}
-
-export function useVisit(patientUuid: string) {
-  const customRepresentation =
-    'custom:(uuid,encounters:(uuid,diagnoses:(uuid,display,certainty,diagnosis:(coded:(uuid,display))),encounterDatetime,encounterType:(uuid,display),encounterProviders:(uuid,display,provider:(uuid,person:(uuid,display)))),location:(uuid,name,display),visitType:(uuid,name,display),startDatetime,stopDatetime)&limit=1';
-
-  const { data, error, isLoading, isValidating, mutate } = useSWR<{ data: { results: Array<Visit> } }, Error>(
-    `${restBaseUrl}/visit?patient=${patientUuid}&v=${customRepresentation}`,
-    openmrsFetch,
-  );
-
-  return {
-    visits: data ? data?.data?.results[0] : null,
-    error,
-    isLoading,
-    isValidating,
-    mutateVisits: mutate,
-  };
-}
-
-export const useProviders = () => {
-  const customRepresentation = 'custom:(uuid,display)';
-  const url = `/ws/rest/v1/provider?v=${customRepresentation}`;
-  const { data, error, isLoading } = useSWRImmutable<{ data: ProvidersResponse }>(url, openmrsFetch);
-
-  return { data, error, isLoading };
-};
-
-export const processClaims = (payload) => {
-  const url = `/ws/rest/v1/insuranceclaims/claims`;
-  return openmrsFetch(url, {
-    method: 'POST',
-    body: JSON.stringify(payload),
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  });
-};
diff --git a/packages/esm-billing-app/src/claims/dashboard/form/claims-form.scss b/packages/esm-billing-app/src/claims/dashboard/form/claims-form.scss
deleted file mode 100755
index 298ec13..0000000
--- a/packages/esm-billing-app/src/claims/dashboard/form/claims-form.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@use '@carbon/layout';
-@import '~@openmrs/esm-styleguide/src/vars';
-
-.heading {
-  @include type.type-style('heading-compact-01');
-  margin: spacing.$spacing-05 0 spacing.$spacing-05;
-}
-
-.warningContainer {
-  background-color: $carbon--red-50;
-  padding: spacing.$spacing-04;
-  margin: spacing.$spacing-03 0 spacing.$spacing-03;
-  display: flex;
-  justify-content: space-between;
-  .warning {
-    @include type.type-style('heading-compact-01');
-    color: $ui-05;
-  }
-}
-
-.form {
-  width: 100%;
-  margin: layout.$spacing-09 layout.$spacing-05 0;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  background-color: white;
-
-  :global(.omrs-breakpoint-lt-desktop) {
-    width: 50%;
-    padding: spacing.$spacing-06 spacing.$spacing-05;
-  }
-
-  .claimFormTitle {
-    @include type.type-style('heading-02');
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin: spacing.$spacing-05 0 1rem;
-    row-gap: 1.5rem;
-    position: relative;
-
-    &::after {
-      content: '';
-      display: block;
-      width: 2rem;
-      border-bottom: 0.375rem solid var(--brand-03);
-      position: absolute;
-      bottom: -0.75rem;
-      left: 0;
-    }
-
-    & > span {
-      @include type.type-style('body-01');
-    }
-  }
-
-  .buttonSet {
-    padding: 0rem;
-    margin-top: spacing.$spacing-03;
-    display: flex;
-    justify-content: flex-end;
-    gap: spacing.$spacing-05;
-    margin-bottom: spacing.$spacing-07;
-
-    :global(.omrs-breakpoint-lt-desktop) {
-      justify-content: center;
-    }
-  }
-
-  :global(.omrs-breakpoint-lt-desktop) {
-    width: 768px;
-  }
-}
-
-.grid {
-  margin: 0 spacing.$spacing-05;
-  padding: 0rem;
-}
-
-.input {
-  margin-top: spacing.$spacing-05;
-}
-
-.button {
-  height: spacing.$spacing-08;
-  display: flex;
-  align-content: flex-start;
-  align-items: baseline;
-  min-width: 20%;
-}
-
-.buttonSet {
-  padding: 0rem;
-  margin-top: spacing.$spacing-05;
-  display: flex;
-  justify-content: flex-end;
-  gap: spacing.$spacing-05;
-  margin-bottom: spacing.$spacing-07;
-}
-
-.claimFormTitle {
-  @include type.type-style('heading-02');
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin: spacing.$spacing-05 0 spacing.$spacing-03;
-  row-gap: 1.5rem;
-  position: relative;
-
-  &::after {
-    content: '';
-    display: block;
-    width: 2rem;
-    border-bottom: 0.375rem solid var(--brand-03);
-    position: absolute;
-    bottom: -0.75rem;
-    left: 0;
-  }
-
-  & > span {
-    @include type.type-style('body-01');
-  }
-}
-
-:global(.omrs-breakpoint-lt-desktop) {
-  .buttonSet {
-    padding: spacing.$spacing-06 spacing.$spacing-05;
-    background-color: $ui-02;
-    justify-content: flex-end;
-    gap: spacing.$spacing-05;
-  }
-}
-
-.formClaimRow {
-  display: flex;
-  flex-wrap: nowrap;
-  gap: spacing.$spacing-05;
-}
-
-.formClaimColumn {
-  flex: 1 1 0%;
-}
diff --git a/packages/esm-billing-app/src/claims/dashboard/header/claims-header.component.tsx b/packages/esm-billing-app/src/claims/dashboard/header/claims-header.component.tsx
deleted file mode 100755
index c997ca3..0000000
--- a/packages/esm-billing-app/src/claims/dashboard/header/claims-header.component.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import { ExtensionSlot } from '@openmrs/esm-framework';
-import styles from './claims-header.scss';
-import ClaimMainComponent from '../../claims-wrap/claims-main-component';
-import { type MappedBill } from '../../../types';
-
-interface ClaimsHeaderProps {
-  patient: fhir.Patient;
-  bill: MappedBill;
-}
-
-const ClaimsHeader: React.FC<ClaimsHeaderProps> = ({ patient, bill }) => {
-  return (
-    <div className={styles.claimContainer}>
-      {patient && <ExtensionSlot name="patient-header-slot" state={{ patientUuid: patient.id, patient }} />}
-      <div className={styles.detailsContainer}>
-        <ClaimMainComponent bill={bill} />
-      </div>
-    </div>
-  );
-};
-
-export default ClaimsHeader;
diff --git a/packages/esm-billing-app/src/claims/dashboard/header/claims-header.scss b/packages/esm-billing-app/src/claims/dashboard/header/claims-header.scss
deleted file mode 100755
index f0e04ce..0000000
--- a/packages/esm-billing-app/src/claims/dashboard/header/claims-header.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.claimContainer {
-  background-color: colors.$gray-10;
-  height: calc(100vh - 3rem);
-}
-
-.errorContainer {
-  margin: layout.$spacing-05;
-}
-
-.loader {
-  display: flex;
-  min-height: layout.$spacing-09;
-  justify-content: center;
-}
-.claimTitle {
-  @include type.type-style('heading-02');
-  display: flex;
-  margin: layout.$spacing-05;
-}
diff --git a/packages/esm-billing-app/src/claims/dashboard/table/claims-table.component.tsx b/packages/esm-billing-app/src/claims/dashboard/table/claims-table.component.tsx
deleted file mode 100755
index 6e221b8..0000000
--- a/packages/esm-billing-app/src/claims/dashboard/table/claims-table.component.tsx
+++ /dev/null
@@ -1,212 +0,0 @@
-import React, { useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import fuzzy from 'fuzzy';
-import {
-  DataTable,
-  DataTableSkeleton,
-  Layer,
-  Table,
-  TableBody,
-  TableCell,
-  TableContainer,
-  TableHead,
-  TableHeader,
-  TableRow,
-  TableToolbar,
-  TableToolbarContent,
-  TableToolbarSearch,
-  TableSelectRow,
-  Tile,
-  Pagination,
-  type DataTableHeader,
-  type DataTableRow,
-} from '@carbon/react';
-import { formatDate, isDesktop, useDebounce, useLayoutType } from '@openmrs/esm-framework';
-import styles from './claims-table.scss';
-import { type LineItem, type MappedBill } from '../../../types';
-
-type ClaimsTableProps = {
-  bill: MappedBill;
-  isSelectable?: boolean;
-  isLoadingBill?: boolean;
-  onSelectItem?: (selectedLineItems: LineItem[]) => void;
-};
-
-const ClaimsTable: React.FC<ClaimsTableProps> = ({ bill, isSelectable = true, isLoadingBill, onSelectItem }) => {
-  const { t } = useTranslation();
-  const { lineItems } = bill;
-  const layout = useLayoutType();
-  const responsiveSize = isDesktop(layout) ? 'sm' : 'lg';
-  const [selectedLineItems, setSelectedLineItems] = useState<LineItem[]>([]);
-  const [searchTerm, setSearchTerm] = useState('');
-  const debouncedSearchTerm = useDebounce(searchTerm);
-  const [currentPage, setCurrentPage] = useState(1);
-  const [pageSize, setPageSize] = useState(10);
-
-  const paidLineItems = useMemo(() => lineItems.filter((item) => item.paymentStatus === 'PAID'), [lineItems]);
-
-  const filteredLineItems = useMemo(() => {
-    if (!debouncedSearchTerm) {
-      return paidLineItems;
-    }
-
-    return fuzzy
-      .filter(debouncedSearchTerm, paidLineItems, {
-        extract: (lineItem: LineItem) => `${lineItem.item}`,
-      })
-      .sort((r1, r2) => r1.score - r2.score)
-      .map((result) => result.original);
-  }, [debouncedSearchTerm, paidLineItems]);
-
-  const paginatedLineItems = useMemo(() => {
-    const startIndex = (currentPage - 1) * pageSize;
-    const endIndex = startIndex + pageSize;
-    return filteredLineItems.slice(startIndex, endIndex);
-  }, [filteredLineItems, currentPage, pageSize]);
-
-  const tableHeaders: Array<typeof DataTableHeader> = [
-    { header: 'No', key: 'no' },
-    { header: 'Serial No.', key: 'serialno' },
-    { header: 'Bill Item', key: 'inventoryname' },
-    { header: 'Status', key: 'status' },
-    { header: 'Total amount', key: 'total' },
-    { header: 'Bill creation date', key: 'dateofbillcreation' },
-  ];
-
-  const processBillItem = (item) => (item.item || item.billableService)?.split(':')[1];
-
-  const tableRows: Array<typeof DataTableRow> = useMemo(
-    () =>
-      paginatedLineItems?.map((item, index) => {
-        return {
-          no: `${index + 1}`,
-          id: `${item.uuid}`,
-          inventoryname: processBillItem(item),
-          serialno: bill.receiptNumber,
-          status: item.paymentStatus,
-          total: item.price * item.quantity,
-          dateofbillcreation: formatDate(new Date(bill.dateCreated), { mode: 'standard' }),
-        };
-      }) ?? [],
-    [bill.dateCreated, bill.receiptNumber, paginatedLineItems],
-  );
-
-  if (isLoadingBill) {
-    return (
-      <div className={styles.loaderContainer}>
-        <DataTableSkeleton
-          columnCount={tableHeaders.length}
-          showHeader={false}
-          showToolbar={false}
-          size={responsiveSize}
-          zebra
-        />
-      </div>
-    );
-  }
-
-  const handleRowSelection = (row: typeof DataTableRow, checked: boolean) => {
-    const matchingRow = filteredLineItems.find((item) => item.uuid === row.id);
-    let newSelectedLineItems;
-
-    if (checked) {
-      newSelectedLineItems = [...selectedLineItems, matchingRow];
-    } else {
-      newSelectedLineItems = selectedLineItems.filter((item) => item.uuid !== row.id);
-    }
-    setSelectedLineItems(newSelectedLineItems);
-    onSelectItem(newSelectedLineItems);
-  };
-
-  return (
-    <div className={styles.claimContainer}>
-      <DataTable headers={tableHeaders} isSortable rows={tableRows} size={responsiveSize} useZebraStyles>
-        {({ rows, headers, getRowProps, getSelectionProps, getTableProps, getToolbarProps }) => (
-          <TableContainer
-            className={styles.tableContainer}
-            description={
-              <span className={styles.tableDescription}>
-                <span>{t('selectitemstobeclaimed', 'Select items that are to be included in the claims')}</span>
-              </span>
-            }
-            title={t('lineItems', 'Line items')}>
-            <div className={styles.toolbarWrapper}>
-              <TableToolbar {...getToolbarProps()} className={styles.tableToolbar} size={responsiveSize}>
-                <TableToolbarContent className={styles.headerContainer}>
-                  <TableToolbarSearch
-                    className={styles.searchbox}
-                    expanded
-                    onChange={(e: React.ChangeEvent<HTMLInputElement>) => setSearchTerm(e.target.value)}
-                    placeholder={t('searchThisTable', 'Search this table')}
-                    size={responsiveSize}
-                  />
-                </TableToolbarContent>
-              </TableToolbar>
-            </div>
-            <Table {...getTableProps()} aria-label="claim line items" className={styles.table}>
-              <TableHead>
-                <TableRow>
-                  {rows.length > 1 && isSelectable ? <TableHeader /> : null}
-                  {headers.map((header) => (
-                    <TableHeader key={header.key}>{header.header}</TableHeader>
-                  ))}
-                </TableRow>
-              </TableHead>
-              <TableBody>
-                {rows.map((row, index) => {
-                  return (
-                    <TableRow
-                      key={row.id}
-                      {...getRowProps({
-                        row,
-                      })}>
-                      {rows.length > 1 && isSelectable && (
-                        <TableSelectRow
-                          aria-label="Select row"
-                          {...getSelectionProps({ row })}
-                          onChange={(checked: boolean) => handleRowSelection(row, checked)}
-                          checked={Boolean(selectedLineItems?.find((item) => item?.uuid === row?.id))}
-                        />
-                      )}
-                      {row.cells.map((cell) => (
-                        <TableCell key={cell.id}>{cell.value}</TableCell>
-                      ))}
-                    </TableRow>
-                  );
-                })}
-              </TableBody>
-            </Table>
-          </TableContainer>
-        )}
-      </DataTable>
-      {filteredLineItems?.length === 0 && (
-        <div className={styles.filterEmptyState}>
-          <Layer>
-            <Tile className={styles.filterEmptyStateTile}>
-              <p className={styles.filterEmptyStateContent}>
-                {t('noMatchingItemsToDisplay', 'No matching items to display')}
-              </p>
-              <p className={styles.filterEmptyStateHelper}>{t('checkFilters', 'Check the filters above')}</p>
-            </Tile>
-          </Layer>
-        </div>
-      )}
-      <Pagination
-        forwardText="Next page"
-        backwardText="Previous page"
-        page={currentPage}
-        pageSize={pageSize}
-        pageSizes={[5, 10, 20, 50]}
-        totalItems={filteredLineItems.length}
-        className={styles.pagination}
-        size={responsiveSize}
-        onChange={({ pageSize: newPageSize, page: newPage }) => {
-          setPageSize(newPageSize);
-          setCurrentPage(newPage);
-        }}
-      />
-    </div>
-  );
-};
-
-export default ClaimsTable;
diff --git a/packages/esm-billing-app/src/claims/dashboard/table/claims-table.scss b/packages/esm-billing-app/src/claims/dashboard/table/claims-table.scss
deleted file mode 100755
index b234589..0000000
--- a/packages/esm-billing-app/src/claims/dashboard/table/claims-table.scss
+++ /dev/null
@@ -1,108 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-@import '~@openmrs/esm-styleguide/src/vars';
-
-.filterEmptyState {
-  align-items: center;
-  background-color: white;
-  display: flex;
-  justify-content: center;
-  padding: layout.$spacing-09 !important;
-  text-align: center;
-}
-
-.filterEmptyStateTile {
-  margin: auto;
-}
-
-.filterEmptyStateContent {
-  @include type.type-style('heading-compact-02');
-  color: $text-02;
-  margin-bottom: 0.5rem;
-}
-
-.filterEmptyStateHelper {
-  @include type.type-style('body-compact-01');
-  color: $text-02;
-}
-
-.headerContainer {
-  background-color: colors.$gray-10;
-}
-
-.claimContainer {
-  width: 100%;
-  margin: layout.$spacing-09 layout.$spacing-05 0;
-  border: 1px solid $ui-03;
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-start;
-}
-
-:global(.omrs-breakpoint-lt-desktop) {
-  .claimContainer {
-    width: 100%;
-  }
-}
-
-.searchbox {
-  input:focus {
-    outline: 2px solid colors.$orange-40 !important;
-  }
-}
-
-.table {
-  td {
-    border-bottom: none !important;
-  }
-}
-
-.tableDescription {
-  display: flex;
-  align-items: flex-start;
-  margin-top: layout.$spacing-02;
-  column-gap: layout.$spacing-01;
-
-  ::after {
-    content: '';
-    display: block;
-    width: 2rem;
-    padding-top: 0.188rem;
-    border-bottom: 0.375rem solid var(--brand-03);
-  }
-
-  & > span {
-    @include type.type-style('body-01');
-  }
-}
-
-.tableToolbar {
-  width: 20%;
-  min-width: 12.5rem;
-}
-
-.toolbarWrapper {
-  position: relative;
-  display: flex;
-  justify-content: flex-end;
-}
-
-:global(.omrs-breakpoint-lt-desktop) {
-  .toolbarWrapper {
-    height: layout.$spacing-09;
-  }
-}
-
-:global(.omrs-breakpoint-gt-tablet) {
-  .toolbarWrapper {
-    height: layout.$spacing-07;
-  }
-}
-
-.tableContainer {
-  width: 100%;
-}
-.pagination {
-  background: white;
-}
diff --git a/packages/esm-billing-app/src/claims/make-claims.component.tsx b/packages/esm-billing-app/src/claims/make-claims.component.tsx
deleted file mode 100755
index 7895815..0000000
--- a/packages/esm-billing-app/src/claims/make-claims.component.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import styles from './make-claims.scss';
-import { Button } from '@carbon/react';
-import { Report } from '@carbon/react/icons';
-import { navigate } from '@openmrs/esm-framework';
-import { spaBasePath } from '../constants';
-
-const MakeClaims: React.FC<{ patientUuid: string; billUuid: string }> = ({ patientUuid, billUuid }) => {
-  const { t } = useTranslation();
-
-  const navigateToCreateClaimScreen = () => {
-    navigate({ to: `${spaBasePath}/billing/patient/${patientUuid}/${billUuid}/claims` });
-  };
-
-  return (
-    <Button
-      kind="secondary"
-      className={styles.button}
-      size="md"
-      renderIcon={(props) => <Report size={24} {...props} />}
-      onClick={navigateToCreateClaimScreen}>
-      {t('makeclaims', 'Make Claims')}
-    </Button>
-  );
-};
-
-export default MakeClaims;
diff --git a/packages/esm-billing-app/src/claims/make-claims.scss b/packages/esm-billing-app/src/claims/make-claims.scss
deleted file mode 100755
index 7f385f2..0000000
--- a/packages/esm-billing-app/src/claims/make-claims.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.button {
-  margin-left: layout.$spacing-04;
-}
diff --git a/packages/esm-billing-app/src/claims/metrics/metrics-card.component.tsx b/packages/esm-billing-app/src/claims/metrics/metrics-card.component.tsx
deleted file mode 100755
index ee97d48..0000000
--- a/packages/esm-billing-app/src/claims/metrics/metrics-card.component.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react';
-import classNames from 'classnames';
-import { Layer, Tile } from '@carbon/react';
-import styles from './metrics-card.scss';
-
-interface MetricsCardProps {
-  label: string;
-  value: number | string;
-  headerLabel: string;
-  children?: React.ReactNode;
-  service?: string;
-}
-
-const MetricsCard: React.FC<MetricsCardProps> = ({ label, value, headerLabel, children }) => {
-  return (
-    <Layer
-      className={classNames(styles.container, {
-        [styles.cardWithChildren]: children,
-      })}>
-      <Tile className={styles.tileContainer}>
-        <div className={styles.tileHeader}>
-          <div className={styles.headerLabelContainer}>
-            <label className={styles.headerLabel}>{headerLabel}</label>
-            {children}
-          </div>
-        </div>
-        <div>
-          <label className={styles.totalsLabel}>{label}</label>
-          <p className={styles.totalsValue}>{value}</p>
-        </div>
-      </Tile>
-    </Layer>
-  );
-};
-
-export default MetricsCard;
diff --git a/packages/esm-billing-app/src/claims/metrics/metrics-card.scss b/packages/esm-billing-app/src/claims/metrics/metrics-card.scss
deleted file mode 100755
index cf2f451..0000000
--- a/packages/esm-billing-app/src/claims/metrics/metrics-card.scss
+++ /dev/null
@@ -1,76 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@import '~@openmrs/esm-styleguide/src/vars';
-
-.container {
-  flex-grow: 1;
-}
-
-:global(.omrs-breakpoint-lt-desktop) {
-  .cardWithChildren {
-    order: 3;
-  }
-}
-
-.tileContainer {
-  border: 0.0625rem solid $ui-03;
-  height: 7.875rem;
-  padding: spacing.$spacing-05;
-  margin: spacing.$spacing-03 spacing.$spacing-03;
-}
-
-.tileHeader {
-  display: flex;
-  justify-content: space-between;
-  align-items: baseline;
-  margin-bottom: spacing.$spacing-03;
-}
-
-.headerLabel {
-  @include type.type-style('heading-compact-01');
-}
-
-.totalsLabel {
-  @include type.type-style('label-01');
-  color: $text-02;
-}
-
-.totalsValue {
-  @include type.type-style('heading-04');
-  color: $ui-05;
-}
-
-.headerLabelContainer {
-  display: flex;
-  height: spacing.$spacing-07;
-
-  :global(.cds--dropdown__wrapper--inline) {
-    gap: 0;
-    margin-top: -0.75rem;
-  }
-
-  :global(.cds--list-box__menu-icon) {
-    height: 1rem;
-  }
-}
-
-.link {
-  text-decoration: none;
-  display: flex;
-  align-items: center;
-  color: $interactive-01;
-
-  svg {
-    margin-left: spacing.$spacing-03;
-  }
-}
-
-html[dir='rtl'] {
-  .link {
-    svg {
-      margin-right: spacing.$spacing-03;
-      margin-left: unset;
-      transform: scale(-1, 1);
-    }
-  }
-}
diff --git a/packages/esm-billing-app/src/claims/metrics/metrics-header.component.tsx b/packages/esm-billing-app/src/claims/metrics/metrics-header.component.tsx
deleted file mode 100755
index c50679f..0000000
--- a/packages/esm-billing-app/src/claims/metrics/metrics-header.component.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import styles from './metrics-header.scss';
-
-const MetricsHeader = () => {
-  const { t } = useTranslation();
-  const metricsTitle = t('claimSummary', 'Claim Summary');
-
-  return (
-    <div className={styles.metricsContainer}>
-      <span className={styles.metricsTitle}>{metricsTitle}</span>
-    </div>
-  );
-};
-
-export default MetricsHeader;
diff --git a/packages/esm-billing-app/src/claims/metrics/metrics-header.scss b/packages/esm-billing-app/src/claims/metrics/metrics-header.scss
deleted file mode 100755
index 572b462..0000000
--- a/packages/esm-billing-app/src/claims/metrics/metrics-header.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-@use '@carbon/layout';
-@use '@carbon/type';
-@import '~@openmrs/esm-styleguide/src/vars';
-
-.metricsContainer {
-  display: flex;
-  justify-content: space-between;
-  height: layout.$spacing-10;
-  align-items: center;
-  padding: 0 layout.$spacing-05;
-}
-
-.metricsTitle {
-  @include type.type-style('heading-03');
-  color: $ui-05;
-}
diff --git a/packages/esm-billing-app/src/claims/metrics/metrics.component.tsx b/packages/esm-billing-app/src/claims/metrics/metrics.component.tsx
deleted file mode 100755
index 5691cfb..0000000
--- a/packages/esm-billing-app/src/claims/metrics/metrics.component.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import styles from './metrics.scss';
-import MetricsHeader from './metrics-header.component';
-import MetricsCard from './metrics-card.component';
-import { computeTotalPrice } from '../../utils';
-import { type LineItem, type MappedBill } from '../../types';
-import { convertToCurrency, formatDate } from '../../helpers';
-
-interface MainMetricsProps {
-  selectedLineItems: LineItem[];
-  bill: MappedBill;
-}
-
-const MainMetrics: React.FC<MainMetricsProps> = ({ selectedLineItems, bill }) => {
-  const { t } = useTranslation();
-
-  const numberOfLineItems = selectedLineItems.length;
-
-  const hasMoreThanOneLineItem = bill?.lineItems?.length > 1;
-  const computedTotal = hasMoreThanOneLineItem ? computeTotalPrice(selectedLineItems) : (bill.totalAmount ?? 0);
-
-  return (
-    <>
-      <MetricsHeader />
-      <div className={styles.cardContainer} data-testid="claims-metrics">
-        <MetricsCard
-          label={t('total', 'Amount')}
-          value={convertToCurrency(computedTotal)}
-          headerLabel={t('totalAmount', 'Total Amount')}
-        />
-        <MetricsCard
-          label={t('items', 'Items')}
-          value={numberOfLineItems.toString()}
-          headerLabel={t('claimsItems', 'Claims Items')}
-        />
-        <MetricsCard
-          label={t('date', 'Date of Claimed')}
-          value={formatDate(bill.dateCreated)}
-          headerLabel={t('date', 'Date of Claimed')}
-        />
-      </div>
-    </>
-  );
-};
-
-export default MainMetrics;
diff --git a/packages/esm-billing-app/src/claims/metrics/metrics.scss b/packages/esm-billing-app/src/claims/metrics/metrics.scss
deleted file mode 100755
index 237cdef..0000000
--- a/packages/esm-billing-app/src/claims/metrics/metrics.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@import '~@openmrs/esm-styleguide/src/vars';
-
-.cardContainer {
-  display: flex;
-  justify-content: space-between;
-  padding: 0 spacing.$spacing-05 spacing.$spacing-07 spacing.$spacing-03;
-  flex-flow: row wrap;
-  margin-top: -(spacing.$spacing-03);
-}
diff --git a/packages/esm-billing-app/src/config-schema.ts b/packages/esm-billing-app/src/config-schema.ts
deleted file mode 100755
index b59aa36..0000000
--- a/packages/esm-billing-app/src/config-schema.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-import { Type } from '@openmrs/esm-framework';
-
-export interface BillingConfig {
-  visitAttributeTypes: {
-    isPatientExempted: string;
-    paymentMethods: string;
-    insuranceScheme: string;
-    policyNumber: string;
-    exemptionCategory: string;
-    billPaymentStatus: string;
-  };
-  inPatientVisitTypeUuid: string;
-  patientExemptionCategories: Array<{ value: string; label: string }>;
-  excludedPaymentMode: Array<{ uuid: string; label: string }>;
-  enforceBillPayment: boolean;
-  mpesaCallbackUrl: string;
-  shortCode: string;
-  passKey: string;
-  authorizationUrl: string;
-  initiateUrl: string;
-  billingStatusQueryUrl: string;
-  mpesaAPIBaseUrl: string;
-}
-
-export const configSchema = {
-  inPatientVisitTypeUuid: {
-    _type: Type.String,
-    _description: 'The visit type uuid for in-patient',
-    _default: 'a73e2ac6-263b-47fc-99fc-e0f2c09fc914',
-  },
-  mpesaAPIBaseUrl: {
-    _type: Type.String,
-    _description: 'The base url that will be used to make any backend calls related to mpesa.',
-    _default: 'https://billing.kenyahmis.org',
-  },
-  visitAttributeTypes: {
-    isPatientExempted: {
-      _type: Type.String,
-      _default: '3b9dfac8-9e4d-11ee-8c90-0242ac120002',
-      _description: 'Whether the patient should be exempted from paying for service i.e Prisoners',
-    },
-    paymentMethods: {
-      _type: Type.String,
-      _description: 'The payment methods visit attribute uuid',
-      _default: 'e6cb0c3b-04b0-4117-9bc6-ce24adbda802',
-    },
-    insuranceScheme: {
-      _type: Type.String,
-      _description: 'The insurance scheme visit attribute uuid',
-      _default: '2d0fa959-6780-41f1-85b1-402045935068',
-    },
-    policyNumber: {
-      _type: Type.String,
-      _description: 'The policy number visit attribute uuid',
-      _default: '0f4f3306-f01b-43c6-af5b-fdb60015cb02',
-    },
-    exemptionCategory: {
-      _type: Type.String,
-      _description: 'The exemption category visit attribute uuid',
-      _default: 'df0362f9-782e-4d92-8bb2-3112e9e9eb3c',
-    },
-    billPaymentStatus: {
-      _type: Type.String,
-      _description: 'The bill payment status visit attribute uuid',
-      _default: '919b51c9-8e2e-468f-8354-181bf3e55786',
-    },
-  },
-  patientExemptionCategories: {
-    _type: Type.Array,
-    _elements: {
-      value: {
-        _type: Type.UUID,
-        _description: 'The value of the exemption category',
-      },
-      label: {
-        _type: Type.String,
-        _default: null,
-        _description: 'The label of the exemption category',
-      },
-    },
-    _default: [{ value: 'IN_PRISON', label: 'In Prison' }],
-  },
-  excludedPaymentMode: {
-    _type: Type.Array,
-    _elements: {
-      uuid: {
-        _type: Type.UUID,
-        _description: 'The value of the payment mode to be excluded',
-      },
-      label: {
-        _type: Type.String,
-        _default: null,
-        _description: 'The label of the payment mode to be excluded',
-      },
-    },
-    _default: [],
-  },
-  enforceBillPayment: {
-    _type: Type.Boolean,
-    _default: true,
-    _description: 'Whether to enforce bill payment or not for patient to receive service',
-  },
-  mpesaCallbackUrl: {
-    _type: Type.String,
-    _default: '',
-    _description: 'MPESA callback Url to receive confirmation payload from MPESA Daraja API',
-  },
-  shortCode: {
-    _type: Type.String,
-    _default: '',
-    _description: 'shortcode used to identify an organization and receive the transaction',
-  },
-  passKey: {
-    _type: Type.String,
-    _default: '',
-    _description: 'Passkey used for generating password for generation of access token to auth APIs',
-  },
-  authorizationUrl: {
-    _type: Type.String,
-    _default: '',
-    _description: 'MPESA Authenciation url gives you a time bound access token to call allowed APIs.',
-  },
-  initiateUrl: {
-    _type: Type.String,
-    _default: '',
-    _description: 'MPESA Initiator url which Initiates online payment on behalf of a customer.',
-  },
-  billingStatusQueryUrl: {
-    _type: Type.String,
-    _default: '${restBaseUrl}/cashier/billLineItem?orderUuid=${orderUuid}&v=full',
-    _description: 'URL to query billing status',
-  },
-};
diff --git a/packages/esm-billing-app/src/constants.ts b/packages/esm-billing-app/src/constants.ts
deleted file mode 100755
index ff0b98e..0000000
--- a/packages/esm-billing-app/src/constants.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export const PENDING_PAYMENT_STATUS = 'PENDING';
-export const EXEMPTED_PAYMENT_STATUS = 'EXEMPTED';
-export const spaBasePath = `${window.spaBase}/home`;
diff --git a/packages/esm-billing-app/src/dashboard.meta.ts b/packages/esm-billing-app/src/dashboard.meta.ts
deleted file mode 100755
index aff6b56..0000000
--- a/packages/esm-billing-app/src/dashboard.meta.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export const dashboardMeta = {
-  slot: 'patient-chart-billing-dashboard-slot',
-  columns: 1,
-  title: 'Billing',
-  path: 'Billing',
-};
diff --git a/packages/esm-billing-app/src/declarations.d.ts b/packages/esm-billing-app/src/declarations.d.ts
deleted file mode 100755
index dbad840..0000000
--- a/packages/esm-billing-app/src/declarations.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare module '*.css';
-declare module '*.scss';
-declare module '@carbon/react';
-declare type SideNavProps = object;
diff --git a/packages/esm-billing-app/src/helpers/functions.ts b/packages/esm-billing-app/src/helpers/functions.ts
deleted file mode 100755
index e0793d9..0000000
--- a/packages/esm-billing-app/src/helpers/functions.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import dayjs from 'dayjs';
-import { type Payment, type LineItem } from '../types';
-
-// amount already paid
-export function calculateTotalAmountTendered(payments: Array<Payment>) {
-  return Array.isArray(payments)
-    ? payments.reduce((totalAmount, item) => {
-        // Ensure that "amount" property is present and numeric
-        if (typeof item.amount === 'number' && item.voided !== true) {
-          return totalAmount + item.amount;
-        }
-        return totalAmount;
-      }, 0)
-    : 0;
-}
-
-// balance
-export function calculateTotalBalance(lineItems: Array<LineItem>, payments: Array<Payment>) {
-  return Math.min(this.calculateTotalAmount(lineItems) - this.calculateTotalAmountTendered(payments));
-}
-
-// total bill
-export function calculateTotalAmount(lineItems: Array<LineItem>) {
-  return Array.isArray(lineItems)
-    ? lineItems.reduce((totalAmount, item) => {
-        // Ensure that "price" and "quantity" properties are present and numeric
-        if (typeof item.price === 'number' && typeof item.quantity === 'number' && item.voided !== true) {
-          return totalAmount + item.price * item.quantity;
-        }
-        return totalAmount;
-      }, 0)
-    : 0;
-}
-
-export const convertToCurrency = (amountToConvert: number) => {
-  const formatter = new Intl.NumberFormat('en-KE', {
-    style: 'currency',
-    currency: 'KES',
-    minimumFractionDigits: 2,
-  });
-
-  let formattedAmount = formatter.format(Math.abs(amountToConvert));
-
-  if (amountToConvert < 0) {
-    formattedAmount = `(${formattedAmount})`;
-  }
-
-  return formattedAmount;
-};
-
-export const getGender = (gender: string, t) => {
-  switch (gender) {
-    case 'male':
-      return t('male', 'Male');
-    case 'female':
-      return t('female', 'Female');
-    case 'other':
-      return t('other', 'Other');
-    case 'unknown':
-      return t('unknown', 'Unknown');
-    default:
-      return gender;
-  }
-};
-
-/**
- * Extracts and returns the substring after the first colon (:) in the input string.
- * The input string is expected to be in the format "uuid:string".
- *
- * @param {string} input - The input string from which the substring is to be extracted.
- * @returns {string} The substring found after the first colon in the input string.
- */
-export function extractString(input: string): string {
-  const parts = input.split(':');
-  return removeUUID(parts.length < 2 ? input : parts[1]);
-}
-
-function removeUUID(str) {
-  // Regular expression to match a UUID
-  const uuidPattern = /[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/i;
-
-  // Replace the UUID with an empty string
-  return str.replace(uuidPattern, '');
-}
-
-// cleans the provider display name
-export function extractNameString(formattedString) {
-  if (!formattedString) {
-    return '';
-  }
-  const parts = formattedString.split(' - ');
-  return parts.length > 1 ? parts[1] : '';
-}
-
-export function formatDate(date) {
-  return dayjs(date).format('YYYY-MM-DD');
-}
diff --git a/packages/esm-billing-app/src/helpers/index.ts b/packages/esm-billing-app/src/helpers/index.ts
deleted file mode 100755
index 484b715..0000000
--- a/packages/esm-billing-app/src/helpers/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './functions';
diff --git a/packages/esm-billing-app/src/hooks/getMflCode.tsx b/packages/esm-billing-app/src/hooks/getMflCode.tsx
deleted file mode 100755
index 01dfb8b..0000000
--- a/packages/esm-billing-app/src/hooks/getMflCode.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { type OpenmrsResource, openmrsFetch } from '@openmrs/esm-framework';
-import useSWRImmutable from 'swr/immutable';
-
-export function useSystemSetting(key: string) {
-  const { data, isLoading } = useSWRImmutable<{ data: { results: Array<OpenmrsResource> } }>(
-    `/ws/rest/v1/systemsetting?q=${key}&v=full`,
-    openmrsFetch,
-    {
-      revalidateOnFocus: false,
-      revalidateOnReconnect: false,
-    },
-  );
-
-  const mflCodeResource = data?.data?.results?.find((resource) => resource.property === 'facility.mflcode');
-
-  const mflCodeValue = mflCodeResource?.value;
-
-  return { mflCodeValue, isLoading };
-}
diff --git a/packages/esm-billing-app/src/hooks/usePatientAttributes.tsx b/packages/esm-billing-app/src/hooks/usePatientAttributes.tsx
deleted file mode 100755
index 03c15da..0000000
--- a/packages/esm-billing-app/src/hooks/usePatientAttributes.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { openmrsFetch, type OpenmrsResource, restBaseUrl, useConfig } from '@openmrs/esm-framework';
-import useSWRImmutable from 'swr/immutable';
-
-interface PatientAttributes extends OpenmrsResource {
-  attributeType: OpenmrsResource;
-  value: string;
-}
-
-/**
- * Custom hook to fetch and retrieve patient attributes for a given patient UUID.
- *
- * @param patientUuid - The UUID of the patient.
- * @returns An object containing the patient's phone number, loading state, and error state.
- */
-export const usePatientAttributes = (patientUuid: string) => {
-  const config = useConfig({ externalModuleName: '@ampath/esm-patient-registration-app' });
-  const { data, isLoading, error } = useSWRImmutable<{ data: { person: { attributes: Array<PatientAttributes> } } }>(
-    `${restBaseUrl}/patient/${patientUuid}?v=custom:(person:(attributes:(uuid,display,value,attributeType:(uuid,name)))`,
-    openmrsFetch,
-  );
-  const patientPhoneAttribute = data?.data?.person?.attributes.find(
-    (attr) => attr.attributeType.uuid === config?.fieldConfigurations?.phone?.personAttributeUuid,
-  )?.value;
-
-  return { phoneNumber: patientPhoneAttribute, isLoading, error };
-};
diff --git a/packages/esm-billing-app/src/hooks/useRequestStatus.tsx b/packages/esm-billing-app/src/hooks/useRequestStatus.tsx
deleted file mode 100755
index ea62980..0000000
--- a/packages/esm-billing-app/src/hooks/useRequestStatus.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { useState, useEffect, type SetStateAction } from 'react';
-import { getRequestStatus, readableStatusMap, getErrorMessage } from '../m-pesa/mpesa-resource';
-import { useTranslation } from 'react-i18next';
-import { useConfig } from '@openmrs/esm-framework';
-import { type BillingConfig } from '../config-schema';
-import { type RequestStatus } from '../types';
-
-type RequestData = { requestId: string; requestStatus: RequestStatus | null };
-
-/**
- * useRequestStatus
- * @param setNotification a function to call with the appropriate notification type
- * @returns a function to trigger the polling.
- */
-export const useRequestStatus = (
-  setNotification: React.Dispatch<SetStateAction<{ type: 'error' | 'success'; message: string } | null>>,
-): [RequestData, React.Dispatch<React.SetStateAction<RequestData | null>>] => {
-  const { t } = useTranslation();
-  const { mpesaAPIBaseUrl } = useConfig<BillingConfig>();
-
-  const [requestData, setRequestData] = useState<{ requestId: string; requestStatus: RequestStatus | null }>({
-    requestId: null,
-    requestStatus: null,
-  });
-
-  useEffect(() => {
-    let interval: NodeJS.Timeout;
-
-    if (requestData.requestId && !['COMPLETE', 'FAILED', 'NOT-FOUND'].includes(requestData.requestStatus)) {
-      const fetchStatus = async () => {
-        try {
-          const status = await getRequestStatus(requestData.requestId, mpesaAPIBaseUrl);
-          if (status === 'COMPLETE' || status === 'FAILED' || status === 'NOT-FOUND') {
-            clearInterval(interval);
-          }
-          if (status === 'COMPLETE' || status === 'INITIATED') {
-            setNotification({ type: 'success', message: readableStatusMap.get(status) });
-          }
-          if (status === 'FAILED' || status === 'NOT-FOUND') {
-            setNotification({ type: 'error', message: readableStatusMap.get(status) });
-          }
-        } catch (error) {
-          clearInterval(interval);
-          setNotification({ type: 'error', message: getErrorMessage(error, t) });
-        }
-      };
-
-      interval = setInterval(fetchStatus, 2000);
-
-      return () => clearInterval(interval);
-    }
-  }, [mpesaAPIBaseUrl, requestData.requestId, requestData.requestStatus, setNotification, t]);
-
-  return [requestData, setRequestData];
-};
diff --git a/packages/esm-billing-app/src/index.ts b/packages/esm-billing-app/src/index.ts
deleted file mode 100755
index 737fdda..0000000
--- a/packages/esm-billing-app/src/index.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { defineConfigSchema, getSyncLifecycle } from '@openmrs/esm-framework';
-import { createDashboardLink } from '@openmrs/esm-patient-common-lib';
-import { createLeftPanelLink } from './left-panel-link.component';
-import { configSchema } from './config-schema';
-import { dashboardMeta } from './dashboard.meta';
-import rootComponent from './root.component';
-import BillHistory from './bill-history/bill-history.component';
-import BillingCheckInForm from './billing-form/billing-checkin-form.component';
-import BillableServicesCardLink from './billable-services-admin-card-link.component';
-import BillableServiceHome from './billable-services/billable-services-home.component';
-import BillingForm from './billing-form/billing-form.component';
-import RequirePaymentModal from './modal/require-payment-modal.component';
-import VisitAttributeTags from './invoice/payments/visit-tags/visit-attribute.component';
-import InitiatePaymentDialog from './invoice/payments/initiate-payment/initiate-payment.component';
-import DrugOrder from './billable-services/billiable-item/drug-order/drug-order.component';
-import LabOrder from './billable-services/billiable-item/test-order/lab-order.component';
-import TestOrderAction from './billable-services/billiable-item/test-order/test-order-action.component';
-import PriceInfoOrder from './billable-services/billiable-item/test-order/price-info-order.componet';
-import ProcedureOrder from './billable-services/billiable-item/test-order/procedure-order.component';
-import ImagingOrder from './billable-services/billiable-item/test-order/imaging-order.component';
-
-const moduleName = '@ampath/esm-billing-app';
-
-const options = {
-  featureName: 'billing',
-  moduleName,
-};
-
-export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');
-
-export function startupApp() {
-  defineConfigSchema(moduleName, configSchema);
-}
-
-export const billingSummaryDashboardLink = getSyncLifecycle(
-  createDashboardLink({ ...dashboardMeta, moduleName }),
-  options,
-);
-// t('billing', 'Billing')
-export const billingDashboardLink = getSyncLifecycle(
-  createLeftPanelLink({
-    name: 'billing',
-    title: 'Billing',
-  }),
-  options,
-);
-
-export const root = getSyncLifecycle(rootComponent, options);
-export const billingPatientSummary = getSyncLifecycle(BillHistory, options);
-export const billingCheckInForm = getSyncLifecycle(BillingCheckInForm, options);
-export const billableServicesHome = getSyncLifecycle(BillableServiceHome, options);
-export const billableServicesCardLink = getSyncLifecycle(BillableServicesCardLink, options);
-export const billingForm = getSyncLifecycle(BillingForm, options);
-export const requirePaymentModal = getSyncLifecycle(RequirePaymentModal, options);
-export const visitAttributeTags = getSyncLifecycle(VisitAttributeTags, options);
-export const initiatePaymentDialog = getSyncLifecycle(InitiatePaymentDialog, options);
-export const labOrder = getSyncLifecycle(LabOrder, options);
-export const priceInfoOrder = getSyncLifecycle(PriceInfoOrder, options);
-export const procedureOrder = getSyncLifecycle(ProcedureOrder, options);
-export const imagingOrder = getSyncLifecycle(ImagingOrder, options);
-export const drugOrder = getSyncLifecycle(DrugOrder, options);
-export const testOrderAction = getSyncLifecycle(TestOrderAction, options);
diff --git a/packages/esm-billing-app/src/invoice/invoice-table.component.tsx b/packages/esm-billing-app/src/invoice/invoice-table.component.tsx
deleted file mode 100755
index 3ebf7e5..0000000
--- a/packages/esm-billing-app/src/invoice/invoice-table.component.tsx
+++ /dev/null
@@ -1,193 +0,0 @@
-import React, { useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import fuzzy from 'fuzzy';
-import {
-  DataTable,
-  DataTableSkeleton,
-  Layer,
-  Table,
-  TableBody,
-  TableCell,
-  TableContainer,
-  TableHead,
-  TableHeader,
-  TableRow,
-  TableToolbar,
-  TableToolbarContent,
-  TableToolbarSearch,
-  TableSelectRow,
-  Tile,
-  type DataTableHeader,
-  type DataTableRow,
-} from '@carbon/react';
-import { isDesktop, useDebounce, useLayoutType } from '@openmrs/esm-framework';
-import { type LineItem, type MappedBill } from '../types';
-import styles from './invoice-table.scss';
-
-type InvoiceTableProps = {
-  bill: MappedBill;
-  isSelectable?: boolean;
-  isLoadingBill?: boolean;
-  onSelectItem?: (selectedLineItems: LineItem[]) => void;
-};
-
-const InvoiceTable: React.FC<InvoiceTableProps> = ({ bill, isSelectable = true, isLoadingBill, onSelectItem }) => {
-  const { t } = useTranslation();
-  const { lineItems } = bill;
-  const paidLineItems = lineItems?.filter((item) => item.paymentStatus === 'PAID') ?? [];
-  const layout = useLayoutType();
-  const responsiveSize = isDesktop(layout) ? 'sm' : 'lg';
-  const [selectedLineItems, setSelectedLineItems] = useState(paidLineItems ?? []);
-  const [searchTerm, setSearchTerm] = useState('');
-  const debouncedSearchTerm = useDebounce(searchTerm);
-  const filteredLineItems = useMemo(() => {
-    if (!debouncedSearchTerm) {
-      return lineItems;
-    }
-
-    return debouncedSearchTerm
-      ? fuzzy
-          .filter(debouncedSearchTerm, lineItems, {
-            extract: (lineItem: LineItem) => `${lineItem.item}`,
-          })
-          .sort((r1, r2) => r1.score - r2.score)
-          .map((result) => result.original)
-      : lineItems;
-  }, [debouncedSearchTerm, lineItems]);
-
-  const tableHeaders: Array<typeof DataTableHeader> = [
-    { header: 'No', key: 'no' },
-    { header: 'Bill item', key: 'billItem' },
-    { header: 'Bill code', key: 'billCode' },
-    { header: 'Status', key: 'status' },
-    { header: 'Quantity', key: 'quantity' },
-    { header: 'Price', key: 'price' },
-    { header: 'Total', key: 'total' },
-  ];
-  const processBillItem = (item) => (item.item || item.billableService)?.split(':')[1];
-
-  const tableRows: Array<typeof DataTableRow> = useMemo(
-    () =>
-      filteredLineItems?.map((item, index) => {
-        return {
-          no: `${index + 1}`,
-          id: `${item.uuid}`,
-          billItem: processBillItem(item),
-          billCode: bill.receiptNumber,
-          status: item.paymentStatus,
-          quantity: item.quantity,
-          price: item.price,
-          total: item.price * item.quantity,
-        };
-      }) ?? [],
-    [bill.receiptNumber, filteredLineItems],
-  );
-
-  if (isLoadingBill) {
-    return (
-      <div className={styles.loaderContainer}>
-        <DataTableSkeleton
-          columnCount={tableHeaders.length}
-          showHeader={false}
-          showToolbar={false}
-          size={responsiveSize}
-          zebra
-        />
-      </div>
-    );
-  }
-
-  const handleRowSelection = (row: typeof DataTableRow, checked: boolean) => {
-    const matchingRow = filteredLineItems.find((item) => item.uuid === row.id);
-    let newSelectedLineItems;
-
-    if (checked) {
-      newSelectedLineItems = [...selectedLineItems, matchingRow];
-    } else {
-      newSelectedLineItems = selectedLineItems.filter((item) => item.uuid !== row.id);
-    }
-    setSelectedLineItems(newSelectedLineItems);
-    onSelectItem(newSelectedLineItems);
-  };
-
-  return (
-    <div className={styles.invoiceContainer}>
-      <DataTable headers={tableHeaders} isSortable rows={tableRows} size={responsiveSize} useZebraStyles>
-        {({ rows, headers, getRowProps, getSelectionProps, getTableProps, getToolbarProps }) => (
-          <TableContainer
-            description={
-              <span className={styles.tableDescription}>
-                <span>{t('itemsToBeBilled', 'Items to be billed')}</span>
-              </span>
-            }
-            title={t('lineItems', 'Line items')}>
-            <div className={styles.toolbarWrapper}>
-              <TableToolbar {...getToolbarProps()} className={styles.tableToolbar} size={responsiveSize}>
-                <TableToolbarContent className={styles.headerContainer}>
-                  <TableToolbarSearch
-                    className={styles.searchbox}
-                    expanded
-                    onChange={(e: React.ChangeEvent<HTMLInputElement>) => setSearchTerm(e.target.value)}
-                    placeholder={t('searchThisTable', 'Search this table')}
-                    size={responsiveSize}
-                  />
-                </TableToolbarContent>
-              </TableToolbar>
-            </div>
-            <Table {...getTableProps()} aria-label="Invoice line items" className={styles.table}>
-              <TableHead>
-                <TableRow>
-                  {rows.length > 1 && isSelectable ? <TableHeader /> : null}
-                  {headers.map((header) => (
-                    <TableHeader key={header.key}>{header.header}</TableHeader>
-                  ))}
-                </TableRow>
-              </TableHead>
-              <TableBody>
-                {rows.map((row, index) => {
-                  return (
-                    <TableRow
-                      key={row.id}
-                      {...getRowProps({
-                        row,
-                      })}>
-                      {rows.length > 1 && isSelectable && (
-                        <TableSelectRow
-                          aria-label="Select row"
-                          {...getSelectionProps({ row })}
-                          disabled={tableRows[index].status === 'PAID'}
-                          onChange={(checked: boolean) => handleRowSelection(row, checked)}
-                          checked={
-                            tableRows[index].status === 'PAID' ||
-                            Boolean(selectedLineItems?.find((item) => item?.uuid === row?.id))
-                          }
-                        />
-                      )}
-                      {row.cells.map((cell) => (
-                        <TableCell key={cell.id}>{cell.value}</TableCell>
-                      ))}
-                    </TableRow>
-                  );
-                })}
-              </TableBody>
-            </Table>
-          </TableContainer>
-        )}
-      </DataTable>
-      {filteredLineItems?.length === 0 && (
-        <div className={styles.filterEmptyState}>
-          <Layer>
-            <Tile className={styles.filterEmptyStateTile}>
-              <p className={styles.filterEmptyStateContent}>
-                {t('noMatchingItemsToDisplay', 'No matching items to display')}
-              </p>
-              <p className={styles.filterEmptyStateHelper}>{t('checkFilters', 'Check the filters above')}</p>
-            </Tile>
-          </Layer>
-        </div>
-      )}
-    </div>
-  );
-};
-
-export default InvoiceTable;
diff --git a/packages/esm-billing-app/src/invoice/invoice-table.scss b/packages/esm-billing-app/src/invoice/invoice-table.scss
deleted file mode 100755
index 5051669..0000000
--- a/packages/esm-billing-app/src/invoice/invoice-table.scss
+++ /dev/null
@@ -1,91 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-@import '~@openmrs/esm-styleguide/src/vars';
-
-.filterEmptyState {
-  align-items: center;
-  background-color: white;
-  display: flex;
-  justify-content: center;
-  padding: layout.$spacing-09 !important;
-  text-align: center;
-}
-
-.filterEmptyStateTile {
-  margin: auto;
-}
-
-.filterEmptyStateContent {
-  @include type.type-style('heading-compact-02');
-  color: $text-02;
-  margin-bottom: 0.5rem;
-}
-
-.filterEmptyStateHelper {
-  @include type.type-style('body-compact-01');
-  color: $text-02;
-}
-
-.headerContainer {
-  background-color: colors.$gray-10;
-}
-
-.invoiceContainer {
-  margin: layout.$spacing-05;
-  border: 1px solid $ui-03;
-}
-
-.searchbox {
-  input:focus {
-    outline: 2px solid colors.$orange-40 !important;
-  }
-}
-
-.table {
-  td {
-    border-bottom: none !important;
-  }
-}
-
-.tableDescription {
-  display: flex;
-  align-items: flex-start;
-  margin-top: layout.$spacing-02;
-  column-gap: layout.$spacing-01;
-
-  ::after {
-    content: '';
-    display: block;
-    width: 2rem;
-    padding-top: 0.188rem;
-    border-bottom: 0.375rem solid var(--brand-03);
-  }
-
-  & > span {
-    @include type.type-style('body-01');
-  }
-}
-
-.tableToolbar {
-  width: 20%;
-  min-width: 12.5rem;
-}
-
-.toolbarWrapper {
-  position: relative;
-  display: flex;
-  justify-content: flex-end;
-}
-
-:global(.omrs-breakpoint-lt-desktop) {
-  .toolbarWrapper {
-    height: layout.$spacing-09;
-  }
-}
-
-:global(.omrs-breakpoint-gt-tablet) {
-  .toolbarWrapper {
-    height: layout.$spacing-07;
-  }
-}
diff --git a/packages/esm-billing-app/src/invoice/invoice.component.tsx b/packages/esm-billing-app/src/invoice/invoice.component.tsx
deleted file mode 100755
index b58f949..0000000
--- a/packages/esm-billing-app/src/invoice/invoice.component.tsx
+++ /dev/null
@@ -1,168 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-import { Button, InlineLoading } from '@carbon/react';
-import { BaggageClaim, Printer, Wallet } from '@carbon/react/icons';
-import { useParams } from 'react-router-dom';
-import { useReactToPrint } from 'react-to-print';
-import { useTranslation } from 'react-i18next';
-import { ExtensionSlot, usePatient, showModal, formatDatetime, parseDate, navigate } from '@openmrs/esm-framework';
-import { ErrorState } from '@openmrs/esm-patient-common-lib';
-import { convertToCurrency } from '../helpers';
-import { type LineItem } from '../types';
-import { useBill, useDefaultFacility } from '../billing.resource';
-import InvoiceTable from './invoice-table.component';
-import Payments from './payments/payments.component';
-import PrintableInvoice from './printable-invoice/printable-invoice.component';
-import styles from './invoice.scss';
-import { spaBasePath } from '../constants';
-
-interface InvoiceDetailsProps {
-  label: string;
-  value: string | number;
-}
-
-const Invoice: React.FC = () => {
-  const { t } = useTranslation();
-  const { data: facilityInfo } = useDefaultFacility();
-  const { billUuid, patientUuid } = useParams();
-  const [isPrinting, setIsPrinting] = useState(false);
-  const { patient, isLoading: isLoadingPatient } = usePatient(patientUuid);
-  const { bill, isLoading: isLoadingBill, error } = useBill(billUuid);
-  const [selectedLineItems, setSelectedLineItems] = useState([]);
-  const componentRef = useRef<HTMLDivElement>(null);
-
-  const handleSelectItem = (lineItems: Array<LineItem>) => {
-    const paidLineItems = bill?.lineItems?.filter((item) => item.paymentStatus === 'PAID') ?? [];
-    setSelectedLineItems([...lineItems, ...paidLineItems]);
-  };
-
-  const handlePrint = useReactToPrint({
-    content: () => componentRef.current,
-    documentTitle: `Invoice ${bill?.receiptNumber} - ${patient?.name?.[0]?.given?.join(' ')} ${
-      patient?.name?.[0].family
-    }`,
-    onBeforePrint() {
-      setIsPrinting(true);
-    },
-    onAfterPrint() {
-      setIsPrinting(false);
-    },
-    removeAfterPrint: true,
-  });
-
-  const handleBillPayment = () => {
-    const dispose = showModal('initiate-payment-modal', {
-      closeModal: () => dispose(),
-      bill: bill,
-    });
-  };
-
-  useEffect(() => {
-    const paidLineItems = bill?.lineItems?.filter((item) => item.paymentStatus === 'PAID') ?? [];
-    setSelectedLineItems(paidLineItems);
-  }, [bill.lineItems]);
-
-  const invoiceDetails = {
-    'Total Amount': convertToCurrency(bill?.totalAmount),
-    'Amount Tendered': convertToCurrency(bill?.tenderedAmount),
-    'Invoice Number': bill.receiptNumber,
-    'Date And Time': formatDatetime(parseDate(bill.dateCreated), { mode: 'standard', noToday: true }),
-    'Invoice Status': bill?.status,
-  };
-
-  if (isLoadingPatient && isLoadingBill) {
-    return (
-      <div className={styles.invoiceContainer}>
-        <InlineLoading
-          className={styles.loader}
-          status="active"
-          iconDescription="Loading"
-          description="Loading patient header..."
-        />
-      </div>
-    );
-  }
-
-  if (error) {
-    return (
-      <div className={styles.errorContainer}>
-        <ErrorState headerTitle={t('invoiceError', 'Invoice error')} error={error} />
-      </div>
-    );
-  }
-
-  return (
-    <div className={styles.invoiceContainer}>
-      {patient && patientUuid && <ExtensionSlot name="patient-header-slot" state={{ patient, patientUuid }} />}
-      <div className={styles.detailsContainer}>
-        <section className={styles.details}>
-          {Object.entries(invoiceDetails).map(([key, val]) => (
-            <InvoiceDetails key={key} label={key} value={val} />
-          ))}
-        </section>
-      </div>
-      <div className={styles.actionArea}>
-        <Button
-          kind="secondary"
-          size="sm"
-          disabled={bill?.status !== 'PAID'}
-          onClick={() => navigate({ to: `\${openmrsBase}/ws/rest/v1/cashier/receipt?billId=${bill.id}` })}
-          renderIcon={Printer}
-          iconDescription="Add">
-          {t('printRecept', 'Print receipt')}
-        </Button>
-        <Button
-          onClick={handlePrint}
-          kind="tertiary"
-          size="sm"
-          disabled={isPrinting}
-          renderIcon={Printer}
-          iconDescription="Add"
-          tooltipPosition="right">
-          {isPrinting ? t('printingInvoice', 'Printing invoice...') : t('printInvoice', 'Print invoice')}
-        </Button>
-        <Button
-          onClick={handleBillPayment}
-          disabled={bill?.status === 'PAID'}
-          size="sm"
-          renderIcon={Wallet}
-          iconDescription="Add"
-          tooltipPosition="left">
-          {t('mpesaPayment', 'MPESA Payment')}
-        </Button>
-        <Button
-          onClick={() => navigate({ to: `${spaBasePath}/billing/patient/${patientUuid}/${billUuid}/claims` })}
-          kind="danger"
-          size="sm"
-          renderIcon={BaggageClaim}
-          iconDescription="Add"
-          tooltipPosition="bottom">
-          {t('claim', 'Process claims')}
-        </Button>
-      </div>
-
-      <InvoiceTable bill={bill} isLoadingBill={isLoadingBill} onSelectItem={handleSelectItem} />
-      <Payments bill={bill} selectedLineItems={selectedLineItems} />
-
-      <div className={styles.printContainer}>
-        <PrintableInvoice
-          ref={componentRef}
-          facilityInfo={facilityInfo}
-          bill={bill}
-          patient={patient}
-          isPrinting={isPrinting}
-        />
-      </div>
-    </div>
-  );
-};
-
-function InvoiceDetails({ label, value }: InvoiceDetailsProps) {
-  return (
-    <div>
-      <h1 className={styles.label}>{label}</h1>
-      <span className={styles.value}>{value}</span>
-    </div>
-  );
-}
-
-export default Invoice;
diff --git a/packages/esm-billing-app/src/invoice/invoice.scss b/packages/esm-billing-app/src/invoice/invoice.scss
deleted file mode 100755
index 759c968..0000000
--- a/packages/esm-billing-app/src/invoice/invoice.scss
+++ /dev/null
@@ -1,111 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.invoiceContainer {
-  background-color: colors.$gray-10;
-  height: calc(100vh - 3rem);
-}
-
-.errorContainer {
-  margin: layout.$spacing-05;
-}
-
-.loader {
-  display: flex;
-  min-height: layout.$spacing-09;
-  justify-content: center;
-}
-
-.detailsContainer {
-  display: flex;
-}
-
-.details {
-  display: flex;
-  flex: 3;
-  flex-flow: row wrap;
-  align-items: center;
-  justify-content: space-between;
-  margin: layout.$spacing-05;
-  row-gap: 1.5rem;
-}
-
-.label {
-  @include type.type-style('body-compact-02');
-  color: colors.$gray-70;
-  margin: layout.$spacing-01;
-}
-
-.value {
-  @include type.type-style('heading-03');
-  display: inline-block;
-  margin-top: layout.$spacing-04;
-}
-
-.backButton {
-  margin: layout.$spacing-04;
-
-  button {
-    display: flex;
-    padding-left: 0 !important;
-
-    svg {
-      order: 1;
-      margin-right: layout.$spacing-03;
-      margin-left: 0 !important;
-    }
-
-    span {
-      order: 2;
-    }
-  }
-}
-
-.button {
-  margin-left: layout.$spacing-04;
-  min-width: 10rem;
-}
-
-.invoicePaymentsContainer {
-  display: flex;
-  flex-direction: column;
-  margin: layout.$spacing-05;
-}
-
-.paymentSection {
-  display: flex;
-  flex-direction: row;
-}
-
-.billDetail {
-  font-weight: bold;
-  color: colors.$cool-gray-90;
-}
-
-@media screen {
-  .printContainer {
-    background-color: colors.$white;
-    display: none;
-  }
-}
-
-@media print {
-  html,
-  body {
-    background-color: colors.$white !important;
-  }
-}
-
-.actionArea {
-  margin: 0.625rem;
-  padding-top: 0.625rem;
-  display: flex;
-  justify-content: flex-end;
-  column-gap: 0.325rem;
-  border-top: 1px solid colors.$gray-20;
-
-  & > button {
-    max-height: 2rem;
-  }
-}
diff --git a/packages/esm-billing-app/src/invoice/payments/initiate-payment/initiate-payment.component.tsx b/packages/esm-billing-app/src/invoice/payments/initiate-payment/initiate-payment.component.tsx
deleted file mode 100755
index 334501b..0000000
--- a/packages/esm-billing-app/src/invoice/payments/initiate-payment/initiate-payment.component.tsx
+++ /dev/null
@@ -1,159 +0,0 @@
-import React, { useEffect, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  Button,
-  Form,
-  ModalBody,
-  ModalHeader,
-  TextInput,
-  Layer,
-  InlineNotification,
-  InlineLoading,
-  Loading,
-} from '@carbon/react';
-import styles from './initiate-payment.scss';
-import { Controller, useForm } from 'react-hook-form';
-import { type MappedBill } from '../../../types';
-import { z } from 'zod';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { formatPhoneNumber } from '../utils';
-import { useSystemSetting } from '../../../hooks/getMflCode';
-import { initiateStkPush } from '../../../m-pesa/mpesa-resource';
-import { useRequestStatus } from '../../../hooks/useRequestStatus';
-import { useConfig, usePatient } from '@openmrs/esm-framework';
-import { type BillingConfig } from '../../../config-schema';
-import { usePatientAttributes } from '../../../hooks/usePatientAttributes';
-
-const InitiatePaymentSchema = z.object({
-  phoneNumber: z
-    .string()
-    .nonempty({ message: 'Phone number is required' })
-    .regex(/^\d{10}$/, { message: 'Phone number must be numeric and 10 digits' }),
-  billAmount: z.string().nonempty({ message: 'Amount is required' }),
-});
-
-export interface InitiatePaymentDialogProps {
-  closeModal: () => void;
-  bill: MappedBill;
-}
-
-const InitiatePaymentDialog: React.FC<InitiatePaymentDialogProps> = ({ closeModal, bill }) => {
-  const { t } = useTranslation();
-  const { phoneNumber, isLoading: isLoadingPhoneNumber } = usePatientAttributes(bill.patientUuid);
-  const { mpesaAPIBaseUrl } = useConfig<BillingConfig>();
-  const { mflCodeValue } = useSystemSetting('facility.mflcode');
-  const [notification, setNotification] = useState<{ type: 'error' | 'success'; message: string } | null>(null);
-  const [isLoading, setIsLoading] = useState(false);
-  const [{ requestStatus }, pollingTrigger] = useRequestStatus(setNotification);
-
-  const {
-    control,
-    handleSubmit,
-    formState: { errors, isValid },
-    setValue,
-  } = useForm<any>({
-    mode: 'all',
-    defaultValues: { billAmount: String(bill.totalAmount), phoneNumber: phoneNumber },
-    resolver: zodResolver(InitiatePaymentSchema),
-  });
-
-  useEffect(() => {
-    setValue('phoneNumber', phoneNumber);
-  }, [phoneNumber, setValue]);
-
-  const onSubmit = async (data: { phoneNumber: any; billAmount: any }) => {
-    const phoneNumber = formatPhoneNumber(data.phoneNumber);
-    const amountBilled = data.billAmount;
-    const accountReference = `${mflCodeValue}#${bill.receiptNumber}`;
-
-    const payload = {
-      AccountReference: accountReference,
-      PhoneNumber: phoneNumber,
-      Amount: amountBilled,
-    };
-
-    setIsLoading(true);
-    const requestId = await initiateStkPush(payload, setNotification, mpesaAPIBaseUrl);
-    setIsLoading(false);
-    pollingTrigger({ requestId, requestStatus: 'INITIATED' });
-  };
-
-  if (isLoadingPhoneNumber || isLoading) {
-    return <InlineLoading status="active" iconDescription="Loading" description="Loading data..." />;
-  }
-
-  return (
-    <div>
-      <ModalHeader closeModal={closeModal} />
-      <ModalBody>
-        <Form className={styles.form}>
-          <h4>{t('paymentPayment', 'Bill Payment')}</h4>
-          {notification && (
-            <InlineNotification
-              kind={notification.type}
-              title={notification.message}
-              onCloseButtonClick={() => setNotification(null)}
-            />
-          )}
-          <section className={styles.section}>
-            <Controller
-              control={control}
-              name="phoneNumber"
-              render={({ field }) => (
-                <Layer>
-                  <TextInput
-                    {...field}
-                    size="md"
-                    labelText={t('Phone Number', 'Phone Number')}
-                    placeholder={t('Phone Number', 'Phone Number')}
-                    invalid={!!errors.phoneNumber}
-                    invalidText={errors.phoneNumber?.message}
-                  />
-                </Layer>
-              )}
-            />
-          </section>
-          <section className={styles.section}>
-            <Controller
-              control={control}
-              name="billAmount"
-              render={({ field }) => (
-                <Layer>
-                  <TextInput
-                    {...field}
-                    size="md"
-                    labelText={t('billAmount', 'Bill Amount')}
-                    placeholder={t('billAmount', 'Bill Amount')}
-                    invalid={!!errors.billAmount}
-                    invalidText={errors.billAmount?.message}
-                  />
-                </Layer>
-              )}
-            />
-          </section>
-          <section>
-            <Button kind="secondary" className={styles.buttonLayout} onClick={closeModal}>
-              {t('cancel', 'Cancel')}
-            </Button>
-            <Button
-              type="submit"
-              className={styles.button}
-              onClick={handleSubmit(onSubmit)}
-              disabled={!isValid || isLoading || requestStatus === 'INITIATED'}>
-              {isLoading ? (
-                <>
-                  <Loading className={styles.button_spinner} withOverlay={false} small />{' '}
-                  {t('processingPayment', 'Processing Payment')}
-                </>
-              ) : (
-                t('initiatePay', 'Initiate Payment')
-              )}
-            </Button>
-          </section>
-        </Form>
-      </ModalBody>
-    </div>
-  );
-};
-
-export default InitiatePaymentDialog;
diff --git a/packages/esm-billing-app/src/invoice/payments/initiate-payment/initiate-payment.scss b/packages/esm-billing-app/src/invoice/payments/initiate-payment/initiate-payment.scss
deleted file mode 100755
index 0864833..0000000
--- a/packages/esm-billing-app/src/invoice/payments/initiate-payment/initiate-payment.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@use '@carbon/colors';
-@use '@carbon/layout';
-@import '~@openmrs/esm-styleguide/src/vars';
-
-.form {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  height: 100%;
-}
-
-.section {
-  margin: spacing.$spacing-03;
-}
-
-.sectionTitle {
-  @include type.type-style('heading-compact-02');
-  color: $text-02;
-  margin-bottom: spacing.$spacing-04;
-}
-
-.buttonLayout {
-  margin-top: layout.$spacing-05;
-  margin-bottom: layout.$spacing-01;
-}
-
-.button {
-  margin-left: layout.$spacing-04;
-  margin-top: layout.$spacing-05;
-  margin-bottom: layout.$spacing-01;
-}
-
-.button_spinner {
-  padding: 0;
-  margin-right: 12px;
-}
diff --git a/packages/esm-billing-app/src/invoice/payments/invoice-breakdown/invoice-breakdown.component.tsx b/packages/esm-billing-app/src/invoice/payments/invoice-breakdown/invoice-breakdown.component.tsx
deleted file mode 100755
index 2bd598f..0000000
--- a/packages/esm-billing-app/src/invoice/payments/invoice-breakdown/invoice-breakdown.component.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import styles from './invoice-breakdown.scss';
-
-type InvoiceBreakDownProps = {
-  label: string;
-  value: string;
-  hasBalance?: Boolean;
-};
-
-export const InvoiceBreakDown: React.FC<InvoiceBreakDownProps> = ({ label, value, hasBalance }) => {
-  return (
-    <div className={styles.invoiceBreakdown}>
-      <span className={hasBalance ? styles.extendedLabel : styles.label}>{label}: </span>
-      <span className={styles.value}>{value}</span>
-    </div>
-  );
-};
diff --git a/packages/esm-billing-app/src/invoice/payments/invoice-breakdown/invoice-breakdown.scss b/packages/esm-billing-app/src/invoice/payments/invoice-breakdown/invoice-breakdown.scss
deleted file mode 100755
index e69d68d..0000000
--- a/packages/esm-billing-app/src/invoice/payments/invoice-breakdown/invoice-breakdown.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.invoiceBreakdown {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  align-items: flex-end;
-  margin: layout.$spacing-02 0;
-}
-
-.label {
-  @include type.type-style('heading-03');
-  color: colors.$gray-100;
-  text-align: end;
-}
-
-.value {
-  @extend .label;
-  font-weight: bold;
-  margin-left: layout.$spacing-03;
-  text-align: start;
-}
-
-.extendedLabel {
-  @extend .label;
-  font-weight: bold;
-  color: crimson;
-}
diff --git a/packages/esm-billing-app/src/invoice/payments/payment-form/payment-form.component.tsx b/packages/esm-billing-app/src/invoice/payments/payment-form/payment-form.component.tsx
deleted file mode 100755
index be7ebec..0000000
--- a/packages/esm-billing-app/src/invoice/payments/payment-form/payment-form.component.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import React, { useCallback } from 'react';
-import {
-  Controller,
-  type FieldArrayWithId,
-  type UseFieldArrayRemove,
-  useFieldArray,
-  useFormContext,
-} from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
-import { TrashCan, Add } from '@carbon/react/icons';
-import { Button, Dropdown, NumberInputSkeleton, TextInput, NumberInput } from '@carbon/react';
-import { ErrorState } from '@openmrs/esm-patient-common-lib';
-import styles from './payment-form.scss';
-import { usePaymentModes } from '../../../billing.resource';
-import { type PaymentFormValue } from '../../../types';
-
-type PaymentFormProps = {
-  disablePayment: boolean;
-  amountDue: number;
-  append: (obj: { method: string; amount: number; referenceCode: string }) => void;
-  fields: FieldArrayWithId<PaymentFormValue, 'payment', 'id'>[];
-  remove: UseFieldArrayRemove;
-};
-
-const PaymentForm: React.FC<PaymentFormProps> = ({ disablePayment, amountDue, append, remove, fields }) => {
-  const { t } = useTranslation();
-  const {
-    control,
-    formState: { errors },
-    setFocus,
-  } = useFormContext<PaymentFormValue>();
-  const { paymentModes, isLoading, error } = usePaymentModes();
-
-  const handleAppendPaymentMode = useCallback(() => {
-    {
-      append({ method: '', amount: 0, referenceCode: '' });
-      setFocus(`payment.${fields.length}.method`);
-    }
-  }, [append]);
-
-  const handleRemovePaymentMode = useCallback((index) => remove(index), [remove]);
-
-  if (isLoading) {
-    return <NumberInputSkeleton />;
-  }
-
-  if (error) {
-    return (
-      <div className={styles.errorPaymentContainer}>
-        <ErrorState headerTitle={t('errorLoadingPaymentModes', 'Payment modes error')} error={error} />
-      </div>
-    );
-  }
-
-  return (
-    <div className={styles.container}>
-      {fields.map((field, index) => (
-        <div key={field.id} className={styles.paymentMethodContainer}>
-          <Controller
-            control={control}
-            name={`payment.${index}.method`}
-            render={({ field }) => (
-              <Dropdown
-                {...field}
-                id="paymentMethod"
-                onChange={({ selectedItem }) => {
-                  setFocus(`payment.${index}.amount`);
-                  field.onChange(selectedItem?.uuid);
-                }}
-                titleText={t('paymentMethod', 'Payment method')}
-                label={t('selectPaymentMethod', 'Select payment method')}
-                items={paymentModes}
-                itemToString={(item) => (item ? item.name : '')}
-                invalid={!!errors?.payment?.[index]?.method}
-                invalidText={errors?.payment?.[index]?.method?.message}
-              />
-            )}
-          />
-          <Controller
-            control={control}
-            name={`payment.${index}.amount`}
-            render={({ field }) => (
-              <NumberInput
-                {...field}
-                id="paymentAmount"
-                onChange={(e) => field.onChange(Number(e.target.value))}
-                invalid={!!errors?.payment?.[index]?.amount}
-                invalidText={errors?.payment?.[index]?.amount?.message}
-                label={t('amount', 'Amount')}
-                placeholder={t('enterAmount', 'Enter amount')}
-              />
-            )}
-          />
-          <Controller
-            name={`payment.${index}.referenceCode`}
-            control={control}
-            render={({ field }) => (
-              <TextInput
-                {...field}
-                id="paymentReferenceCode"
-                labelText={t('referenceNumber', 'Reference number')}
-                placeholder={t('enterReferenceNumber', 'Enter ref. number')}
-                type="text"
-              />
-            )}
-          />
-          <div className={styles.removeButtonContainer}>
-            <TrashCan onClick={() => handleRemovePaymentMode(index)} className={styles.removeButton} size={20} />
-          </div>
-        </div>
-      ))}
-      <Button
-        disabled={disablePayment}
-        size="md"
-        onClick={handleAppendPaymentMode}
-        className={styles.paymentButtons}
-        renderIcon={(props) => <Add size={24} {...props} />}
-        iconDescription="Add">
-        {t('addPaymentOptions', 'Add payment option')}
-      </Button>
-    </div>
-  );
-};
-
-export default PaymentForm;
diff --git a/packages/esm-billing-app/src/invoice/payments/payment-form/payment-form.scss b/packages/esm-billing-app/src/invoice/payments/payment-form/payment-form.scss
deleted file mode 100755
index 6edab6d..0000000
--- a/packages/esm-billing-app/src/invoice/payments/payment-form/payment-form.scss
+++ /dev/null
@@ -1,54 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.container {
-  margin: 1rem;
-}
-
-.paymentContainer {
-  margin: layout.$layout-01;
-  padding: layout.$layout-01;
-  width: 70%;
-  border-right: 1px solid colors.$cool-gray-40;
-}
-
-.paymentButtons {
-  margin: layout.$layout-01 0;
-}
-
-.paymentMethodContainer {
-  display: grid;
-  grid-template-columns: repeat(4, minmax(auto, 1fr));
-  align-items: flex-start;
-  column-gap: 1rem;
-  margin: 0.625rem 0;
-  width: 100%;
-}
-
-.paymentTotals {
-  margin-top: layout.$spacing-01;
-}
-
-.processPayments {
-  display: flex;
-  justify-content: flex-end;
-  margin: layout.$spacing-05;
-  column-gap: layout.$spacing-04;
-}
-
-.errorPaymentContainer {
-  margin: layout.$spacing-04;
-  min-height: layout.$spacing-09;
-}
-
-.removeButtonContainer {
-  display: flex;
-  align-self: center;
-  cursor: pointer;
-  margin-left: layout.$spacing-07;
-}
-
-.removeButton {
-  color: colors.$red-60;
-}
diff --git a/packages/esm-billing-app/src/invoice/payments/payment-history/payment-history.component.tsx b/packages/esm-billing-app/src/invoice/payments/payment-history/payment-history.component.tsx
deleted file mode 100755
index 4ce7f67..0000000
--- a/packages/esm-billing-app/src/invoice/payments/payment-history/payment-history.component.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import React from 'react';
-import { DataTable, Table, TableHead, TableRow, TableHeader, TableBody, TableCell } from '@carbon/react';
-import { type MappedBill } from '../../../types';
-import { formatDate } from '@openmrs/esm-framework';
-import { convertToCurrency } from '../../../helpers';
-
-type PaymentHistoryProps = {
-  bill: MappedBill;
-};
-
-const PaymentHistory: React.FC<PaymentHistoryProps> = ({ bill }) => {
-  const headers = [
-    {
-      key: 'dateCreated',
-      header: 'Date of payment',
-    },
-    {
-      key: 'amountTendered',
-      header: 'Amount tendered',
-    },
-    {
-      key: 'paymentMethod',
-      header: 'Payment method',
-    },
-  ];
-  const rows = bill?.payments?.map((payment) => ({
-    id: `${payment.uuid}`,
-    dateCreated: formatDate(new Date(payment.dateCreated)),
-    amountTendered: convertToCurrency(payment.amountTendered),
-    amount: convertToCurrency(payment.amount),
-    paymentMethod: payment.instanceType.name,
-  }));
-
-  if (Object.values(bill?.payments ?? {}).length === 0) {
-    return;
-  }
-
-  return (
-    <DataTable size="sm" rows={rows} headers={headers}>
-      {({ rows, headers, getTableProps, getHeaderProps, getRowProps }) => (
-        <Table {...getTableProps()}>
-          <TableHead>
-            <TableRow>
-              {headers.map((header) => (
-                <TableHeader {...getHeaderProps({ header })}>{header.header}</TableHeader>
-              ))}
-            </TableRow>
-          </TableHead>
-          <TableBody>
-            {rows.map((row) => (
-              <TableRow {...getRowProps({ row })}>
-                {row.cells.map((cell) => (
-                  <TableCell key={cell.id}>{cell.value}</TableCell>
-                ))}
-              </TableRow>
-            ))}
-          </TableBody>
-        </Table>
-      )}
-    </DataTable>
-  );
-};
-
-export default PaymentHistory;
diff --git a/packages/esm-billing-app/src/invoice/payments/payments.component.tsx b/packages/esm-billing-app/src/invoice/payments/payments.component.tsx
deleted file mode 100755
index d3003c8..0000000
--- a/packages/esm-billing-app/src/invoice/payments/payments.component.tsx
+++ /dev/null
@@ -1,129 +0,0 @@
-import React, { useState } from 'react';
-import { FormProvider, useFieldArray, useForm, useWatch } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
-import { z } from 'zod';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { navigate, showSnackbar } from '@openmrs/esm-framework';
-import { Button } from '@carbon/react';
-import { CardHeader } from '@openmrs/esm-patient-common-lib';
-import { type LineItem, type PaymentFormValue, type MappedBill } from '../../types';
-import { convertToCurrency } from '../../helpers';
-import { createPaymentPayload } from './utils';
-import { processBillPayment } from '../../billing.resource';
-import { InvoiceBreakDown } from './invoice-breakdown/invoice-breakdown.component';
-import PaymentHistory from './payment-history/payment-history.component';
-import PaymentForm from './payment-form/payment-form.component';
-import styles from './payments.scss';
-import { computeTotalPrice, extractErrorMessagesFromResponse } from '../../utils';
-import { mutate } from 'swr';
-
-type PaymentProps = {
-  bill: MappedBill;
-  selectedLineItems: Array<LineItem>;
-};
-
-const Payments: React.FC<PaymentProps> = ({ bill, selectedLineItems }) => {
-  const { t } = useTranslation();
-  const paymentSchema = z.object({
-    method: z.string().refine((value) => !!value, 'Payment method is required'),
-    amount: z
-      .number()
-      .lte(bill.totalAmount - bill.tenderedAmount, { message: 'Amount paid should not be greater than amount due' }),
-    referenceCode: z.union([z.number(), z.string()]).optional(),
-  });
-
-  const methods = useForm<PaymentFormValue>({
-    mode: 'all',
-    defaultValues: {},
-    resolver: zodResolver(z.object({ payment: z.array(paymentSchema) })),
-  });
-  const formArrayMethods = useFieldArray({ name: 'payment', control: methods.control });
-
-  const formValues = useWatch({
-    name: 'payment',
-    control: methods.control,
-  });
-  const [paymentSuccessful, setPaymentSuccessful] = useState(false);
-
-  const hasMoreThanOneLineItem = bill?.lineItems?.length > 1;
-  const computedTotal = hasMoreThanOneLineItem ? computeTotalPrice(selectedLineItems) : (bill.totalAmount ?? 0);
-  const totalAmountTendered = formValues?.reduce((curr: number, prev) => curr + Number(prev.amount) ?? 0, 0) ?? 0;
-  const amountDue = Number(bill.totalAmount) - (Number(bill.tenderedAmount) + Number(totalAmountTendered));
-
-  const handleNavigateToBillingDashboard = () =>
-    navigate({
-      to: window.getOpenmrsSpaBase() + 'home/billing',
-    });
-
-  const handleProcessPayment = () => {
-    const { remove } = formArrayMethods;
-    const paymentPayload = createPaymentPayload(bill, bill.patientUuid, formValues, amountDue, selectedLineItems);
-    remove();
-    processBillPayment(paymentPayload, bill.uuid).then(
-      (resp) => {
-        showSnackbar({
-          title: t('billPayment', 'Bill payment'),
-          subtitle: 'Bill payment processing has been successful',
-          kind: 'success',
-          timeoutInMs: 3000,
-        });
-        const url = `/ws/rest/v1/cashier/bill/${bill.uuid}`;
-        mutate((key) => typeof key === 'string' && key.startsWith(url), undefined, { revalidate: true });
-        setPaymentSuccessful(true);
-      },
-      (error) => {
-        showSnackbar({
-          title: t('failedBillPayment', 'Bill payment failed'),
-          subtitle: `An unexpected error occurred while processing your bill payment. Please contact the system administrator and provide them with the following error details: ${extractErrorMessagesFromResponse(
-            error.responseBody,
-          )}`,
-          kind: 'error',
-          timeoutInMs: 3000,
-          isLowContrast: true,
-        });
-      },
-    );
-  };
-
-  const amountDueDisplay = (amount: number) => (amount < 0 ? 'Client balance' : 'Amount Due');
-
-  return (
-    <FormProvider {...methods}>
-      <div className={styles.wrapper}>
-        <div className={styles.paymentContainer}>
-          <CardHeader title={t('payments', 'Payments')}>
-            <span></span>
-          </CardHeader>
-          <div>
-            {bill && <PaymentHistory bill={bill} />}
-            <PaymentForm {...formArrayMethods} disablePayment={amountDue <= 0} amountDue={amountDue} />
-          </div>
-        </div>
-        <div className={styles.divider} />
-        <div className={styles.paymentTotals}>
-          <InvoiceBreakDown label={t('totalAmount', 'Total Amount')} value={convertToCurrency(bill.totalAmount)} />
-          <InvoiceBreakDown
-            label={t('totalTendered', 'Total Tendered')}
-            value={convertToCurrency(bill.tenderedAmount + totalAmountTendered ?? 0)}
-          />
-          <InvoiceBreakDown label={t('discount', 'Discount')} value={'--'} />
-          <InvoiceBreakDown
-            hasBalance={amountDue < 0 ?? false}
-            label={amountDueDisplay(amountDue)}
-            value={convertToCurrency(amountDue ?? 0)}
-          />
-          <div className={styles.processPayments}>
-            <Button onClick={handleNavigateToBillingDashboard} kind="secondary">
-              {t('discard', 'Discard')}
-            </Button>
-            <Button onClick={() => handleProcessPayment()} disabled={!formValues?.length || !methods.formState.isValid}>
-              {t('processPayment', 'Process Payment')}
-            </Button>
-          </div>
-        </div>
-      </div>
-    </FormProvider>
-  );
-};
-
-export default Payments;
diff --git a/packages/esm-billing-app/src/invoice/payments/payments.resource.ts b/packages/esm-billing-app/src/invoice/payments/payments.resource.ts
deleted file mode 100755
index 087bad3..0000000
--- a/packages/esm-billing-app/src/invoice/payments/payments.resource.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import useSWR from 'swr';
-import { openmrsFetch, useConfig } from '@openmrs/esm-framework';
-import { type BillingConfig } from '../../config-schema';
-
-type PaymentMethod = {
-  uuid: string;
-  description: string;
-  name: string;
-  retired: boolean;
-};
-
-const swrOption = {
-  errorRetryCount: 2,
-};
-
-export const usePaymentModes = () => {
-  const { excludedPaymentMode } = useConfig<BillingConfig>();
-  const url = `/ws/rest/v1/cashier/paymentMode`;
-  const { data, isLoading, error, mutate } = useSWR<{ data: { results: Array<PaymentMethod> } }>(
-    url,
-    openmrsFetch,
-    swrOption,
-  );
-  const allowedPaymentModes =
-    excludedPaymentMode?.length > 0
-      ? (data?.data?.results.filter((mode) => !excludedPaymentMode.some((excluded) => excluded.uuid === mode.uuid)) ??
-        [])
-      : (data?.data?.results ?? []);
-  return {
-    paymentModes: allowedPaymentModes,
-    isLoading,
-    mutate,
-    error,
-  };
-};
diff --git a/packages/esm-billing-app/src/invoice/payments/payments.scss b/packages/esm-billing-app/src/invoice/payments/payments.scss
deleted file mode 100755
index a80ae5a..0000000
--- a/packages/esm-billing-app/src/invoice/payments/payments.scss
+++ /dev/null
@@ -1,46 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.wrapper {
-  display: flex;
-}
-
-.divider {
-  background: colors.$gray-20;
-  height: 12rem;
-  margin: 2rem;
-  width: 1px;
-}
-
-.paymentContainer {
-  margin: layout.$layout-01 0;
-  padding: layout.$layout-01;
-  width: 70%;
-}
-
-.paymentButtons {
-  margin: layout.$layout-01 0;
-}
-
-.paymentMethodContainer {
-  display: grid;
-  grid-template-columns: 1fr 1fr 1fr 1fr;
-  align-items: flex-end;
-  column-gap: 1rem;
-  margin: 0.625rem 0;
-}
-
-.paymentTotals {
-  margin: layout.$spacing-05 0;
-  padding: layout.$spacing-07 layout.$spacing-05;
-}
-
-.processPayments {
-  display: flex;
-  justify-content: flex-end;
-  margin: layout.$spacing-05;
-  padding-top: layout.$spacing-05;
-  column-gap: layout.$spacing-04;
-  border-top: 1px solid colors.$cool-gray-40;
-}
diff --git a/packages/esm-billing-app/src/invoice/payments/utils.ts b/packages/esm-billing-app/src/invoice/payments/utils.ts
deleted file mode 100755
index b5eba81..0000000
--- a/packages/esm-billing-app/src/invoice/payments/utils.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { type FormPayment, type LineItem, type MappedBill } from '../../types';
-
-const hasLineItem = (lineItems: Array<LineItem>, item: LineItem) => {
-  if (lineItems?.length === 0) {
-    return false;
-  }
-  const foundItem = lineItems.find((lineItem) => lineItem.uuid === item.uuid);
-  return Boolean(foundItem);
-};
-
-export const createPaymentPayload = (
-  bill: MappedBill,
-  patientUuid: string,
-  formValues: Array<FormPayment>,
-  amountDue: number,
-  selectedLineItems: Array<LineItem>,
-) => {
-  const { cashier } = bill;
-  const totalAmount = bill?.totalAmount;
-  const paymentStatus = amountDue <= 0 ? 'PAID' : 'PENDING';
-  const previousPayments = bill.payments.map((payment) => ({
-    amount: payment.amount,
-    amountTendered: payment.amountTendered,
-    attributes: [],
-    instanceType: payment.instanceType.uuid,
-  }));
-
-  const newPayments = formValues.map((formValue) => ({
-    amount: parseFloat(totalAmount.toFixed(2)),
-    amountTendered: parseFloat(Number(formValue.amount).toFixed(2)),
-    attributes: [],
-    instanceType: formValue.method,
-  }));
-
-  const updatedPayments = newPayments.concat(previousPayments);
-  const totalAmountRendered = updatedPayments.reduce((acc, payment) => acc + payment.amountTendered, 0);
-
-  const updatedLineItems = bill.lineItems.map((lineItem) => ({
-    ...lineItem,
-    billableService: processBillItem(lineItem),
-    item: processBillItem(lineItem),
-    paymentStatus:
-      bill?.lineItems.length > 1
-        ? hasLineItem(selectedLineItems ?? [], lineItem) && totalAmountRendered >= lineItem.price * lineItem.quantity
-          ? 'PAID'
-          : 'PENDING'
-        : paymentStatus,
-  }));
-
-  const allItemsBillPaymentStatus =
-    updatedLineItems.filter((item) => item.paymentStatus === 'PENDING').length === 0 ? 'PAID' : 'PENDING';
-
-  const processedPayment = {
-    cashPoint: bill.cashPointUuid,
-    cashier: cashier.uuid,
-    lineItems: updatedLineItems,
-    payments: [...updatedPayments],
-    patient: patientUuid,
-    status: selectedLineItems?.length > 0 ? allItemsBillPaymentStatus : paymentStatus,
-  };
-
-  return processedPayment;
-};
-
-const processBillItem = (item) => (item.item || item.billableService)?.split(':')[0];
-
-export function formatPhoneNumber(phone) {
-  let phone_ = phone.toString().replace(/\D/g, ''); // Convert to string first
-  const length = phone_.length;
-
-  let _phone = '';
-  if (length === 12 && phone_.substring(0, 3) === '254') {
-    _phone = phone_;
-  } else if (length === 9 && phone_.substring(0, 1) === '7') {
-    _phone = '254' + phone_;
-  } else if (length === 10 && phone_.substring(0, 1) === '0') {
-    _phone = '254' + phone_.substring(1, 10);
-  } else {
-    _phone = 'Invalid Phone Number ' + phone;
-  }
-
-  return _phone;
-}
diff --git a/packages/esm-billing-app/src/invoice/payments/visit-tags/visit-attribute.component.tsx b/packages/esm-billing-app/src/invoice/payments/visit-tags/visit-attribute.component.tsx
deleted file mode 100755
index 7678de6..0000000
--- a/packages/esm-billing-app/src/invoice/payments/visit-tags/visit-attribute.component.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import { Tag } from '@carbon/react';
-import { usePatientPaymentInfo } from '../../../billing.resource';
-
-type VisitAttributeTagsProps = { patientUuid: string };
-
-const VisitAttributeTags: React.FC<VisitAttributeTagsProps> = ({ patientUuid }) => {
-  const patientBillingInfo = usePatientPaymentInfo(patientUuid);
-  return (
-    <div>
-      {patientBillingInfo?.map((tag) => (
-        <React.Fragment key={tag.name}>
-          <Tag type="gray">{tag.name}</Tag>
-          <Tag type="cool-gray">{tag.value}</Tag>
-        </React.Fragment>
-      ))}
-    </div>
-  );
-};
-
-export default VisitAttributeTags;
diff --git a/packages/esm-billing-app/src/invoice/printable-invoice/print-receipt.component.tsx b/packages/esm-billing-app/src/invoice/printable-invoice/print-receipt.component.tsx
deleted file mode 100755
index 2311d1d..0000000
--- a/packages/esm-billing-app/src/invoice/printable-invoice/print-receipt.component.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { ConfigurableLink } from '@openmrs/esm-framework';
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import styles from './print-receipt.scss';
-import { Button } from '@carbon/react';
-import { Printer } from '@carbon/react/icons';
-
-interface PrintReceiptProps {
-  billId: number;
-}
-const PrintReceipt: React.FC<PrintReceiptProps> = ({ billId }) => {
-  const { t } = useTranslation();
-  return (
-    <Button
-      kind="secondary"
-      className={styles.button}
-      size="md"
-      renderIcon={(props) => <Printer size={24} {...props} />}>
-      <ConfigurableLink
-        className={styles.configurableLink}
-        to={`\${openmrsBase}/ws/rest/v1/cashier/receipt?billId=${billId}`}>
-        {t('printReceipt', 'Print receipt')}
-      </ConfigurableLink>{' '}
-    </Button>
-  );
-};
-
-export default PrintReceipt;
diff --git a/packages/esm-billing-app/src/invoice/printable-invoice/print-receipt.scss b/packages/esm-billing-app/src/invoice/printable-invoice/print-receipt.scss
deleted file mode 100755
index f78896b..0000000
--- a/packages/esm-billing-app/src/invoice/printable-invoice/print-receipt.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.configurableLink {
-  color: colors.$white;
-  margin: 0;
-  padding: 0;
-  text-decoration: none;
-}
diff --git a/packages/esm-billing-app/src/invoice/printable-invoice/printable-footer.component.tsx b/packages/esm-billing-app/src/invoice/printable-invoice/printable-footer.component.tsx
deleted file mode 100755
index eca12fe..0000000
--- a/packages/esm-billing-app/src/invoice/printable-invoice/printable-footer.component.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from 'react';
-import styles from './printable-footer.scss';
-import { useTranslation } from 'react-i18next';
-import dayjs from 'dayjs';
-import { useSession } from '@openmrs/esm-framework';
-
-type PrintableFooterProps = {
-  facilityInfo: Record<string, any>;
-};
-
-const PrintableFooter: React.FC<PrintableFooterProps> = ({ facilityInfo }) => {
-  const { t } = useTranslation();
-  const session = useSession();
-
-  return (
-    <div className={styles.container}>
-      <p className={styles.itemFooter}>{facilityInfo?.display}</p>
-      <p className={styles.footDescription}>
-        {t(
-          'generatedMessage',
-          'The invoice has been electronically generated and is a valid document. It was created by {{userName}} on {{date}} at {{time}}',
-          {
-            userName: `${session?.user?.display}`,
-            date: dayjs().format('DD-MM-YYYY'),
-            time: dayjs().format('hh:mm A'),
-          },
-        )}
-      </p>
-    </div>
-  );
-};
-
-export default PrintableFooter;
diff --git a/packages/esm-billing-app/src/invoice/printable-invoice/printable-footer.scss b/packages/esm-billing-app/src/invoice/printable-invoice/printable-footer.scss
deleted file mode 100755
index 00334d1..0000000
--- a/packages/esm-billing-app/src/invoice/printable-invoice/printable-footer.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.container {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  bottom: 0;
-  padding: layout.$spacing-01;
-  justify-content: center;
-}
-
-.itemFooter {
-  padding: layout.$spacing-01 layout.$spacing-05;
-  @include type.type-style('body-compact-02');
-  color: colors.$cool-gray-90;
-}
-
-.footDescription {
-  @include type.type-style('legal-01');
-  padding: layout.$spacing-01 layout.$spacing-05;
-  color: colors.$cool-gray-70;
-}
diff --git a/packages/esm-billing-app/src/invoice/printable-invoice/printable-footer.test.tsx b/packages/esm-billing-app/src/invoice/printable-invoice/printable-footer.test.tsx
deleted file mode 100755
index e2e261d..0000000
--- a/packages/esm-billing-app/src/invoice/printable-invoice/printable-footer.test.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import { screen, render } from '@testing-library/react';
-import PrintableFooter from './printable-footer.component';
-
-jest.mock('../../billing.resource', () => ({
-  useDefaultFacility: jest.fn(),
-}));
-
-describe('PrintableFooter', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  test('should render PrintableFooter component', () => {
-    render(<PrintableFooter facilityInfo={{ display: 'MTRH', uuid: 'mtrh-uuid' }} />);
-    const footer = screen.getByText('MTRH');
-    expect(footer).toBeInTheDocument();
-  });
-});
diff --git a/packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice-header.component.tsx b/packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice-header.component.tsx
deleted file mode 100755
index d650ef0..0000000
--- a/packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice-header.component.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import React from 'react';
-import { type PatientDetails } from '../../types';
-import styles from './printable-invoice-header.scss';
-import { useConfig } from '@openmrs/esm-framework';
-import { useTranslation } from 'react-i18next';
-import startCase from 'lodash-es/startCase';
-
-interface PrintableInvoiceHeaderProps {
-  patientDetails: PatientDetails;
-  facilityInfo: Record<string, any>;
-}
-
-const PrintableInvoiceHeader: React.FC<PrintableInvoiceHeaderProps> = ({ patientDetails, facilityInfo }) => {
-  const { t } = useTranslation();
-  const { logo } = useConfig({ externalModuleName: '@ampath/esm-login-app' });
-
-  return (
-    <div className={styles.container}>
-      <div className={styles.printableHeader}>
-        <p className={styles.heading}>{t('invoice', 'Invoice')}</p>
-        {logo?.src ? (
-          <img className={styles.img} height={60} width={250} src={logo.src} alt={logo.alt} />
-        ) : logo?.name ? (
-          logo.name
-        ) : (
-          // OpenMRS Logo
-          <svg
-            className={styles.img}
-            role="img"
-            width={110}
-            height={40}
-            viewBox="0 0 380 119"
-            xmlns="http://www.w3.org/2000/svg">
-            <path
-              fillRule="evenodd"
-              clipRule="evenodd"
-              d="M40.29 40.328a27.755 27.755 0 0 1 19.688-8.154c7.669 0 14.613 3.102 19.647 8.116l.02-18.54A42.835 42.835 0 0 0 59.978 17c-7.089 0-13.813 1.93-19.709 4.968l.021 18.36ZM79.645 79.671a27.744 27.744 0 0 1-19.684 8.154c-7.67 0-14.614-3.101-19.651-8.116l-.02 18.54A42.857 42.857 0 0 0 59.96 103a42.833 42.833 0 0 0 19.672-4.751l.013-18.578ZM40.328 79.696c-5.038-5.037-8.154-11.995-8.154-19.685 0-7.669 3.102-14.612 8.116-19.65l-18.54-.02A42.85 42.85 0 0 0 17 60.012a42.819 42.819 0 0 0 4.752 19.672l18.576.013ZM79.634 40.289a27.753 27.753 0 0 1 8.154 19.688 27.744 27.744 0 0 1-8.117 19.646l18.542.02a42.842 42.842 0 0 0 4.749-19.666c0-7.09-1.714-13.779-4.751-19.675l-18.577-.013ZM156.184 60.002c0-8.748-6.118-15.776-15.025-15.776-8.909 0-15.025 7.028-15.025 15.776 0 8.749 6.116 15.78 15.025 15.78 8.907 0 15.025-7.031 15.025-15.78Zm-34.881 0c0-11.482 8.318-19.958 19.856-19.958 11.536 0 19.855 8.477 19.855 19.959 0 11.484-8.319 19.964-19.855 19.964-11.538 0-19.856-8.48-19.856-19.965ZM179.514 75.54c5.507 0 9.05-4.14 9.05-9.482 0-5.341-3.543-9.483-9.05-9.483-5.505 0-9.046 4.142-9.046 9.483 0 5.342 3.541 9.482 9.046 9.482ZM166.22 53.306h4.248v3.704h.11c2.344-2.725 5.449-4.36 9.154-4.36 8.014 0 13.408 5.67 13.408 13.408 0 7.63-5.613 13.406-12.752 13.406-4.58 0-8.231-2.29-9.81-5.178h-.11V90.87h-4.248V53.306ZM217.773 63.768c-.163-4.305-3-7.193-7.686-7.193-4.685 0-7.79 2.888-8.335 7.193h16.021Zm3.653 10.412c-3.001 3.868-6.596 5.284-11.339 5.284-8.01 0-12.914-5.993-12.914-13.406 0-7.901 5.559-13.407 13.08-13.407 7.196 0 12.096 4.906 12.096 13.354v1.362h-20.597c.325 4.413 3.704 8.173 8.335 8.173 3.65 0 6.105-1.307 8.12-3.868l3.219 2.508ZM227.854 59.356c0-2.346-.216-4.36-.216-6.05h4.031c0 1.363.11 2.777.11 4.195h.11c1.144-2.505 4.306-4.85 8.5-4.85 6.705 0 9.699 4.252 9.699 10.41v15.748h-4.248v-15.31c0-4.253-1.856-6.924-5.833-6.924-5.503 0-7.903 3.979-7.903 9.811V78.81h-4.25V59.356ZM259.211 41.008h6.708L278.8 70.791h.107l12.982-29.782h6.549v37.99h-4.506V47.124h-.106L280.192 79h-2.738l-13.629-31.875h-.107V79h-4.507V41.01ZM312.392 57.752h4.023c4.992 0 11.487 0 11.487-6.282 0-5.47-4.776-6.276-9.177-6.276h-6.333v12.558Zm-4.506-16.744h9.711c7.352 0 15.132 1.072 15.132 10.462 0 5.527-3.594 9.125-9.495 10.037L334.018 79h-5.525l-10.304-17.063h-5.797V79h-4.506V41.01ZM358.123 47.712c-1.506-2.413-4.187-3.486-6.926-3.486-3.973 0-8.1 1.88-8.1 6.385 0 3.49 1.931 5.047 7.994 6.98 5.903 1.878 11.377 3.809 11.377 11.267 0 7.567-6.495 11.11-13.36 11.11-4.402 0-9.125-1.45-11.7-5.262l3.862-3.165c1.61 2.794 4.83 4.24 8.105 4.24 3.862 0 8.263-2.253 8.263-6.601 0-4.669-3.165-5.474-9.928-7.728-5.366-1.771-9.442-4.134-9.442-10.463 0-7.298 6.277-10.945 12.929-10.945 4.241 0 7.836 1.178 10.625 4.45l-3.699 3.218Z"
-            />
-          </svg>
-        )}
-      </div>
-
-      <div className={styles.printableBody}>
-        <div className={styles.billDetails}>
-          <p className={styles.itemHeading}>{t('billedTo', 'Billed to')}</p>
-          <p className={styles.itemLabel}>{startCase(patientDetails?.name)}</p>
-          <p className={styles.itemLabel}>{patientDetails?.county}</p>
-          <p className={styles.itemLabel}>
-            {patientDetails?.subCounty}
-            {patientDetails?.city ? `, ${patientDetails?.city}` : null}
-          </p>
-        </div>
-
-        <div className={styles.facilityDetails}>
-          <p className={styles.facilityName}>{facilityInfo?.display}</p>
-          <p className={styles.itemLabel}>Kenya</p>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default PrintableInvoiceHeader;
diff --git a/packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice-header.scss b/packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice-header.scss
deleted file mode 100755
index c72d4e0..0000000
--- a/packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice-header.scss
+++ /dev/null
@@ -1,61 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.container {
-  padding: 0 1rem 2rem;
-  border-bottom: 1px solid #ebedf2;
-  margin-bottom: 2rem;
-}
-
-.printableBody {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-}
-
-.printableHeader {
-  display: flex;
-  flex-direction: row;
-}
-
-.img {
-  display: flex;
-  margin-left: auto;
-}
-
-.billDetails {
-  display: flex;
-  width: 50%;
-  flex-direction: column;
-}
-
-.facilityDetails {
-  display: flex;
-  flex-flow: column wrap;
-  text-align: right;
-}
-
-.heading {
-  font-size: 40px;
-  text-transform: uppercase;
-  margin-bottom: layout.$spacing-05;
-}
-
-.facilityName {
-  @include type.type-style('heading-compact-02');
-  font-weight: bold;
-  color: colors.$green-70;
-}
-
-.itemHeading {
-  @include type.type-style('body-compact-02');
-  margin-bottom: 0.25rem;
-  font-weight: bold;
-  color: colors.$cool-gray-90;
-}
-
-.itemLabel {
-  @include type.type-style('body-compact-02');
-  color: colors.$cool-gray-90;
-}
diff --git a/packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice-header.test.tsx b/packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice-header.test.tsx
deleted file mode 100755
index de1face..0000000
--- a/packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice-header.test.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import React from 'react';
-import { screen, render } from '@testing-library/react';
-import PrintableInvoiceHeader from './printable-invoice-header.component';
-import { useConfig } from '@openmrs/esm-framework';
-
-const mockUseConfig = useConfig as jest.MockedFunction<typeof useConfig>;
-
-jest.mock('../../billing.resource', () => ({
-  useDefaultFacility: jest.fn(),
-}));
-
-jest.mock('@openmrs/esm-framework', () => ({
-  useConfig: jest.fn(),
-}));
-const testProps = {
-  patientDetails: {
-    name: 'John Doe',
-    county: 'Nairobi',
-    subCounty: 'Westlands',
-    city: 'Nairobi',
-    age: '45',
-    gender: 'Male',
-  },
-};
-
-describe('PrintableInvoiceHeader', () => {
-  test('should render PrintableInvoiceHeader component', () => {
-    mockUseConfig.mockReturnValue({ logo: { src: 'logo.png', alt: 'logo' } });
-
-    render(<PrintableInvoiceHeader facilityInfo={{ display: 'MTRH', uuid: 'mtrh-uuid' }} {...testProps} />);
-    const header = screen.getByText('Invoice');
-    expect(header).toBeInTheDocument();
-
-    expect(screen.getByText('John Doe')).toBeInTheDocument();
-    expect(screen.getByText('Nairobi')).toBeInTheDocument();
-    expect(screen.getByText('Westlands, Nairobi')).toBeInTheDocument();
-    expect(screen.getByText('MTRH')).toBeInTheDocument();
-    expect(screen.getByText('Kenya')).toBeInTheDocument();
-  });
-
-  test('should display the logo when logo is provided', () => {
-    mockUseConfig.mockReturnValue({ logo: { src: 'logo.png', alt: 'logo' } });
-
-    render(<PrintableInvoiceHeader facilityInfo={{ display: 'MTRH', uuid: 'mtrh-uuid' }} {...testProps} />);
-    const logo = screen.getByAltText('logo');
-    expect(logo).toBeInTheDocument();
-  });
-
-  test('should display the default logo when logo is not provided', () => {
-    mockUseConfig.mockReturnValue({ logo: {} });
-
-    render(<PrintableInvoiceHeader facilityInfo={{ display: 'MTRH', uuid: 'mtrh-uuid' }} {...testProps} />);
-    const logo = screen.getByRole('img');
-    expect(logo).toBeInTheDocument();
-  });
-});
diff --git a/packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice.component.tsx b/packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice.component.tsx
deleted file mode 100755
index 16c4433..0000000
--- a/packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice.component.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import React, { useMemo } from 'react';
-import {
-  DataTable,
-  Table,
-  TableContainer,
-  TableHead,
-  TableRow,
-  TableBody,
-  TableHeader,
-  TableCell,
-} from '@carbon/react';
-import { age, formatDatetime, parseDate } from '@openmrs/esm-framework';
-import { convertToCurrency, extractString, getGender } from '../../helpers';
-import { type MappedBill } from '../../types';
-import { useTranslation } from 'react-i18next';
-import PrintableFooter from './printable-footer.component';
-import PrintableInvoiceHeader from './printable-invoice-header.component';
-import styles from './printable-invoice.scss';
-
-type PrintableInvoiceProps = {
-  bill: MappedBill;
-  patient: fhir.Patient;
-  isPrinting: boolean;
-  facilityInfo: Record<string, any>;
-};
-
-const PrintableInvoice = React.forwardRef<HTMLDivElement, PrintableInvoiceProps>(
-  ({ bill, patient, facilityInfo }, ref) => {
-    const { t } = useTranslation();
-    const headerData = [
-      { header: 'Inventory item', key: 'billItem' },
-      { header: 'Quantity', key: 'quantity' },
-      { header: 'Unit price', key: 'price' },
-      { header: 'Total', key: 'total' },
-    ];
-
-    const rowData =
-      bill?.lineItems?.map((item, index) => {
-        return {
-          id: `${item.uuid}`,
-          billItem: `${index + 1} - ${
-            item.item === '' ? extractString(item?.billableService) : extractString(item.item)
-          }`,
-          quantity: item.quantity,
-          price: item.price,
-          total: item.price * item.quantity,
-        };
-      }) ?? [];
-
-    const invoiceTotal = {
-      'Total Amount': convertToCurrency(bill?.totalAmount),
-      'Amount Tendered': convertToCurrency(bill?.tenderedAmount),
-      'Discount Amount': convertToCurrency(0),
-      'Amount due': convertToCurrency(bill?.totalAmount - bill?.tenderedAmount),
-    };
-
-    const patientDetails = useMemo(() => {
-      return {
-        name: `${patient?.name?.[0]?.given?.join(' ')} ${patient?.name?.[0].family}`,
-        age: age(patient?.birthDate),
-        gender: getGender(patient?.gender, t),
-        city: patient?.address?.[0].city,
-        county: patient?.address?.[0].district,
-        subCounty: patient?.address?.[0].state,
-      };
-    }, [patient, t]);
-
-    const invoiceDetails = {
-      'Invoice #': bill.receiptNumber,
-      'Invoice date': formatDatetime(parseDate(bill.dateCreated), { mode: 'standard', noToday: true }),
-      Status: bill.status,
-    };
-
-    return (
-      <div ref={ref} className={styles.container}>
-        <PrintableInvoiceHeader patientDetails={patientDetails} facilityInfo={facilityInfo} />
-        <div className={styles.printableInvoiceContainer}>
-          <div className={styles.detailsContainer}>
-            {Object.entries(invoiceDetails).map(([key, val]) => (
-              <div key={key} className={styles.item}>
-                <p className={styles.itemHeading}>{key}</p>
-                <span className={styles.itemValue}>{val}</span>
-              </div>
-            ))}
-          </div>
-
-          <div className={styles.itemsContainer}>
-            <div className={styles.tableContainer}>
-              <DataTable size="sm" isSortable rows={rowData} headers={headerData} useZebraStyles>
-                {({ rows, headers, getRowProps, getTableProps }) => (
-                  <TableContainer>
-                    <Table {...getTableProps()} aria-label="Invoice line items">
-                      <TableHead>
-                        <TableRow>
-                          {headers.map((header) => (
-                            <TableHeader key={header.key}>{header.header}</TableHeader>
-                          ))}
-                        </TableRow>
-                      </TableHead>
-                      <TableBody>
-                        {rows.map((row) => (
-                          <TableRow
-                            key={row.id}
-                            {...getRowProps({
-                              row,
-                            })}>
-                            {row.cells.map((cell) => (
-                              <TableCell key={cell.id}>{cell.value}</TableCell>
-                            ))}
-                          </TableRow>
-                        ))}
-                      </TableBody>
-                    </Table>
-                  </TableContainer>
-                )}
-              </DataTable>
-            </div>
-
-            <div className={styles.totalContainer}>
-              {Object.entries(invoiceTotal).map(([key, val]) => (
-                <p key={key} className={styles.itemTotal}>
-                  <span className={styles.itemHeading}>{key}</span>: <span className={styles.itemLabel}>{val}</span>
-                </p>
-              ))}
-            </div>
-          </div>
-        </div>
-        <PrintableFooter facilityInfo={facilityInfo} />
-      </div>
-    );
-  },
-);
-
-export default PrintableInvoice;
diff --git a/packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice.scss b/packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice.scss
deleted file mode 100755
index f78d9a2..0000000
--- a/packages/esm-billing-app/src/invoice/printable-invoice/printable-invoice.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.printableInvoiceContainer {
-  display: flex;
-  flex-direction: row;
-}
-
-.container {
-  margin-top: layout.$spacing-05;
-}
-
-.itemsContainer {
-  display: flex;
-  flex-direction: column;
-  width: 80%;
-  padding: layout.$spacing-05;
-  margin: layout.$spacing-05;
-}
-
-.detailsContainer {
-  margin: layout.$spacing-05 0;
-  width: 20%;
-}
-
-.tableContainer {
-  margin-bottom: layout.$spacing-05;
-}
-
-.totalContainer {
-  display: flex;
-  flex-direction: column;
-}
-
-.item {
-  margin: layout.$spacing-04;
-}
-
-.itemHeading {
-  @include type.type-style('label-02');
-  font-style: bold;
-  color: colors.$cool-gray-90;
-  margin-bottom: layout.$spacing-01;
-}
-
-.itemValue {
-  @include type.type-style('legal-01');
-  color: colors.$cool-gray-90;
-}
-
-.itemTotal {
-  border-bottom: solid 0.00125rem colors.$cool-gray-10;
-  padding: layout.$spacing-02;
-}
-
-.itemLabel {
-  float: right;
-  @include type.type-style('label-01');
-}
diff --git a/packages/esm-billing-app/src/left-panel-link.component.tsx b/packages/esm-billing-app/src/left-panel-link.component.tsx
deleted file mode 100755
index 608d0e6..0000000
--- a/packages/esm-billing-app/src/left-panel-link.component.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import React, { useMemo } from 'react';
-import last from 'lodash-es/last';
-import { BrowserRouter, useLocation } from 'react-router-dom';
-import { ConfigurableLink } from '@openmrs/esm-framework';
-
-export interface LinkConfig {
-  name: string;
-  title: string;
-}
-
-export function LinkExtension({ config }: { config: LinkConfig }) {
-  const { name, title } = config;
-  const location = useLocation();
-  const spaBasePath = window.getOpenmrsSpaBase() + 'home';
-
-  let urlSegment = useMemo(() => decodeURIComponent(last(location.pathname.split('/'))), [location.pathname]);
-
-  const isUUID = (value) => {
-    const regex = /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/;
-    return regex.test(value);
-  };
-
-  if (isUUID(urlSegment)) {
-    urlSegment = 'billing';
-  }
-
-  return (
-    <ConfigurableLink
-      to={spaBasePath + '/' + name}
-      className={`cds--side-nav__link ${name === urlSegment && 'active-left-nav-link'}`}>
-      {title}
-    </ConfigurableLink>
-  );
-}
-
-export const createLeftPanelLink = (config: LinkConfig) => () => (
-  <BrowserRouter>
-    <LinkExtension config={config} />
-  </BrowserRouter>
-);
diff --git a/packages/esm-billing-app/src/m-pesa/mpesa-resource.tsx b/packages/esm-billing-app/src/m-pesa/mpesa-resource.tsx
deleted file mode 100755
index 3e970c2..0000000
--- a/packages/esm-billing-app/src/m-pesa/mpesa-resource.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import { type RequestStatus } from '../types';
-
-export const readableStatusMap = new Map<RequestStatus, string>();
-readableStatusMap.set('COMPLETE', 'Complete');
-readableStatusMap.set('FAILED', 'Failed');
-readableStatusMap.set('INITIATED', 'Waiting for user...');
-readableStatusMap.set('NOT-FOUND', 'Request not found');
-
-export const initiateStkPush = async (
-  payload,
-  setNotification: (notification: { type: 'error' | 'success'; message: string }) => void,
-  MPESA_PAYMENT_API_BASE_URL: string,
-): Promise<string> => {
-  try {
-    const url = `${MPESA_PAYMENT_API_BASE_URL}/api/mpesa/stk-push`;
-
-    const res = await fetch(url, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        phoneNumber: payload.PhoneNumber,
-        amount: payload.Amount,
-        accountReference: payload.AccountReference,
-      }),
-    });
-
-    if (!res.ok && res.status === 403) {
-      const error = new Error('Health facility M-PESA data not configured.');
-      throw error;
-    }
-
-    const response: { requestId: string } = await res.json();
-
-    setNotification({ message: 'STK Push sent successfully', type: 'success' });
-    return response.requestId;
-  } catch (err) {
-    const error = err as Error;
-    setNotification({
-      message: error.message ?? 'Unable to initiate Lipa Na Mpesa, please try again later.',
-      type: 'error',
-    });
-  }
-};
-
-export const getRequestStatus = async (
-  requestId: string,
-  MPESA_PAYMENT_API_BASE_URL: string,
-): Promise<RequestStatus> => {
-  const requestResponse = await fetch(`${MPESA_PAYMENT_API_BASE_URL}/api/mpesa/check-payment-state`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      requestId,
-    }),
-  });
-
-  if (!requestResponse.ok) {
-    const error = new Error(`HTTP error! status: ${requestResponse.status}`);
-
-    if (requestResponse.statusText) {
-      error.message = requestResponse.statusText;
-    }
-    throw error;
-  }
-
-  const requestStatus: { status: RequestStatus } = await requestResponse.json();
-
-  return requestStatus.status;
-};
-
-export const getErrorMessage = (err: { message: string }, t) => {
-  if (err.message) {
-    return err.message;
-  }
-
-  return t('unKnownErrorMsg', 'An unknown error occurred');
-};
diff --git a/packages/esm-billing-app/src/metrics-cards/card.component.tsx b/packages/esm-billing-app/src/metrics-cards/card.component.tsx
deleted file mode 100755
index 02d882b..0000000
--- a/packages/esm-billing-app/src/metrics-cards/card.component.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-import styles from './card.scss';
-
-export default function Card({ count, title }) {
-  return (
-    <div className={styles.container}>
-      <h1 className={styles.title}>{title}</h1>
-      <span className={styles.count}>{count}</span>
-    </div>
-  );
-}
diff --git a/packages/esm-billing-app/src/metrics-cards/card.scss b/packages/esm-billing-app/src/metrics-cards/card.scss
deleted file mode 100755
index 3de4880..0000000
--- a/packages/esm-billing-app/src/metrics-cards/card.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.container {
-  border: 1px solid colors.$gray-20;
-  padding: layout.$spacing-05;
-  flex: 1;
-}
-
-.title {
-  @include type.type-style('heading-compact-02');
-}
-
-.count {
-  @include type.type-style('heading-05');
-  display: inline-block;
-  font-weight: 300;
-  margin-top: layout.$spacing-05;
-}
diff --git a/packages/esm-billing-app/src/metrics-cards/metrics-cards.component.tsx b/packages/esm-billing-app/src/metrics-cards/metrics-cards.component.tsx
deleted file mode 100755
index d38b855..0000000
--- a/packages/esm-billing-app/src/metrics-cards/metrics-cards.component.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import React, { useMemo } from 'react';
-import Card from './card.component';
-import styles from './metrics-cards.scss';
-import { useBills } from '../billing.resource';
-import { useBillMetrics } from './metrics.resource';
-import { useTranslation } from 'react-i18next';
-import { ErrorState } from '@openmrs/esm-patient-common-lib';
-import { InlineLoading } from '@carbon/react';
-
-export default function MetricsCards() {
-  const { t } = useTranslation();
-  const { bills, isLoading, error } = useBills('');
-  const { cumulativeBills, pendingBills, paidBills } = useBillMetrics(bills);
-
-  const cards = useMemo(
-    () => [
-      { title: 'Cumulative Bills', count: cumulativeBills },
-      { title: 'Pending Bills', count: pendingBills },
-      { title: 'Paid Bills', count: paidBills },
-    ],
-    [cumulativeBills, pendingBills, paidBills],
-  );
-
-  if (isLoading) {
-    return (
-      <section className={styles.container}>
-        <InlineLoading status="active" iconDescription="Loading" description="Loading bill metrics..." />
-      </section>
-    );
-  }
-
-  if (error) {
-    return <ErrorState headerTitle={t('billMetrics', 'Bill metrics')} error={error} />;
-  }
-  return (
-    <section className={styles.container}>
-      {cards.map((card) => (
-        <Card key={card.title} title={card.title} count={card.count} />
-      ))}
-    </section>
-  );
-}
diff --git a/packages/esm-billing-app/src/metrics-cards/metrics-cards.scss b/packages/esm-billing-app/src/metrics-cards/metrics-cards.scss
deleted file mode 100755
index 99546e0..0000000
--- a/packages/esm-billing-app/src/metrics-cards/metrics-cards.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.container {
-  display: flex;
-  margin: layout.$spacing-05;
-  justify-content: space-between;
-  column-gap: layout.$spacing-09;
-  row-gap: layout.$spacing-05;
-  flex-flow: row wrap;
-}
diff --git a/packages/esm-billing-app/src/metrics-cards/metrics.resource.ts b/packages/esm-billing-app/src/metrics-cards/metrics.resource.ts
deleted file mode 100755
index 7658308..0000000
--- a/packages/esm-billing-app/src/metrics-cards/metrics.resource.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { calculateTotalAmount, convertToCurrency } from '../helpers';
-import { type MappedBill } from '../types';
-
-/**
- * A custom hook for calculating bill metrics.
- *
- * This hook takes in an array of bills and calculates the total amount for different
- * bill statuses (cumulative, pending, paid) using provided helper functions.
- *
- * @param {Array<Object>} bills - An array of bill objects. Each bill object should have a `status` and `lineItems` properties.
- *
- * @returns {{
- *   cumulativeBills: string,
- *   pendingBills: string,
- *   paidBills: string
- * }}
- */
-
-export const useBillMetrics = (bills: Array<MappedBill>) => {
-  const { paidTotal, pendingTotal, cumulativeTotal } = calculateBillTotals(bills);
-  return {
-    cumulativeBills: convertToCurrency(cumulativeTotal),
-    pendingBills: convertToCurrency(pendingTotal),
-    paidBills: convertToCurrency(paidTotal),
-  };
-};
-
-const calculateBillTotals = (bills: Array<MappedBill>) => {
-  let paidTotal = 0;
-  let pendingTotal = 0;
-  let cumulativeTotal = 0;
-
-  bills.forEach((bill) => {
-    if (bill.status === 'PAID') {
-      paidTotal += bill.totalAmount;
-    } else if (bill.status === 'PENDING') {
-      pendingTotal += bill.totalAmount;
-    }
-    cumulativeTotal += bill.totalAmount; // Add to cumulative total regardless of status
-  });
-
-  return { paidTotal, pendingTotal, cumulativeTotal };
-};
-
-export default calculateBillTotals;
diff --git a/packages/esm-billing-app/src/modal/require-payment-modal.component.tsx b/packages/esm-billing-app/src/modal/require-payment-modal.component.tsx
deleted file mode 100755
index 7e9ecd1..0000000
--- a/packages/esm-billing-app/src/modal/require-payment-modal.component.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  ModalBody,
-  ModalFooter,
-  Button,
-  InlineLoading,
-  StructuredListWrapper,
-  StructuredListHead,
-  StructuredListRow,
-  StructuredListCell,
-  StructuredListBody,
-  ComposedModal,
-  Heading,
-} from '@carbon/react';
-import styles from './require-payment.scss';
-import { convertToCurrency, extractString } from '../helpers';
-import { navigate, useConfig } from '@openmrs/esm-framework';
-import { type BillingConfig } from '../config-schema';
-import { getPatientUuidFromUrl } from '@openmrs/esm-patient-common-lib';
-import { useBillingPrompt } from '../billing-prompt/billing-prompt.resource';
-
-type RequirePaymentModalProps = {};
-
-const RequirePaymentModal: React.FC<RequirePaymentModalProps> = () => {
-  const { t } = useTranslation();
-  const patientUuid = getPatientUuidFromUrl();
-  const { shouldShowBillingPrompt, isLoading, bills } = useBillingPrompt(patientUuid);
-  const [showModal, setShowModal] = useState({ loadingModal: true, billingModal: true });
-  const { enforceBillPayment } = useConfig<BillingConfig>();
-
-  const closeButtonText = enforceBillPayment
-    ? t('navigateBack', 'Navigate back')
-    : t('proceedToCare', 'Proceed to care');
-
-  const handleCloseModal = () => {
-    enforceBillPayment
-      ? navigate({ to: `\${openmrsSpaBase}/home` })
-      : setShowModal((prevState) => ({ ...prevState, billingModal: false }));
-  };
-
-  const lineItems = bills
-    .filter((bill) => bill.status !== 'PAID')
-    .flatMap((bill) => bill.lineItems)
-    .filter((lineItem) => lineItem.paymentStatus !== 'EXEMPTED');
-
-  if (!shouldShowBillingPrompt) {
-    return null;
-  }
-
-  return (
-    <ComposedModal preventCloseOnClickOutside open={showModal.billingModal}>
-      {isLoading ? (
-        <ModalBody>
-          <Heading className={styles.modalTitle}>{t('billingStatus', 'Billing status')}</Heading>
-          <InlineLoading
-            status="active"
-            iconDescription="Loading"
-            description={t('patientBilling', 'Verifying patient bills')}
-          />
-        </ModalBody>
-      ) : (
-        <ModalBody>
-          <Heading className={styles.modalTitle}>{t('patientBillingAlert', 'Patient Billing Alert')}</Heading>
-          <p className={styles.bodyShort02}>
-            {t('billPaymentRequiredMessage', 'The current patient has pending bill. Advice patient to settle bill.')}
-          </p>
-          <StructuredListWrapper isCondensed>
-            <StructuredListHead>
-              <StructuredListRow head>
-                <StructuredListCell head>{t('item', 'Item')}</StructuredListCell>
-                <StructuredListCell head>{t('quantity', 'Quantity')}</StructuredListCell>
-                <StructuredListCell head>{t('unitPrice', 'Unit price')}</StructuredListCell>
-                <StructuredListCell head>{t('total', 'Total')}</StructuredListCell>
-              </StructuredListRow>
-            </StructuredListHead>
-            <StructuredListBody>
-              {lineItems.map((lineItem) => {
-                return (
-                  <StructuredListRow>
-                    <StructuredListCell>{extractString(lineItem.billableService || lineItem.item)}</StructuredListCell>
-                    <StructuredListCell>{lineItem.quantity}</StructuredListCell>
-                    <StructuredListCell>{convertToCurrency(lineItem.price)}</StructuredListCell>
-                    <StructuredListCell>{convertToCurrency(lineItem.quantity * lineItem.price)}</StructuredListCell>
-                  </StructuredListRow>
-                );
-              })}
-            </StructuredListBody>
-          </StructuredListWrapper>
-          {!enforceBillPayment && (
-            <p className={styles.providerMessage}>
-              {t(
-                'providerMessage',
-                'By clicking Proceed to care, you acknowledge that you have advised the patient to settle the bill.',
-              )}
-            </p>
-          )}
-        </ModalBody>
-      )}
-      <ModalFooter>
-        <Button kind="secondary" onClick={() => navigate({ to: `\${openmrsSpaBase}/home` })}>
-          {t('cancel', 'Cancel')}
-        </Button>
-        <Button kind="danger" onClick={handleCloseModal}>
-          {closeButtonText}
-        </Button>
-      </ModalFooter>
-    </ComposedModal>
-  );
-};
-
-export default RequirePaymentModal;
diff --git a/packages/esm-billing-app/src/modal/require-payment.scss b/packages/esm-billing-app/src/modal/require-payment.scss
deleted file mode 100755
index 10aa8f9..0000000
--- a/packages/esm-billing-app/src/modal/require-payment.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-@use '@carbon/type';
-@use '@carbon/colors';
-
-.bodyShort02 {
-  margin-bottom: 0.5rem;
-  @include type.type-style('body-compact-02');
-}
-
-.providerMessage {
-  @include type.type-style('heading-01');
-  color: colors.$red-50;
-  margin-top: 1.5rem;
-}
-
-.modalTitle {
-  @include type.type-style('productive-heading-03');
-  padding: 0.5rem 0;
-}
diff --git a/packages/esm-billing-app/src/past-patient-bills/filtered-patient-bills.component.tsx b/packages/esm-billing-app/src/past-patient-bills/filtered-patient-bills.component.tsx
deleted file mode 100755
index 55e3cff..0000000
--- a/packages/esm-billing-app/src/past-patient-bills/filtered-patient-bills.component.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import React from 'react';
-import {
-  Layer,
-  DataTable,
-  TableContainer,
-  Table,
-  TableHead,
-  TableRow,
-  TableHeader,
-  TableBody,
-  TableExpandRow,
-  TableCell,
-  Tile,
-} from '@carbon/react';
-import { convertToCurrency, extractString } from '../helpers';
-import { useTranslation } from 'react-i18next';
-import { type MappedBill } from '../types';
-import styles from '../bills-table/bills-table.scss';
-import { ConfigurableLink } from '@openmrs/esm-framework';
-import { EmptyState } from '@openmrs/esm-patient-common-lib';
-
-type PatientBillsProps = {
-  patientUuid: string;
-  bills: Array<MappedBill>;
-  setPatientUuid: (patientUuid: string) => void;
-};
-
-const PastPatientBills: React.FC<PatientBillsProps> = ({ patientUuid, bills, setPatientUuid }) => {
-  const { t } = useTranslation();
-
-  if (!patientUuid) {
-    <h3>Missing patient information</h3>;
-  }
-
-  const tableHeaders = [
-    { header: 'Date', key: 'date' },
-    { header: 'Billable Service', key: 'billableService' },
-    { header: 'Total Amount', key: 'totalAmount' },
-  ];
-
-  const billingUrl = '${openmrsSpaBase}/home/billing/patient/${patientUuid}/${uuid}';
-
-  const tableRows = bills.map((bill) => ({
-    id: `${bill.uuid}`,
-    date: (
-      <ConfigurableLink
-        style={{ textDecoration: 'none', maxWidth: '50%' }}
-        to={billingUrl}
-        templateParams={{ patientUuid: bill.patientUuid, uuid: bill.uuid }}>
-        {bill.dateCreated}
-      </ConfigurableLink>
-    ),
-    billableService: extractString(bill.billingService),
-    totalAmount: convertToCurrency(bill.totalAmount),
-  }));
-
-  if (bills.length === 0 && patientUuid !== '') {
-    <EmptyState displayText={'Pending Patient Bills Found'} headerTitle={'No Pending Patient Bills Found'} />;
-  }
-
-  return (
-    <div className={styles.container}>
-      <DataTable
-        rows={tableRows}
-        headers={tableHeaders}
-        size="sm"
-        useZebraStyles
-        render={({
-          rows,
-          headers,
-          getHeaderProps,
-          getExpandHeaderProps,
-          getRowProps,
-          getExpandedRowProps,
-          getTableProps,
-          getTableContainerProps,
-        }) => (
-          <TableContainer
-            title={t('patientBills', 'Patient bill')}
-            description={t('patientBillsDescription', 'List of patient bills')}
-            {...getTableContainerProps()}>
-            <Table {...getTableProps()} aria-label="sample table">
-              <TableHead>
-                <TableRow>
-                  <TableHeader enableToggle={true} {...getExpandHeaderProps()} />
-                  {headers.map((header, i) => (
-                    <TableHeader
-                      key={i}
-                      {...getHeaderProps({
-                        header,
-                      })}>
-                      {header.header}
-                    </TableHeader>
-                  ))}
-                </TableRow>
-              </TableHead>
-              <TableBody>
-                {rows.map((row, index) => (
-                  <React.Fragment key={row.id}>
-                    <TableExpandRow
-                      {...getRowProps({
-                        row,
-                      })}>
-                      {row.cells.map((cell) => (
-                        <TableCell key={cell.id}>{cell.value}</TableCell>
-                      ))}
-                    </TableExpandRow>
-                  </React.Fragment>
-                ))}
-              </TableBody>
-            </Table>
-          </TableContainer>
-        )}
-      />
-    </div>
-  );
-};
-
-export default PastPatientBills;
diff --git a/packages/esm-billing-app/src/past-patient-bills/patient-bills-dashboard/patient-bills-dashboard.scss b/packages/esm-billing-app/src/past-patient-bills/patient-bills-dashboard/patient-bills-dashboard.scss
deleted file mode 100755
index b3010f4..0000000
--- a/packages/esm-billing-app/src/past-patient-bills/patient-bills-dashboard/patient-bills-dashboard.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.container {
-  height: calc(100vh - 3rem);
-}
-
-.billsTableContainer {
-  margin: layout.$spacing-03 layout.$spacing-01;
-}
diff --git a/packages/esm-billing-app/src/past-patient-bills/patient-bills-dashboard/patient-bills-dashboard.tsx b/packages/esm-billing-app/src/past-patient-bills/patient-bills-dashboard/patient-bills-dashboard.tsx
deleted file mode 100755
index ecbca8b..0000000
--- a/packages/esm-billing-app/src/past-patient-bills/patient-bills-dashboard/patient-bills-dashboard.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import React, { useState } from 'react';
-import styles from './patient-bills-dashboard.scss';
-import { ExtensionSlot } from '@openmrs/esm-framework';
-import PastPatientBills from '../filtered-patient-bills.component';
-import { useBills } from '../../billing.resource';
-import { Dropdown } from '@carbon/react';
-
-const filterItems = [
-  { id: 'PENDING', text: 'Pending bills' },
-  { id: 'POSTED', text: 'Posted bills' },
-];
-
-const PatientBillsScreen: React.FC = () => {
-  const [patientUuid, setPatientUuid] = React.useState<string>('');
-  const { bills } = useBills(patientUuid);
-  const filterBills = bills.filter((bill) => bill.status !== 'PAID' && patientUuid === bill.patientUuid) ?? [];
-
-  return (
-    <main className={styles.container}>
-      <ExtensionSlot
-        name="patient-search-bar-slot"
-        state={{
-          selectPatientAction: (patientUuid) => setPatientUuid(patientUuid),
-          buttonProps: {
-            kind: 'primary',
-          },
-        }}
-      />
-      <PastPatientBills patientUuid={patientUuid} bills={filterBills} setPatientUuid={setPatientUuid} />
-    </main>
-  );
-};
-
-export default PatientBillsScreen;
diff --git a/packages/esm-billing-app/src/past-patient-bills/patient-bills.scss b/packages/esm-billing-app/src/past-patient-bills/patient-bills.scss
deleted file mode 100755
index e26d7a5..0000000
--- a/packages/esm-billing-app/src/past-patient-bills/patient-bills.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-@use '@carbon/colors';
-@use '@carbon/layout';
-@use '@carbon/type';
-
-.button {
-  margin-left: layout.$spacing-04;
-}
-
-.billsTableContainer {
-  margin: 2rem 1rem;
-}
diff --git a/packages/esm-billing-app/src/root.component.tsx b/packages/esm-billing-app/src/root.component.tsx
deleted file mode 100755
index 2526570..0000000
--- a/packages/esm-billing-app/src/root.component.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import { BrowserRouter, Route, Routes } from 'react-router-dom';
-import { BillingDashboard } from './billing-dashboard/billing-dashboard.component';
-import Invoice from './invoice/invoice.component';
-import ClaimScreen from './claims/dashboard/claims-dashboard.component';
-
-const RootComponent: React.FC = () => {
-  const baseName = window.getOpenmrsSpaBase() + 'home/billing';
-
-  return (
-    <BrowserRouter basename={baseName}>
-      <Routes>
-        <Route path="/" element={<BillingDashboard />} />
-        <Route path="/patient/:patientUuid/:billUuid" element={<Invoice />} />
-        <Route path="/patient/:patientUuid/:billUuid/claims" element={<ClaimScreen />} />
-      </Routes>
-    </BrowserRouter>
-  );
-};
-
-export default RootComponent;
diff --git a/packages/esm-billing-app/src/root.scss b/packages/esm-billing-app/src/root.scss
deleted file mode 100755
index 0a39cd4..0000000
--- a/packages/esm-billing-app/src/root.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-@use '@carbon/styles/scss/type';
-@import '~@openmrs/esm-styleguide/src/vars';
-
-.productiveHeading01 {
-  @include type.type-style('heading-compact-01');
-}
-
-.productiveHeading02 {
-  @include type.type-style('heading-compact-02');
-}
-
-.bodyLong01 {
-  @include type.type-style('body-01');
-}
-
-.caption01 {
-  @include type.type-style('legal-01');
-}
-
-.bodyShort02 {
-  @include type.type-style('body-compact-02');
-}
-
-.text02 {
-  color: $text-02;
-}
-
-.text01 {
-  color: $ui-05;
-}
diff --git a/packages/esm-billing-app/src/routes.json b/packages/esm-billing-app/src/routes.json
deleted file mode 100755
index 1383e2d..0000000
--- a/packages/esm-billing-app/src/routes.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "$schema": "https://json.openmrs.org/routes.schema.json",
-  "backendDependencies": {
-    "ampathemr": "^1.0.0"
-  },
-  "pages": [
-    {
-      "component": "billableServicesHome",
-      "route":"billable-services"
-    },
-    {
-      "component": "requirePaymentModal",
-      "routeRegex": "^patient\/.+\/chart",
-      "online": true,
-      "offline": false
-    }
-  ],
-  "extensions": [
-    {
-      "component": "billingDashboardLink",
-      "name": "billing-dashboard-link",
-      "slot": "homepage-dashboard-slot",
-      "meta": {
-        "name": "billing",
-        "title": "billing",
-        "slot": "billing-dashboard-slot"
-      }
-    },
-    {
-      "component": "root",
-      "name": "billing-dashboard-root",
-      "slot": "billing-dashboard-slot"
-    },
-    {
-      "name": "billing-patient-summary",
-      "component": "billingPatientSummary",
-      "slot": "patient-chart-billing-dashboard-slot",
-      "order": 10,
-      "meta": {
-        "columnSpan": 4
-      }
-    },
-    {
-      "name": "billing-summary-dashboard-link",
-      "component": "billingSummaryDashboardLink",
-      "slot": "patient-chart-dashboard-slot",
-      "order": 11,
-      "meta": {
-        "columns": 1,
-        "columnSpan": 1,
-        "slot": "patient-chart-billing-dashboard-slot",
-        "path": "Billing"
-      }
-    },
-    {
-      "name": "billing-check-in-form",
-      "slot": "extra-visit-attribute-slot",
-      "component": "billingCheckInForm"
-    },
-    {
-      "slot": "system-admin-page-card-link-slot",
-      "component": "billableServicesCardLink",
-      "name": "billable-services-admin-card-link"
-    },
-    {
-      "name": "billing-form",
-      "component": "billingForm"
-    },
-    {
-      "name": "require-billing-modal",
-      "component": "requirePaymentModal"
-    },
-    {
-      "name": "patient-banner-billing-tags",
-      "component": "visitAttributeTags",
-      "slot": "patient-banner-tags-slot",
-      "order": 2
-    },
-    {
-      "name": "initiate-payment-modal",
-      "component": "initiatePaymentDialog"
-    },
-    {
-      "name": "lab-order-billable-item",
-      "component": "labOrder",
-      "slot": "top-of-lab-order-form-slot"
-    },
-    {
-      "name": "procedure-order-billable-item",
-      "component": "procedureOrder",
-      "slot": "top-of-procedure-order-form-slot"
-    },
-    {
-      "name": "imaging-order-billable-item",
-      "component": "imagingOrder",
-      "slot": "top-of-imaging-order-form-slot"
-    },
-    {
-      "name": "price-info-order",
-      "component": "priceInfoOrder"
-    },
-    {
-      "name": "drug-order-billable-item",
-      "component": "drugOrder",
-      "slot": "medication-info-slot"
-    },
-    {
-      "name": "test-order-action",
-      "component": "testOrderAction",
-      "slot": "tests-ordered-actions-slot",
-      "order": 0
-    }
-  ]
-}
diff --git a/packages/esm-billing-app/src/types/index.ts b/packages/esm-billing-app/src/types/index.ts
deleted file mode 100755
index 1c4d618..0000000
--- a/packages/esm-billing-app/src/types/index.ts
+++ /dev/null
@@ -1,278 +0,0 @@
-import { type OpenmrsResource } from '@openmrs/esm-framework';
-import { type Drug, type OrderBasketItem } from '@openmrs/esm-patient-common-lib';
-export interface MappedBill {
-  uuid: string;
-  id: number;
-  patientUuid: string;
-  patientName: string;
-  cashPointUuid: string;
-  cashPointName: string;
-  cashPointLocation: string;
-  cashier: Provider;
-  receiptNumber: string;
-  status: string;
-  identifier: string;
-  dateCreated: string;
-  lineItems: Array<LineItem>;
-  billingService: string;
-  payments: Array<Payment>;
-  totalAmount?: number;
-  tenderedAmount?: number;
-  display?: string;
-}
-
-interface LocationLink {
-  rel: string;
-  uri: string;
-  resourceAlias: string;
-}
-
-interface Location {
-  uuid: string;
-  display: string;
-  links: LocationLink[];
-}
-
-interface CashPoint {
-  uuid: string;
-  name: string;
-  description: string;
-  retired: boolean;
-  location: Location;
-}
-
-interface ProviderLink {
-  rel: string;
-  uri: string;
-  resourceAlias: string;
-}
-
-interface Provider {
-  uuid: string;
-  display: string;
-  links: ProviderLink[];
-}
-
-export interface LineItem {
-  uuid: string;
-  display: string;
-  voided: boolean;
-  voidReason: string | null;
-  item: string;
-  billableService: string;
-  quantity: number;
-  price: number;
-  priceName: string;
-  priceUuid: string;
-  lineItemOrder: number;
-  resourceVersion: string;
-  paymentStatus: string;
-  itemOrServiceConceptUuid: string;
-}
-
-interface PatientLink {
-  rel: string;
-  uri: string;
-  resourceAlias: string;
-}
-
-interface Patient {
-  uuid: string;
-  display: string;
-  links: PatientLink[];
-}
-
-interface AttributeType {
-  uuid: string;
-  name: string;
-  description: string;
-  retired: boolean;
-  attributeOrder: number;
-  format: string;
-  foreignKey: string | null;
-  regExp: string | null;
-  required: boolean;
-}
-
-interface Attribute {
-  uuid: string;
-  display: string;
-  voided: boolean;
-  voidReason: string | null;
-  value: string;
-  attributeType: AttributeType;
-  order: number;
-  valueName: string;
-  resourceVersion: string;
-}
-
-interface PaymentInstanceType {
-  uuid: string;
-  name: string;
-  description: string;
-  retired: boolean;
-}
-export interface PatientInvoice {
-  uuid: string;
-  display: string;
-  voided: boolean;
-  voidReason: string | null;
-  adjustedBy: any[];
-  billAdjusted: any;
-  cashPoint: CashPoint;
-  cashier: Provider;
-  dateCreated: string;
-  lineItems: LineItem[];
-  patient: Patient;
-  payments: Payment[];
-  receiptNumber: string;
-  status: string;
-  adjustmentReason: any;
-  id: number;
-  resourceVersion: string;
-}
-
-export interface PatientDetails {
-  name: string;
-  age: string;
-  gender: string;
-  city: string;
-  county: string;
-  subCounty: string;
-}
-
-export interface FacilityDetail {
-  uuid: string;
-  display: string;
-}
-
-export type ServiceConcept = {
-  concept: {
-    uuid: string;
-    display: string;
-  };
-  conceptName: {
-    uuid: string;
-    display: string;
-  };
-  display: string;
-};
-
-export type BillingService = {
-  name: string;
-  servicePrices: Array<{ name: string; paymentMode: { uuid: string; name: string }; price: number; uuid: string }>;
-  serviceStatus: string;
-  serviceType: { display: string };
-  shortName: string;
-  uuid: string;
-};
-
-export interface DrugOrderBasketItem extends OrderBasketItem {
-  drug: Drug;
-  unit: DosingUnit;
-  commonMedicationName: string;
-  dosage: number;
-  frequency: MedicationFrequency;
-  route: MedicationRoute;
-  quantityUnits: QuantityUnit;
-  patientInstructions: string;
-  asNeeded: boolean;
-  asNeededCondition: string;
-  // TODO: This is unused
-  startDate: Date | string;
-  durationUnit: DurationUnit;
-  duration: number | null;
-  pillsDispensed: number;
-  numRefills: number;
-  indication: string;
-  isFreeTextDosage: boolean;
-  freeTextDosage: string;
-  previousOrder?: string;
-  template?: OrderTemplate;
-}
-
-export interface DrugOrderTemplate {
-  uuid: string;
-  name: string;
-  drug: Drug;
-  template: OrderTemplate;
-}
-
-export interface OrderTemplate {
-  type: string;
-  dosingType: string;
-  dosingInstructions: DosingInstructions;
-}
-
-export interface DosingInstructions {
-  dose: Array<MedicationDosage>;
-  units: Array<DosingUnit>;
-  route: Array<MedicationRoute>;
-  frequency: Array<MedicationFrequency>;
-  instructions?: Array<MedicationInstructions>;
-  durationUnits?: Array<DurationUnit>;
-  quantityUnits?: Array<QuantityUnit>;
-  asNeeded?: boolean;
-  asNeededCondition?: string;
-}
-
-export interface MedicationDosage extends Omit<CommonMedicationProps, 'value'> {
-  value: number;
-}
-
-export type MedicationFrequency = CommonMedicationValueCoded;
-
-export type MedicationRoute = CommonMedicationValueCoded;
-
-export type MedicationInstructions = CommonMedicationProps;
-
-export type DosingUnit = CommonMedicationValueCoded;
-
-export type QuantityUnit = CommonMedicationValueCoded;
-
-export type DurationUnit = CommonMedicationValueCoded;
-
-interface CommonMedicationProps {
-  value: string;
-  default?: boolean;
-}
-
-export interface CommonMedicationValueCoded extends CommonMedicationProps {
-  valueCoded: string;
-}
-
-export type PaymentMethod = {
-  uuid: string;
-  description: string;
-  name: string;
-  retired: boolean;
-};
-
-export interface Payment {
-  uuid: string;
-  instanceType: PaymentInstanceType;
-  attributes: Attribute[];
-  amount: number;
-  amountTendered: number;
-  dateCreated: string;
-  voided: boolean;
-  resourceVersion: string;
-}
-
-export type FormPayment = { method: string; amount: string | number; referenceCode?: number | string };
-
-export type PaymentFormValue = {
-  payment: Array<FormPayment>;
-};
-
-export type QueueEntry = {
-  queueEntry: {
-    uuid: string;
-    priority: OpenmrsResource;
-    status: OpenmrsResource;
-    queue: OpenmrsResource;
-    queueComingFrom: OpenmrsResource;
-  };
-};
-
-export type RequestStatus = 'INITIATED' | 'COMPLETE' | 'FAILED' | 'NOT-FOUND';
diff --git a/packages/esm-billing-app/src/utils.ts b/packages/esm-billing-app/src/utils.ts
deleted file mode 100755
index 483f5bd..0000000
--- a/packages/esm-billing-app/src/utils.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { type OpenmrsResource } from '@openmrs/esm-framework';
-import { type LineItem, type MappedBill } from './types';
-
-export const createBillWaiverPayload = (
-  bill: MappedBill,
-  amountWaived: number,
-  totalAmount: number,
-  lineItems: Array<LineItem>,
-  paymentModes: Array<OpenmrsResource>,
-) => {
-  const { cashier } = bill;
-
-  const billPayment = {
-    amount: parseFloat(totalAmount.toFixed(2)),
-    amountTendered: parseFloat(Number(amountWaived).toFixed(2)),
-    attributes: [],
-    instanceType: paymentModes?.find((mode) => mode.name.toLowerCase().includes('waiver'))?.uuid,
-  };
-
-  const processedLineItems = lineItems.map((lineItem) => ({
-    ...lineItem,
-    billableService: processBillItem(lineItem),
-    item: processBillItem(lineItem),
-    paymentStatus: 'PAID',
-  }));
-
-  const processedPayment = {
-    cashPoint: bill.cashPointUuid,
-    cashier: cashier.uuid,
-    lineItems: processedLineItems,
-    payments: [...bill.payments, billPayment],
-    patient: bill.patientUuid,
-  };
-
-  return processedPayment;
-};
-
-const processBillItem = (item) => (item.item || item.billableService)?.split(':')[0];
-
-function extractMessage(input: string): string | null {
-  const parts = input?.split('=>');
-  if (parts?.length > 0) {
-    return parts[parts.length - 1].trim();
-  }
-  return null;
-}
-
-/**
- * Extracts error messages from a given error response object.
- * If fieldErrors are present, it extracts the error messages from each field.
- * If globalErrors are present, it extracts the error messages from each global error.
- * Otherwise, it returns the top-level error message.
- *
- * @param {ErrorObject} errorObject - The error response object.
- */
-export function extractErrorMessagesFromResponse(errorObject): string {
-  const {
-    error: { fieldErrors, globalErrors, message },
-  } = errorObject ?? {};
-
-  if (Object.keys(fieldErrors ?? {})?.length > 0) {
-    return Object.values(fieldErrors)
-      .flatMap((errors: Array<any>) => errors.map((error) => error.message))
-      .join('\n');
-  }
-
-  if (globalErrors?.length) {
-    return globalErrors.map((error) => error.message).join('\n');
-  }
-
-  return extractMessage(message) ?? 'An error occurred';
-}
-
-export const computeTotalPrice = (items) => {
-  if (items && !items.length) {
-    return 0;
-  }
-
-  let totalPrice = 0;
-
-  items?.forEach((item) => {
-    const { price, quantity } = item;
-    totalPrice += price * quantity;
-  });
-
-  return totalPrice;
-};
diff --git a/packages/esm-billing-app/translations/en.json b/packages/esm-billing-app/translations/en.json
deleted file mode 100755
index 2c8142b..0000000
--- a/packages/esm-billing-app/translations/en.json
+++ /dev/null
@@ -1,166 +0,0 @@
-{
-  "actions": "Actions",
-  "addBill": "Add bill item(s)",
-  "addBillableServices": "Add Billable Services",
-  "addNewBillableService": "Add new billable service",
-  "addNewService": "Add new service",
-  "addPaymentOptions": "Add payment option",
-  "addTariffsave": "Add Tariff",
-  "addTariffsServices": "Add Tariffs Services",
-  "amount": "Amount",
-  "amountToWaiveAriaLabel": "Enter amount to waive",
-  "amountToWaiveHelper": "Specify the amount to be deducted from the bill",
-  "amountToWaiveLabel": "Amount to Waive",
-  "availableTariffs": "Available Tariffs",
-  "billableService": "Billable service",
-  "billableServices": "Billable Services",
-  "billAmount": "Bill Amount",
-  "billedItems": "Billed Items",
-  "billedTo": "Billed to",
-  "billErrorService": "Bill service error",
-  "billing": "Billing",
-  "billingForm": "Billing Form",
-  "billingStatus": "Billing status",
-  "billItem": "Bill item",
-  "billItems": "Save Bill",
-  "billList": "Bill list",
-  "billMetrics": "Bill metrics",
-  "billName": " {{billName}} ",
-  "billPayment": "Bill payment",
-  "billPaymentRequiredMessage": "The current patient has pending bill. Advice patient to settle bill before receiving services",
-  "billServicesManagement": "Bill services management",
-  "billsList": "Bill list",
-  "billTariffs": "Insurance Tariffs",
-  "billTotal": "Bill total",
-  "billWaiver": "Bill Waiver",
-  "billWaiverError": "Bill waiver failed {{error}}",
-  "billWaiverSuccess": "Bill waiver successful",
-  "cancel": "Cancel",
-  "checkFilters": "Check the filters above",
-  "checkValidity": "Check Validity",
-  "claim": "Process claims",
-  "claimcode": " Claim Code",
-  "claimError": "Claim Error",
-  "claimExplanation": "Claim Explanation",
-  "claimJustification": "Claim Justification",
-  "claimsItems": "Claims Items",
-  "claimSummary": "Claim Summary",
-  "createClaimError": "Create Claim error",
-  "date": "Date of Claimed",
-  "diagnoses": "Diagnoses",
-  "discard": "Discard",
-  "discardClaim": "Discard Claim",
-  "discount": "Discount",
-  "enterAmount": "Enter amount",
-  "enterConcept": "Associated concept",
-  "enterReferenceNumber": "Enter ref. number",
-  "enterSHANumber": "Enter SHA Number",
-  "errorLoadingBillServices": "Error loading bill services",
-  "errorLoadingPaymentModes": "Payment modes error",
-  "exemptionCategory": "Exemption category",
-  "facility": "Facility",
-  "failedBillPayment": "Bill payment failed",
-  "filterBy": "Filter by",
-  "filterTable": "Filter table",
-  "formTitle": "Fill in the form details",
-  "generatedMessage": "The invoice has been electronically generated and is a valid document. It was created by {{userName}} on {{date}} at {{time}}",
-  "guaranteeId": "Guarantee Id",
-  "home": "Home",
-  "identifier": "Identifier",
-  "initiatePay": "Initiate Payment",
-  "insuranceScheme": "Insurance scheme",
-  "invalidSHANumber": "SHA number is invalid, advice patient to update payment or contact SHA",
-  "invalidWaiverAmountMessage": "Amount to waive cannot be greater than total amount",
-  "invoice": "Invoice",
-  "invoiceError": "Invoice error",
-  "isPatientExemptedLegend": "Is patient exempted from payment?",
-  "item": "Item",
-  "items": "Items",
-  "itemsToBeBilled": "Items to be billed",
-  "launchBillForm": "Launch bill form",
-  "lineItems": "Line items",
-  "loading": "Loading",
-  "loadingBillingServices": "Loading billing services...",
-  "loadingData": "Loading data...",
-  "loadingDescription": "Loading",
-  "makeclaims": "Make Claims",
-  "manageBillableServices": "Manage billable services",
-  "mpesaPayment": "MPESA Payment",
-  "name": "Name",
-  "navigateBack": "Navigate back",
-  "nextPage": "Next page",
-  "no": "No",
-  "noBillDisplay": "There are no bills to display for this patient",
-  "noMatchingBillsToDisplay": "No matching bills to display",
-  "noMatchingItemsToDisplay": "No matching items to display",
-  "noMatchingServicesToDisplay": "No matching services to display",
-  "noResultsFor": "No results for",
-  "noServicesToDisplay": "There are no services to display",
-  "patientBilling": "Patient Billing",
-  "patientBillingAlert": "Patient Billing Alert",
-  "patientBills": "Patient bill",
-  "patientBillsDescription": "List of patient bills",
-  "paymentMethod": "Payment method",
-  "paymentMethodsTitle": "Payment methods",
-  "paymentMode": "Payment Mode",
-  "paymentPayment": "Bill Payment",
-  "payments": "Payments",
-  "Phone Number": "Phone Number",
-  "pickLabRequest": "Pick Lab Request",
-  "policyNumber": "Policy number",
-  "postWaiver": "Post waiver",
-  "previousPage": "Previous page",
-  "prices": "Prices",
-  "printingInvoice": "Printing invoice...",
-  "printInvoice": "Print invoice",
-  "printReceipt": "Print receipt",
-  "printRecept": "Print receipt",
-  "proceedToCare": "Proceed to care",
-  "processClaim": "Process Claim",
-  "processing": "Processing...",
-  "processingPayment": "Processing Payment",
-  "processPayment": "Process Payment",
-  "provider_name": "Provider Name",
-  "providerMessage": "By clicking Proceed to care, you acknowledge that you have advised the patient to settle the bill.",
-  "quantity": "Quantity",
-  "referenceNumber": "Ref number",
-  "save": "Save",
-  "searchConcepts": "Search associated concept",
-  "searching": "Searching",
-  "searchServices": "Search services",
-  "searchThisTable": "Search this table",
-  "selectCategory": "Select category",
-  "selectExemptionCategory": "Select exemption category",
-  "selectitemstobeclaimed": "Select items that are to be included in the claims",
-  "selectPaymentMethod": "Select payment method",
-  "sellingAmount": "Enter selling price",
-  "sellingPrice": "Selling Price",
-  "sendClaim": "Claim sent successfully",
-  "sendClaimError": "Request Failed, Please try later........",
-  "service": "Service",
-  "serviceMetrics": "Service Metrics",
-  "serviceName": "Service Name",
-  "serviceShortName": "Short Name",
-  "servicesList": "Services list",
-  "serviceType": "Service Type",
-  "shaNotValid": "Invalid SHA Number",
-  "shaNumber": "SHA Number",
-  "shortName": "Short Name",
-  "status": "Service Status",
-  "stockItem": "Stock Item",
-  "tariffs": "Tariffs",
-  "total": "Total",
-  "totalAmount": "Total Amount",
-  "totalTendered": "Total Tendered",
-  "treatmentend": "Treatment End",
-  "treatmentstart": "Treatment Start",
-  "unitPrice": "Unit price",
-  "unsettledBill": "Unsettled bill for test.",
-  "valid": "Valid SHA Number",
-  "validatingSHANumber": "Validating SHA Number",
-  "validSHANumber": "SHA number is valid, proceed with care",
-  "visitTime": "Visit time",
-  "visittype": "Visit Type",
-  "waiverForm": "Waiver form",
-  "yes": "Yes"
-}
diff --git a/packages/esm-billing-app/tsconfig.json b/packages/esm-billing-app/tsconfig.json
deleted file mode 100755
index 54ce28c..0000000
--- a/packages/esm-billing-app/tsconfig.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "include": ["src/**/*"],
-  "exclude": ["src/**/*.test.tsx"]
-}
diff --git a/packages/esm-billing-app/webpack.config.js b/packages/esm-billing-app/webpack.config.js
deleted file mode 100755
index 2c74029..0000000
--- a/packages/esm-billing-app/webpack.config.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('openmrs/default-webpack-config');
diff --git a/packages/esm-hts-app/jest.config.js b/packages/esm-hts-app/jest.config.js
deleted file mode 100755
index 0352f62..0000000
--- a/packages/esm-hts-app/jest.config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const rootConfig = require('../../jest.config.js');
-
-module.exports = rootConfig;
diff --git a/packages/esm-hts-app/package.json b/packages/esm-hts-app/package.json
deleted file mode 100755
index 7825c83..0000000
--- a/packages/esm-hts-app/package.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "name": "@ampath/esm-hts-app",
-  "version": "6.0.0",
-  "description": "AMPATH HTS App",
-  "browser": "dist/ampath-esm-hts-app.js",
-  "main": "src/index.ts",
-  "source": true,
-  "license": "MPL-2.0",
-  "homepage": "https://github.com/AMPATH/ampath-esm-3.x#readme",
-  "scripts": {
-    "start": "openmrs develop",
-    "serve": "webpack serve --mode=development",
-    "debug": "npm run serve",
-    "build": "webpack --mode production",
-    "analyze": "webpack --mode=production --env.analyze=true",
-    "lint": "cross-env TIMING=1 eslint src --ext ts,tsx",
-    "test": "cross-env TZ=UTC jest --config jest.config.js --verbose false --passWithNoTests --color",
-    "test:watch": "cross-env TZ=UTC jest --watch --config jest.config.js --color",
-    "coverage": "yarn test --coverage",
-    "typescript": "tsc",
-    "extract-translations": "i18next 'src/**/*.component.tsx'"
-  },
-  "browserslist": [
-    "extends browserslist-config-openmrs"
-  ],
-  "keywords": [
-    "openmrs",
-    "ampath"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/AMPATH/ampath-esm-3.x.git"
-  },
-  "bugs": {
-    "url": "https://github.com/AMPATH/ampath-esm-3.x/issues"
-  },
-  "dependencies": {
-    "@carbon/react": "~1.37.0",
-    "lodash-es": "^4.17.15"
-  },
-  "peerDependencies": {
-    "@openmrs/esm-framework": "5.x",
-    "react": "^18.1.0",
-    "react-i18next": "11.x",
-    "react-router-dom": "6.x",
-    "swr": "2.x"
-  },
-  "devDependencies": {
-    "webpack": "^5.74.0"
-  }
-}
diff --git a/packages/esm-hts-app/src/config-schema.ts b/packages/esm-hts-app/src/config-schema.ts
deleted file mode 100755
index 11a9cc5..0000000
--- a/packages/esm-hts-app/src/config-schema.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Type } from '@openmrs/esm-framework';
-export const configSchema = {
-  basicAuthBase64: {
-    _type: Type.String,
-    _description: 'Basic auth base64 string for the API call e.g Basic someBase64String==',
-    _default: '',
-  },
-};
-
-export type PreAppointmentsConfig = {
-  basicAuthBase64: string;
-};
diff --git a/packages/esm-hts-app/src/dashboard.meta.tsx b/packages/esm-hts-app/src/dashboard.meta.tsx
deleted file mode 100755
index 6aa5369..0000000
--- a/packages/esm-hts-app/src/dashboard.meta.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Coronavirus } from '@carbon/react/icons';
-
-export const htsPatientChartMeta = {
-  title: 'HTS',
-  slotName: 'ampath-hts-patient-chart-slot',
-  isExpanded: false,
-};
-
-export const htsDashboardMeta = {
-  name: 'hts-cases',
-  slot: 'hts-cases-dashboard-slot',
-  config: { columns: 1, type: 'grid', programme: 'hts', dashboardTitle: 'HTS clubs', icon: Coronavirus },
-  title: 'HTS clubs',
-  dashboardIcon: Coronavirus,
-};
-
-export const htsPatientClinicalChartMeta = {
-  title: 'HTS Services',
-  slotName: 'ohri-hts-slot',
-  isExpanded: false,
-};
-
-export const htsPatientSummaryMeta = {
-  slot: 'hts-patient-summary-slot',
-  columns: 1,
-  title: 'HTS Patient Summary',
-  path: 'hts-patient-summary',
-  layoutMode: 'anchored',
-};
-
-export const htsProgramManagementDashboardMeta = {
-  slot: 'hts-program-management-summary-slot',
-  columns: 1,
-  title: 'HTS Services',
-  path: 'hts-program-management',
-  layoutMode: 'anchored',
-};
diff --git a/packages/esm-hts-app/src/dashboard.scss b/packages/esm-hts-app/src/dashboard.scss
deleted file mode 100755
index a99e1db..0000000
--- a/packages/esm-hts-app/src/dashboard.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@import './root.scss';
-
-.noMarker {
-  list-style-type: none;
-}
-
-.noMarker button {
-  margin-top: 2px;
-  padding-top: 2px;
-  padding-bottom: 2px;
-  font: lighter;
-}
-
-.noMarker ul li a {
-  padding-left: 40px !important;
-}
-
-.currentNavItem > a {
-  background-color: #cecece !important;
-  color: #161616 !important;
-  border-left-color: var(--brand-01) !important;
-  font: bolder;
-}
-
-.hide {
-  display: none;
-}
diff --git a/packages/esm-hts-app/src/declarations.d.ts b/packages/esm-hts-app/src/declarations.d.ts
deleted file mode 100755
index 8539186..0000000
--- a/packages/esm-hts-app/src/declarations.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare module '@carbon/react';
-declare module '*.css';
-declare module '*.scss';
-declare type SideNavProps = {};
diff --git a/packages/esm-hts-app/src/header/hts-header.component.tsx b/packages/esm-hts-app/src/header/hts-header.component.tsx
deleted file mode 100755
index 8f776cf..0000000
--- a/packages/esm-hts-app/src/header/hts-header.component.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { Calendar, Location } from '@carbon/react/icons';
-import { useSession, formatDate } from '@openmrs/esm-framework';
-import HTSIllustration from './hts-illustration.component';
-import styles from './hts-header.scss';
-
-export const HTSHeader: React.FC = () => {
-  const { t } = useTranslation();
-  const userSession = useSession();
-  const userLocation = userSession?.sessionLocation?.display;
-
-  return (
-    <div className={styles.header}>
-      <div className={styles['left-justified-items']}>
-        <HTSIllustration />
-        <div className={styles['page-labels']}>
-          <p className={styles['page-name']}>{t('hts', 'HTS Dashboard')}</p>
-        </div>
-      </div>
-      <div className={styles['right-justified-items']}>
-        <div className={styles['date-and-location']}>
-          <Location size={16} />
-          <span className={styles.value}>{userLocation}</span>
-          <span className={styles.middot}>&middot;</span>
-          <Calendar size={16} />
-          <span className={styles.value}>{formatDate(new Date(), { mode: 'standard' })}</span>
-        </div>
-      </div>
-    </div>
-  );
-};
diff --git a/packages/esm-hts-app/src/header/hts-header.scss b/packages/esm-hts-app/src/header/hts-header.scss
deleted file mode 100755
index 1bd8b4e..0000000
--- a/packages/esm-hts-app/src/header/hts-header.scss
+++ /dev/null
@@ -1,68 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@import '~@openmrs/esm-styleguide/src/vars';
-
-.header {
-  @include type.type-style('body-compact-02');
-  color: $text-02;
-  height: spacing.$spacing-12;
-  background-color: $ui-02;
-  display: flex;
-  justify-content: space-between;
-}
-
-.left-justified-items {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  margin-left: 0.75rem;
-}
-
-.right-justified-items {
-  @include type.type-style('body-compact-02');
-  color: $text-02;
-  padding-top: 1rem;
-}
-
-.page-name {
-  @include type.type-style('heading-04');
-}
-
-.page-labels {
-  margin-left: 1rem;
-
-  p:first-of-type {
-    margin-bottom: 0.25rem;
-  }
-}
-
-.date-and-location {
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  margin-right: 1rem;
-}
-
-.value {
-  margin-left: 0.25rem;
-}
-
-.middot {
-  margin: 0 0.5rem;
-}
-
-.view {
-  @include type.type-style('label-01');
-}
-
-svg.iconOverrides {
-  width: 72 !important;
-  height: 72 !important;
-  fill: var(--brand-03);
-}
-
-.svgContainer svg {
-  width: 72px;
-  height: 72px;
-  fill: var(--brand-03);
-}
diff --git a/packages/esm-hts-app/src/header/hts-illustration.component.tsx b/packages/esm-hts-app/src/header/hts-illustration.component.tsx
deleted file mode 100755
index d733949..0000000
--- a/packages/esm-hts-app/src/header/hts-illustration.component.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-import { Eyedropper } from '@carbon/react/icons';
-import styles from './hts-header.scss';
-
-const HTSIllustration: React.FC = () => {
-  return (
-    <div className={styles.svgContainer}>
-      <Eyedropper className={styles.iconOverrides} />
-    </div>
-  );
-};
-
-export default HTSIllustration;
diff --git a/packages/esm-hts-app/src/hts.component.tsx b/packages/esm-hts-app/src/hts.component.tsx
deleted file mode 100755
index 21abc4f..0000000
--- a/packages/esm-hts-app/src/hts.component.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import HTSHomePatientTabs from './views/dashboard/patient-list-tabs/hts-patient-list-tabs.component';
-import HTSSummaryTile from './views/dashboard/summary-tiles/hts-summary-tiles.component';
-import HTSSummaryTileOverallUptake from './views/dashboard/summary-tiles/hts-summary-tiles-overall-uptake.component';
-import { HTSHeader } from './header/hts-header.component';
-import styles from './hts.scss';
-
-const HTSDashboard: React.FC = () => {
-  const { t } = useTranslation();
-
-  return (
-    <React.Fragment>
-      <HTSHeader />
-      <div className={styles.tileLayout}>
-        <HTSSummaryTile headerTitle={t('totalScreened', 'Total Screened')} />
-        <HTSSummaryTile headerTitle={t('totalEligible', 'Total Eligible')} />
-        <HTSSummaryTile headerTitle={t('totalTested', 'Total Tested')} />
-        <HTSSummaryTile headerTitle={t('totalPositive', 'Total Positive')} />
-        <HTSSummaryTile headerTitle={t('totalNegative', 'Total Negative')} />
-        <HTSSummaryTile headerTitle={t('totalInvalid', 'Total Invalid')} />
-        <HTSSummaryTileOverallUptake headerTitle={t('overallUptake', 'Overall Uptake')} />
-      </div>
-      <div className={styles.tabList}>
-        <HTSHomePatientTabs />
-      </div>
-    </React.Fragment>
-  );
-};
-
-export default HTSDashboard;
diff --git a/packages/esm-hts-app/src/hts.scss b/packages/esm-hts-app/src/hts.scss
deleted file mode 100755
index 4caad50..0000000
--- a/packages/esm-hts-app/src/hts.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-:global(.-esm-home__dashboard-view__dashboardView___k24ro) {
-  background-color: none;
-}
-
-.tileLayout {
-  display: flex;
-  flex-wrap: wrap;
-  margin: 0 0.5rem;
-}
diff --git a/packages/esm-hts-app/src/index.ts b/packages/esm-hts-app/src/index.ts
deleted file mode 100755
index 8a38185..0000000
--- a/packages/esm-hts-app/src/index.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { defineConfigSchema, getSyncLifecycle } from '@openmrs/esm-framework';
-import { configSchema } from './config-schema';
-import Root from './root.component';
-import {
-  htsPatientClinicalChartMeta,
-  htsPatientSummaryMeta,
-  htsProgramManagementDashboardMeta,
-} from './dashboard.meta';
-import { createDashboardGroup, createDashboardLink } from '@openmrs/esm-patient-common-lib';
-import HTSHomePatientTabs from './views/dashboard/patient-list-tabs/hts-patient-list-tabs.component';
-import { createLeftPanelLink } from './left-panel-link.component';
-import HTSSummaryTiles from './views/dashboard/summary-tiles/hts-summary-tiles.component';
-import htsPatientSummary from './views/dashboard/patient-summary/patient-summary.component';
-import HtsProgramManagementSummary from './views/dashboard/hts-program-services/hts-program-services';
-
-export const moduleName = '@ampath/esm-hts-app';
-
-const options = {
-  featureName: 'esm-hts-app',
-  moduleName,
-};
-
-export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');
-
-export const root = getSyncLifecycle(Root, options);
-
-export function startupApp() {
-  defineConfigSchema(moduleName, configSchema);
-}
-
-export const patientChartTptDashboard = getSyncLifecycle(createDashboardGroup(htsPatientClinicalChartMeta), options);
-
-export const htsLeftPanelLink = getSyncLifecycle(
-  createLeftPanelLink({
-    name: 'hts',
-    title: 'HTS',
-    slot: 'hts-dashboard-slot',
-  }),
-  options,
-);
-export const htsDashboardTiles = getSyncLifecycle(HTSSummaryTiles, {
-  featureName: 'hts-home-tiles',
-  moduleName,
-});
-
-export const htsDashboardTabs = getSyncLifecycle(HTSHomePatientTabs, {
-  featureName: 'hts-home-tabs',
-  moduleName,
-});
-
-export const htsPatientSummaryDashboardLink = getSyncLifecycle(
-  createDashboardLink({ ...htsPatientSummaryMeta, moduleName }),
-  options,
-);
-export const htsPatientSummaryDashboard = getSyncLifecycle(htsPatientSummary, {
-  featureName: 'hts-patient-summary',
-  moduleName,
-});
-
-export const htsProgramManagementDashboardLink = getSyncLifecycle(
-  createDashboardLink({ ...htsProgramManagementDashboardMeta, moduleName }),
-  options,
-);
-export const htsProgramManagementDashboard = getSyncLifecycle(HtsProgramManagementSummary, {
-  featureName: 'hts-program-management-summary',
-  moduleName,
-});
diff --git a/packages/esm-hts-app/src/left-panel-link.component.tsx b/packages/esm-hts-app/src/left-panel-link.component.tsx
deleted file mode 100755
index 972b2c4..0000000
--- a/packages/esm-hts-app/src/left-panel-link.component.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React, { useMemo } from 'react';
-import last from 'lodash-es/last';
-import { BrowserRouter, useLocation } from 'react-router-dom';
-import { ConfigurableLink } from '@openmrs/esm-framework';
-
-export interface LinkConfig {
-  name: string;
-  title: string;
-  slot?: string;
-}
-
-function LinkExtension({ config }: { config: LinkConfig }) {
-  const { name, title } = config;
-  const location = useLocation();
-  const spaBasePath = window.getOpenmrsSpaBase() + 'home';
-
-  const urlSegment = useMemo(() => decodeURIComponent(last(location.pathname.split('/'))), [location.pathname]);
-
-  return (
-    <ConfigurableLink
-      to={spaBasePath + '/' + name}
-      className={`cds--side-nav__link ${name === urlSegment && 'active-left-nav-link'}`}>
-      {title}
-    </ConfigurableLink>
-  );
-}
-
-export const createLeftPanelLink = (config: LinkConfig) => () => (
-  <BrowserRouter>
-    <LinkExtension config={config} />
-  </BrowserRouter>
-);
diff --git a/packages/esm-hts-app/src/root.component.tsx b/packages/esm-hts-app/src/root.component.tsx
deleted file mode 100755
index d3d1ffb..0000000
--- a/packages/esm-hts-app/src/root.component.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import { BrowserRouter, Route, Routes } from 'react-router-dom';
-import HtsDashboard from './hts.component';
-
-const Root: React.FC = () => {
-  const basePath = window.getOpenmrsSpaBase() + 'home/hts';
-
-  return (
-    <BrowserRouter basename={basePath}>
-      <Routes>
-        <Route path="/" element={<HtsDashboard />} />
-      </Routes>
-    </BrowserRouter>
-  );
-};
-
-export default Root;
diff --git a/packages/esm-hts-app/src/root.scss b/packages/esm-hts-app/src/root.scss
deleted file mode 100755
index 081ea14..0000000
--- a/packages/esm-hts-app/src/root.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@import '~@openmrs/esm-styleguide/src/vars';
diff --git a/packages/esm-hts-app/src/routes.json b/packages/esm-hts-app/src/routes.json
deleted file mode 100755
index 643e480..0000000
--- a/packages/esm-hts-app/src/routes.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "$schema": "https://json.openmrs.org/routes.schema.json",
-  "backendDependencies": {
-    "webservices.rest": "^2.2.0"
-  },
-  "pages": [
-    {
-      "component": "root",
-      "route": "hts"
-    }
-  ],
-  "extensions": [
-    {
-      "component": "root",
-      "name": "hts-root",
-      "slot": "hts-dashboard-slot"
-    },
-    {
-      "component": "htsLeftPanelLink",
-      "name": "hts-left-panel-link",
-      "slot": "homepage-dashboard-slot",
-      "meta": {
-        "name": "hts",
-        "title": "HTS",
-        "slot": "hts-dashboard-slot",
-        "config": {
-          "columns": 1,
-          "type": "grid",
-          "programme": "hts",
-          "dashboardTitle": "HTS Dashboard"
-        }
-      }
-    },
-    {
-      "name": "hts-home-tiles-ext",
-      "slot": "hts-home-tiles-slot",
-      "component": "htsDashboardTiles"
-    },
-    {
-      "name": "hts-home-tabs-ext",
-      "slot": "hts-home-tabs-slot",
-      "component": "htsDashboardTabs"
-    },
-
-    {
-      "name": "hts-dashboard-link",
-      "slot": "dashboard-slot",
-      "component": "htsFolderLink",
-      "meta": {
-        "slot": "ohri-hts-dashboard-slot",
-        "isFolder": true,
-        "title": "HTS Service"
-      }
-    },
-    {
-      "name": "ohri-hts",
-      "slot": "patient-chart-dashboard-slot",
-      "component": "patientChartTptDashboard",
-      "order": 24
-    },
-    {
-      "name": "hts-patient-summary",
-      "slot": "ohri-hts-slot",
-      "component": "htsPatientSummaryDashboardLink",
-      "meta": {
-        "slot": "hts-patient-summary-slot",
-        "columns": 1,
-        "path": "hts-patient-summary",
-        "layoutMode": "anchored"
-      }
-    },
-    {
-      "name": "hts-patient-summary-ext",
-      "slot": "hts-patient-summary-slot",
-      "component": "htsPatientSummaryDashboard"
-    },
-    {
-      "name": "hts-program-management-summary",
-      "slot": "ohri-hts-slot",
-      "component": "hstProgramManagementDashboardLink",
-      "meta": {
-        "slot": "hts-program-management-summary-slot",
-        "columns": 1,
-        "path": "hts-program-management",
-        "layoutMode": "anchored"
-      }
-    },
-    {
-      "name": "hts-program-management-summary-ext",
-      "slot": "hts-program-management-summary-slot",
-      "component": "htsProgramManagementDashboard"
-    }
-  ]
-}
diff --git a/packages/esm-hts-app/src/views/dashboard/common.scss b/packages/esm-hts-app/src/views/dashboard/common.scss
deleted file mode 100755
index 4118084..0000000
--- a/packages/esm-hts-app/src/views/dashboard/common.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@import '../../root.scss';
-
-.widgetContainer {
-  background-color: $ui-background;
-}
-
-.widgetHeaderContainer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: spacing.$spacing-04 0 spacing.$spacing-04 spacing.$spacing-05;
-}
-
-.widgetHeaderContainer > h4:after {
-  content: '';
-  display: block;
-  width: 2rem;
-  padding-top: 0.188rem;
-  border-bottom: 0.375rem solid var(--brand-01);
-}
-
-.toggleButtons {
-  width: fit-content;
-  margin: 0 spacing.$spacing-03;
-}
-
-.tabContainer div[role='tabpanel'] {
-  padding: 0 !important;
-}
-
-.tabContainer li button {
-  width: 100% !important;
-}
diff --git a/packages/esm-hts-app/src/views/dashboard/hts-program-services/common.scss b/packages/esm-hts-app/src/views/dashboard/hts-program-services/common.scss
deleted file mode 100755
index 480416a..0000000
--- a/packages/esm-hts-app/src/views/dashboard/hts-program-services/common.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-@use '../../../../../../node_modules/@carbon/styles/scss/spacing';
-@import '../../../root';
-
-.widgetContainer {
-  background-color: $ui-background;
-}
-
-.widgetHeaderContainer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: spacing.$spacing-04 0 spacing.$spacing-04 spacing.$spacing-05;
-}
-
-.widgetHeaderContainer > h4:after {
-  content: '';
-  display: block;
-  width: 2rem;
-  padding-top: 0.188rem;
-  border-bottom: 0.375rem solid var(--brand-01);
-}
-
-.toggleButtons {
-  width: fit-content;
-  margin: 0 spacing.$spacing-03;
-}
-
-.tabContainer div[role='tabpanel'] {
-  padding: 0 !important;
-}
-
-.tabContainer li button {
-  width: 100% !important;
-}
diff --git a/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-initial.component.tsx b/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-initial.component.tsx
deleted file mode 100755
index c7cb1aa..0000000
--- a/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-initial.component.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { EmptyState } from '@openmrs/esm-patient-common-lib';
-
-const HtsInitial: React.FC = () => {
-  const { t } = useTranslation();
-
-  const headerHtsInitial = t('htsInitial', 'HTS Initial');
-
-  return (
-    <>
-      <EmptyState displayText={headerHtsInitial} headerTitle={headerHtsInitial} />
-    </>
-  );
-};
-
-export default HtsInitial;
diff --git a/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-linkage.component.tsx b/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-linkage.component.tsx
deleted file mode 100755
index eb8acfb..0000000
--- a/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-linkage.component.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { EmptyState } from '@openmrs/esm-patient-common-lib';
-
-const HtsLinkage: React.FC = () => {
-  const { t } = useTranslation();
-
-  const headerHtsLinkage = t('htsLinkage', 'HTS Linkage');
-
-  return (
-    <>
-      <EmptyState displayText={headerHtsLinkage} headerTitle={headerHtsLinkage} />
-    </>
-  );
-};
-
-export default HtsLinkage;
diff --git a/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-program-services.tsx b/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-program-services.tsx
deleted file mode 100755
index 392c0fb..0000000
--- a/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-program-services.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, { useState } from 'react';
-import { Tabs, Tab, TabList } from '@carbon/react';
-import styles from './common.scss';
-import { useTranslation } from 'react-i18next';
-import HtsScreening from './hts-screening.component';
-import HtsInitial from './hts-initial.component';
-import HtsRetest from './hts-retest.component';
-import HtsReferred from './hts-referred.component';
-import HtsLinkage from './hts-linkage.component';
-
-const HtsProgramManagementSummary: React.FC = () => {
-  const { t } = useTranslation();
-  const [activeTab, setActiveTab] = useState('htsScreening');
-
-  const handleTabChange = (tabId: string) => {
-    setActiveTab(tabId);
-  };
-
-  return (
-    <div className={styles.tabContainer}>
-      <Tabs selected={activeTab} onSelectionChange={handleTabChange}>
-        <TabList contained>
-          <Tab id="htsScreening">{t('htsScreening', 'HTS Screening')}</Tab>
-          <Tab id="htsInitial">{t('htsInitial', 'HTS Initial')}</Tab>
-          <Tab id="htsRetest ">{t('htsRetest', 'HTS Retest')}</Tab>
-          <Tab id="htsReferred">{t('htsReferred', 'HTS Referred')}</Tab>
-          <Tab id="htsLinkage">{t('htsLinkage', 'HTS Linkage')}</Tab>
-        </TabList>
-      </Tabs>
-      {activeTab === 'htsScreening' && <HtsScreening />}
-      {Tab === 'htsInitial' && <HtsInitial />}
-      {Tab === 'htsRetest' && <HtsRetest />}
-      {Tab === 'htsReferred' && <HtsReferred />}
-      {Tab === 'htsLinkage' && <HtsLinkage />}
-    </div>
-  );
-};
-
-export default HtsProgramManagementSummary;
diff --git a/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-program.scss b/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-program.scss
deleted file mode 100755
index 6edca40..0000000
--- a/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-program.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@import '../../../root.scss';
-
-.widgetContainer {
-  background-color: $ui-background;
-}
-
-.widgetHeaderContainer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: spacing.$spacing-04 0 spacing.$spacing-04 spacing.$spacing-05;
-}
-
-.widgetHeaderContainer > h4:after {
-  content: '';
-  display: block;
-  width: 2rem;
-  padding-top: 0.188rem;
-  border-bottom: 0.375rem solid var(--brand-01);
-}
-
-.toggleButtons {
-  width: fit-content;
-  margin: 0 spacing.$spacing-03;
-}
-
-.tabContainer div[role='tabpanel'] {
-  padding: 0 !important;
-}
-
-.tabContainer li button {
-  width: 100% !important;
-}
diff --git a/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-referred.component.tsx b/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-referred.component.tsx
deleted file mode 100755
index d4217f6..0000000
--- a/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-referred.component.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { EmptyState } from '@openmrs/esm-patient-common-lib';
-
-const HtsReferred: React.FC = () => {
-  const { t } = useTranslation();
-
-  const headerHtsReferred = t('htsReferred', 'HTS Referred');
-
-  return (
-    <>
-      <EmptyState displayText={headerHtsReferred} headerTitle={headerHtsReferred} />
-    </>
-  );
-};
-
-export default HtsReferred;
diff --git a/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-retest.component.tsx b/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-retest.component.tsx
deleted file mode 100755
index 7d820ce..0000000
--- a/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-retest.component.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { EmptyState } from '@openmrs/esm-patient-common-lib';
-
-const HtsRetest: React.FC = () => {
-  const { t } = useTranslation();
-
-  const headerHtsRetest = t('htsRetest', 'HTS Retest');
-
-  return (
-    <>
-      <EmptyState displayText={headerHtsRetest} headerTitle={headerHtsRetest} />
-    </>
-  );
-};
-
-export default HtsRetest;
diff --git a/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-screening.component.tsx b/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-screening.component.tsx
deleted file mode 100755
index 647a9e3..0000000
--- a/packages/esm-hts-app/src/views/dashboard/hts-program-services/hts-screening.component.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { EmptyState } from '@openmrs/esm-patient-common-lib';
-
-const HtsScreening: React.FC = () => {
-  const { t } = useTranslation();
-
-  const headerHtsScreening = t('htsScreening', 'HTS Screening');
-
-  return (
-    <>
-      <EmptyState displayText={headerHtsScreening} headerTitle={headerHtsScreening} />
-    </>
-  );
-};
-
-export default HtsScreening;
diff --git a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/empty-state/empty-data-illustration.component.tsx b/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/empty-state/empty-data-illustration.component.tsx
deleted file mode 100755
index e594a32..0000000
--- a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/empty-state/empty-data-illustration.component.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-
-export const EmptyDataIllustration = ({ width = '64', height = '64' }) => {
-  return (
-    <svg width={width} height={height} viewBox="0 0 64 64">
-      <title>Empty data illustration</title>
-      <g fill="none" fillRule="evenodd">
-        <path
-          d="M38.133 13.186H21.947c-.768.001-1.39.623-1.39 1.391V50.55l-.186.057-3.97 1.216a.743.743 0 01-.927-.493L3.664 12.751a.742.742 0 01.492-.926l6.118-1.874 17.738-5.43 6.119-1.873a.741.741 0 01.926.492L38.076 13l.057.186z"
-          fill="#F4F4F4"
-        />
-        <path
-          d="M41.664 13L38.026 1.117A1.576 1.576 0 0036.056.07l-8.601 2.633-17.737 5.43-8.603 2.634a1.578 1.578 0 00-1.046 1.97l12.436 40.616a1.58 1.58 0 001.969 1.046l5.897-1.805.185-.057v-.194l-.185.057-5.952 1.822a1.393 1.393 0 01-1.737-.923L.247 12.682a1.39 1.39 0 01.923-1.738L9.772 8.31 27.51 2.881 36.112.247a1.393 1.393 0 011.737.923L41.47 13l.057.186h.193l-.057-.185z"
-          fill="#8D8D8D"
-        />
-        <path
-          d="M11.378 11.855a.836.836 0 01-.798-.59L9.385 7.361a.835.835 0 01.554-1.042l16.318-4.996a.836.836 0 011.042.554l1.195 3.902a.836.836 0 01-.554 1.043l-16.318 4.995a.831.831 0 01-.244.037z"
-          fill="#C6C6C6"
-        />
-        <circle fill="#C6C6C6" cx={17.636} cy={2.314} r={1.855} />
-        <circle fill="#FFF" fillRule="nonzero" cx={17.636} cy={2.314} r={1.175} />
-        <path
-          d="M55.893 53.995H24.544a.79.79 0 01-.788-.789V15.644a.79.79 0 01.788-.788h31.349a.79.79 0 01.788.788v37.562a.79.79 0 01-.788.789z"
-          fill="#F4F4F4"
-        />
-        <path
-          d="M41.47 13H21.948a1.579 1.579 0 00-1.576 1.577V52.4l.185-.057V14.577c.001-.768.623-1.39 1.391-1.39h19.581L41.471 13zm17.02 0H21.947a1.579 1.579 0 00-1.576 1.577v42.478c0 .87.706 1.576 1.576 1.577H58.49a1.579 1.579 0 001.576-1.577V14.577a1.579 1.579 0 00-1.576-1.576zm1.39 44.055c0 .768-.622 1.39-1.39 1.392H21.947c-.768-.001-1.39-.624-1.39-1.392V14.577c0-.768.622-1.39 1.39-1.39H58.49c.768 0 1.39.622 1.39 1.39v42.478z"
-          fill="#8D8D8D"
-        />
-        <path
-          d="M48.751 17.082H31.686a.836.836 0 01-.835-.835v-4.081c0-.46.374-.834.835-.835H48.75c.461 0 .834.374.835.835v4.08c0 .462-.374.835-.835.836z"
-          fill="#C6C6C6"
-        />
-        <circle fill="#C6C6C6" cx={40.218} cy={9.755} r={1.855} />
-        <circle fill="#FFF" fillRule="nonzero" cx={40.218} cy={9.755} r={1.13} />
-      </g>
-    </svg>
-  );
-};
diff --git a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/empty-state/empty-state.component.tsx b/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/empty-state/empty-state.component.tsx
deleted file mode 100755
index ae93962..0000000
--- a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/empty-state/empty-state.component.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import React from 'react';
-import { Layer, Button, Tile } from '@carbon/react';
-import { useTranslation } from 'react-i18next';
-import { EmptyDataIllustration } from './empty-data-illustration.component';
-import { useLayoutType } from '@openmrs/esm-framework';
-import styles from './empty-state.scss';
-import { Add } from '@carbon/react/icons';
-
-export interface EmptyStateProps {
-  displayText: string;
-  headerTitle: string;
-  launchForm?(): void;
-  scheduleType: string;
-}
-
-export const EmptyState: React.FC<EmptyStateProps> = ({ headerTitle, displayText, launchForm, scheduleType }) => {
-  const { t } = useTranslation();
-  const isTablet = useLayoutType() === 'tablet';
-
-  return (
-    <Layer>
-      <Tile className={styles.tile}>
-        <div className={isTablet ? styles.tabletHeading : styles.desktopHeading}>
-          <h4>{headerTitle}</h4>
-        </div>
-        <EmptyDataIllustration />
-        <p className={styles.content}>
-          {t('emptyStateText', 'There are no {{displayText}} to display', { displayText })}
-        </p>
-        {scheduleType === 'Scheduled' ? (
-          <p className={styles.action}>
-            {launchForm && (
-              <span>
-                <Button renderIcon={Add} kind="ghost" onClick={() => launchForm()}>
-                  {t('createAppointment', 'Create appointment')}
-                </Button>
-              </span>
-            )}
-          </p>
-        ) : null}
-      </Tile>
-    </Layer>
-  );
-};
diff --git a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/empty-state/empty-state.scss b/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/empty-state/empty-state.scss
deleted file mode 100755
index 098a6e6..0000000
--- a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/empty-state/empty-state.scss
+++ /dev/null
@@ -1,70 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@import '~@openmrs/esm-styleguide/src/vars';
-
-.content {
-  @include type.type-style('heading-compact-01');
-  color: $text-02;
-  margin-top: spacing.$spacing-05;
-  margin-bottom: spacing.$spacing-03;
-}
-
-.desktopHeading {
-  h4 {
-    @include type.type-style('heading-compact-02');
-    color: $text-02;
-  }
-}
-
-.tabletHeading {
-  h4 {
-    @include type.type-style('heading-03');
-    color: $text-02;
-  }
-}
-
-.desktopHeading,
-.tabletHeading {
-  text-align: left;
-  text-transform: capitalize;
-  margin-bottom: spacing.$spacing-05;
-
-  h4:after {
-    content: '';
-    display: block;
-    width: 2rem;
-    padding-top: 0.188rem;
-    border-bottom: 0.375rem solid var(--brand-03);
-  }
-}
-
-.heading:after {
-  content: '';
-  display: block;
-  width: 2rem;
-  padding-top: 0.188rem;
-  border-bottom: 0.375rem solid var(--brand-03);
-}
-
-.tile {
-  text-align: center;
-  border: 1px solid $ui-03;
-}
-
-.actionText {
-  display: flex;
-  align-items: center;
-}
-
-.header4 {
-  @include type.type-style('heading-compact-01');
-  margin-bottom: 1rem;
-}
-
-// Overriding styles for RTL support
-html[dir='rtl'] {
-  .desktopHeading,
-  .tabletHeading {
-    text-align: right;
-  }
-}
diff --git a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/due-for-linkage.component.tsx b/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/due-for-linkage.component.tsx
deleted file mode 100755
index 74048b0..0000000
--- a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/due-for-linkage.component.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  DataTable,
-  TableContainer,
-  Table,
-  TableHead,
-  TableHeader,
-  TableRow,
-  TableBody,
-  TableCell,
-  TableToolbar,
-  TableToolbarContent,
-  TableToolbarSearch,
-  Pagination,
-  DataTableSkeleton,
-  Button,
-} from '@carbon/react';
-import { Download } from '@carbon/react/icons';
-import { ConfigurableLink, useConfig, usePagination } from '@openmrs/esm-framework';
-import { EmptyState } from '../empty-state/empty-state.component';
-
-const DueForLinkage: React.FC = () => {
-  const { t } = useTranslation();
-  //data fetching hook called here, will populate the table rows
-
-  const headerData = [
-    {
-      header: 'Patient Name',
-      key: 'name',
-    },
-    {
-      header: 'Identifier',
-      key: 'identifier',
-    },
-    {
-      header: 'Gender',
-      key: 'gender',
-    },
-    {
-      header: 'Phone Number',
-      key: 'phoneNumber',
-    },
-  ];
-
-  return (
-    <EmptyState
-      displayText={t('dueForLinkageDisplayText', 'due for linkage patients')}
-      headerTitle={t('dueForLinkageHeader', 'Due for linkage')}
-      scheduleType="Unscheduled"
-    />
-  );
-};
-
-export default DueForLinkage;
diff --git a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/due-for-retest.component.tsx b/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/due-for-retest.component.tsx
deleted file mode 100755
index bd227fe..0000000
--- a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/due-for-retest.component.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  DataTable,
-  TableContainer,
-  Table,
-  TableHead,
-  TableHeader,
-  TableRow,
-  TableBody,
-  TableCell,
-  TableToolbar,
-  TableToolbarContent,
-  TableToolbarSearch,
-  Pagination,
-  DataTableSkeleton,
-  Button,
-} from '@carbon/react';
-import { Download } from '@carbon/react/icons';
-import { ConfigurableLink, useConfig, usePagination } from '@openmrs/esm-framework';
-import { EmptyState } from '../empty-state/empty-state.component';
-
-const DueForRetest: React.FC = () => {
-  const { t } = useTranslation();
-  //data fetching hook called here, will populate the table rows
-
-  const headerData = [
-    {
-      header: 'Patient Name',
-      key: 'name',
-    },
-    {
-      header: 'Identifier',
-      key: 'identifier',
-    },
-    {
-      header: 'Gender',
-      key: 'gender',
-    },
-    {
-      header: 'Phone Number',
-      key: 'phoneNumber',
-    },
-  ];
-
-  return (
-    <EmptyState
-      displayText={t('dueForRetestDisplayText', 'due for retest patients')}
-      headerTitle={t('dueForRetestHeader', 'Due for retest')}
-      scheduleType="Unscheduled"
-    />
-  );
-};
-
-export default DueForRetest;
diff --git a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/eligible.component.tsx b/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/eligible.component.tsx
deleted file mode 100755
index b2f3970..0000000
--- a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/eligible.component.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  DataTable,
-  TableContainer,
-  Table,
-  TableHead,
-  TableHeader,
-  TableRow,
-  TableBody,
-  TableCell,
-  TableToolbar,
-  TableToolbarContent,
-  TableToolbarSearch,
-  Pagination,
-  DataTableSkeleton,
-  Button,
-} from '@carbon/react';
-import { Download } from '@carbon/react/icons';
-import { ConfigurableLink, useConfig, usePagination } from '@openmrs/esm-framework';
-import { EmptyState } from '../empty-state/empty-state.component';
-
-const Eligible: React.FC = () => {
-  const { t } = useTranslation();
-  //data fetching hook called here, will populate the table rows
-
-  const headerData = [
-    //will populate the data table headers
-    {
-      header: 'Patient Number',
-      key: 'number',
-    },
-    {
-      header: 'Name',
-      key: 'name',
-    },
-    {
-      header: 'Age',
-      key: 'age',
-    },
-    {
-      header: 'Sex',
-      key: 'sex',
-    },
-    {
-      header: 'Phone Number',
-      key: 'phoneNumber',
-    },
-    {
-      header: 'Latest VL',
-      key: 'latestVL',
-    },
-    {
-      header: 'Latest VL Date',
-      key: 'latestVLDate',
-    },
-    {
-      header: 'VL Category',
-      key: 'vlCategory',
-    },
-    {
-      header: 'Latest RTC date',
-      key: 'latestRTCDate',
-    },
-  ];
-
-  return (
-    <EmptyState
-      displayText={t('eligibilityDisplay', 'patients eligible for hts screening')}
-      headerTitle={t('eligibilityHeader', 'Eligible patients')}
-      scheduleType="Unscheduled"
-    />
-  );
-};
-
-export default Eligible;
diff --git a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/hts-screening.component.tsx b/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/hts-screening.component.tsx
deleted file mode 100755
index e3b5e37..0000000
--- a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/hts-screening.component.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  DataTable,
-  TableContainer,
-  Table,
-  TableHead,
-  TableHeader,
-  TableRow,
-  TableBody,
-  TableCell,
-  TableToolbar,
-  TableToolbarContent,
-  TableToolbarSearch,
-  Pagination,
-  DataTableSkeleton,
-  Button,
-} from '@carbon/react';
-import { Download } from '@carbon/react/icons';
-import { ConfigurableLink, useConfig, usePagination } from '@openmrs/esm-framework';
-import { EmptyState } from '../empty-state/empty-state.component';
-
-const HTSScreening: React.FC = () => {
-  const { t } = useTranslation();
-  //data fetching hook called here, will populate the table rows
-
-  const headerData = [
-    //will populate the data table headers
-    {
-      header: 'Patient Number',
-      key: 'number',
-    },
-    {
-      header: 'Name',
-      key: 'name',
-    },
-    {
-      header: 'Age',
-      key: 'age',
-    },
-    {
-      header: 'Sex',
-      key: 'sex',
-    },
-    {
-      header: 'Phone Number',
-      key: 'phoneNumber',
-    },
-    {
-      header: 'Last appointment date',
-      key: 'lastAppointmentDate',
-    },
-    {
-      header: 'Visit Type',
-      key: 'visitType',
-    },
-    {
-      header: 'Latest RTC Date',
-      key: 'latestRTCDate',
-    },
-    {
-      header: 'Days since last appointment',
-      key: 'daysSinceLastAppointment',
-    },
-    {
-      header: 'Current regimen',
-      key: 'currentRegimen',
-    },
-    {
-      header: 'Adherence',
-      key: 'adherence',
-    },
-  ];
-
-  return (
-    <EmptyState
-      displayText={t('HTSScreeningDisplay', 'hts screened patients')}
-      headerTitle={t('HTSScreening', 'HTS Screening')}
-      scheduleType="Unscheduled"
-    />
-  );
-};
-
-export default HTSScreening;
diff --git a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/invalid-result.component.tsx b/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/invalid-result.component.tsx
deleted file mode 100755
index 98125bc..0000000
--- a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/invalid-result.component.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  DataTable,
-  TableContainer,
-  Table,
-  TableHead,
-  TableHeader,
-  TableRow,
-  TableBody,
-  TableCell,
-  TableToolbar,
-  TableToolbarContent,
-  TableToolbarSearch,
-  Pagination,
-  DataTableSkeleton,
-  Button,
-} from '@carbon/react';
-import { Download } from '@carbon/react/icons';
-import { ConfigurableLink, useConfig, usePagination } from '@openmrs/esm-framework';
-import { EmptyState } from '../empty-state/empty-state.component';
-
-const InvalidResult: React.FC = () => {
-  const { t } = useTranslation();
-  //data fetching hook called here, will populate the table rows
-
-  const headerData = [
-    {
-      header: 'Patient Name',
-      key: 'name',
-    },
-    {
-      header: 'Identifier',
-      key: 'identifier',
-    },
-    {
-      header: 'Gender',
-      key: 'gender',
-    },
-    {
-      header: 'Phone Number',
-      key: 'phoneNumber',
-    },
-  ];
-
-  return (
-    <EmptyState
-      displayText={t('invalidResultDisplayText', 'invalid results')}
-      headerTitle={t('invalidResultHeader', 'Invalid results')}
-      scheduleType="Unscheduled"
-    />
-  );
-};
-
-export default InvalidResult;
diff --git a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/module-uptake.component.tsx b/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/module-uptake.component.tsx
deleted file mode 100755
index 8415e26..0000000
--- a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/module-uptake.component.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  DataTable,
-  TableContainer,
-  Table,
-  TableHead,
-  TableHeader,
-  TableRow,
-  TableBody,
-  TableCell,
-  TableToolbar,
-  TableToolbarContent,
-  TableToolbarSearch,
-  Pagination,
-  DataTableSkeleton,
-  Button,
-} from '@carbon/react';
-import { Download } from '@carbon/react/icons';
-import { ConfigurableLink, useConfig, usePagination } from '@openmrs/esm-framework';
-import { EmptyState } from '../empty-state/empty-state.component';
-
-const ModuleUptake: React.FC = () => {
-  const { t } = useTranslation();
-  const [showTable, setShowTable] = useState(false);
-  //data fetching hook called here, will populate the table rows
-  const sampleData = [
-    {
-      id: '1',
-      mflCode: 'AM123',
-      facilityName: 'Ampath Ex 1',
-      county: 'Transzoia',
-      numberTested: 162,
-      numberTestedPositive: 1,
-      numberLinked: 1,
-      percentage: '100%',
-    },
-    {
-      id: '2',
-      mflCode: 'AM124',
-      facilityName: 'Ampath Ex 2',
-      county: 'Uasin Gishu',
-      numberTested: 200,
-      numberTestedPositive: 4,
-      numberLinked: 4,
-      percentage: '100%',
-    },
-  ];
-
-  const headerData = [
-    {
-      header: 'MFL Code',
-      key: 'mflCode',
-    },
-    {
-      header: 'Facility Name',
-      key: 'facilityName',
-    },
-    {
-      header: 'County',
-      key: 'county',
-    },
-    {
-      header: 'Number Tested',
-      key: 'numberTested',
-    },
-    {
-      header: 'Number Tested Positive',
-      key: 'numberTestedPositive',
-    },
-    {
-      header: 'Number Linked',
-      key: 'numberLinked',
-    },
-    {
-      header: 'Percentage',
-      key: 'percentage',
-    },
-  ];
-  return (
-    <div>
-      {/* <EmptyState
-      displayText={t('moduleUptakeDisplayText', 'module uptakes')}
-      headerTitle={t('moduleUptakeHeader', 'Module Uptake')}
-      scheduleType="Unscheduled"
-    /> */}
-      <DataTable
-        rows={sampleData}
-        headers={headerData}
-        render={({ rows, headers, getHeaderProps, getRowProps }) => (
-          <TableContainer title="Module Uptake Data">
-            <Table>
-              <TableHead>
-                <TableRow>
-                  {headers.map((header) => (
-                    <TableHeader key={header.key} {...getHeaderProps({ header })}>
-                      {header.header}
-                    </TableHeader>
-                  ))}
-                </TableRow>
-              </TableHead>
-              <TableBody>
-                {rows.map((row) => (
-                  <TableRow key={row.id} {...getRowProps({ row })}>
-                    {row.cells.map((cell) => (
-                      <TableCell key={cell.id}>{cell.value}</TableCell>
-                    ))}
-                  </TableRow>
-                ))}
-              </TableBody>
-            </Table>
-            <Pagination totalItems={sampleData.length} pageSize={10} pageSizes={[10, 20, 30, 40, 50]} />
-          </TableContainer>
-        )}
-      />
-    </div>
-  );
-};
-
-export default ModuleUptake;
diff --git a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/tested.component.tsx b/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/tested.component.tsx
deleted file mode 100755
index f2ddb00..0000000
--- a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tables/tested.component.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  DataTable,
-  TableContainer,
-  Table,
-  TableHead,
-  TableHeader,
-  TableRow,
-  TableBody,
-  TableCell,
-  TableToolbar,
-  TableToolbarContent,
-  TableToolbarSearch,
-  Pagination,
-  DataTableSkeleton,
-  Button,
-} from '@carbon/react';
-import { Download } from '@carbon/react/icons';
-import { ConfigurableLink, useConfig, usePagination } from '@openmrs/esm-framework';
-import { EmptyState } from '../empty-state/empty-state.component';
-
-const Tested: React.FC = () => {
-  const { t } = useTranslation();
-  //data fetching hook called here, will populate the table rows
-
-  const headerData = [
-    {
-      header: 'Patient Name',
-      key: 'name',
-    },
-    {
-      header: 'Identifier',
-      key: 'identifier',
-    },
-    {
-      header: 'Gender',
-      key: 'gender',
-    },
-    {
-      header: 'Phone Number',
-      key: 'phoneNumber',
-    },
-  ];
-
-  return (
-    <EmptyState
-      displayText={t('totalTestedDisplayText', 'tested patients')}
-      headerTitle={t('totalTestedHeader', 'Total Tested')}
-      scheduleType="Unscheduled"
-    />
-  );
-};
-
-export default Tested;
diff --git a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tabs.component.tsx b/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tabs.component.tsx
deleted file mode 100755
index f4909e3..0000000
--- a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tabs.component.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { Tabs, TabList, Tab, TabPanels, TabPanel } from '@carbon/react';
-import styles from './hts-patient-list-tabs.scss';
-import HTSScreening from './hts-patient-list-tables/hts-screening.component';
-import Eligible from './hts-patient-list-tables/eligible.component';
-import Tested from './hts-patient-list-tables/tested.component';
-import DueForLinkage from './hts-patient-list-tables/due-for-linkage.component';
-import DueForRetest from './hts-patient-list-tables/due-for-retest.component';
-import InvalidResult from './hts-patient-list-tables/invalid-result.component';
-import ModuleUptake from './hts-patient-list-tables/module-uptake.component';
-
-function HTSHomePatientTabs() {
-  const { t } = useTranslation();
-
-  return (
-    <div className={styles.tabs}>
-      <Tabs>
-        <TabList aria-label="List of tabs" contained>
-          <Tab>{t('HTSScreening', 'HTS Screening')}</Tab>
-          <Tab>{t('totalEligible', 'Total Eligible')}</Tab>
-          <Tab>{t('totalTested', 'Total Tested')}</Tab>
-          <Tab>{t('dueForRetest', 'Due For Retest')}</Tab>
-          <Tab>{t('dueForLinkage', 'Due For Linkage')}</Tab>
-          <Tab>{t('invalidResult', 'Invalid Result')}</Tab>
-          <Tab>{t('moduleUptake', 'Module Uptake')}</Tab>
-        </TabList>
-        <TabPanels>
-          <TabPanel>
-            <HTSScreening />
-          </TabPanel>
-          <TabPanel>
-            <Eligible />
-          </TabPanel>
-          <TabPanel>
-            <Tested />
-          </TabPanel>
-          <TabPanel>
-            <DueForRetest />
-          </TabPanel>
-          <TabPanel>
-            <DueForLinkage />
-          </TabPanel>
-          <TabPanel>
-            <InvalidResult />
-          </TabPanel>
-          <TabPanel>
-            <ModuleUptake />
-          </TabPanel>
-        </TabPanels>
-      </Tabs>
-    </div>
-  );
-}
-
-export default HTSHomePatientTabs;
diff --git a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tabs.scss b/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tabs.scss
deleted file mode 100755
index 86e2a8c..0000000
--- a/packages/esm-hts-app/src/views/dashboard/patient-list-tabs/hts-patient-list-tabs.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.tabs {
-  padding-top: 0.5rem;
-}
diff --git a/packages/esm-hts-app/src/views/dashboard/patient-summary/hts-patientsummary.scss b/packages/esm-hts-app/src/views/dashboard/patient-summary/hts-patientsummary.scss
deleted file mode 100755
index d0a2e90..0000000
--- a/packages/esm-hts-app/src/views/dashboard/patient-summary/hts-patientsummary.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-/* hts-patientsummary.scss */
-.summary-container {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-}
-
-.title {
-  text-align: left;
-  padding: 20px;
-}
-
-.tile {
-  width: 100%;
-  height: 200px;
-  background-color: #f0eded;
-  margin-bottom: 10px;
-}
-
-.table {
-  width: 100%;
-  height: 200px;
-  border: 10px solid #ccc;
-}
diff --git a/packages/esm-hts-app/src/views/dashboard/patient-summary/patient-summary.component.tsx b/packages/esm-hts-app/src/views/dashboard/patient-summary/patient-summary.component.tsx
deleted file mode 100755
index a87c94c..0000000
--- a/packages/esm-hts-app/src/views/dashboard/patient-summary/patient-summary.component.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import { EmptyState } from '@openmrs/esm-patient-common-lib';
-import { useTranslation } from 'react-i18next';
-
-const HtsPatientSummary: React.FC = () => {
-  const { t } = useTranslation();
-
-  const headerCharacteristics = t('characteristics', 'Characteristics');
-  const headerHIVMonitoring = t('HIVMonitoring', 'HIV Monitoring');
-  const headerLastVisitDetails = t('lastVisitDetails', 'Last Visit Details');
-
-  return (
-    <>
-      <EmptyState displayText={headerCharacteristics} headerTitle={headerCharacteristics} />
-
-      <EmptyState displayText={headerHIVMonitoring} headerTitle={headerHIVMonitoring} />
-
-      <EmptyState displayText={headerLastVisitDetails} headerTitle={headerLastVisitDetails} />
-    </>
-  );
-};
-
-export default HtsPatientSummary;
diff --git a/packages/esm-hts-app/src/views/dashboard/summary-tiles/hts-summary-tile.scss b/packages/esm-hts-app/src/views/dashboard/summary-tiles/hts-summary-tile.scss
deleted file mode 100755
index 1f81b11..0000000
--- a/packages/esm-hts-app/src/views/dashboard/summary-tiles/hts-summary-tile.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-.tileContent {
-  display: flex;
-  flex-direction: column;
-  align-items: space-between;
-}
-
-.tileContainer {
-  background-color: white;
-  border: 0.0625rem solid #e0e0e0;
-  height: 7.875rem;
-  padding: 1rem;
-  margin: 0.5rem 0.5rem;
-  flex-grow: 1;
-}
-
-.tileHeader {
-  font-size: 0.875rem;
-  font-weight: 600;
-  line-height: 1.28572;
-  letter-spacing: 0.16px;
-  color: #525252;
-}
-
-.displayDetails {
-  margin-top: 1.5rem;
-}
-
-.displayData {
-  font-size: 1.75rem;
-  font-weight: 400;
-  line-height: 1.28572;
-  letter-spacing: 0;
-  color: #161616;
-}
diff --git a/packages/esm-hts-app/src/views/dashboard/summary-tiles/hts-summary-tiles-overall-uptake.component.tsx b/packages/esm-hts-app/src/views/dashboard/summary-tiles/hts-summary-tiles-overall-uptake.component.tsx
deleted file mode 100755
index eff2b53..0000000
--- a/packages/esm-hts-app/src/views/dashboard/summary-tiles/hts-summary-tiles-overall-uptake.component.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-import { Tile } from '@carbon/react';
-import styles from './hts-summary-tile.scss';
-interface SummaryTileProps {
-  headerTitle: string;
-}
-
-const HTSSummaryTileOverallUptake: React.FC<SummaryTileProps> = ({ headerTitle }) => {
-  return (
-    <React.Fragment>
-      <Tile className={styles.tileContainer}>
-        <div>
-          <div className={styles.tileContent}>
-            <div className={styles.tileHeader}>
-              <header>{headerTitle}</header>
-            </div>
-            <div className={styles.displayDetails}>
-              <div>Percentage</div>
-              <div className={styles.displayData}>0%</div>
-            </div>
-          </div>
-        </div>
-      </Tile>
-    </React.Fragment>
-  );
-};
-
-export default HTSSummaryTileOverallUptake;
diff --git a/packages/esm-hts-app/src/views/dashboard/summary-tiles/hts-summary-tiles.component.tsx b/packages/esm-hts-app/src/views/dashboard/summary-tiles/hts-summary-tiles.component.tsx
deleted file mode 100755
index 187a335..0000000
--- a/packages/esm-hts-app/src/views/dashboard/summary-tiles/hts-summary-tiles.component.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-import { Tile } from '@carbon/react';
-import styles from './hts-summary-tile.scss';
-interface SummaryTileProps {
-  headerTitle: string;
-}
-
-const HTSSummaryTile: React.FC<SummaryTileProps> = ({ headerTitle }) => {
-  return (
-    <React.Fragment>
-      <Tile className={styles.tileContainer}>
-        <div>
-          <div className={styles.tileContent}>
-            <div className={styles.tileHeader}>
-              <header>{headerTitle}</header>
-            </div>
-            <div className={styles.displayDetails}>
-              <div>Patients</div>
-              <div className={styles.displayData}>{0}</div>
-            </div>
-          </div>
-        </div>
-      </Tile>
-    </React.Fragment>
-  );
-};
-
-export default HTSSummaryTile;
diff --git a/packages/esm-hts-app/translations/en.json b/packages/esm-hts-app/translations/en.json
deleted file mode 100755
index d666264..0000000
--- a/packages/esm-hts-app/translations/en.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "characteristics": "Characteristics",
-  "createAppointment": "Create appointment",
-  "dueForLinkage": "Due For Linkage",
-  "dueForLinkageDisplayText": "due for linkage patients",
-  "dueForLinkageHeader": "Due for linkage",
-  "dueForRetest": "Due For Retest",
-  "dueForRetestDisplayText": "due for retest patients",
-  "dueForRetestHeader": "Due for retest",
-  "eligibilityDisplay": "patients eligible for hts screening",
-  "eligibilityHeader": "Eligible patients",
-  "emptyStateText": "There are no {{displayText}} to display",
-  "HIVMonitoring": "HIV Monitoring",
-  "hts": "HTS Dashboard",
-  "htsInitial": "HTS Initial",
-  "htsLinkage": "HTS Linkage",
-  "htsReferred": "HTS Referred",
-  "htsRetest": "HTS Retest",
-  "htsScreening": "HTS Screening",
-  "HTSScreening": "HTS Screening",
-  "HTSScreeningDisplay": "hts screened patients",
-  "invalidResult": "Invalid Result",
-  "invalidResultDisplayText": "invalid results",
-  "invalidResultHeader": "Invalid results",
-  "lastVisitDetails": "Last Visit Details",
-  "moduleUptake": "Module Uptake",
-  "overallUptake": "Overall Uptake",
-  "totalEligible": "Total Eligible",
-  "totalInvalid": "Total invalid",
-  "totalNegative": "Total negative",
-  "totalPositive": "Total positive",
-  "totalScreened": "Total screened",
-  "totalTested": "Total Tested",
-  "totalTestedDisplayText": "tested patients",
-  "totalTestedHeader": "Total Tested"
-}
diff --git a/packages/esm-hts-app/tsconfig.json b/packages/esm-hts-app/tsconfig.json
deleted file mode 100755
index 54ce28c..0000000
--- a/packages/esm-hts-app/tsconfig.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "include": ["src/**/*"],
-  "exclude": ["src/**/*.test.tsx"]
-}
diff --git a/packages/esm-hts-app/webpack.config.js b/packages/esm-hts-app/webpack.config.js
deleted file mode 100755
index 2c74029..0000000
--- a/packages/esm-hts-app/webpack.config.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('openmrs/default-webpack-config');
diff --git a/packages/esm-lab-order-manifest-app/jest.config.js b/packages/esm-lab-order-manifest-app/jest.config.js
deleted file mode 100755
index 0352f62..0000000
--- a/packages/esm-lab-order-manifest-app/jest.config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const rootConfig = require('../../jest.config.js');
-
-module.exports = rootConfig;
diff --git a/packages/esm-lab-order-manifest-app/package.json b/packages/esm-lab-order-manifest-app/package.json
deleted file mode 100755
index 0438801..0000000
--- a/packages/esm-lab-order-manifest-app/package.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "name": "@ampath/esm-lab-order-manifest-app",
-  "version": "6.0.0",
-  "description": "AMPATH lab Orders Manifest App",
-  "browser": "dist/ampath-esm-lab-order-manifest-app.js",
-  "main": "src/index.ts",
-  "source": true,
-  "license": "MPL-2.0",
-  "homepage": "https://github.com/AMPATH/ampath-esm-3.x#readme",
-  "scripts": {
-    "start": "openmrs develop --port 4542 --backend http://amrs.ampath.or.ke:8080 --api-url /amrs --importmap http://amrs.ampath.or.ke:8080/amrs/spa/importmap.json",
-    "serve": "webpack serve --mode=development",
-    "debug": "npm run serve",
-    "build": "webpack --mode production",
-    "analyze": "webpack --mode=production --env.analyze=true",
-    "lint": "cross-env TIMING=1 eslint src --ext ts,tsx",
-    "test": "cross-env TZ=UTC jest --config jest.config.js --verbose false --passWithNoTests --color",
-    "test:watch": "cross-env TZ=UTC jest --watch --config jest.config.js --color",
-    "coverage": "yarn test --coverage",
-    "typescript": "tsc",
-    "extract-translations": "i18next 'src/**/*.component.tsx'"
-  },
-  "browserslist": [
-    "extends browserslist-config-openmrs"
-  ],
-  "keywords": [
-    "openmrs",
-    "ampath"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/AMPATH/ampath-esm-3.x.git"
-  },
-  "bugs": {
-    "url": "https://github.com/AMPATH/ampath-esm-3.x/issues"
-  },
-  "dependencies": {
-    "@carbon/react": "~1.37.0",
-    "lodash-es": "^4.17.15"
-  },
-  "peerDependencies": {
-    "@openmrs/esm-framework": "5.x",
-    "@openmrs/esm-laboratory-app": "*",
-    "react": "^18.1.0",
-    "react-i18next": "11.x",
-    "react-router-dom": "6.x",
-    "swr": "2.x"
-  },
-  "devDependencies": {
-    "webpack": "^5.74.0"
-  }
-}
diff --git a/packages/esm-lab-order-manifest-app/src/config-schema.ts b/packages/esm-lab-order-manifest-app/src/config-schema.ts
deleted file mode 100755
index 81d64f9..0000000
--- a/packages/esm-lab-order-manifest-app/src/config-schema.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Type } from '@openmrs/esm-framework';
-export const configSchema = {
-  basicAuthBase64: {
-    _type: Type.String,
-    _description: 'Basic auth base64 string for the API call e.g Basic someBase64String==',
-    _default: '',
-  },
-};
diff --git a/packages/esm-lab-order-manifest-app/src/declarations.d.ts b/packages/esm-lab-order-manifest-app/src/declarations.d.ts
deleted file mode 100755
index 8539186..0000000
--- a/packages/esm-lab-order-manifest-app/src/declarations.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare module '@carbon/react';
-declare module '*.css';
-declare module '*.scss';
-declare type SideNavProps = {};
diff --git a/packages/esm-lab-order-manifest-app/src/index.ts b/packages/esm-lab-order-manifest-app/src/index.ts
deleted file mode 100755
index c306f29..0000000
--- a/packages/esm-lab-order-manifest-app/src/index.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework';
-import { configSchema } from './config-schema';
-import Root from './root.component';
-
-const moduleName = '@ampath/esm-lab-order-manifest-app';
-
-const options = {
-  featureName: 'esm-lab-order-manifest-app',
-  moduleName,
-};
-
-export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');
-
-export const root = getSyncLifecycle(Root, options);
-export const manifestOrdersComponent = getAsyncLifecycle(
-  () => import('./lab-order-manifest/manifest-orders.component'),
-  options,
-);
-
-export const postOrderToEidDialog = getAsyncLifecycle(
-  () => import('./lab-order-manifest/dialog/post-to-eid-dialog.component'),
-  options,
-);
-
-export const postOrderToEidButton = getAsyncLifecycle(
-  () => import('./lab-order-manifest/order-actions/post-to-eid-action.component'),
-  options,
-);
-
-export function startupApp() {
-  defineConfigSchema(moduleName, configSchema);
-}
diff --git a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/post-orde-to-eid-dialog.scss b/packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/post-orde-to-eid-dialog.scss
deleted file mode 100755
index e76de4d..0000000
--- a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/post-orde-to-eid-dialog.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-
-section {
-  margin: spacing.$spacing-03;
-}
-
-.sectionTitle {
-  margin-bottom: spacing.$spacing-04;
-}
-
-.modalBody {
-  padding-bottom: spacing.$spacing-05;
-}
diff --git a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/post-to-eid-dialog.component.tsx b/packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/post-to-eid-dialog.component.tsx
deleted file mode 100755
index 3028f03..0000000
--- a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/post-to-eid-dialog.component.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import React, { useState } from 'react';
-
-import {
-  Button,
-  ContentSwitcher,
-  Form,
-  ModalBody,
-  ModalFooter,
-  ModalHeader,
-  Select,
-  SelectItem,
-  Switch,
-  TextArea,
-  Grid,
-  Checkbox,
-  TextInput,
-  IconButton,
-} from '@carbon/react';
-import { useTranslation } from 'react-i18next';
-import styles from './post-orde-to-eid-dialog.scss';
-import { type Result } from '../manifest-orders-list-resource';
-import { PostToEid } from './post-to-eid-dialog.resource';
-import { showNotification, showSnackbar } from '@openmrs/esm-framework';
-
-import { Card } from './verification.component';
-
-interface PostOrderDialogProps {
-  order: Result;
-  closeModal: () => void;
-}
-
-const PostEidOrderDialog: React.FC<PostOrderDialogProps> = ({ order, closeModal }) => {
-  const { t } = useTranslation();
-
-  const [notes, setNotes] = useState('');
-
-  const postOrder = async (event) => {
-    event.preventDefault();
-    // TODO Clean up for amrs posting to nascop eid
-    const payload = {
-      fulfillerStatus: 'EXCEPTION',
-      fulfillerComment: notes,
-    };
-    PostToEid(order.uuid, payload).then(
-      (resp) => {
-        showSnackbar({
-          isLowContrast: true,
-          title: t('postOrder', 'Post Order'),
-          kind: 'success',
-          subtitle: t(
-            'successfullyPosted',
-            `You have successfully posted an Order with OrderNumber ${order.orderNumber} `,
-          ),
-        });
-        closeModal();
-      },
-      (err) => {
-        showNotification({
-          title: t(`errorRejectingOrder', 'Error Rejecting the order`),
-          kind: 'error',
-          critical: true,
-          description: err?.message,
-        });
-      },
-    );
-  };
-
-  return (
-    <div>
-      <Form onSubmit={postOrder}>
-        <ModalHeader closeModal={closeModal} title={t('postOrder', 'Post Order To EID')} />
-        <ModalBody>
-          <div className={styles.modalBody}>
-            <section className={styles.section}>
-              <h5 className={styles.section}>
-                {order?.accessionNumber} &nbsp; · &nbsp;{order?.fulfillerStatus} &nbsp; · &nbsp;
-                {order?.orderNumber}
-                &nbsp;
-              </h5>
-            </section>
-            <br />
-            <section className={styles.section}>
-              <Card label="Client ID (CCC Number)" value="" />
-              <TextArea
-                labelText={t('notes', 'Enter Comments ')}
-                id="nextNotes"
-                name="nextNotes"
-                invalidText="Required"
-                helperText="Please enter comment"
-                maxCount={500}
-                enableCounter
-                onChange={(e) => setNotes(e.target.value)}
-              />
-            </section>
-          </div>
-        </ModalBody>
-        <ModalFooter>
-          <Button kind="secondary" onClick={closeModal}>
-            {t('cancel', 'Cancel')}
-          </Button>
-          <Button kind="success" type="submit">
-            {t('postToEid', 'Post To EID')}
-          </Button>
-        </ModalFooter>
-      </Form>
-    </div>
-  );
-};
-
-export default PostEidOrderDialog;
diff --git a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/post-to-eid-dialog.resource.ts b/packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/post-to-eid-dialog.resource.ts
deleted file mode 100755
index 8fcf8f4..0000000
--- a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/post-to-eid-dialog.resource.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { openmrsFetch } from '@openmrs/esm-framework';
-
-export async function PostToEid(uuid: string, body: any) {
-  const abortController = new AbortController();
-
-  return openmrsFetch(`/ws/rest/v1/order/${uuid}/fulfillerdetails/`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    signal: abortController.signal,
-    body: body,
-  });
-}
diff --git a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/verification-modal.scss b/packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/verification-modal.scss
deleted file mode 100755
index 33765c8..0000000
--- a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/verification-modal.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-@use '@carbon/type';
-@use '@carbon/colors';
-
-.cardContainer {
-  display: grid;
-  grid-template-columns: 0.5fr 1fr;
-  column-gap: 0.25rem;
-  margin: 0.5rem 0;
-}
-
-.label {
-  @include type.type-style('body-compact-02');
-  color: colors.$cool-gray-100;
-  font-weight: bold;
-}
-
-.value {
-  @include type.type-style('legal-01');
-  color: colors.$cool-gray-80;
-}
diff --git a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/verification.component.tsx b/packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/verification.component.tsx
deleted file mode 100755
index 6bf9ec7..0000000
--- a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/dialog/verification.component.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import React from 'react';
-import { ModalHeader, ModalBody, ModalFooter, Button } from '@carbon/react';
-import { useTranslation } from 'react-i18next';
-import styles from './verification-modal.scss';
-
-type VerificationModalProps = { clientData; closeModal };
-
-const VerificationModal: React.FC<VerificationModalProps> = ({ clientData, closeModal }) => {
-  const { t } = useTranslation();
-  return (
-    <div>
-      <ModalHeader closeModal={closeModal} title={t('clientRegistry', 'Client registry')} />
-      <ModalBody>
-        <p>{t('clientRegistry', 'Client registry')}</p>
-        <Card label="Name" value={`${clientData.firstName} ${clientData.middleName} ${clientData.lastName}`} />
-        <Card
-          label="Identification Type"
-          value={clientData.identifications.map((id) => id.identificationType).join(' ')}
-        />
-        <Card
-          label="Identication Number"
-          value={clientData.identifications.map((id) => id.identificationNumber).join(' ')}
-        />
-        <Card label="Date of Birth" value={clientData.dateOfBirth} />
-        <Card label={t('gender', 'Gender')} value={clientData.gender} />
-      </ModalBody>
-      <ModalFooter>
-        <Button kind="secondary" onClick={() => {}}>
-          {t('contactSupport', 'Contact supportt')}
-        </Button>
-        <Button kind="danger" onClick={closeModal}>
-          {t('continue', 'Continue')}
-        </Button>
-      </ModalFooter>
-    </div>
-  );
-};
-
-export default VerificationModal;
-
-export const Card: React.FC<{ label: string; value: string }> = ({ label, value }) => {
-  return (
-    <div className={styles.cardContainer}>
-      <span>{label}</span>
-      <span>{value}</span>
-    </div>
-  );
-};
diff --git a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/manifest-orders-list-resource.ts b/packages/esm-lab-order-manifest-app/src/lab-order-manifest/manifest-orders-list-resource.ts
deleted file mode 100755
index 1beb709..0000000
--- a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/manifest-orders-list-resource.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import { openmrsFetch } from '@openmrs/esm-framework';
-import useSWR from 'swr';
-
-export interface Result {
-  uuid: string;
-  orderNumber: string;
-  accessionNumber: string;
-  patient: Patient;
-  concept: Concept;
-  action: string;
-  careSetting: CareSetting;
-  previousOrder: PreviousOrder;
-  dateActivated: string;
-  scheduledDate: any;
-  dateStopped: any;
-  autoExpireDate: any;
-  encounter: Encounter;
-  orderer: Orderer;
-  orderReason: any;
-  orderReasonNonCoded: any;
-  orderType: OrderType;
-  urgency: string;
-  instructions: any;
-  commentToFulfiller: any;
-  display: string;
-  auditInfo: AuditInfo;
-  fulfillerStatus: string;
-  fulfillerComment: any;
-  specimenSource: SpecimenSource;
-  laterality: any;
-  clinicalHistory: any;
-  frequency: any;
-  numberOfRepeats: any;
-  links: Link[];
-  type: string;
-  resourceVersion: string;
-}
-
-export interface Patient {
-  uuid: string;
-  display: string;
-  links: Link[];
-}
-
-export interface Link {
-  rel: string;
-  uri: string;
-  resourceAlias: string;
-}
-
-export interface Concept {
-  uuid: string;
-  display: string;
-  links: Link[];
-}
-
-export interface CareSetting {
-  uuid: string;
-  name: string;
-  description: string;
-  retired: boolean;
-  careSettingType: string;
-  display: string;
-  links: Link[];
-  resourceVersion: string;
-}
-
-export interface PreviousOrder {
-  uuid: string;
-  display: string;
-  links: Link[];
-  type: string;
-}
-
-export interface Encounter {
-  uuid: string;
-  display: string;
-  links: Link[];
-}
-
-export interface Orderer {
-  uuid: string;
-  display: string;
-  links: Link[];
-}
-
-export interface OrderType {
-  uuid: string;
-  display: string;
-  name: string;
-  javaClassName: string;
-  retired: boolean;
-  description: string;
-  conceptClasses: any[];
-  parent: any;
-  links: Link[];
-  resourceVersion: string;
-}
-
-export interface AuditInfo {
-  creator: Creator;
-  dateCreated: string;
-  changedBy: any;
-  dateChanged: any;
-}
-
-export interface Creator {
-  uuid: string;
-  display: string;
-  links: Link[];
-}
-
-export interface SpecimenSource {
-  uuid: string;
-  display: string;
-  links: Link[];
-}
-
-export function useGetOrdersWorklist(activatedOnOrAfterDate: string, fulfillerStatus: string) {
-  const apiUrl = `/ws/rest/v1/order?orderTypes=52a447d3-a64a-11e3-9aeb-50e549534c5e&activatedOnOrAfterDate=${activatedOnOrAfterDate}&isStopped=false&fulfillerStatus=${fulfillerStatus}&v=full
-`;
-
-  const { data, error, isLoading } = useSWR<{ data: { results: Array<Result> } }, Error>(apiUrl, openmrsFetch);
-
-  return {
-    workListEntries: data?.data ? data.data.results : [],
-    isLoading,
-    isError: error,
-  };
-}
diff --git a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/manifest-orders-list.tsx b/packages/esm-lab-order-manifest-app/src/lab-order-manifest/manifest-orders-list.tsx
deleted file mode 100755
index a11e784..0000000
--- a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/manifest-orders-list.tsx
+++ /dev/null
@@ -1,230 +0,0 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import {
-  DataTable,
-  DataTableSkeleton,
-  Pagination,
-  Table,
-  TableBody,
-  TableCell,
-  TableContainer,
-  TableHead,
-  TableHeader,
-  TableRow,
-  Dropdown,
-  TabPanel,
-  TableToolbar,
-  TableToolbarContent,
-  TableToolbarSearch,
-  Layer,
-  Tag,
-  Tile,
-  Button,
-  DatePicker,
-  DatePickerInput,
-} from '@carbon/react';
-import styles from './manifest-styles.scss';
-
-import { useTranslation } from 'react-i18next';
-import { ExtensionSlot, age, formatDate, formatDatetime, parseDate, usePagination } from '@openmrs/esm-framework';
-
-import { type Result, useGetOrdersWorklist } from './manifest-orders-list-resource';
-import { getStatusColor } from '../utils/function';
-
-interface ManifestOrdersListProps {}
-
-interface PostOrderProps {
-  order: Result;
-}
-
-const ManifestOrdersList: React.FC<ManifestOrdersListProps> = () => {
-  const { t } = useTranslation();
-
-  const OrderStatuses = ['All', 'RECEIVED', 'IN_PROGRESS', 'COMPLETED', 'EXCEPTION', 'ON_HOLD', 'DECLINED'];
-
-  const [activatedOnOrAfterDate, setActivatedOnOrAfterDate] = useState('');
-
-  const [filter, setFilter] = useState<
-    'All' | 'EXCEPTION' | 'RECEIVED' | 'COMPLETED' | 'IN_PROGRESS' | 'ON_HOLD' | 'DECLINED'
-  >('All');
-
-  const { workListEntries, isLoading } = useGetOrdersWorklist(activatedOnOrAfterDate, '');
-
-  const filteredStatus = useMemo(() => {
-    if (!filter || filter == 'All') {
-      return workListEntries;
-    }
-
-    if (filter) {
-      return workListEntries?.filter((order) => order.fulfillerStatus === filter);
-    }
-
-    return workListEntries;
-  }, [filter, workListEntries]);
-
-  const pageSizes = [10, 20, 30, 40, 50];
-  const [currentPageSize, setPageSize] = useState(10);
-
-  const { goTo, results: paginatedWorklistQueueEntries, currentPage } = usePagination(filteredStatus, currentPageSize);
-  // get picked orders
-  let columns = [
-    { id: 0, header: t('date', 'Date'), key: 'date' },
-
-    { id: 1, header: t('orderNumber', 'Order Number'), key: 'orderNumber' },
-    { id: 2, header: t('patient', 'Patient'), key: 'patient' },
-
-    {
-      id: 3,
-      header: t('accessionNumber', 'Accession Number'),
-      key: 'accessionNumber',
-    },
-    { id: 4, header: t('test', 'Test'), key: 'test' },
-    { id: 5, header: t('action', 'Action'), key: 'action' },
-    { id: 6, header: t('status', 'Status'), key: 'status' },
-    { id: 8, header: t('orderer', 'Orderer'), key: 'orderer' },
-    { id: 9, header: t('urgency', 'Urgency'), key: 'urgency' },
-    { id: 10, header: t('actions', 'Actions'), key: 'actions' },
-  ];
-
-  const handleOrderStatusChange = ({ selectedItem }) => setFilter(selectedItem);
-  const tableRows = useMemo(() => {
-    return paginatedWorklistQueueEntries
-      ?.filter((item) => item.action === 'NEW')
-      .map((entry, index) => ({
-        ...entry,
-        id: entry.uuid,
-        date: {
-          content: (
-            <>
-              <span className={styles['single-line-display']}>{formatDate(parseDate(entry.dateActivated))}</span>
-            </>
-          ),
-        },
-        patient: {
-          content: (
-            <>
-              <span>{entry.patient.display.split('-')[1]}</span>
-            </>
-          ),
-        },
-        orderNumber: { content: <span>{entry.orderNumber}</span> },
-        accessionNumber: { content: <span>{entry.accessionNumber}</span> },
-        test: { content: <span>{entry.concept.display}</span> },
-        action: { content: <span>{entry.action}</span> },
-        status: {
-          content: (
-            <>
-              <Tag>
-                <span className={styles.statusContainer} style={{ color: `${getStatusColor(entry.fulfillerStatus)}` }}>
-                  <span>{entry.fulfillerStatus}</span>
-                </span>
-              </Tag>
-            </>
-          ),
-        },
-        orderer: { content: <span>{entry.orderer.display}</span> },
-        urgency: { content: <span>{entry.urgency}</span> },
-        actions: {
-          content: <></>,
-        },
-      }));
-  }, [paginatedWorklistQueueEntries]);
-  if (isLoading) {
-    return <DataTableSkeleton role="progressbar" />;
-  }
-  if (paginatedWorklistQueueEntries?.length >= 0) {
-    return (
-      <DataTable rows={tableRows} headers={columns} useZebraStyles overflowMenuOnHover={true}>
-        {({ rows, headers, getHeaderProps, getTableProps, getRowProps, onInputChange }) => (
-          <TableContainer className={styles.tableContainer}>
-            <TableToolbar
-              style={{
-                position: 'static',
-                height: '3rem',
-                overflow: 'visible',
-                backgroundColor: 'color',
-              }}>
-              <TableToolbarContent>
-                <Layer style={{ margin: '5px' }}>
-                  <Dropdown
-                    id="orderStatus"
-                    initialSelectedItem={'All'}
-                    label=""
-                    titleText={t('filterOrdersByStatus', 'Filter Orders by status') + ':'}
-                    type="inline"
-                    items={OrderStatuses}
-                    onChange={handleOrderStatusChange}
-                  />
-                </Layer>
-
-                <Layer style={{ margin: '5px' }}>
-                  <DatePicker dateFormat="Y-m-d" datePickerType="single">
-                    <DatePickerInput
-                      labelText={''}
-                      id="activatedOnOrAfterDate"
-                      placeholder="YYYY-MM-DD"
-                      onChange={(event) => {
-                        setActivatedOnOrAfterDate(event.target.value);
-                      }}
-                      type="date"
-                      value={activatedOnOrAfterDate}
-                    />
-                  </DatePicker>
-                </Layer>
-              </TableToolbarContent>
-            </TableToolbar>
-            <Table {...getTableProps()} className={styles.activePatientsTable}>
-              <TableHead>
-                <TableRow>
-                  {headers.map((header) => (
-                    <TableHeader {...getHeaderProps({ header })}>{header.header?.content ?? header.header}</TableHeader>
-                  ))}
-                </TableRow>
-              </TableHead>
-              <TableBody>
-                {rows.map((row, index) => {
-                  return (
-                    <React.Fragment key={row.id}>
-                      <TableRow {...getRowProps({ row })} key={row.id}>
-                        {row.cells.map((cell) => (
-                          <TableCell key={cell.id}>{cell.value?.content ?? cell.value}</TableCell>
-                        ))}
-                      </TableRow>
-                    </React.Fragment>
-                  );
-                })}
-              </TableBody>
-            </Table>
-            {rows.length === 0 ? (
-              <div className={styles.tileContainer}>
-                <Tile className={styles.tile}>
-                  <div className={styles.tileContent}>
-                    <p className={styles.content}>{t('noWorklistsToDisplay', 'No worklists orders to display')}</p>
-                  </div>
-                </Tile>
-              </div>
-            ) : null}
-            <Pagination
-              forwardText="Next page"
-              backwardText="Previous page"
-              page={currentPage}
-              pageSize={currentPageSize}
-              pageSizes={pageSizes}
-              totalItems={workListEntries?.length}
-              className={styles.pagination}
-              onChange={({ pageSize, page }) => {
-                if (pageSize !== currentPageSize) {
-                  setPageSize(pageSize);
-                }
-                if (page !== currentPage) {
-                  goTo(page);
-                }
-              }}
-            />
-          </TableContainer>
-        )}
-      </DataTable>
-    );
-  }
-};
-
-export default ManifestOrdersList;
diff --git a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/manifest-orders.component.tsx b/packages/esm-lab-order-manifest-app/src/lab-order-manifest/manifest-orders.component.tsx
deleted file mode 100755
index e348106..0000000
--- a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/manifest-orders.component.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from 'react';
-import { Search } from '@carbon/react';
-import styles from './manifest-styles.scss';
-import { t } from 'i18next';
-import { useTranslation } from 'react-i18next';
-import ManifestOrdersList from './manifest-orders-list';
-
-const ManifestOrders = () => {
-  const { t } = useTranslation();
-  return (
-    <section className={styles.orderTabsContainer}>
-      <div className={styles.searchContainer}>
-        <Search
-          closeButtonLabelText={t('clearSearchInput', 'Clear search input')}
-          placeholder={t('searchByPatientIdOrName', 'Search by patient ID or name')}
-          labelText={t('searchByPatientIdOrName', 'Search by patient ID or name')}
-          onChange={(e) => {
-            e.preventDefault();
-            // setSearchTermUserInput(e.target.value);
-          }}
-          size="md"
-          className={styles.patientSearch}
-        />
-      </div>
-      <div>
-        <h5>Order list</h5>
-        <ManifestOrdersList />
-      </div>
-    </section>
-  );
-};
-
-export default ManifestOrders;
diff --git a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/manifest-styles.scss b/packages/esm-lab-order-manifest-app/src/lab-order-manifest/manifest-styles.scss
deleted file mode 100755
index c6c525f..0000000
--- a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/manifest-styles.scss
+++ /dev/null
@@ -1,212 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@import '~@openmrs/esm-styleguide/src/vars';
-@import '../root.scss';
-
-title {
-  width: 6.938rem;
-  height: 1.75rem;
-  margin: 0.438rem 22.875rem 0.813rem 0;
-  font-family: IBMPlexSans;
-  font-size: 1.25rem;
-  font-weight: normal;
-  font-stretch: normal;
-  font-style: normal;
-  line-height: 1.4;
-  letter-spacing: normal;
-}
-
-.link {
-  text-decoration: none;
-}
-
-.breadcrumbsSlot {
-  grid-row: 1 / 2;
-  grid-column: 1 / 2;
-}
-
-.orderTabsContainer {
-  height: 100%;
-  width: 100%;
-
-  :global(.cds--tab-content) {
-    padding: 0 !important;
-  }
-}
-
-.orderTabs {
-  grid-column: 'span 2';
-  padding: 0 spacing.$spacing-05;
-}
-
-.newListButton {
-  width: fit-content;
-  justify-self: end;
-  align-self: center;
-}
-
-.tabsContainer {
-  background-color: $ui-02;
-
-  :global(.cds--tabs__nav-item--selected) {
-    box-shadow: inset 0 2px 0 0 var(--brand-03) !important;
-  }
-
-  :global(.cds--tab--list) button {
-    max-width: 12rem !important;
-  }
-}
-
-.hiddenTabsContent,
-.tabs .hiddenTabsContent {
-  display: none;
-}
-
-.patientListTableContainer {
-  grid-row: 3 / 4;
-  grid-column: 1 / 2;
-  height: 100%;
-  margin: 0.5rem spacing.$spacing-05;
-  background-color: $ui-01;
-  border: 0.5px solid #e0e0e0;
-
-  :global(.cds--data-table-container) {
-    padding-top: 0 !important;
-  }
-
-  tbody > tr > :nth-child(2) {
-    white-space: nowrap;
-  }
-
-  :global(.cds--data-table td) {
-    height: unset !important;
-  }
-
-  :global(.cds--data-table--zebra) tbody tr[data-parent-row]:nth-child(4n + 1) td {
-    background-color: $ui-02;
-    border-bottom: 1px solid $ui-03;
-    border-top: 1px solid $ui-03;
-  }
-
-  :global(.cds--data-table--zebra) tbody tr[data-parent-row]:nth-child(4n + 3) td {
-    background-color: $ui-01;
-    border-bottom: 1px solid $ui-03;
-  }
-}
-
-.tableContainer {
-  background-color: $ui-01;
-  margin: 0 spacing.$spacing-05;
-  padding: 0;
-
-  a {
-    text-decoration: none;
-  }
-
-  th {
-    color: $text-02;
-  }
-
-  :global(.cds--data-table) {
-    background-color: $ui-03;
-  }
-
-  .toolbarContent {
-    height: spacing.$spacing-07;
-    margin-bottom: spacing.$spacing-02;
-  }
-}
-
-.activePatientsTable tr:last-of-type {
-  td {
-    border-bottom: none;
-  }
-}
-
-.searchContainer {
-  display: flex;
-  align-items: center;
-  flex-direction: row-reverse;
-  padding-top: 0.5rem;
-
-  :global(.cds--search-magnifier-icon) {
-    z-index: 0 !important;
-  }
-
-  input {
-    background-color: #fff;
-  }
-}
-
-.addOrderBtn {
-  width: 10rem !important;
-  padding: 0.5rem !important;
-  margin-left: 1rem;
-  margin-right: 1rem;
-}
-
-.patientSearch {
-  width: 25rem;
-  border-bottom-color: $ui-03;
-}
-
-.locationFilter {
-  width: 25rem;
-}
-
-.search {
-  width: 100%;
-  max-width: 16rem;
-  background-color: $ui-02;
-  border-bottom-color: $ui-03;
-}
-
-.container {
-  background-color: $ui-01;
-}
-
-.expandedLabQueueVisitRow {
-  :global(.cds--tab-content) {
-    padding: 0.5rem 0;
-  }
-
-  td {
-    padding: 0.5rem;
-
-    > div {
-      max-height: max-content !important;
-      background-color: $ui-02;
-    }
-  }
-
-  th[colspan] td[colspan] > div:first-child {
-    padding: 0 1rem;
-  }
-}
-
-.tileContainer {
-  background-color: $ui-02;
-  border-top: 1px solid $ui-03;
-  padding: 5rem 0;
-}
-
-.tile {
-  margin: auto;
-  width: fit-content;
-}
-
-.tileContent {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-.content {
-  @include type.type-style('heading-compact-02');
-  color: $text-02;
-  margin-bottom: 0.5rem;
-}
-
-.single-line-display {
-  white-space: nowrap;
-}
diff --git a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/order-actions/post-to-eid-action.component.tsx b/packages/esm-lab-order-manifest-app/src/lab-order-manifest/order-actions/post-to-eid-action.component.tsx
deleted file mode 100755
index 115f7a5..0000000
--- a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/order-actions/post-to-eid-action.component.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React, { useCallback } from 'react';
-import { OverflowMenuItem, OverflowMenu } from '@carbon/react';
-import { useTranslation } from 'react-i18next';
-import { showModal } from '@openmrs/esm-framework';
-import { type Result } from '../manifest-orders-list-resource';
-
-interface PostEidOrderOverflowMenuItemProps {
-  order: Result;
-}
-
-const RejectOrderOverflowMenuItem: React.FC<PostEidOrderOverflowMenuItemProps> = ({ order }) => {
-  const { t } = useTranslation();
-
-  const handlePostEidOrderModel = useCallback(() => {
-    const dispose = showModal('post-lab-order-to-eid-component', {
-      closeModal: () => dispose(),
-      order,
-    });
-  }, [order]);
-  return (
-    <OverflowMenuItem
-      itemText={t('postOrder', 'Post Order')}
-      onClick={handlePostEidOrderModel}
-      style={{
-        maxWidth: '100vw',
-      }}
-      isDelete={true}
-      hasDivider
-    />
-  );
-};
-
-export default RejectOrderOverflowMenuItem;
diff --git a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/pre-appointment.scss b/packages/esm-lab-order-manifest-app/src/lab-order-manifest/pre-appointment.scss
deleted file mode 100755
index 0501a46..0000000
--- a/packages/esm-lab-order-manifest-app/src/lab-order-manifest/pre-appointment.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/colors';
-
-.preAppointment {
-  margin: spacing.$spacing-05;
-  padding: spacing.$spacing-05;
-  border: 1px solid colors.$cool-gray-20;
-}
-
-.emptyStateContainer {
-  margin: spacing.$spacing-05;
-}
diff --git a/packages/esm-lab-order-manifest-app/src/root.component.tsx b/packages/esm-lab-order-manifest-app/src/root.component.tsx
deleted file mode 100755
index c785aab..0000000
--- a/packages/esm-lab-order-manifest-app/src/root.component.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import React from 'react';
-import { BrowserRouter } from 'react-router-dom';
-
-const Root: React.FC = () => {
-  return <BrowserRouter basename={window.getOpenmrsSpaBase()}></BrowserRouter>;
-};
-
-export default Root;
diff --git a/packages/esm-lab-order-manifest-app/src/root.scss b/packages/esm-lab-order-manifest-app/src/root.scss
deleted file mode 100755
index e69de29..0000000
diff --git a/packages/esm-lab-order-manifest-app/src/routes.json b/packages/esm-lab-order-manifest-app/src/routes.json
deleted file mode 100755
index 18442d8..0000000
--- a/packages/esm-lab-order-manifest-app/src/routes.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "$schema": "https://json.openmrs.org/routes.schema.json",
-  "backendDependencies": {
-    "webservices.rest": "^2.2.0"
-  },
-  "pages": [
-
-  ],
-  "extensions": [
-    {
-      "name": "lab-order-manifest-component",
-      "slot": "lab-panels-slot",
-      "component": "manifestOrdersComponent",
-      "meta": {
-        "name": "worklistPanelSlot",
-        "title": "Ref Lab Orders"
-      }
-    },
-    {
-      "name": "post-lab-order-to-eid-component",
-      "component": "postOrderToEidDialog"
-    },
-    {
-      "name": "post-eid-order-button",
-      "component": "postOrderToEidButton",
-      "slot": "order-actions-slot"
-    }
-  ]
-}
diff --git a/packages/esm-lab-order-manifest-app/src/types/index.ts b/packages/esm-lab-order-manifest-app/src/types/index.ts
deleted file mode 100755
index e69de29..0000000
diff --git a/packages/esm-lab-order-manifest-app/src/utils/function.ts b/packages/esm-lab-order-manifest-app/src/utils/function.ts
deleted file mode 100755
index 9c9ad61..0000000
--- a/packages/esm-lab-order-manifest-app/src/utils/function.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export const getStatusColor = (fulfillerStatus: string) => {
-  if (fulfillerStatus === 'COMPLETED') {
-    return 'green';
-  } else if (fulfillerStatus === 'IN_PROGRESS') {
-    return 'orange';
-  } else {
-    return 'red';
-  }
-};
diff --git a/packages/esm-lab-order-manifest-app/translations/en.json b/packages/esm-lab-order-manifest-app/translations/en.json
deleted file mode 100755
index 58cf11c..0000000
--- a/packages/esm-lab-order-manifest-app/translations/en.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "cancel": "Cancel",
-  "clearSearchInput": "Clear search input",
-  "clientRegistry": "Client registry",
-  "contactSupport": "Contact support",
-  "continue": "Continue",
-  "errorRejectingOrder', 'Error Rejecting the order": "",
-  "gender": "Gender",
-  "notes": "Enter Comments ",
-  "postOrder": "Post Order To EID",
-  "postToEid": "Post To EID",
-  "searchByPatientIdOrName": "Search by patient ID or name",
-  "successfullyPosted": "You have successfully posted an Order with OrderNumber"
-}
diff --git a/packages/esm-lab-order-manifest-app/tsconfig.json b/packages/esm-lab-order-manifest-app/tsconfig.json
deleted file mode 100755
index 54ce28c..0000000
--- a/packages/esm-lab-order-manifest-app/tsconfig.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "include": ["src/**/*"],
-  "exclude": ["src/**/*.test.tsx"]
-}
diff --git a/packages/esm-lab-order-manifest-app/webpack.config.js b/packages/esm-lab-order-manifest-app/webpack.config.js
deleted file mode 100755
index 2c74029..0000000
--- a/packages/esm-lab-order-manifest-app/webpack.config.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('openmrs/default-webpack-config');
diff --git a/packages/esm-otz-app/jest.config.js b/packages/esm-otz-app/jest.config.js
deleted file mode 100755
index 0352f62..0000000
--- a/packages/esm-otz-app/jest.config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const rootConfig = require('../../jest.config.js');
-
-module.exports = rootConfig;
diff --git a/packages/esm-otz-app/package.json b/packages/esm-otz-app/package.json
deleted file mode 100755
index 4e05f16..0000000
--- a/packages/esm-otz-app/package.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "name": "@ampath/esm-otz-app",
-  "version": "6.0.0",
-  "description": "AMPATH OTZ App",
-  "browser": "dist/ampath-esm-otz-app.js",
-  "main": "src/index.ts",
-  "source": true,
-  "license": "MPL-2.0",
-  "homepage": "https://github.com/AMPATH/ampath-esm-3.x#readme",
-  "scripts": {
-    "start": "openmrs develop",
-    "serve": "webpack serve --mode=development",
-    "debug": "npm run serve",
-    "build": "webpack --mode production",
-    "analyze": "webpack --mode=production --env.analyze=true",
-    "lint": "cross-env TIMING=1 eslint src --ext ts,tsx",
-    "test": "cross-env TZ=UTC jest --config jest.config.js --verbose false --passWithNoTests --color",
-    "test:watch": "cross-env TZ=UTC jest --watch --config jest.config.js --color",
-    "coverage": "yarn test --coverage",
-    "typescript": "tsc",
-    "extract-translations": "i18next 'src/**/*.component.tsx'"
-  },
-  "browserslist": [
-    "extends browserslist-config-openmrs"
-  ],
-  "keywords": [
-    "openmrs",
-    "ampath"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/AMPATH/ampath-esm-3.x.git"
-  },
-  "bugs": {
-    "url": "https://github.com/AMPATH/ampath-esm-3.x/issues"
-  },
-  "dependencies": {
-    "@carbon/react": "~1.37.0",
-    "lodash-es": "^4.17.15"
-  },
-  "peerDependencies": {
-    "@openmrs/esm-framework": "5.x",
-    "react": "^18.1.0",
-    "react-i18next": "11.x",
-    "react-router-dom": "6.x",
-    "swr": "2.x"
-  },
-  "devDependencies": {
-    "webpack": "^5.74.0"
-  }
-}
diff --git a/packages/esm-otz-app/src/config-schema.ts b/packages/esm-otz-app/src/config-schema.ts
deleted file mode 100755
index 11a9cc5..0000000
--- a/packages/esm-otz-app/src/config-schema.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Type } from '@openmrs/esm-framework';
-export const configSchema = {
-  basicAuthBase64: {
-    _type: Type.String,
-    _description: 'Basic auth base64 string for the API call e.g Basic someBase64String==',
-    _default: '',
-  },
-};
-
-export type PreAppointmentsConfig = {
-  basicAuthBase64: string;
-};
diff --git a/packages/esm-otz-app/src/dashboard.meta.tsx b/packages/esm-otz-app/src/dashboard.meta.tsx
deleted file mode 100755
index a2de2fb..0000000
--- a/packages/esm-otz-app/src/dashboard.meta.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Coronavirus } from '@carbon/react/icons';
-
-export const otzPatientChartMeta = {
-  title: 'OTZ',
-  slotName: 'ampath-otz-patient-chart-slot',
-  isExpanded: false,
-};
-
-export const otzDashboardMeta = {
-  name: 'otz-cases',
-  slot: 'otz-cases-dashboard-slot',
-  config: { columns: 1, type: 'grid', programme: 'otz', dashboardTitle: 'OTZ clubs', icon: Coronavirus },
-  title: 'OTZ clubs',
-  dashboardIcon: Coronavirus,
-};
-
-export const otzPatientClinicalChartMeta = {
-  title: 'OTZ Program',
-  slotName: 'ohri-otz-slot',
-  isExpanded: false,
-};
-
-export const otzPatientSummaryMeta = {
-  slot: 'otz-patient-summary-slot',
-  columns: 1,
-  title: 'OTZ Patient Summary',
-  path: 'otz-patient-summary',
-  layoutMode: 'anchored',
-};
-
-export const otzProgramManagementDashboardMeta = {
-  slot: 'otz-program-management-summary-slot',
-  columns: 1,
-  title: 'OTZ Services',
-  path: 'otz-program-management',
-  layoutMode: 'anchored',
-};
diff --git a/packages/esm-otz-app/src/dashboard.scss b/packages/esm-otz-app/src/dashboard.scss
deleted file mode 100755
index a99e1db..0000000
--- a/packages/esm-otz-app/src/dashboard.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@import './root.scss';
-
-.noMarker {
-  list-style-type: none;
-}
-
-.noMarker button {
-  margin-top: 2px;
-  padding-top: 2px;
-  padding-bottom: 2px;
-  font: lighter;
-}
-
-.noMarker ul li a {
-  padding-left: 40px !important;
-}
-
-.currentNavItem > a {
-  background-color: #cecece !important;
-  color: #161616 !important;
-  border-left-color: var(--brand-01) !important;
-  font: bolder;
-}
-
-.hide {
-  display: none;
-}
diff --git a/packages/esm-otz-app/src/declarations.d.ts b/packages/esm-otz-app/src/declarations.d.ts
deleted file mode 100755
index 8539186..0000000
--- a/packages/esm-otz-app/src/declarations.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare module '@carbon/react';
-declare module '*.css';
-declare module '*.scss';
-declare type SideNavProps = {};
diff --git a/packages/esm-otz-app/src/header/otz-header.component.tsx b/packages/esm-otz-app/src/header/otz-header.component.tsx
deleted file mode 100755
index 1ee33ff..0000000
--- a/packages/esm-otz-app/src/header/otz-header.component.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { Calendar, Location } from '@carbon/react/icons';
-import { useSession, formatDate } from '@openmrs/esm-framework';
-import OTZIllustration from './otz-illustration.component';
-import styles from './otz-header.scss';
-
-export const OTZHeader: React.FC = () => {
-  const { t } = useTranslation();
-  const userSession = useSession();
-  const userLocation = userSession?.sessionLocation?.display;
-
-  return (
-    <div className={styles.header}>
-      <div className={styles['left-justified-items']}>
-        <OTZIllustration />
-        <div className={styles['page-labels']}>
-          <p className={styles['page-name']}>{t('otz', 'OTZ Dashboard')}</p>
-        </div>
-      </div>
-      <div className={styles['right-justified-items']}>
-        <div className={styles['date-and-location']}>
-          <Location size={16} />
-          <span className={styles.value}>{userLocation}</span>
-          <span className={styles.middot}>&middot;</span>
-          <Calendar size={16} />
-          <span className={styles.value}>{formatDate(new Date(), { mode: 'standard' })}</span>
-        </div>
-      </div>
-    </div>
-  );
-};
diff --git a/packages/esm-otz-app/src/header/otz-header.scss b/packages/esm-otz-app/src/header/otz-header.scss
deleted file mode 100755
index 1bd8b4e..0000000
--- a/packages/esm-otz-app/src/header/otz-header.scss
+++ /dev/null
@@ -1,68 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@import '~@openmrs/esm-styleguide/src/vars';
-
-.header {
-  @include type.type-style('body-compact-02');
-  color: $text-02;
-  height: spacing.$spacing-12;
-  background-color: $ui-02;
-  display: flex;
-  justify-content: space-between;
-}
-
-.left-justified-items {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  margin-left: 0.75rem;
-}
-
-.right-justified-items {
-  @include type.type-style('body-compact-02');
-  color: $text-02;
-  padding-top: 1rem;
-}
-
-.page-name {
-  @include type.type-style('heading-04');
-}
-
-.page-labels {
-  margin-left: 1rem;
-
-  p:first-of-type {
-    margin-bottom: 0.25rem;
-  }
-}
-
-.date-and-location {
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  margin-right: 1rem;
-}
-
-.value {
-  margin-left: 0.25rem;
-}
-
-.middot {
-  margin: 0 0.5rem;
-}
-
-.view {
-  @include type.type-style('label-01');
-}
-
-svg.iconOverrides {
-  width: 72 !important;
-  height: 72 !important;
-  fill: var(--brand-03);
-}
-
-.svgContainer svg {
-  width: 72px;
-  height: 72px;
-  fill: var(--brand-03);
-}
diff --git a/packages/esm-otz-app/src/header/otz-illustration.component.tsx b/packages/esm-otz-app/src/header/otz-illustration.component.tsx
deleted file mode 100755
index 1928fa6..0000000
--- a/packages/esm-otz-app/src/header/otz-illustration.component.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-import { Medication } from '@carbon/react/icons';
-import styles from './otz-header.scss';
-
-const OTZIllustration: React.FC = () => {
-  return (
-    <div className={styles.svgContainer}>
-      <Medication className={styles.iconOverrides} />
-    </div>
-  );
-};
-
-export default OTZIllustration;
diff --git a/packages/esm-otz-app/src/index.ts b/packages/esm-otz-app/src/index.ts
deleted file mode 100755
index 5c315aa..0000000
--- a/packages/esm-otz-app/src/index.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { defineConfigSchema, getSyncLifecycle } from '@openmrs/esm-framework';
-import { configSchema } from './config-schema';
-import Root from './root.component';
-import {
-  otzPatientClinicalChartMeta,
-  otzPatientSummaryMeta,
-  otzProgramManagementDashboardMeta,
-} from './dashboard.meta';
-import { createDashboardGroup, createDashboardLink } from '@openmrs/esm-patient-common-lib';
-import OTZHomePatientTabs from './views/dashboard/patient-list-tabs/otz-patient-list-tabs.component';
-import { createLeftPanelLink } from './left-panel-link.component';
-import OTZSummaryTiles from './views/dashboard/summary-tiles/otz-summary-tiles.component';
-import otzPatientSummary from './views/dashboard/patient-summary/patient-summary.component';
-import otzProgramManagementSummary from './views/dashboard/otz-program-services/otz-program-services';
-
-export const moduleName = '@ampath/esm-otz-app';
-
-const options = {
-  featureName: 'esm-otz-app',
-  moduleName,
-};
-
-export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');
-
-export const root = getSyncLifecycle(Root, options);
-
-export function startupApp() {
-  defineConfigSchema(moduleName, configSchema);
-}
-
-export const patientChartTptDashboard = getSyncLifecycle(createDashboardGroup(otzPatientClinicalChartMeta), options);
-
-export const otzLeftPanelLink = getSyncLifecycle(
-  createLeftPanelLink({
-    name: 'otz',
-    title: 'OTZ',
-    slot: 'otz-dashboard-slot',
-  }),
-  options,
-);
-export const otzDashboardTiles = getSyncLifecycle(OTZSummaryTiles, {
-  featureName: 'otz-home-tiles',
-  moduleName,
-});
-
-export const otzDashboardTabs = getSyncLifecycle(OTZHomePatientTabs, {
-  featureName: 'otz-home-tabs',
-  moduleName,
-});
-
-export const otzPatientSummaryDashboardLink = getSyncLifecycle(
-  createDashboardLink({ ...otzPatientSummaryMeta, moduleName }),
-  options,
-);
-export const otzPatientSummaryDashboard = getSyncLifecycle(otzPatientSummary, {
-  featureName: 'otz-patient-summary',
-  moduleName,
-});
-
-export const otzProgramManagementDashboardLink = getSyncLifecycle(
-  createDashboardLink({ ...otzProgramManagementDashboardMeta, moduleName }),
-  options,
-);
-export const otzProgramManagementDashboard = getSyncLifecycle(otzProgramManagementSummary, {
-  featureName: 'otz-program-management-summary',
-  moduleName,
-});
diff --git a/packages/esm-otz-app/src/left-panel-link.component.tsx b/packages/esm-otz-app/src/left-panel-link.component.tsx
deleted file mode 100755
index 972b2c4..0000000
--- a/packages/esm-otz-app/src/left-panel-link.component.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React, { useMemo } from 'react';
-import last from 'lodash-es/last';
-import { BrowserRouter, useLocation } from 'react-router-dom';
-import { ConfigurableLink } from '@openmrs/esm-framework';
-
-export interface LinkConfig {
-  name: string;
-  title: string;
-  slot?: string;
-}
-
-function LinkExtension({ config }: { config: LinkConfig }) {
-  const { name, title } = config;
-  const location = useLocation();
-  const spaBasePath = window.getOpenmrsSpaBase() + 'home';
-
-  const urlSegment = useMemo(() => decodeURIComponent(last(location.pathname.split('/'))), [location.pathname]);
-
-  return (
-    <ConfigurableLink
-      to={spaBasePath + '/' + name}
-      className={`cds--side-nav__link ${name === urlSegment && 'active-left-nav-link'}`}>
-      {title}
-    </ConfigurableLink>
-  );
-}
-
-export const createLeftPanelLink = (config: LinkConfig) => () => (
-  <BrowserRouter>
-    <LinkExtension config={config} />
-  </BrowserRouter>
-);
diff --git a/packages/esm-otz-app/src/otz.component.tsx b/packages/esm-otz-app/src/otz.component.tsx
deleted file mode 100755
index db5c1ee..0000000
--- a/packages/esm-otz-app/src/otz.component.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import OTZHomePatientTabs from './views/dashboard/patient-list-tabs/otz-patient-list-tabs.component';
-import OTZSummaryTile from './views/dashboard/summary-tiles/otz-summary-tiles.component';
-import { OTZHeader } from './header/otz-header.component';
-import styles from './otz.scss';
-
-const OtzDashboard: React.FC = () => {
-  const { t } = useTranslation();
-
-  return (
-    <React.Fragment>
-      <OTZHeader />
-      <div className={styles.tileLayout}>
-        <OTZSummaryTile headerTitle={t('totalEnrolled', 'Total enrolled')} />
-        <OTZSummaryTile headerTitle={t('totalActive', 'Total active')} />
-        <OTZSummaryTile headerTitle={t('eligibleNotEnrolled', 'Eligible not enrolled')} />
-      </div>
-      <div className={styles.tabList}>
-        <OTZHomePatientTabs />
-      </div>
-    </React.Fragment>
-  );
-};
-
-export default OtzDashboard;
diff --git a/packages/esm-otz-app/src/otz.scss b/packages/esm-otz-app/src/otz.scss
deleted file mode 100755
index 4caad50..0000000
--- a/packages/esm-otz-app/src/otz.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-:global(.-esm-home__dashboard-view__dashboardView___k24ro) {
-  background-color: none;
-}
-
-.tileLayout {
-  display: flex;
-  flex-wrap: wrap;
-  margin: 0 0.5rem;
-}
diff --git a/packages/esm-otz-app/src/root.component.tsx b/packages/esm-otz-app/src/root.component.tsx
deleted file mode 100755
index 49e2f79..0000000
--- a/packages/esm-otz-app/src/root.component.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import { BrowserRouter, Route, Routes } from 'react-router-dom';
-import OtzDashboard from './otz.component';
-
-const Root: React.FC = () => {
-  const basePath = window.getOpenmrsSpaBase() + 'home/otz';
-
-  return (
-    <BrowserRouter basename={basePath}>
-      <Routes>
-        <Route path="/" element={<OtzDashboard />} />
-      </Routes>
-    </BrowserRouter>
-  );
-};
-
-export default Root;
diff --git a/packages/esm-otz-app/src/root.scss b/packages/esm-otz-app/src/root.scss
deleted file mode 100755
index 081ea14..0000000
--- a/packages/esm-otz-app/src/root.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@import '~@openmrs/esm-styleguide/src/vars';
diff --git a/packages/esm-otz-app/src/routes.json b/packages/esm-otz-app/src/routes.json
deleted file mode 100755
index 8f4b753..0000000
--- a/packages/esm-otz-app/src/routes.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "$schema": "https://json.openmrs.org/routes.schema.json",
-  "backendDependencies": {
-    "webservices.rest": "^2.2.0"
-  },
-  "pages": [
-    {
-      "component": "root",
-      "route": "otz"
-    }
-  ],
-  "extensions": [
-    {
-      "component": "root",
-      "name": "otz-root",
-      "slot": "otz-dashboard-slot"
-    },
-    {
-      "component": "otzLeftPanelLink",
-      "name": "otz-left-panel-link",
-      "slot": "homepage-dashboard-slot",
-      "meta": {
-        "name": "otz",
-        "title": "OTZ",
-        "slot": "otz-dashboard-slot",
-        "config": {
-          "columns": 1,
-          "type": "grid",
-          "programme": "otz",
-          "dashboardTitle": "OTZ Dashboard"
-        }
-      }
-    },
-    {
-      "name": "otz-home-tiles-ext",
-      "slot": "otz-home-tiles-slot",
-      "component": "otzDashboardTiles"
-    },
-    {
-      "name": "otz-home-tabs-ext",
-      "slot": "otz-home-tabs-slot",
-      "component": "otzDashboardTabs"
-    },
-
-    {
-      "name": "otz-dashboard-link",
-      "slot": "dashboard-slot",
-      "component": "otzFolderLink",
-      "meta": {
-        "slot": "ohri-otz-dashboard-slot",
-        "isFolder": true,
-        "title": "OTZ Program"
-      }
-    },
-    {
-      "name": "ohri-otz",
-      "slot": "patient-chart-dashboard-slot",
-      "component": "patientChartTptDashboard",
-      "order": 24
-    },
-    {
-      "name": "otz-patient-summary",
-      "slot": "ohri-otz-slot",
-      "component": "otzPatientSummaryDashboardLink",
-      "meta": {
-        "slot": "otz-patient-summary-slot",
-        "columns": 1,
-        "path": "otz-patient-summary",
-        "layoutMode": "anchored"
-      }
-    },
-    {
-      "name": "otz-patient-summary-ext",
-      "slot": "otz-patient-summary-slot",
-      "component": "otzPatientSummaryDashboard"
-    },
-
-    {
-      "name": "otz-program-management-summary",
-      "slot": "ohri-otz-slot",
-      "component": "otzProgramManagementDashboardLink",
-      "meta": {
-        "slot": "otz-program-management-summary-slot",
-        "columns": 1,
-        "path": "otz-program-management",
-        "layoutMode": "anchored"
-      }
-    },
-    {
-      "name": "otz-program-management-summary-ext",
-      "slot": "otz-program-management-summary-slot",
-      "component": "otzProgramManagementDashboard"
-    }
-  ]
-}
diff --git a/packages/esm-otz-app/src/views/dashboard/common.scss b/packages/esm-otz-app/src/views/dashboard/common.scss
deleted file mode 100755
index 4118084..0000000
--- a/packages/esm-otz-app/src/views/dashboard/common.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@import '../../root.scss';
-
-.widgetContainer {
-  background-color: $ui-background;
-}
-
-.widgetHeaderContainer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: spacing.$spacing-04 0 spacing.$spacing-04 spacing.$spacing-05;
-}
-
-.widgetHeaderContainer > h4:after {
-  content: '';
-  display: block;
-  width: 2rem;
-  padding-top: 0.188rem;
-  border-bottom: 0.375rem solid var(--brand-01);
-}
-
-.toggleButtons {
-  width: fit-content;
-  margin: 0 spacing.$spacing-03;
-}
-
-.tabContainer div[role='tabpanel'] {
-  padding: 0 !important;
-}
-
-.tabContainer li button {
-  width: 100% !important;
-}
diff --git a/packages/esm-otz-app/src/views/dashboard/otz-program-services/common.scss b/packages/esm-otz-app/src/views/dashboard/otz-program-services/common.scss
deleted file mode 100755
index 480416a..0000000
--- a/packages/esm-otz-app/src/views/dashboard/otz-program-services/common.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-@use '../../../../../../node_modules/@carbon/styles/scss/spacing';
-@import '../../../root';
-
-.widgetContainer {
-  background-color: $ui-background;
-}
-
-.widgetHeaderContainer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: spacing.$spacing-04 0 spacing.$spacing-04 spacing.$spacing-05;
-}
-
-.widgetHeaderContainer > h4:after {
-  content: '';
-  display: block;
-  width: 2rem;
-  padding-top: 0.188rem;
-  border-bottom: 0.375rem solid var(--brand-01);
-}
-
-.toggleButtons {
-  width: fit-content;
-  margin: 0 spacing.$spacing-03;
-}
-
-.tabContainer div[role='tabpanel'] {
-  padding: 0 !important;
-}
-
-.tabContainer li button {
-  width: 100% !important;
-}
diff --git a/packages/esm-otz-app/src/views/dashboard/otz-program-services/otz-enrolment.component.tsx b/packages/esm-otz-app/src/views/dashboard/otz-program-services/otz-enrolment.component.tsx
deleted file mode 100755
index 9b8afd4..0000000
--- a/packages/esm-otz-app/src/views/dashboard/otz-program-services/otz-enrolment.component.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { EmptyState } from '@openmrs/esm-patient-common-lib';
-const otzEnrolmentList: React.FC = () => {
-  const { t } = useTranslation();
-
-  const headerOtzEnrolment = t('otzEnrolment', 'OTZ Enrolment');
-
-  return (
-    <>
-      <EmptyState displayText={headerOtzEnrolment} headerTitle={headerOtzEnrolment} />
-    </>
-  );
-};
-
-export default otzEnrolmentList;
diff --git a/packages/esm-otz-app/src/views/dashboard/otz-program-services/otz-program-services.tsx b/packages/esm-otz-app/src/views/dashboard/otz-program-services/otz-program-services.tsx
deleted file mode 100755
index 99d17de..0000000
--- a/packages/esm-otz-app/src/views/dashboard/otz-program-services/otz-program-services.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import React, { useState } from 'react';
-import { Tabs, Tab, TabList } from '@carbon/react';
-import styles from './common.scss';
-import { useTranslation } from 'react-i18next';
-import OtzEnrolmentList from './otz-enrolment.component';
-
-const OtzProgramManagementSummary: React.FC = () => {
-  const { t } = useTranslation();
-  const [activeTab, setActiveTab] = useState('otzEnrolment');
-
-  const handleTabChange = (tabId: string) => {
-    setActiveTab(tabId);
-  };
-
-  return (
-    <div className={styles.tabContainer}>
-      <Tabs selected={activeTab} onSelectionChange={handleTabChange}>
-        <TabList contained>
-          <Tab id="otzEnrolment">{t('otzEnrolment', 'OTZ Enrolment')}</Tab>
-        </TabList>
-      </Tabs>
-      {activeTab === 'otzEnrolment' && <OtzEnrolmentList />}
-    </div>
-  );
-};
-
-export default OtzProgramManagementSummary;
diff --git a/packages/esm-otz-app/src/views/dashboard/otz-program-services/otz-program.scss b/packages/esm-otz-app/src/views/dashboard/otz-program-services/otz-program.scss
deleted file mode 100755
index 6edca40..0000000
--- a/packages/esm-otz-app/src/views/dashboard/otz-program-services/otz-program.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@import '../../../root.scss';
-
-.widgetContainer {
-  background-color: $ui-background;
-}
-
-.widgetHeaderContainer {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: spacing.$spacing-04 0 spacing.$spacing-04 spacing.$spacing-05;
-}
-
-.widgetHeaderContainer > h4:after {
-  content: '';
-  display: block;
-  width: 2rem;
-  padding-top: 0.188rem;
-  border-bottom: 0.375rem solid var(--brand-01);
-}
-
-.toggleButtons {
-  width: fit-content;
-  margin: 0 spacing.$spacing-03;
-}
-
-.tabContainer div[role='tabpanel'] {
-  padding: 0 !important;
-}
-
-.tabContainer li button {
-  width: 100% !important;
-}
diff --git a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/empty-state/empty-data-illustration.component.tsx b/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/empty-state/empty-data-illustration.component.tsx
deleted file mode 100755
index e594a32..0000000
--- a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/empty-state/empty-data-illustration.component.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-
-export const EmptyDataIllustration = ({ width = '64', height = '64' }) => {
-  return (
-    <svg width={width} height={height} viewBox="0 0 64 64">
-      <title>Empty data illustration</title>
-      <g fill="none" fillRule="evenodd">
-        <path
-          d="M38.133 13.186H21.947c-.768.001-1.39.623-1.39 1.391V50.55l-.186.057-3.97 1.216a.743.743 0 01-.927-.493L3.664 12.751a.742.742 0 01.492-.926l6.118-1.874 17.738-5.43 6.119-1.873a.741.741 0 01.926.492L38.076 13l.057.186z"
-          fill="#F4F4F4"
-        />
-        <path
-          d="M41.664 13L38.026 1.117A1.576 1.576 0 0036.056.07l-8.601 2.633-17.737 5.43-8.603 2.634a1.578 1.578 0 00-1.046 1.97l12.436 40.616a1.58 1.58 0 001.969 1.046l5.897-1.805.185-.057v-.194l-.185.057-5.952 1.822a1.393 1.393 0 01-1.737-.923L.247 12.682a1.39 1.39 0 01.923-1.738L9.772 8.31 27.51 2.881 36.112.247a1.393 1.393 0 011.737.923L41.47 13l.057.186h.193l-.057-.185z"
-          fill="#8D8D8D"
-        />
-        <path
-          d="M11.378 11.855a.836.836 0 01-.798-.59L9.385 7.361a.835.835 0 01.554-1.042l16.318-4.996a.836.836 0 011.042.554l1.195 3.902a.836.836 0 01-.554 1.043l-16.318 4.995a.831.831 0 01-.244.037z"
-          fill="#C6C6C6"
-        />
-        <circle fill="#C6C6C6" cx={17.636} cy={2.314} r={1.855} />
-        <circle fill="#FFF" fillRule="nonzero" cx={17.636} cy={2.314} r={1.175} />
-        <path
-          d="M55.893 53.995H24.544a.79.79 0 01-.788-.789V15.644a.79.79 0 01.788-.788h31.349a.79.79 0 01.788.788v37.562a.79.79 0 01-.788.789z"
-          fill="#F4F4F4"
-        />
-        <path
-          d="M41.47 13H21.948a1.579 1.579 0 00-1.576 1.577V52.4l.185-.057V14.577c.001-.768.623-1.39 1.391-1.39h19.581L41.471 13zm17.02 0H21.947a1.579 1.579 0 00-1.576 1.577v42.478c0 .87.706 1.576 1.576 1.577H58.49a1.579 1.579 0 001.576-1.577V14.577a1.579 1.579 0 00-1.576-1.576zm1.39 44.055c0 .768-.622 1.39-1.39 1.392H21.947c-.768-.001-1.39-.624-1.39-1.392V14.577c0-.768.622-1.39 1.39-1.39H58.49c.768 0 1.39.622 1.39 1.39v42.478z"
-          fill="#8D8D8D"
-        />
-        <path
-          d="M48.751 17.082H31.686a.836.836 0 01-.835-.835v-4.081c0-.46.374-.834.835-.835H48.75c.461 0 .834.374.835.835v4.08c0 .462-.374.835-.835.836z"
-          fill="#C6C6C6"
-        />
-        <circle fill="#C6C6C6" cx={40.218} cy={9.755} r={1.855} />
-        <circle fill="#FFF" fillRule="nonzero" cx={40.218} cy={9.755} r={1.13} />
-      </g>
-    </svg>
-  );
-};
diff --git a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/empty-state/empty-state.component.tsx b/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/empty-state/empty-state.component.tsx
deleted file mode 100755
index ae93962..0000000
--- a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/empty-state/empty-state.component.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import React from 'react';
-import { Layer, Button, Tile } from '@carbon/react';
-import { useTranslation } from 'react-i18next';
-import { EmptyDataIllustration } from './empty-data-illustration.component';
-import { useLayoutType } from '@openmrs/esm-framework';
-import styles from './empty-state.scss';
-import { Add } from '@carbon/react/icons';
-
-export interface EmptyStateProps {
-  displayText: string;
-  headerTitle: string;
-  launchForm?(): void;
-  scheduleType: string;
-}
-
-export const EmptyState: React.FC<EmptyStateProps> = ({ headerTitle, displayText, launchForm, scheduleType }) => {
-  const { t } = useTranslation();
-  const isTablet = useLayoutType() === 'tablet';
-
-  return (
-    <Layer>
-      <Tile className={styles.tile}>
-        <div className={isTablet ? styles.tabletHeading : styles.desktopHeading}>
-          <h4>{headerTitle}</h4>
-        </div>
-        <EmptyDataIllustration />
-        <p className={styles.content}>
-          {t('emptyStateText', 'There are no {{displayText}} to display', { displayText })}
-        </p>
-        {scheduleType === 'Scheduled' ? (
-          <p className={styles.action}>
-            {launchForm && (
-              <span>
-                <Button renderIcon={Add} kind="ghost" onClick={() => launchForm()}>
-                  {t('createAppointment', 'Create appointment')}
-                </Button>
-              </span>
-            )}
-          </p>
-        ) : null}
-      </Tile>
-    </Layer>
-  );
-};
diff --git a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/empty-state/empty-state.scss b/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/empty-state/empty-state.scss
deleted file mode 100755
index 098a6e6..0000000
--- a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/empty-state/empty-state.scss
+++ /dev/null
@@ -1,70 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@import '~@openmrs/esm-styleguide/src/vars';
-
-.content {
-  @include type.type-style('heading-compact-01');
-  color: $text-02;
-  margin-top: spacing.$spacing-05;
-  margin-bottom: spacing.$spacing-03;
-}
-
-.desktopHeading {
-  h4 {
-    @include type.type-style('heading-compact-02');
-    color: $text-02;
-  }
-}
-
-.tabletHeading {
-  h4 {
-    @include type.type-style('heading-03');
-    color: $text-02;
-  }
-}
-
-.desktopHeading,
-.tabletHeading {
-  text-align: left;
-  text-transform: capitalize;
-  margin-bottom: spacing.$spacing-05;
-
-  h4:after {
-    content: '';
-    display: block;
-    width: 2rem;
-    padding-top: 0.188rem;
-    border-bottom: 0.375rem solid var(--brand-03);
-  }
-}
-
-.heading:after {
-  content: '';
-  display: block;
-  width: 2rem;
-  padding-top: 0.188rem;
-  border-bottom: 0.375rem solid var(--brand-03);
-}
-
-.tile {
-  text-align: center;
-  border: 1px solid $ui-03;
-}
-
-.actionText {
-  display: flex;
-  align-items: center;
-}
-
-.header4 {
-  @include type.type-style('heading-compact-01');
-  margin-bottom: 1rem;
-}
-
-// Overriding styles for RTL support
-html[dir='rtl'] {
-  .desktopHeading,
-  .tabletHeading {
-    text-align: right;
-  }
-}
diff --git a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/eligible-for-vl-testing.component.tsx b/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/eligible-for-vl-testing.component.tsx
deleted file mode 100755
index 1814509..0000000
--- a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/eligible-for-vl-testing.component.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  DataTable,
-  TableContainer,
-  Table,
-  TableHead,
-  TableHeader,
-  TableRow,
-  TableBody,
-  TableCell,
-  TableToolbar,
-  TableToolbarContent,
-  TableToolbarSearch,
-  Pagination,
-  DataTableSkeleton,
-  Button,
-} from '@carbon/react';
-import { Download } from '@carbon/react/icons';
-import { ConfigurableLink, useConfig, usePagination } from '@openmrs/esm-framework';
-import { EmptyState } from '../empty-state/empty-state.component';
-
-const EligibleForVLTest: React.FC = () => {
-  const { t } = useTranslation();
-  //data fetching hook called here, will populate the table rows
-
-  const headerData = [
-    //will populate the data table headers
-    {
-      header: 'Patient Number',
-      key: 'number',
-    },
-    {
-      header: 'Name',
-      key: 'name',
-    },
-    {
-      header: 'Age',
-      key: 'age',
-    },
-    {
-      header: 'Sex',
-      key: 'sex',
-    },
-    {
-      header: 'Phone Number',
-      key: 'phoneNumber',
-    },
-    {
-      header: 'Latest VL',
-      key: 'latestVL',
-    },
-    {
-      header: 'Latest VL Date',
-      key: 'latestVLDate',
-    },
-    {
-      header: 'VL Category',
-      key: 'vlCategory',
-    },
-    {
-      header: 'Latest RTC date',
-      key: 'latestRTCDate',
-    },
-  ];
-
-  return (
-    <EmptyState
-      displayText={t('vlEligibilityDisplay', 'patients eligible for viral load testing')}
-      headerTitle={t('vlEligibilityHeader', 'Eligible for Viral Load Testing')}
-      scheduleType="Unscheduled"
-    />
-  );
-};
-
-export default EligibleForVLTest;
diff --git a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/eligible-not-enrolled.component.tsx b/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/eligible-not-enrolled.component.tsx
deleted file mode 100755
index 1040b29..0000000
--- a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/eligible-not-enrolled.component.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  DataTable,
-  TableContainer,
-  Table,
-  TableHead,
-  TableHeader,
-  TableRow,
-  TableBody,
-  TableCell,
-  TableToolbar,
-  TableToolbarContent,
-  TableToolbarSearch,
-  Pagination,
-  DataTableSkeleton,
-  Button,
-} from '@carbon/react';
-import { Download } from '@carbon/react/icons';
-import { ConfigurableLink, useConfig, usePagination } from '@openmrs/esm-framework';
-import { EmptyState } from '../empty-state/empty-state.component';
-
-const EligibleNotEnrolled: React.FC = () => {
-  const { t } = useTranslation();
-  //data fetching hook called here, will populate the table rows
-
-  const headerData = [
-    {
-      header: 'Patient Name',
-      key: 'name',
-    },
-    {
-      header: 'Identifier',
-      key: 'identifier',
-    },
-    {
-      header: 'Gender',
-      key: 'gender',
-    },
-    {
-      header: 'Phone Number',
-      key: 'phoneNumber',
-    },
-  ];
-
-  return (
-    <EmptyState
-      displayText={t('eligibleNotEnrolledDisplayText', 'eligible non-enrolled patients')}
-      headerTitle={t('totalActiveHeader', 'Eligible not enrolled')}
-      scheduleType="Unscheduled"
-    />
-  );
-};
-
-export default EligibleNotEnrolled;
diff --git a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/missed-appointments.component.tsx b/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/missed-appointments.component.tsx
deleted file mode 100755
index 5972377..0000000
--- a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/missed-appointments.component.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  DataTable,
-  TableContainer,
-  Table,
-  TableHead,
-  TableHeader,
-  TableRow,
-  TableBody,
-  TableCell,
-  TableToolbar,
-  TableToolbarContent,
-  TableToolbarSearch,
-  Pagination,
-  DataTableSkeleton,
-  Button,
-} from '@carbon/react';
-import { Download } from '@carbon/react/icons';
-import { ConfigurableLink, useConfig, usePagination } from '@openmrs/esm-framework';
-import { EmptyState } from '../empty-state/empty-state.component';
-
-const MissedAppointments: React.FC = () => {
-  const { t } = useTranslation();
-  //data fetching hook called here, will populate the table rows
-
-  const headerData = [
-    //will populate the data table headers
-    {
-      header: 'Patient Number',
-      key: 'number',
-    },
-    {
-      header: 'Name',
-      key: 'name',
-    },
-    {
-      header: 'Age',
-      key: 'age',
-    },
-    {
-      header: 'Sex',
-      key: 'sex',
-    },
-    {
-      header: 'Phone Number',
-      key: 'phoneNumber',
-    },
-    {
-      header: 'Last appointment date',
-      key: 'lastAppointmentDate',
-    },
-    {
-      header: 'Visit Type',
-      key: 'visitType',
-    },
-    {
-      header: 'Latest RTC Date',
-      key: 'latestRTCDate',
-    },
-    {
-      header: 'Days since last appointment',
-      key: 'daysSinceLastAppointment',
-    },
-    {
-      header: 'Current regimen',
-      key: 'currentRegimen',
-    },
-    {
-      header: 'Adherence',
-      key: 'adherence',
-    },
-  ];
-
-  return (
-    <EmptyState
-      displayText={t('missedAppointments-lower', 'missed appointments')}
-      headerTitle={t('missedAppointments', 'Missed appointments')}
-      scheduleType="Unscheduled"
-    />
-  );
-};
-
-export default MissedAppointments;
diff --git a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/total-active.component.tsx b/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/total-active.component.tsx
deleted file mode 100755
index b3fd393..0000000
--- a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/total-active.component.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  DataTable,
-  TableContainer,
-  Table,
-  TableHead,
-  TableHeader,
-  TableRow,
-  TableBody,
-  TableCell,
-  TableToolbar,
-  TableToolbarContent,
-  TableToolbarSearch,
-  Pagination,
-  DataTableSkeleton,
-  Button,
-} from '@carbon/react';
-import { Download } from '@carbon/react/icons';
-import { ConfigurableLink, useConfig, usePagination } from '@openmrs/esm-framework';
-import { EmptyState } from '../empty-state/empty-state.component';
-
-const TotalActive: React.FC = () => {
-  const { t } = useTranslation();
-  //data fetching hook called here, will populate the table rows
-
-  const headerData = [
-    {
-      header: 'Patient Name',
-      key: 'name',
-    },
-    {
-      header: 'Identifier',
-      key: 'identifier',
-    },
-    {
-      header: 'Gender',
-      key: 'gender',
-    },
-    {
-      header: 'Phone Number',
-      key: 'phoneNumber',
-    },
-  ];
-
-  return (
-    <EmptyState
-      displayText={t('totalActiveDisplayText', 'total active patients')}
-      headerTitle={t('totalActiveHeader', 'Total active patients')}
-      scheduleType="Unscheduled"
-    />
-  );
-};
-
-export default TotalActive;
diff --git a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/total-enrolled.component.tsx b/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/total-enrolled.component.tsx
deleted file mode 100755
index 7ea167b..0000000
--- a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tables/total-enrolled.component.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  DataTable,
-  TableContainer,
-  Table,
-  TableHead,
-  TableHeader,
-  TableRow,
-  TableBody,
-  TableCell,
-  TableToolbar,
-  TableToolbarContent,
-  TableToolbarSearch,
-  Pagination,
-  DataTableSkeleton,
-  Button,
-} from '@carbon/react';
-import { Download } from '@carbon/react/icons';
-import { ConfigurableLink, useConfig, usePagination } from '@openmrs/esm-framework';
-import { EmptyState } from '../empty-state/empty-state.component';
-
-const TotalEnrolled: React.FC = () => {
-  const { t } = useTranslation();
-  //data fetching hook called here, will populate the table rows
-
-  const headerData = [
-    {
-      header: 'Patient Name',
-      key: 'name',
-    },
-    {
-      header: 'Identifier',
-      key: 'identifier',
-    },
-    {
-      header: 'Gender',
-      key: 'gender',
-    },
-    {
-      header: 'Phone Number',
-      key: 'phoneNumber',
-    },
-  ];
-
-  return (
-    <EmptyState
-      displayText={t('totalEnrolledDisplayText', 'total enrolled patients')}
-      headerTitle={t('totalEnrolledHeader', 'Total enrolled patients')}
-      scheduleType="Unscheduled"
-    />
-  );
-};
-
-export default TotalEnrolled;
diff --git a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tabs.component.tsx b/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tabs.component.tsx
deleted file mode 100755
index e723f7e..0000000
--- a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tabs.component.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { Tabs, TabList, Tab, TabPanels, TabPanel } from '@carbon/react';
-import styles from './otz-patient-list-tabs.scss';
-import MissedAppointments from './otz-patient-list-tables/missed-appointments.component';
-import EligibleForVLTest from './otz-patient-list-tables/eligible-for-vl-testing.component';
-import TotalEnrolled from './otz-patient-list-tables/total-enrolled.component';
-import TotalActive from './otz-patient-list-tables/total-active.component';
-import EligibleNotEnrolled from './otz-patient-list-tables/eligible-not-enrolled.component';
-
-function OTZHomePatientTabs() {
-  const { t } = useTranslation();
-
-  return (
-    <div className={styles.tabs}>
-      <Tabs>
-        <TabList aria-label="List of tabs" contained>
-          <Tab>{t('missedAppointments', 'Missed Appointments')}</Tab>
-          <Tab>{t('vlEligible', 'ELigible for Viral Load Testing')}</Tab>
-          <Tab>{t('totalEnrolled', 'Total Enrolled')}</Tab>
-          <Tab>{t('totalActive', 'Total active')}</Tab>
-          <Tab>{t('eligibleNotEnrolled', 'Eligible Not Enrolled')}</Tab>
-        </TabList>
-        <TabPanels>
-          <TabPanel>
-            <MissedAppointments />
-          </TabPanel>
-          <TabPanel>
-            <EligibleForVLTest />
-          </TabPanel>
-          <TabPanel>
-            <TotalEnrolled />
-          </TabPanel>
-          <TabPanel>
-            <TotalActive />
-          </TabPanel>
-          <TabPanel>
-            <EligibleNotEnrolled />
-          </TabPanel>
-        </TabPanels>
-      </Tabs>
-    </div>
-  );
-}
-
-export default OTZHomePatientTabs;
diff --git a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tabs.scss b/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tabs.scss
deleted file mode 100755
index 86e2a8c..0000000
--- a/packages/esm-otz-app/src/views/dashboard/patient-list-tabs/otz-patient-list-tabs.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.tabs {
-  padding-top: 0.5rem;
-}
diff --git a/packages/esm-otz-app/src/views/dashboard/patient-summary/otz-patientsummary.scss b/packages/esm-otz-app/src/views/dashboard/patient-summary/otz-patientsummary.scss
deleted file mode 100755
index 1ba6506..0000000
--- a/packages/esm-otz-app/src/views/dashboard/patient-summary/otz-patientsummary.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-/* otz-patientsummary.scss */
-.summary-container {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-}
-
-.title {
-  text-align: left;
-  padding: 20px;
-}
-
-.tile {
-  width: 100%;
-  height: 200px;
-  background-color: #f0eded;
-  margin-bottom: 10px;
-}
-
-.table {
-  width: 100%;
-  height: 200px;
-  border: 10px solid #ccc;
-}
diff --git a/packages/esm-otz-app/src/views/dashboard/patient-summary/patient-summary.component.tsx b/packages/esm-otz-app/src/views/dashboard/patient-summary/patient-summary.component.tsx
deleted file mode 100755
index f4e27bb..0000000
--- a/packages/esm-otz-app/src/views/dashboard/patient-summary/patient-summary.component.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import { EmptyState } from '@openmrs/esm-patient-common-lib';
-import { useTranslation } from 'react-i18next';
-
-const OtzPatientSummary: React.FC = () => {
-  const { t } = useTranslation();
-
-  const headerClinicalViews = t('clinicalViews', 'clinical Views');
-  const headerAppointments = t('appointments', 'Appointments');
-  const headerViralLoads = t('viralLoads', 'viral Loads');
-
-  return (
-    <>
-      <EmptyState displayText={headerClinicalViews} headerTitle={headerClinicalViews} />
-
-      <EmptyState displayText={headerAppointments} headerTitle={headerAppointments} />
-
-      <EmptyState displayText={headerViralLoads} headerTitle={headerViralLoads} />
-    </>
-  );
-};
-
-export default OtzPatientSummary;
diff --git a/packages/esm-otz-app/src/views/dashboard/summary-tiles/otz-summary-tile.scss b/packages/esm-otz-app/src/views/dashboard/summary-tiles/otz-summary-tile.scss
deleted file mode 100755
index 1f81b11..0000000
--- a/packages/esm-otz-app/src/views/dashboard/summary-tiles/otz-summary-tile.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-.tileContent {
-  display: flex;
-  flex-direction: column;
-  align-items: space-between;
-}
-
-.tileContainer {
-  background-color: white;
-  border: 0.0625rem solid #e0e0e0;
-  height: 7.875rem;
-  padding: 1rem;
-  margin: 0.5rem 0.5rem;
-  flex-grow: 1;
-}
-
-.tileHeader {
-  font-size: 0.875rem;
-  font-weight: 600;
-  line-height: 1.28572;
-  letter-spacing: 0.16px;
-  color: #525252;
-}
-
-.displayDetails {
-  margin-top: 1.5rem;
-}
-
-.displayData {
-  font-size: 1.75rem;
-  font-weight: 400;
-  line-height: 1.28572;
-  letter-spacing: 0;
-  color: #161616;
-}
diff --git a/packages/esm-otz-app/src/views/dashboard/summary-tiles/otz-summary-tiles.component.tsx b/packages/esm-otz-app/src/views/dashboard/summary-tiles/otz-summary-tiles.component.tsx
deleted file mode 100755
index b7404a3..0000000
--- a/packages/esm-otz-app/src/views/dashboard/summary-tiles/otz-summary-tiles.component.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-import { Tile } from '@carbon/react';
-import styles from './otz-summary-tile.scss';
-interface SummaryTileProps {
-  headerTitle: string;
-}
-
-const OTZSummaryTile: React.FC<SummaryTileProps> = ({ headerTitle }) => {
-  return (
-    <React.Fragment>
-      <Tile className={styles.tileContainer}>
-        <div>
-          <div className={styles.tileContent}>
-            <div className={styles.tileHeader}>
-              <header>{headerTitle}</header>
-            </div>
-            <div className={styles.displayDetails}>
-              <div>Patients</div>
-              <div className={styles.displayData}>{0}</div>
-            </div>
-          </div>
-        </div>
-      </Tile>
-    </React.Fragment>
-  );
-};
-
-export default OTZSummaryTile;
diff --git a/packages/esm-otz-app/translations/en.json b/packages/esm-otz-app/translations/en.json
deleted file mode 100755
index 87378c0..0000000
--- a/packages/esm-otz-app/translations/en.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "appointments": "Appointments",
-  "clinicalViews": "clinical Views",
-  "createAppointment": "Create appointment",
-  "eligibleNotEnrolled": "Eligible Not Enrolled",
-  "eligibleNotEnrolledDisplayText": "eligible non-enrolled patients",
-  "emptyStateText": "There are no {{displayText}} to display",
-  "missedAppointments": "Missed Appointments",
-  "missedAppointments-lower": "missed appointments",
-  "otz": "OTZ Dashboard",
-  "otzEnrolment": "OTZ Enrolment",
-  "totalActive": "Total active",
-  "totalActiveDisplayText": "total active patients",
-  "totalActiveHeader": "Total active patients",
-  "totalEnrolled": "Total Enrolled",
-  "totalEnrolledDisplayText": "total enrolled patients",
-  "totalEnrolledHeader": "Total enrolled patients",
-  "viralLoads": "viral Loads",
-  "vlEligibilityDisplay": "patients eligible for viral load testing",
-  "vlEligibilityHeader": "Eligible for Viral Load Testing",
-  "vlEligible": "ELigible for Viral Load Testing"
-}
diff --git a/packages/esm-otz-app/tsconfig.json b/packages/esm-otz-app/tsconfig.json
deleted file mode 100755
index 54ce28c..0000000
--- a/packages/esm-otz-app/tsconfig.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "include": ["src/**/*"],
-  "exclude": ["src/**/*.test.tsx"]
-}
diff --git a/packages/esm-otz-app/webpack.config.js b/packages/esm-otz-app/webpack.config.js
deleted file mode 100755
index 2c74029..0000000
--- a/packages/esm-otz-app/webpack.config.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('openmrs/default-webpack-config');
diff --git a/packages/esm-patient-clinical-view-app/src/specialized-clinics/hiv-care-and-treatment-services/hiv-testing-services/constants.ts b/packages/esm-patient-clinical-view-app/src/specialized-clinics/hiv-care-and-treatment-services/hiv-testing-services/constants.ts
index 753372a..93ecdd3 100755
--- a/packages/esm-patient-clinical-view-app/src/specialized-clinics/hiv-care-and-treatment-services/hiv-testing-services/constants.ts
+++ b/packages/esm-patient-clinical-view-app/src/specialized-clinics/hiv-care-and-treatment-services/hiv-testing-services/constants.ts
@@ -1,21 +1,21 @@
 // HTS screening
-export const populationTypeConcept = 'cf543666-ce76-4e91-8b8d-c0b54a436a2e';
-export const keyPopulationTypeConcept = '160581AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const priorityPopulationConcept = '138643AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const disabilityListConcept = '162558AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const departmentConcept = '159936AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const healthCareWorkerConcept = '5619AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const relationWithIndexClientConcept = '166570AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const eligibilityConcept = '162699AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const populationTypeConcept = 'bbc2e048-0db6-4c22-a951-dab66b1243f9';
+export const keyPopulationTypeConcept = '93aa3f1d-1c39-4196-b5e6-8adc916cd5d6';
+export const priorityPopulationConcept = '8b0fa615-39c7-40ba-ad06-579ae540c6a5';
+export const disabilityListConcept = '522cca7a-235d-43d4-837e-8a118f2d9f88';
+export const departmentConcept = 'a8a17e48-1350-11df-a1f1-0026b9348838';
+export const healthCareWorkerConcept = 'a8aaf158-1350-11df-a1f1-0026b9348838';
+export const relationWithIndexClientConcept = 'bfdf728c-9c56-4ba9-ad40-1ae3c7fcdfa9';
+export const eligibilityConcept = 'e01da5a1-c3e7-4b7f-98d0-05b4bae023fb';
 export const mlPrediction = '167163AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const testingRecommended = '167229AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const testingRecommended = '584e01aa-a1a1-41d2-84c5-6331817bb53b';
 
 // HTS testing
-export const testApproachConcept = '163556AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const testStrategyConcept = 'd85ff219-0f5a-408d-8df0-96bcc9be5071';
-export const entryPointConcept = '160540AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const finalResultConcept = '159427AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const tbScreeeningConcept = '1659AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const testApproachConcept = '1219f85c-31dd-4212-92ac-77926fa5ba03';
+export const testStrategyConcept = '1219f85c-31dd-4212-92ac-77926fa5ba03';
+export const entryPointConcept = 'aad34924-d6e7-4138-a841-0fea9ee4b41f';
+export const finalResultConcept = 'a89c6c64-1350-11df-a1f1-0026b9348838';
+export const tbScreeeningConcept = '02ad9357-b996-4530-b1a4-aff91a105383';
 
 export const encounterRepresentation =
   'custom:(uuid,encounterDatetime,encounterType,location:(uuid,name),' +
diff --git a/packages/esm-patient-clinical-view-app/src/specialized-clinics/hiv-care-and-treatment-services/hiv-testing-services/views/hiv-testing/hiv-screening-constants.ts b/packages/esm-patient-clinical-view-app/src/specialized-clinics/hiv-care-and-treatment-services/hiv-testing-services/views/hiv-testing/hiv-screening-constants.ts
index ee64f1a..2e4832c 100755
--- a/packages/esm-patient-clinical-view-app/src/specialized-clinics/hiv-care-and-treatment-services/hiv-testing-services/views/hiv-testing/hiv-screening-constants.ts
+++ b/packages/esm-patient-clinical-view-app/src/specialized-clinics/hiv-care-and-treatment-services/hiv-testing-services/views/hiv-testing/hiv-screening-constants.ts
@@ -7,7 +7,7 @@ export const hivScreeningConceptMap = {
       '138643AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA': 'Priority Population',
     },
   },
-  '160581AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA': {
+  '93aa3f1d-1c39-4196-b5e6-8adc916cd5d6': {
     display: 'Key Population Type :',
     answers: {
       '105AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA': 'People who inject drugs',
diff --git a/packages/esm-patient-clinical-view-app/src/specialized-clinics/hiv-care-and-treatment-services/hiv-testing-services/views/hiv-testing/hiv-testing-constants.ts b/packages/esm-patient-clinical-view-app/src/specialized-clinics/hiv-care-and-treatment-services/hiv-testing-services/views/hiv-testing/hiv-testing-constants.ts
index 2d94a81..5df6d44 100755
--- a/packages/esm-patient-clinical-view-app/src/specialized-clinics/hiv-care-and-treatment-services/hiv-testing-services/views/hiv-testing/hiv-testing-constants.ts
+++ b/packages/esm-patient-clinical-view-app/src/specialized-clinics/hiv-care-and-treatment-services/hiv-testing-services/views/hiv-testing/hiv-testing-constants.ts
@@ -1,5 +1,5 @@
 export const hivTestingConceptMap = {
-  'cf543666-ce76-4e91-8b8d-c0b54a436a2e': {
+  '93aa3f1d-1c39-4196-b5e6-8adc916cd5d6': {
     display: 'Population type',
     answers: {
       '5d308c8c-ad49-45e1-9885-e5d09a8e5587': 'General Population',
@@ -17,7 +17,7 @@ export const hivTestingConceptMap = {
       '1175AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA': 'Not Applicable',
     },
   },
-  '91a87033-8f75-4f08-9f15-0d8ae66bd9d9': {
+  '522cca7a-235d-43d4-837e-8a118f2d9f88': {
     display: 'Does client have any disability?',
     answers: {
       '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA': 'Yes',
diff --git a/yarn.lock b/yarn.lock
old mode 100755
new mode 100644
index d73b52b..5994b4c
--- a/yarn.lock
+++ b/yarn.lock
@@ -18,11 +18,9 @@ __metadata:
   dependencies:
     "@babel/core": "npm:^7.11.6"
     "@carbon/charts-react": "npm:^1.16.1"
-    "@carbon/react": "npm:~1.37.0"
     "@carbon/styles": "npm:^1.58.0"
     "@hookform/resolvers": "npm:^3.3.1"
-    "@ohri/openmrs-esm-ohri-commons-lib": "npm:next"
-    "@openmrs/esm-framework": "npm:^5.7.1-pre.2076"
+    "@openmrs/esm-framework": "npm:^5.7.2-pre.2101"
     "@openmrs/esm-patient-common-lib": "npm:next"
     "@playwright/test": "npm:1.40.1"
     "@swc/core": "npm:^1.2.165"
@@ -64,7 +62,7 @@ __metadata:
     jspdf: "npm:^2.5.1"
     lint-staged: "npm:^15.2.1"
     moment: "npm:^2.30.1"
-    openmrs: "npm:^5.7.1-pre.2076"
+    openmrs: "npm:^5.7.2-pre.2101"
     pdf-lib: "npm:^1.17.1"
     prettier: "npm:^3.1.1"
     react: "npm:^18.1.0"
@@ -86,40 +84,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@ampath/esm-ampath-core-app@workspace:packages/esm-ampath-core-app":
-  version: 0.0.0-use.local
-  resolution: "@ampath/esm-ampath-core-app@workspace:packages/esm-ampath-core-app"
-  dependencies:
-    "@carbon/react": "npm:~1.37.0"
-    lodash-es: "npm:^4.17.15"
-    webpack: "npm:^5.74.0"
-  peerDependencies:
-    "@ohri/openmrs-esm-ohri-commons-lib": 2.x
-    "@openmrs/esm-framework": 5.x
-    react: ^18.1.0
-    react-i18next: 11.x
-    react-router-dom: 6.x
-    swr: 2.x
-  languageName: unknown
-  linkType: soft
-
-"@ampath/esm-billing-app@workspace:packages/esm-billing-app":
-  version: 0.0.0-use.local
-  resolution: "@ampath/esm-billing-app@workspace:packages/esm-billing-app"
-  dependencies:
-    "@carbon/react": "npm:^1.42.1"
-    lodash-es: "npm:^4.17.15"
-    react-to-print: "npm:^2.14.13"
-    webpack: "npm:^5.74.0"
-  peerDependencies:
-    "@openmrs/esm-framework": 5.x
-    react: ^18.1.0
-    react-i18next: 11.x
-    react-router-dom: 6.x
-    swr: 2.x
-  languageName: unknown
-  linkType: soft
-
 "@ampath/esm-care-panel-app@workspace:packages/esm-care-panel-app":
   version: 0.0.0-use.local
   resolution: "@ampath/esm-care-panel-app@workspace:packages/esm-care-panel-app"
@@ -137,39 +101,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@ampath/esm-hts-app@workspace:packages/esm-hts-app":
-  version: 0.0.0-use.local
-  resolution: "@ampath/esm-hts-app@workspace:packages/esm-hts-app"
-  dependencies:
-    "@carbon/react": "npm:~1.37.0"
-    lodash-es: "npm:^4.17.15"
-    webpack: "npm:^5.74.0"
-  peerDependencies:
-    "@openmrs/esm-framework": 5.x
-    react: ^18.1.0
-    react-i18next: 11.x
-    react-router-dom: 6.x
-    swr: 2.x
-  languageName: unknown
-  linkType: soft
-
-"@ampath/esm-lab-order-manifest-app@workspace:packages/esm-lab-order-manifest-app":
-  version: 0.0.0-use.local
-  resolution: "@ampath/esm-lab-order-manifest-app@workspace:packages/esm-lab-order-manifest-app"
-  dependencies:
-    "@carbon/react": "npm:~1.37.0"
-    lodash-es: "npm:^4.17.15"
-    webpack: "npm:^5.74.0"
-  peerDependencies:
-    "@openmrs/esm-framework": 5.x
-    "@openmrs/esm-laboratory-app": "*"
-    react: ^18.1.0
-    react-i18next: 11.x
-    react-router-dom: 6.x
-    swr: 2.x
-  languageName: unknown
-  linkType: soft
-
 "@ampath/esm-morgue-app@workspace:packages/esm-morgue-app":
   version: 0.0.0-use.local
   resolution: "@ampath/esm-morgue-app@workspace:packages/esm-morgue-app"
@@ -187,22 +118,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@ampath/esm-otz-app@workspace:packages/esm-otz-app":
-  version: 0.0.0-use.local
-  resolution: "@ampath/esm-otz-app@workspace:packages/esm-otz-app"
-  dependencies:
-    "@carbon/react": "npm:~1.37.0"
-    lodash-es: "npm:^4.17.15"
-    webpack: "npm:^5.74.0"
-  peerDependencies:
-    "@openmrs/esm-framework": 5.x
-    react: ^18.1.0
-    react-i18next: 11.x
-    react-router-dom: 6.x
-    swr: 2.x
-  languageName: unknown
-  linkType: soft
-
 "@ampath/esm-patient-clinical-view-app@workspace:packages/esm-patient-clinical-view-app":
   version: 0.0.0-use.local
   resolution: "@ampath/esm-patient-clinical-view-app@workspace:packages/esm-patient-clinical-view-app"
@@ -1786,7 +1701,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/icons-react@npm:^11.26.0, @carbon/icons-react@npm:^11.35.0, @carbon/icons-react@npm:^11.45.0":
+"@carbon/icons-react@npm:^11.26.0, @carbon/icons-react@npm:^11.45.0":
   version: 11.45.0
   resolution: "@carbon/icons-react@npm:11.45.0"
   dependencies:
@@ -1799,7 +1714,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/layout@npm:^11.19.0, @carbon/layout@npm:^11.20.0, @carbon/layout@npm:^11.23.0, @carbon/layout@npm:^11.23.1":
+"@carbon/layout@npm:^11.19.0, @carbon/layout@npm:^11.23.0, @carbon/layout@npm:^11.23.1":
   version: 11.23.1
   resolution: "@carbon/layout@npm:11.23.1"
   dependencies:
@@ -1817,40 +1732,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/react@npm:>1.47.0 <1.50.0":
-  version: 1.49.0
-  resolution: "@carbon/react@npm:1.49.0"
-  dependencies:
-    "@babel/runtime": "npm:^7.18.3"
-    "@carbon/feature-flags": "npm:^0.16.0"
-    "@carbon/icons-react": "npm:^11.35.0"
-    "@carbon/layout": "npm:^11.20.0"
-    "@carbon/styles": "npm:^1.49.0"
-    "@ibm/telemetry-js": "npm:^1.2.0"
-    classnames: "npm:2.5.1"
-    copy-to-clipboard: "npm:^3.3.1"
-    downshift: "npm:8.3.1"
-    flatpickr: "npm:4.6.9"
-    invariant: "npm:^2.2.3"
-    lodash.debounce: "npm:^4.0.8"
-    lodash.findlast: "npm:^4.5.0"
-    lodash.isequal: "npm:^4.5.0"
-    lodash.omit: "npm:^4.5.0"
-    lodash.throttle: "npm:^4.1.1"
-    prop-types: "npm:^15.7.2"
-    react-is: "npm:^18.2.0"
-    use-resize-observer: "npm:^6.0.0"
-    wicg-inert: "npm:^3.1.1"
-    window-or-global: "npm:^1.0.1"
-  peerDependencies:
-    react: ^16.8.6 || ^17.0.1 || ^18.2.0
-    react-dom: ^16.8.6 || ^17.0.1 || ^18.2.0
-    sass: ^1.33.0
-  checksum: 10/18e74975d78a8f26a464b2783a98cfa21610679e9bedc31e9f98e5b05a7ecfa157dd00569f9d54985ebfddcaeeae19096553c8f1cf57bc4f070405faeed3d70a
-  languageName: node
-  linkType: hard
-
-"@carbon/react@npm:^1.12.0, @carbon/react@npm:^1.13.0, @carbon/react@npm:^1.42.1":
+"@carbon/react@npm:^1.12.0, @carbon/react@npm:^1.42.1":
   version: 1.62.0
   resolution: "@carbon/react@npm:1.62.0"
   dependencies:
@@ -1917,7 +1799,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/styles@npm:^1.37.0, @carbon/styles@npm:^1.49.0, @carbon/styles@npm:^1.58.0, @carbon/styles@npm:^1.61.0":
+"@carbon/styles@npm:^1.37.0, @carbon/styles@npm:^1.58.0, @carbon/styles@npm:^1.61.0":
   version: 1.61.0
   resolution: "@carbon/styles@npm:1.61.0"
   dependencies:
@@ -2179,7 +2061,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ibm/telemetry-js@npm:^1.2.0, @ibm/telemetry-js@npm:^1.5.0, @ibm/telemetry-js@npm:^1.5.1, @ibm/telemetry-js@npm:^1.6.0":
+"@ibm/telemetry-js@npm:^1.5.0, @ibm/telemetry-js@npm:^1.5.1, @ibm/telemetry-js@npm:^1.6.0":
   version: 1.6.0
   resolution: "@ibm/telemetry-js@npm:1.6.0"
   bin:
@@ -3107,30 +2989,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ohri/openmrs-esm-ohri-commons-lib@npm:next":
-  version: 2.3.7-pre.447
-  resolution: "@ohri/openmrs-esm-ohri-commons-lib@npm:2.3.7-pre.447"
-  dependencies:
-    "@carbon/react": "npm:^1.13.0"
-    "@openmrs/openmrs-form-engine-lib": "npm:2.0.0-pre.1260"
-    fuzzy: "npm:^0.1.3"
-    lodash-es: "npm:^4.17.15"
-    systemjs-webpack-interop: "npm:^2.3.7"
-    yup: "npm:^1.4.0"
-  peerDependencies:
-    "@openmrs/esm-framework": "*"
-    "@openmrs/esm-patient-common-lib": "*"
-    dayjs: 1.x
-    react: 18.x
-    react-i18next: 11.x
-    swr: 2.x
-  checksum: 10/b35b78a86c75deee09f24c46d19935ee204f34bd0015f097eb134ef26dba488f21de2160b88a602d9c69e08a914401be4b339fa2e7554b1473ab096172c3fd8d
-  languageName: node
-  linkType: hard
-
-"@openmrs/esm-api@npm:5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "@openmrs/esm-api@npm:5.7.1-pre.2076"
+"@openmrs/esm-api@npm:5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "@openmrs/esm-api@npm:5.7.2-pre.2101"
   dependencies:
     "@types/fhir": "npm:0.0.31"
     lodash-es: "npm:^4.17.21"
@@ -3139,17 +3000,17 @@ __metadata:
     "@openmrs/esm-error-handling": 5.x
     "@openmrs/esm-navigation": 5.x
     "@openmrs/esm-offline": 5.x
-  checksum: 10/fcf5f563484373e0c507ecf1d10f1f62c2a1b7b691146e23ee8e7d4df445d735e36ebb3980f6f8d74529e7bd29119a6fad8ded131a4c6da024aa59974a0ffd84
+  checksum: 10/1b515f0c9698f6e64569192c3c97c7adf2020932a359c07b3d4ad1854ae3c6d19915185e27898e46d6871b23e02820fddc4a5d887e0bc4b2a94ce8984af9f6b8
   languageName: node
   linkType: hard
 
-"@openmrs/esm-app-shell@npm:5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "@openmrs/esm-app-shell@npm:5.7.1-pre.2076"
+"@openmrs/esm-app-shell@npm:5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "@openmrs/esm-app-shell@npm:5.7.2-pre.2101"
   dependencies:
     "@carbon/react": "npm:~1.37.0"
-    "@openmrs/esm-framework": "npm:5.7.1-pre.2076"
-    "@openmrs/esm-styleguide": "npm:5.7.1-pre.2076"
+    "@openmrs/esm-framework": "npm:5.7.2-pre.2101"
+    "@openmrs/esm-styleguide": "npm:5.7.2-pre.2101"
     dayjs: "npm:^1.10.4"
     dexie: "npm:^3.0.3"
     html-webpack-plugin: "npm:^5.5.0"
@@ -3166,7 +3027,6 @@ __metadata:
     single-spa: "npm:^6.0.1"
     swc-loader: "npm:^0.2.3"
     swr: "npm:^2.2.2"
-    systemjs: "npm:^6.8.3"
     webpack: "npm:^5.88.0"
     webpack-pwa-manifest: "npm:^4.3.0"
     workbox-core: "npm:^6.1.5"
@@ -3174,57 +3034,57 @@ __metadata:
     workbox-strategies: "npm:^6.1.5"
     workbox-webpack-plugin: "npm:^6.1.5"
     workbox-window: "npm:^6.1.5"
-  checksum: 10/c69c66eae5e6efbd9de6f1ddf5e533f72b243ef2989552df113d7dc3d5562203839298c4ec4340eccc5a148d27791f8de81f2a6866d1de5429b3cc6c731761ed
+  checksum: 10/9136a8e63dca88d32d228f56cbb9894651e8291e4140cca140a4b1f181a2e9f8016bc96ad18114cef9b1d6163bd19ba557a15d746dd65704bd32e8e23c0cbaf9
   languageName: node
   linkType: hard
 
-"@openmrs/esm-config@npm:5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "@openmrs/esm-config@npm:5.7.1-pre.2076"
+"@openmrs/esm-config@npm:5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "@openmrs/esm-config@npm:5.7.2-pre.2101"
   dependencies:
     ramda: "npm:^0.26.1"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
     single-spa: 5.x
-  checksum: 10/b2d4318cc29e18df21002b7975a94eb88a922a9a32b4fcab2ff71a15b60171bb733c3e215146422a836c9e33ef678778c4658e654f799b007a9191f076fe4718
+  checksum: 10/704987fa69037d849f507528ea6bc62d2c5214ca5fd705256480063ff48a45ea947fe50a1debae421ed66050b4146c47b08e3d7c24780c80ae30807453735ead
   languageName: node
   linkType: hard
 
-"@openmrs/esm-context@npm:5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "@openmrs/esm-context@npm:5.7.1-pre.2076"
+"@openmrs/esm-context@npm:5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "@openmrs/esm-context@npm:5.7.2-pre.2101"
   dependencies:
     immer: "npm:^10.0.4"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
-  checksum: 10/c23e027a04b0e7702df40dc8da7c58e4ddb2911109d6c59f4673e37829321e3e9936cb7d730e09d2a56b36402c921556c153a8ef946a46c0507c1c1621edad36
+  checksum: 10/9a7aed1cd5f5e815c92e37fc5f34f6003e0328532b3be9ab4a4f0305a9e4d7cd3202835644edef0819d9c02128da1038837466ea644ec07b32a17d1cd7456427
   languageName: node
   linkType: hard
 
-"@openmrs/esm-dynamic-loading@npm:5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "@openmrs/esm-dynamic-loading@npm:5.7.1-pre.2076"
+"@openmrs/esm-dynamic-loading@npm:5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "@openmrs/esm-dynamic-loading@npm:5.7.2-pre.2101"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-translations": 5.x
-  checksum: 10/7888f10c61b54f94d7f79ca2ec2d62c79da7d26ae1f8f72931684ad92ec7199d91513a88a3843aa26f466a859b9269e9616f462a7315dc33008d1f69b6ac2f90
+  checksum: 10/ec4462707f0a00054ddd7817ab612f0ed893078b20ff7f5689927fefe7fb4db13bda61f23596bbf58d7f89a9fdaa4a9b7febe498e597d30dd844304fe984be82
   languageName: node
   linkType: hard
 
-"@openmrs/esm-error-handling@npm:5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "@openmrs/esm-error-handling@npm:5.7.1-pre.2076"
+"@openmrs/esm-error-handling@npm:5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "@openmrs/esm-error-handling@npm:5.7.2-pre.2101"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: 10/64ef869e256049a2d8b8017677607d78228c6eb5207d207c0bc1453e5e6194bec169b9b3ebcf2723accdea02dd0cae52900086a7ee1dacb6c6eab387638b3590
+  checksum: 10/8ace05490252b5851b59ed44f3e0a1217aaf335a431ecb55fe6d18a98179243512bde8a087ad3e9d9c28e4da9b378d7b341ce1bf955e32df25a2e3705c2af447
   languageName: node
   linkType: hard
 
-"@openmrs/esm-extensions@npm:5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "@openmrs/esm-extensions@npm:5.7.1-pre.2076"
+"@openmrs/esm-extensions@npm:5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "@openmrs/esm-extensions@npm:5.7.2-pre.2101"
   dependencies:
     lodash-es: "npm:^4.17.21"
   peerDependencies:
@@ -3234,43 +3094,43 @@ __metadata:
     "@openmrs/esm-state": 5.x
     "@openmrs/esm-utils": 5.x
     single-spa: 5.x
-  checksum: 10/342535786d089b58969729b2df0d98ce590d3aef5c5809d73df1c0af1b49973fbad83c46d52224a6e42a61d8e240e1fe545fb9640c126285c9069258cb76c9af
+  checksum: 10/ee70cf281b5b97c640598e82c3e58a0ae9090c5376432a10195c81632a00d1455834a687d92bf193641a07f129db853d7482634eb1fa3b123af33aa1a353bdb9
   languageName: node
   linkType: hard
 
-"@openmrs/esm-feature-flags@npm:5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "@openmrs/esm-feature-flags@npm:5.7.1-pre.2076"
+"@openmrs/esm-feature-flags@npm:5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "@openmrs/esm-feature-flags@npm:5.7.2-pre.2101"
   dependencies:
     ramda: "npm:^0.26.1"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
     single-spa: 5.x
-  checksum: 10/bc433f537235051288a70282aeb431d4269e7aff1115bd997212a1f8be4a7db464caa617659e1d962faec588de38f22a8dbd87d3ece66c4de7c537fee7dfa1bf
-  languageName: node
-  linkType: hard
-
-"@openmrs/esm-framework@npm:5.7.1-pre.2076, @openmrs/esm-framework@npm:^5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "@openmrs/esm-framework@npm:5.7.1-pre.2076"
-  dependencies:
-    "@openmrs/esm-api": "npm:5.7.1-pre.2076"
-    "@openmrs/esm-config": "npm:5.7.1-pre.2076"
-    "@openmrs/esm-context": "npm:5.7.1-pre.2076"
-    "@openmrs/esm-dynamic-loading": "npm:5.7.1-pre.2076"
-    "@openmrs/esm-error-handling": "npm:5.7.1-pre.2076"
-    "@openmrs/esm-extensions": "npm:5.7.1-pre.2076"
-    "@openmrs/esm-feature-flags": "npm:5.7.1-pre.2076"
-    "@openmrs/esm-globals": "npm:5.7.1-pre.2076"
-    "@openmrs/esm-navigation": "npm:5.7.1-pre.2076"
-    "@openmrs/esm-offline": "npm:5.7.1-pre.2076"
-    "@openmrs/esm-react-utils": "npm:5.7.1-pre.2076"
-    "@openmrs/esm-routes": "npm:5.7.1-pre.2076"
-    "@openmrs/esm-state": "npm:5.7.1-pre.2076"
-    "@openmrs/esm-styleguide": "npm:5.7.1-pre.2076"
-    "@openmrs/esm-translations": "npm:5.7.1-pre.2076"
-    "@openmrs/esm-utils": "npm:5.7.1-pre.2076"
+  checksum: 10/cae49a6347c1b1810b90533b26a0c48758533744ed1f4bc2290d8557b5bf5a3420167688832edb3aba2d454a4562a0a088ff3b946da9fc07a373412384430c14
+  languageName: node
+  linkType: hard
+
+"@openmrs/esm-framework@npm:5.7.2-pre.2101, @openmrs/esm-framework@npm:^5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "@openmrs/esm-framework@npm:5.7.2-pre.2101"
+  dependencies:
+    "@openmrs/esm-api": "npm:5.7.2-pre.2101"
+    "@openmrs/esm-config": "npm:5.7.2-pre.2101"
+    "@openmrs/esm-context": "npm:5.7.2-pre.2101"
+    "@openmrs/esm-dynamic-loading": "npm:5.7.2-pre.2101"
+    "@openmrs/esm-error-handling": "npm:5.7.2-pre.2101"
+    "@openmrs/esm-extensions": "npm:5.7.2-pre.2101"
+    "@openmrs/esm-feature-flags": "npm:5.7.2-pre.2101"
+    "@openmrs/esm-globals": "npm:5.7.2-pre.2101"
+    "@openmrs/esm-navigation": "npm:5.7.2-pre.2101"
+    "@openmrs/esm-offline": "npm:5.7.2-pre.2101"
+    "@openmrs/esm-react-utils": "npm:5.7.2-pre.2101"
+    "@openmrs/esm-routes": "npm:5.7.2-pre.2101"
+    "@openmrs/esm-state": "npm:5.7.2-pre.2101"
+    "@openmrs/esm-styleguide": "npm:5.7.2-pre.2101"
+    "@openmrs/esm-translations": "npm:5.7.2-pre.2101"
+    "@openmrs/esm-utils": "npm:5.7.2-pre.2101"
     dayjs: "npm:^1.10.7"
   peerDependencies:
     dayjs: 1.x
@@ -3281,35 +3141,35 @@ __metadata:
     rxjs: 6.x
     single-spa: 5.x
     swr: 2.x
-  checksum: 10/24968534fc5de2b78e1bdf95fd030d0326dd008cc3192130f620df95c17796001fa60f87befedf29d17c8221f08b26eee142d94e0feb76124c0d030b2b69a9ee
+  checksum: 10/0cdcbd9ddf3608e8780f097f00fa775a5e384c456a7fb03118678756fd5cb5ded0d51279d88ec86ebdc19ac584f2c7b82579f41afcd44560d1d40651f7e4aa7c
   languageName: node
   linkType: hard
 
-"@openmrs/esm-globals@npm:5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "@openmrs/esm-globals@npm:5.7.1-pre.2076"
+"@openmrs/esm-globals@npm:5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "@openmrs/esm-globals@npm:5.7.2-pre.2101"
   dependencies:
     "@types/fhir": "npm:0.0.31"
   peerDependencies:
     single-spa: 5.x
-  checksum: 10/b8b9647657cf70e9a7a55a9897809cec0cdc4a15a947a9920db042fe503cacd502ec80ce5da37b890eb75149f6f86d1c7bd7df964d0fbd293ff5d0f9ad6996f0
+  checksum: 10/f1fee89db5a9bd55b58303deae9e7d9d11fd5f67781a7108319825b441a47bc12efa34edf8f28e53fd22f9ab2872aba55e49aa22308028c816174fba126f236d
   languageName: node
   linkType: hard
 
-"@openmrs/esm-navigation@npm:5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "@openmrs/esm-navigation@npm:5.7.1-pre.2076"
+"@openmrs/esm-navigation@npm:5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "@openmrs/esm-navigation@npm:5.7.2-pre.2101"
   dependencies:
     path-to-regexp: "npm:6.1.0"
   peerDependencies:
     "@openmrs/esm-state": 5.x
-  checksum: 10/5de2e623bd037cabaaf3d562b6e9b1a0d3710db005dce7c3828ebc98d054a745ea7c43242a92c6c86b847cb8be672b792c50e7a1da0a27cf9630741253c7ac63
+  checksum: 10/71fa2bbdfc0d57214efd2397f7fff985d29f9ed2f99faaf363a8e288d9b7681dab4118b0275f4234c3efa8745c665a7e3602123511a7766854915948c6cf6443
   languageName: node
   linkType: hard
 
-"@openmrs/esm-offline@npm:5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "@openmrs/esm-offline@npm:5.7.1-pre.2076"
+"@openmrs/esm-offline@npm:5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "@openmrs/esm-offline@npm:5.7.2-pre.2101"
   dependencies:
     dexie: "npm:^3.0.3"
     lodash-es: "npm:^4.17.21"
@@ -3320,7 +3180,7 @@ __metadata:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
     rxjs: 6.x
-  checksum: 10/636fa1297dbc759c9cabc178edbbf5ddb86ba57d11f8ea52036ec91e1856e177da3c6d2d61a5d7959a4e19b03e038bdc6ec03c3942061b89f1a35b193d6ee12f
+  checksum: 10/a1d3878cf060a5d5875cf3d50a0daa4791a45b9481fa62df4d418e00f3e1413c956c422f69225649740b9038b120ebcda4458afb4d4a5ddb80c4b82d0bf890b7
   languageName: node
   linkType: hard
 
@@ -3339,9 +3199,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@openmrs/esm-react-utils@npm:5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "@openmrs/esm-react-utils@npm:5.7.1-pre.2076"
+"@openmrs/esm-react-utils@npm:5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "@openmrs/esm-react-utils@npm:5.7.2-pre.2101"
   dependencies:
     lodash-es: "npm:^4.17.21"
     single-spa-react: "npm:^6.0.0"
@@ -3362,34 +3222,39 @@ __metadata:
     react-i18next: 11.x
     rxjs: 6.x
     swr: 2.x
-  checksum: 10/a1bebe24bb919372821713afc5838c5717153b1f2ed59ef3e6fb7181c4a4716fa4b7b049ab74dcc5b10172066102de757a79610faf19a4f127ec6c4aa064bbf6
+  checksum: 10/29ff319a95fc4aaea68d8888a27613face1eb00ec82e6dba85c7e4d1c24f271f99572dd11c737df3c3cc4fb5253299b4e045f4a511f3ad823cebb6d9fc32a1ba
   languageName: node
   linkType: hard
 
-"@openmrs/esm-routes@npm:5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "@openmrs/esm-routes@npm:5.7.1-pre.2076"
+"@openmrs/esm-routes@npm:5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "@openmrs/esm-routes@npm:5.7.2-pre.2101"
   peerDependencies:
+    "@openmrs/esm-config": 5.x
+    "@openmrs/esm-dynamic-loading": 5.x
+    "@openmrs/esm-extensions": 5.x
+    "@openmrs/esm-feature-flags": 5.x
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-utils": 5.x
-  checksum: 10/60b11aaaf429c01c17662c3b4bd1f778d65efe6e2c959099eec623946fbe524a97f89203fa89ecc1b1947278e6cf7b2382dbf3805788285db4c37c2ae3d1685e
+    single-spa: 6.x
+  checksum: 10/322c523508ba6e19734796a3ecd8dafbd18ac1c95f0a0c4f5a262a6ecc0c7eed494c025ddd1250ab7b071b7bc562b2883da82ab0b23e31ce9ce2ff4b2b0c151c
   languageName: node
   linkType: hard
 
-"@openmrs/esm-state@npm:5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "@openmrs/esm-state@npm:5.7.1-pre.2076"
+"@openmrs/esm-state@npm:5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "@openmrs/esm-state@npm:5.7.2-pre.2101"
   dependencies:
     zustand: "npm:^4.3.6"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: 10/d347f0fb9941187475d5bd0513583bf6dcfbc3630739c6d9c86ce06eb26751afb4e42960c334aa3adc7c7e7902523f3e7505f3ace67686bc6446b596a69e620c
+  checksum: 10/f8b7c697b37a9892322d2ba15a1e585b1d1a10495f85e600556b5b51dcf2fd3523af5f1858d6d3bc70daef2f41f1fb0438b7d0bb82d7ae5518510bbb0882bb73
   languageName: node
   linkType: hard
 
-"@openmrs/esm-styleguide@npm:5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "@openmrs/esm-styleguide@npm:5.7.1-pre.2076"
+"@openmrs/esm-styleguide@npm:5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "@openmrs/esm-styleguide@npm:5.7.2-pre.2101"
   dependencies:
     "@carbon/charts": "npm:^1.12.0"
     "@carbon/react": "npm:~1.37.0"
@@ -3412,24 +3277,24 @@ __metadata:
     react: 18.x
     react-dom: 18.x
     rxjs: 6.x
-  checksum: 10/9d0443d839a41b042b2c622e95d37df755a723d7502c99727614461632e8b29628f395c6f54c88ef32418196789cff25b7645cd2e56f322d48c34ff080e059c6
+  checksum: 10/b3e09adcef5f7cbe69841d38198fe93206a5ca52e822d162917bb9314362dd8430cbdadc0b84e5b1aafb9c3486e4f84d3911061c9aeede8ad3b0bf8c139d8d16
   languageName: node
   linkType: hard
 
-"@openmrs/esm-translations@npm:5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "@openmrs/esm-translations@npm:5.7.1-pre.2076"
+"@openmrs/esm-translations@npm:5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "@openmrs/esm-translations@npm:5.7.2-pre.2101"
   dependencies:
     i18next: "npm:21.10.0"
   peerDependencies:
     i18next: 21.x
-  checksum: 10/15be469bdbaf52a53d4101cc1eacffe9a51eafa309d80000a99025ef1173fb20a1ef1b25249f0513e2f47792fd86e1d887f34d7dc735a0597e88b082d3d6db0c
+  checksum: 10/473bc07234de334af8e057fafe4f2daad3f33db40df0ddf4c848ff474f726d807107bc9d051cc0040e561c8c299cd9297ba3ec147d4827898458b2fa63da08ba
   languageName: node
   linkType: hard
 
-"@openmrs/esm-utils@npm:5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "@openmrs/esm-utils@npm:5.7.1-pre.2076"
+"@openmrs/esm-utils@npm:5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "@openmrs/esm-utils@npm:5.7.2-pre.2101"
   dependencies:
     "@internationalized/date": "npm:^3.5.4"
     semver: "npm:7.3.2"
@@ -3438,41 +3303,13 @@ __metadata:
     dayjs: 1.x
     i18next: 21.x
     rxjs: 6.x
-  checksum: 10/fd51a5610518c0f7a384e51492d1e2f0667ed7459e26805c4f928caa7e5b4fcac98bea38c48c4352f66e3a863f2a71114bfdbda2958e67f57297a174f3f01a1f
-  languageName: node
-  linkType: hard
-
-"@openmrs/openmrs-form-engine-lib@npm:2.0.0-pre.1260":
-  version: 2.0.0-pre.1260
-  resolution: "@openmrs/openmrs-form-engine-lib@npm:2.0.0-pre.1260"
-  dependencies:
-    "@carbon/react": "npm:>1.47.0 <1.50.0"
-    ace-builds: "npm:^1.33.2"
-    classnames: "npm:^2.5.1"
-    dayjs: "npm:1.x"
-    formik: "npm:^2.4.6"
-    lodash-es: "npm:^4.17.21"
-    react-error-boundary: "npm:^4.0.13"
-    react-markdown: "npm:^7.1.2"
-    react-waypoint: "npm:^10.3.0"
-    react-webcam: "npm:^7.2.0"
-    yup: "npm:^1.4.0"
-  peerDependencies:
-    "@openmrs/esm-framework": 5.x
-    "@openmrs/esm-patient-common-lib": 8.x
-    dayjs: 1.x
-    i18next: 23.x
-    react: 18.x
-    react-i18next: 11.x
-    rxjs: 6.x
-    swr: 2.x
-  checksum: 10/3266f4c4df6254f46017808dc5fec6071c8ab3a7476147285d182cee1679156f037ef058cdea18f55fce1175007c4dbd6997742eaa695419dd555d6d1efa077e
+  checksum: 10/3c55b3fec0e307a18f9ac728ccdf2f5966e1244f180eb01750a9fa9e7af401fea75dd37a3e29ba80d392fb52c1144f3fbfcfcc15edf4eca8ec29bd192afb69bc
   languageName: node
   linkType: hard
 
-"@openmrs/webpack-config@npm:5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "@openmrs/webpack-config@npm:5.7.1-pre.2076"
+"@openmrs/webpack-config@npm:5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "@openmrs/webpack-config@npm:5.7.2-pre.2101"
   dependencies:
     "@swc/core": "npm:^1.3.58"
     clean-webpack-plugin: "npm:^4.0.0"
@@ -3480,6 +3317,7 @@ __metadata:
     css-loader: "npm:^5.2.4"
     fork-ts-checker-webpack-plugin: "npm:^6.5.0"
     lodash: "npm:^4.17.21"
+    lodash-es: "npm:^4.17.21"
     sass: "npm:>=1.45.0 <1.65.0"
     sass-loader: "npm:^12.3.0"
     style-loader: "npm:^3.3.1"
@@ -3489,7 +3327,7 @@ __metadata:
     webpack-stats-plugin: "npm:^1.0.3"
   peerDependencies:
     webpack: 5.x
-  checksum: 10/31f02e07f104d1323515ade178d02bbf97569366d70ba8c28024bc0cd5fcd6629693bf42c651420ff7f4f3ce5e6f5aec03cc17d9bfec66b6d6c878702b74325a
+  checksum: 10/5a39817518f71c10ed5605637640a3612fd0640700d08769f82fc3b25e1f418e8ebf7c05b9ca99dbaba64971b9267242b3b09d3701ecc11f6f7c874261313268
   languageName: node
   linkType: hard
 
@@ -5546,15 +5384,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/debug@npm:^4.0.0":
-  version: 4.1.12
-  resolution: "@types/debug@npm:4.1.12"
-  dependencies:
-    "@types/ms": "npm:*"
-  checksum: 10/47876a852de8240bfdaf7481357af2b88cb660d30c72e73789abf00c499d6bc7cd5e52f41c915d1b9cd8ec9fef5b05688d7b7aef17f7f272c2d04679508d1053
-  languageName: node
-  linkType: hard
-
 "@types/eslint-scope@npm:^3.7.3":
   version: 3.7.7
   resolution: "@types/eslint-scope@npm:3.7.7"
@@ -5639,15 +5468,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/hast@npm:^2.0.0":
-  version: 2.3.10
-  resolution: "@types/hast@npm:2.3.10"
-  dependencies:
-    "@types/unist": "npm:^2"
-  checksum: 10/41531b7fbf590b02452996fc63272479c20a07269e370bd6514982cbcd1819b4b84d3ea620f2410d1b9541a23d08ce2eeb0a592145d05e00e249c3d56700d460
-  languageName: node
-  linkType: hard
-
 "@types/history@npm:^4.7.11":
   version: 4.7.11
   resolution: "@types/history@npm:4.7.11"
@@ -5757,22 +5577,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/mdast@npm:^3.0.0":
-  version: 3.0.15
-  resolution: "@types/mdast@npm:3.0.15"
-  dependencies:
-    "@types/unist": "npm:^2"
-  checksum: 10/050a5c1383928b2688dd145382a22535e2af87dc3fd592c843abb7851bcc99893a1ee0f63be19fc4e89779387ec26a57486cfb425b016c0b2a98a17fc4a1e8b3
-  languageName: node
-  linkType: hard
-
-"@types/mdurl@npm:^1.0.0":
-  version: 1.0.5
-  resolution: "@types/mdurl@npm:1.0.5"
-  checksum: 10/e8e872e8da8f517a9c748b06cec61c947cb73fd3069e8aeb0926670ec5dfac5d30549b3d0f1634950401633e812f9b7263f2d5dbe7e98fce12bcb2c659aa4b21
-  languageName: node
-  linkType: hard
-
 "@types/mime@npm:^1":
   version: 1.3.5
   resolution: "@types/mime@npm:1.3.5"
@@ -5794,13 +5598,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/ms@npm:*":
-  version: 0.7.34
-  resolution: "@types/ms@npm:0.7.34"
-  checksum: 10/f38d36e7b6edecd9badc9cf50474159e9da5fa6965a75186cceaf883278611b9df6669dc3a3cc122b7938d317b68a9e3d573d316fcb35d1be47ec9e468c6bd8a
-  languageName: node
-  linkType: hard
-
 "@types/node-forge@npm:^1.3.0":
   version: 1.3.11
   resolution: "@types/node-forge@npm:1.3.11"
@@ -5991,13 +5788,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/unist@npm:^2, @types/unist@npm:^2.0.0":
-  version: 2.0.10
-  resolution: "@types/unist@npm:2.0.10"
-  checksum: 10/e2924e18dedf45f68a5c6ccd6015cd62f1643b1b43baac1854efa21ae9e70505db94290434a23da1137d9e31eb58e54ca175982005698ac37300a1c889f6c4aa
-  languageName: node
-  linkType: hard
-
 "@types/uuid@npm:^8.3.0":
   version: 8.3.4
   resolution: "@types/uuid@npm:8.3.4"
@@ -6403,13 +6193,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ace-builds@npm:^1.33.2":
-  version: 1.35.2
-  resolution: "ace-builds@npm:1.35.2"
-  checksum: 10/dca440312d85e85cf3e0cac5ee1ffad2d282b31fbcffbd5b6d72cfdd5037cdb85b43d41ef3e3557ab5d446009233c37a4b26b99f7b1cf1f043210d27a8abf571
-  languageName: node
-  linkType: hard
-
 "acorn-globals@npm:^7.0.0":
   version: 7.0.1
   resolution: "acorn-globals@npm:7.0.1"
@@ -7213,13 +6996,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bail@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "bail@npm:2.0.2"
-  checksum: 10/aab4e8ccdc8d762bf3fdfce8e706601695620c0c2eda256dd85088dc0be3cfd7ff126f6e99c2bee1f24f5d418414aacf09d7f9702f16d6963df2fa488cda8824
-  languageName: node
-  linkType: hard
-
 "balanced-match@npm:^1.0.0":
   version: 1.0.2
   resolution: "balanced-match@npm:1.0.2"
@@ -7700,13 +7476,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"character-entities@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "character-entities@npm:2.0.2"
-  checksum: 10/c8dd1f4bf1a92fccf7d2fad9673660a88b37854557d30f6076c32fedfb92d1420208298829ff1d3b6b4fa1c7012e8326c45e7f5c3ed1e9a09ec177593c521b2f
-  languageName: node
-  linkType: hard
-
 "chardet@npm:^0.7.0":
   version: 0.7.0
   resolution: "chardet@npm:0.7.0"
@@ -7804,7 +7573,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"classnames@npm:2.5.1, classnames@npm:^2.3.2, classnames@npm:^2.5.1":
+"classnames@npm:2.5.1, classnames@npm:^2.3.2":
   version: 2.5.1
   resolution: "classnames@npm:2.5.1"
   checksum: 10/58eb394e8817021b153bb6e7d782cfb667e4ab390cb2e9dac2fc7c6b979d1cc2b2a733093955fc5c94aa79ef5c8c89f11ab77780894509be6afbb91dddd79d15
@@ -8064,13 +7833,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"comma-separated-tokens@npm:^2.0.0":
-  version: 2.0.3
-  resolution: "comma-separated-tokens@npm:2.0.3"
-  checksum: 10/e3bf9e0332a5c45f49b90e79bcdb4a7a85f28d6a6f0876a94f1bb9b2bfbdbbb9292aac50e1e742d8c0db1e62a0229a106f57917e2d067fca951d81737651700d
-  languageName: node
-  linkType: hard
-
 "commander@npm:2, commander@npm:^2.20.0":
   version: 2.20.3
   resolution: "commander@npm:2.20.3"
@@ -8213,13 +7975,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"consolidated-events@npm:^1.1.0 || ^2.0.0":
-  version: 2.0.2
-  resolution: "consolidated-events@npm:2.0.2"
-  checksum: 10/594de16e04e3140e8f7d5ae5e3d8f6f95f9922a926829e2099e2e743b36fac62398db1a501cdf975f76e55be8b1f14c427346bb6683d38798a1ccd752401c7ca
-  languageName: node
-  linkType: hard
-
 "content-disposition@npm:0.5.4":
   version: 0.5.4
   resolution: "content-disposition@npm:0.5.4"
@@ -9072,7 +8827,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dayjs@npm:1.x, dayjs@npm:^1.10.4, dayjs@npm:^1.10.7, dayjs@npm:^1.8.36":
+"dayjs@npm:^1.10.4, dayjs@npm:^1.10.7, dayjs@npm:^1.8.36":
   version: 1.11.12
   resolution: "dayjs@npm:1.11.12"
   checksum: 10/8ee7c1e14961fd08d40b788d0c0e930dc6288b3d32911bb911b2fb31bb703c262788164fbe678ee9e50e2a35268d667b8c8ba43fd1806771c1f404c300a2b428
@@ -9102,7 +8857,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:~4.3.4":
+"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:~4.3.4":
   version: 4.3.5
   resolution: "debug@npm:4.3.5"
   dependencies:
@@ -9128,15 +8883,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"decode-named-character-reference@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "decode-named-character-reference@npm:1.0.2"
-  dependencies:
-    character-entities: "npm:^2.0.0"
-  checksum: 10/f4c71d3b93105f20076052f9cb1523a22a9c796b8296cd35eef1ca54239c78d182c136a848b83ff8da2071e3ae2b1d300bf29d00650a6d6e675438cc31b11d78
-  languageName: node
-  linkType: hard
-
 "dedent@npm:^1.0.0":
   version: 1.5.3
   resolution: "dedent@npm:1.5.3"
@@ -9286,7 +9032,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dequal@npm:^2.0.0, dequal@npm:^2.0.3":
+"dequal@npm:^2.0.3":
   version: 2.0.3
   resolution: "dequal@npm:2.0.3"
   checksum: 10/6ff05a7561f33603df87c45e389c9ac0a95e3c056be3da1a0c4702149e3a7f6fe5ffbb294478687ba51a9e95f3a60e8b6b9005993acd79c292c7d15f71964b6b
@@ -9328,13 +9074,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"diff@npm:^5.0.0":
-  version: 5.2.0
-  resolution: "diff@npm:5.2.0"
-  checksum: 10/01b7b440f83a997350a988e9d2f558366c0f90f15be19f4aa7f1bb3109a4e153dfc3b9fbf78e14ea725717017407eeaa2271e3896374a0181e8f52445740846d
-  languageName: node
-  linkType: hard
-
 "dir-glob@npm:^3.0.1":
   version: 3.0.1
   resolution: "dir-glob@npm:3.0.1"
@@ -9516,21 +9255,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"downshift@npm:8.3.1":
-  version: 8.3.1
-  resolution: "downshift@npm:8.3.1"
-  dependencies:
-    "@babel/runtime": "npm:^7.22.15"
-    compute-scroll-into-view: "npm:^3.0.3"
-    prop-types: "npm:^15.8.1"
-    react-is: "npm:^18.2.0"
-    tslib: "npm:^2.6.2"
-  peerDependencies:
-    react: ">=16.12.0"
-  checksum: 10/b616da957802bd80bc8d909d36bff851d9701e743d800be6443514f24deeaf0ce22ae56e6802c386c769328d8442969c6629c6f94d99ff12bea8d07e11c86cee
-  languageName: node
-  linkType: hard
-
 "downshift@npm:8.5.0":
   version: 8.5.0
   resolution: "downshift@npm:8.5.0"
@@ -10789,13 +10513,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fuzzy@npm:^0.1.3":
-  version: 0.1.3
-  resolution: "fuzzy@npm:0.1.3"
-  checksum: 10/3cf399457f3f9832af5d72bdbf354b287d977fca6bd800fb457579a9ccf8d8faa297f70ab7fada0147591e022d817532072ab07f69490b84f5dda96051e8c3ab
-  languageName: node
-  linkType: hard
-
 "gauge@npm:^4.0.3":
   version: 4.0.4
   resolution: "gauge@npm:4.0.4"
@@ -11221,13 +10938,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hast-util-whitespace@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "hast-util-whitespace@npm:2.0.1"
-  checksum: 10/ad5a61f4e81330413d4182247e158d77408a076994fbe7257574ea6489728bb4138c83e00482051c941973d4ed3049729afb35600debfc6d1d945c40453685f7
-  languageName: node
-  linkType: hard
-
 "he@npm:^1.2.0":
   version: 1.2.0
   resolution: "he@npm:1.2.0"
@@ -11770,13 +11480,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"inline-style-parser@npm:0.1.1":
-  version: 0.1.1
-  resolution: "inline-style-parser@npm:0.1.1"
-  checksum: 10/e661f4fb6824a41076c4d23358e8b581fd3410fbfb9baea4cb542a85448b487691c3b9bbb58ad73a95613041ca616f059595f19cadd0c22476a1fffa79842b48
-  languageName: node
-  linkType: hard
-
 "inquirer@npm:^7.3.3":
   version: 7.3.3
   resolution: "inquirer@npm:7.3.3"
@@ -11954,13 +11657,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-buffer@npm:^2.0.0":
-  version: 2.0.5
-  resolution: "is-buffer@npm:2.0.5"
-  checksum: 10/3261a8b858edcc6c9566ba1694bf829e126faa88911d1c0a747ea658c5d81b14b6955e3a702d59dabadd58fdd440c01f321aa71d6547105fd21d03f94d0597e7
-  languageName: node
-  linkType: hard
-
 "is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7":
   version: 1.2.7
   resolution: "is-callable@npm:1.2.7"
@@ -13230,13 +12926,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"kleur@npm:^4.0.3":
-  version: 4.1.5
-  resolution: "kleur@npm:4.1.5"
-  checksum: 10/44d84cc4eedd4311099402ef6d4acd9b2d16e08e499d6ef3bb92389bd4692d7ef09e35248c26e27f98acac532122acb12a1bfee645994ae3af4f0a37996da7df
-  languageName: node
-  linkType: hard
-
 "klona@npm:^2.0.4, klona@npm:^2.0.5":
   version: 2.0.6
   resolution: "klona@npm:2.0.6"
@@ -13679,63 +13368,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mdast-util-definitions@npm:^5.0.0":
-  version: 5.1.2
-  resolution: "mdast-util-definitions@npm:5.1.2"
-  dependencies:
-    "@types/mdast": "npm:^3.0.0"
-    "@types/unist": "npm:^2.0.0"
-    unist-util-visit: "npm:^4.0.0"
-  checksum: 10/4491b7c551ce1bdeb6c8fb1968cd461acb01ca1584f12c240755541a92d7f02bc5b9c9d6303d50deaed6d959ba58fe9a352a3e676e0f1d954e003de1277f57e4
-  languageName: node
-  linkType: hard
-
-"mdast-util-from-markdown@npm:^1.0.0":
-  version: 1.3.1
-  resolution: "mdast-util-from-markdown@npm:1.3.1"
-  dependencies:
-    "@types/mdast": "npm:^3.0.0"
-    "@types/unist": "npm:^2.0.0"
-    decode-named-character-reference: "npm:^1.0.0"
-    mdast-util-to-string: "npm:^3.1.0"
-    micromark: "npm:^3.0.0"
-    micromark-util-decode-numeric-character-reference: "npm:^1.0.0"
-    micromark-util-decode-string: "npm:^1.0.0"
-    micromark-util-normalize-identifier: "npm:^1.0.0"
-    micromark-util-symbol: "npm:^1.0.0"
-    micromark-util-types: "npm:^1.0.0"
-    unist-util-stringify-position: "npm:^3.0.0"
-    uvu: "npm:^0.5.0"
-  checksum: 10/1d334a54ddd6481ec4acf64c2c537b6463bc5113ba5a408f65c228dcc302d46837352814f11307af0f8b51dd7e4a0b887ce692e4d30ff31ff9d578b8ca82810b
-  languageName: node
-  linkType: hard
-
-"mdast-util-to-hast@npm:^11.0.0":
-  version: 11.3.0
-  resolution: "mdast-util-to-hast@npm:11.3.0"
-  dependencies:
-    "@types/hast": "npm:^2.0.0"
-    "@types/mdast": "npm:^3.0.0"
-    "@types/mdurl": "npm:^1.0.0"
-    mdast-util-definitions: "npm:^5.0.0"
-    mdurl: "npm:^1.0.0"
-    unist-builder: "npm:^3.0.0"
-    unist-util-generated: "npm:^2.0.0"
-    unist-util-position: "npm:^4.0.0"
-    unist-util-visit: "npm:^4.0.0"
-  checksum: 10/db5132f092790213e435c1dc2de9c1ea6c33917aae17bab6181f8981df4abf739890f5bce89b1100e9bbbabe76c67aeb43223787158e82c0d36d7c18a89f4f51
-  languageName: node
-  linkType: hard
-
-"mdast-util-to-string@npm:^3.1.0":
-  version: 3.2.0
-  resolution: "mdast-util-to-string@npm:3.2.0"
-  dependencies:
-    "@types/mdast": "npm:^3.0.0"
-  checksum: 10/fafe201c12a0d412a875fe8540bf70b4360f3775fb7f0d19403ba7b59e50f74f730e3b405c72ad940bc8a3ec1ba311f76dfca61c4ce585dce1ccda2168ec244f
-  languageName: node
-  linkType: hard
-
 "mdn-data@npm:2.0.14":
   version: 2.0.14
   resolution: "mdn-data@npm:2.0.14"
@@ -13743,13 +13375,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mdurl@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "mdurl@npm:1.0.1"
-  checksum: 10/ada367d01c9e81d07328101f187d5bd8641b71f33eab075df4caed935a24fa679e625f07108801d8250a5e4a99e5cd4be7679957a11424a3aa3e740d2bb2d5cb
-  languageName: node
-  linkType: hard
-
 "media-typer@npm:0.3.0":
   version: 0.3.0
   resolution: "media-typer@npm:0.3.0"
@@ -13794,242 +13419,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromark-core-commonmark@npm:^1.0.1":
-  version: 1.1.0
-  resolution: "micromark-core-commonmark@npm:1.1.0"
-  dependencies:
-    decode-named-character-reference: "npm:^1.0.0"
-    micromark-factory-destination: "npm:^1.0.0"
-    micromark-factory-label: "npm:^1.0.0"
-    micromark-factory-space: "npm:^1.0.0"
-    micromark-factory-title: "npm:^1.0.0"
-    micromark-factory-whitespace: "npm:^1.0.0"
-    micromark-util-character: "npm:^1.0.0"
-    micromark-util-chunked: "npm:^1.0.0"
-    micromark-util-classify-character: "npm:^1.0.0"
-    micromark-util-html-tag-name: "npm:^1.0.0"
-    micromark-util-normalize-identifier: "npm:^1.0.0"
-    micromark-util-resolve-all: "npm:^1.0.0"
-    micromark-util-subtokenize: "npm:^1.0.0"
-    micromark-util-symbol: "npm:^1.0.0"
-    micromark-util-types: "npm:^1.0.1"
-    uvu: "npm:^0.5.0"
-  checksum: 10/a73694d223ac8baad8ff00597a3c39d61f5b32bfd56fe4bcf295d75b2a4e8e67fb2edbfc7cc287b362b9d7f6d24fce08b6a7e8b5b155d79bcc1e4d9b2756ffb2
-  languageName: node
-  linkType: hard
-
-"micromark-factory-destination@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "micromark-factory-destination@npm:1.1.0"
-  dependencies:
-    micromark-util-character: "npm:^1.0.0"
-    micromark-util-symbol: "npm:^1.0.0"
-    micromark-util-types: "npm:^1.0.0"
-  checksum: 10/9e2b5fb5fedbf622b687e20d51eb3d56ae90c0e7ecc19b37bd5285ec392c1e56f6e21aa7cfcb3c01eda88df88fe528f3acb91a5f57d7f4cba310bc3cd7f824fa
-  languageName: node
-  linkType: hard
-
-"micromark-factory-label@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "micromark-factory-label@npm:1.1.0"
-  dependencies:
-    micromark-util-character: "npm:^1.0.0"
-    micromark-util-symbol: "npm:^1.0.0"
-    micromark-util-types: "npm:^1.0.0"
-    uvu: "npm:^0.5.0"
-  checksum: 10/fcda48f1287d9b148c562c627418a2ab759cdeae9c8e017910a0cba94bb759a96611e1fc6df33182e97d28fbf191475237298983bb89ef07d5b02464b1ad28d5
-  languageName: node
-  linkType: hard
-
-"micromark-factory-space@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "micromark-factory-space@npm:1.1.0"
-  dependencies:
-    micromark-util-character: "npm:^1.0.0"
-    micromark-util-types: "npm:^1.0.0"
-  checksum: 10/b58435076b998a7e244259a4694eb83c78915581206b6e7fc07b34c6abd36a1726ade63df8972fbf6c8fa38eecb9074f4e17be8d53f942e3b3d23d1a0ecaa941
-  languageName: node
-  linkType: hard
-
-"micromark-factory-title@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "micromark-factory-title@npm:1.1.0"
-  dependencies:
-    micromark-factory-space: "npm:^1.0.0"
-    micromark-util-character: "npm:^1.0.0"
-    micromark-util-symbol: "npm:^1.0.0"
-    micromark-util-types: "npm:^1.0.0"
-  checksum: 10/4432d3dbc828c81f483c5901b0c6591a85d65a9e33f7d96ba7c3ae821617a0b3237ff5faf53a9152d00aaf9afb3a9f185b205590f40ed754f1d9232e0e9157b1
-  languageName: node
-  linkType: hard
-
-"micromark-factory-whitespace@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "micromark-factory-whitespace@npm:1.1.0"
-  dependencies:
-    micromark-factory-space: "npm:^1.0.0"
-    micromark-util-character: "npm:^1.0.0"
-    micromark-util-symbol: "npm:^1.0.0"
-    micromark-util-types: "npm:^1.0.0"
-  checksum: 10/ef0fa682c7d593d85a514ee329809dee27d10bc2a2b65217d8ef81173e33b8e83c549049764b1ad851adfe0a204dec5450d9d20a4ca8598f6c94533a73f73fcd
-  languageName: node
-  linkType: hard
-
-"micromark-util-character@npm:^1.0.0":
-  version: 1.2.0
-  resolution: "micromark-util-character@npm:1.2.0"
-  dependencies:
-    micromark-util-symbol: "npm:^1.0.0"
-    micromark-util-types: "npm:^1.0.0"
-  checksum: 10/88cf80f9b4c95266f24814ef587fb4180454668dcc3be4ac829e1227188cf349c8981bfca29e3eab1682f324c2c47544c0b0b799a26fbf9df5f156c6a84c970c
-  languageName: node
-  linkType: hard
-
-"micromark-util-chunked@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "micromark-util-chunked@npm:1.1.0"
-  dependencies:
-    micromark-util-symbol: "npm:^1.0.0"
-  checksum: 10/c435bde9110cb595e3c61b7f54c2dc28ee03e6a57fa0fc1e67e498ad8bac61ee5a7457a2b6a73022ddc585676ede4b912d28dcf57eb3bd6951e54015e14dc20b
-  languageName: node
-  linkType: hard
-
-"micromark-util-classify-character@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "micromark-util-classify-character@npm:1.1.0"
-  dependencies:
-    micromark-util-character: "npm:^1.0.0"
-    micromark-util-symbol: "npm:^1.0.0"
-    micromark-util-types: "npm:^1.0.0"
-  checksum: 10/8499cb0bb1f7fb946f5896285fcca65cd742f66cd3e79ba7744792bd413ec46834f932a286de650349914d02e822946df3b55d03e6a8e1d245d1ddbd5102e5b0
-  languageName: node
-  linkType: hard
-
-"micromark-util-combine-extensions@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "micromark-util-combine-extensions@npm:1.1.0"
-  dependencies:
-    micromark-util-chunked: "npm:^1.0.0"
-    micromark-util-types: "npm:^1.0.0"
-  checksum: 10/ee78464f5d4b61ccb437850cd2d7da4d690b260bca4ca7a79c4bb70291b84f83988159e373b167181b6716cb197e309bc6e6c96a68cc3ba9d50c13652774aba9
-  languageName: node
-  linkType: hard
-
-"micromark-util-decode-numeric-character-reference@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "micromark-util-decode-numeric-character-reference@npm:1.1.0"
-  dependencies:
-    micromark-util-symbol: "npm:^1.0.0"
-  checksum: 10/4733fe75146e37611243f055fc6847137b66f0cde74d080e33bd26d0408c1d6f44cabc984063eee5968b133cb46855e729d555b9ff8d744652262b7b51feec73
-  languageName: node
-  linkType: hard
-
-"micromark-util-decode-string@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "micromark-util-decode-string@npm:1.1.0"
-  dependencies:
-    decode-named-character-reference: "npm:^1.0.0"
-    micromark-util-character: "npm:^1.0.0"
-    micromark-util-decode-numeric-character-reference: "npm:^1.0.0"
-    micromark-util-symbol: "npm:^1.0.0"
-  checksum: 10/f1625155db452f15aa472918499689ba086b9c49d1322a08b22bfbcabe918c61b230a3002c8bc3ea9b1f52ca7a9bb1c3dd43ccb548c7f5f8b16c24a1ae77a813
-  languageName: node
-  linkType: hard
-
-"micromark-util-encode@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "micromark-util-encode@npm:1.1.0"
-  checksum: 10/4ef29d02b12336918cea6782fa87c8c578c67463925221d4e42183a706bde07f4b8b5f9a5e1c7ce8c73bb5a98b261acd3238fecd152e6dd1cdfa2d1ae11b60a0
-  languageName: node
-  linkType: hard
-
-"micromark-util-html-tag-name@npm:^1.0.0":
-  version: 1.2.0
-  resolution: "micromark-util-html-tag-name@npm:1.2.0"
-  checksum: 10/ccf0fa99b5c58676dc5192c74665a3bfd1b536fafaf94723bd7f31f96979d589992df6fcf2862eba290ef18e6a8efb30ec8e1e910d9f3fc74f208871e9f84750
-  languageName: node
-  linkType: hard
-
-"micromark-util-normalize-identifier@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "micromark-util-normalize-identifier@npm:1.1.0"
-  dependencies:
-    micromark-util-symbol: "npm:^1.0.0"
-  checksum: 10/8655bea41ffa4333e03fc22462cb42d631bbef9c3c07b625fd852b7eb442a110f9d2e5902a42e65188d85498279569502bf92f3434a1180fc06f7c37edfbaee2
-  languageName: node
-  linkType: hard
-
-"micromark-util-resolve-all@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "micromark-util-resolve-all@npm:1.1.0"
-  dependencies:
-    micromark-util-types: "npm:^1.0.0"
-  checksum: 10/1ce6c0237cd3ca061e76fae6602cf95014e764a91be1b9f10d36cb0f21ca88f9a07de8d49ab8101efd0b140a4fbfda6a1efb72027ab3f4d5b54c9543271dc52c
-  languageName: node
-  linkType: hard
-
-"micromark-util-sanitize-uri@npm:^1.0.0":
-  version: 1.2.0
-  resolution: "micromark-util-sanitize-uri@npm:1.2.0"
-  dependencies:
-    micromark-util-character: "npm:^1.0.0"
-    micromark-util-encode: "npm:^1.0.0"
-    micromark-util-symbol: "npm:^1.0.0"
-  checksum: 10/0d024100d95ffb88bf75f3360e305b545c1eb745430959b8633f7aa93f37ec401fc7094c90c97298409a9e30d94d53b895bae224e1bb966bea114976cfa0fd48
-  languageName: node
-  linkType: hard
-
-"micromark-util-subtokenize@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "micromark-util-subtokenize@npm:1.1.0"
-  dependencies:
-    micromark-util-chunked: "npm:^1.0.0"
-    micromark-util-symbol: "npm:^1.0.0"
-    micromark-util-types: "npm:^1.0.0"
-    uvu: "npm:^0.5.0"
-  checksum: 10/075a1db6ea586d65827d3eead33dbfc520c4e43659c93fcd8fd82f44a7b75cfe61dcde967a3dfcc2ffd999347440ba5aa6698e65a04f3fc627e13e9f12a1a910
-  languageName: node
-  linkType: hard
-
-"micromark-util-symbol@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "micromark-util-symbol@npm:1.1.0"
-  checksum: 10/a26b6b1efd77a715a4d9bbe0a5338eaf3d04ea5e85733e34fee56dfeabf64495c0afc5438fe5220316884cd3a5eae1f17768e0ff4e117827ea4a653897466f86
-  languageName: node
-  linkType: hard
-
-"micromark-util-types@npm:^1.0.0, micromark-util-types@npm:^1.0.1":
-  version: 1.1.0
-  resolution: "micromark-util-types@npm:1.1.0"
-  checksum: 10/287ac5de4a3802bb6f6c3842197c294997a488db1c0486e03c7a8e674d9eb7720c17dda1bcb814814b8343b338c4826fcbc0555f3e75463712a60dcdb53a028e
-  languageName: node
-  linkType: hard
-
-"micromark@npm:^3.0.0":
-  version: 3.2.0
-  resolution: "micromark@npm:3.2.0"
-  dependencies:
-    "@types/debug": "npm:^4.0.0"
-    debug: "npm:^4.0.0"
-    decode-named-character-reference: "npm:^1.0.0"
-    micromark-core-commonmark: "npm:^1.0.1"
-    micromark-factory-space: "npm:^1.0.0"
-    micromark-util-character: "npm:^1.0.0"
-    micromark-util-chunked: "npm:^1.0.0"
-    micromark-util-combine-extensions: "npm:^1.0.0"
-    micromark-util-decode-numeric-character-reference: "npm:^1.0.0"
-    micromark-util-encode: "npm:^1.0.0"
-    micromark-util-normalize-identifier: "npm:^1.0.0"
-    micromark-util-resolve-all: "npm:^1.0.0"
-    micromark-util-sanitize-uri: "npm:^1.0.0"
-    micromark-util-subtokenize: "npm:^1.0.0"
-    micromark-util-symbol: "npm:^1.0.0"
-    micromark-util-types: "npm:^1.0.1"
-    uvu: "npm:^0.5.0"
-  checksum: 10/560a4a501efc3859d622461aaa9345fb95b99a2f34d3d3f2a775ab04de1dd857cb0f642083a6b28ab01bd817f5f0741a1be9857fd702f45e04a3752927a66719
-  languageName: node
-  linkType: hard
-
 "micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:~4.0.7":
   version: 4.0.7
   resolution: "micromatch@npm:4.0.7"
@@ -14325,13 +13714,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mri@npm:^1.1.0":
-  version: 1.2.0
-  resolution: "mri@npm:1.2.0"
-  checksum: 10/6775a1d2228bb9d191ead4efc220bd6be64f943ad3afd4dcb3b3ac8fc7b87034443f666e38805df38e8d047b29f910c3cc7810da0109af83e42c82c73bd3f6bc
-  languageName: node
-  linkType: hard
-
 "mrmime@npm:^2.0.0":
   version: 2.0.0
   resolution: "mrmime@npm:2.0.0"
@@ -14812,12 +14194,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"openmrs@npm:^5.7.1-pre.2076":
-  version: 5.7.1-pre.2076
-  resolution: "openmrs@npm:5.7.1-pre.2076"
+"openmrs@npm:^5.7.2-pre.2101":
+  version: 5.7.2-pre.2101
+  resolution: "openmrs@npm:5.7.2-pre.2101"
   dependencies:
-    "@openmrs/esm-app-shell": "npm:5.7.1-pre.2076"
-    "@openmrs/webpack-config": "npm:5.7.1-pre.2076"
+    "@openmrs/esm-app-shell": "npm:5.7.2-pre.2101"
+    "@openmrs/webpack-config": "npm:5.7.2-pre.2101"
     "@pnpm/npm-conf": "npm:^2.1.0"
     "@swc/core": "npm:^1.3.58"
     autoprefixer: "npm:^10.4.2"
@@ -14825,11 +14207,13 @@ __metadata:
     browserslist-config-openmrs: "npm:^1.0.1"
     chalk: "npm:^4.1.2"
     copy-webpack-plugin: "npm:^11.0.0"
+    css-loader: "npm:^5.2.4"
     cssnano: "npm:^5.0.16"
     ejs: "npm:^3.1.8"
     glob: "npm:^7.1.3"
     html-webpack-plugin: "npm:^5.5.0"
     inquirer: "npm:^7.3.3"
+    lodash-es: "npm:^4.17.21"
     mini-css-extract-plugin: "npm:^2.4.5"
     node-watch: "npm:^0.7.4"
     npm-registry-fetch: "npm:^14.0.3"
@@ -14837,19 +14221,23 @@ __metadata:
     postcss: "npm:^8.4.6"
     postcss-loader: "npm:^6.2.1"
     rimraf: "npm:^3.0.2"
+    sass-loader: "npm:^12.3.0"
     semver: "npm:^7.3.4"
+    style-loader: "npm:^3.3.1"
     swc-loader: "npm:^0.2.3"
     tar: "npm:^6.0.5"
     typescript: "npm:^4.6.4"
     webpack: "npm:^5.88.0"
+    webpack-bundle-analyzer: "npm:^4.5.0"
     webpack-cli: "npm:^4.10.0"
     webpack-dev-server: "npm:^4.10.1"
     webpack-pwa-manifest: "npm:^4.3.0"
+    webpack-stats-plugin: "npm:^1.0.3"
     workbox-webpack-plugin: "npm:^6.4.1"
     yargs: "npm:^17.6.2"
   bin:
     openmrs: ./dist/cli.js
-  checksum: 10/6d52a9884b6a594c330925a56623960a9c910d5ea3453ffe9c6a4d9934997dcd464c592a396b1eeff7d0b1e2e67077c274dc419c55d6ea6593024cc9bb895b6b
+  checksum: 10/19658252aa2c11369b10cbeb9b37616ff14cd582519b6fa827686525e94b04f9c6be34397fc84b86ab468e5438e4edac7b9245d2e638199a9c9855347334e275
   languageName: node
   linkType: hard
 
@@ -15889,7 +15277,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prop-types@npm:^15.0.0, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1":
+"prop-types@npm:^15.7.2, prop-types@npm:^15.8.1":
   version: 15.8.1
   resolution: "prop-types@npm:15.8.1"
   dependencies:
@@ -15900,20 +15288,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"property-expr@npm:^2.0.2, property-expr@npm:^2.0.5":
+"property-expr@npm:^2.0.2":
   version: 2.0.6
   resolution: "property-expr@npm:2.0.6"
   checksum: 10/89977f4bb230736c1876f460dd7ca9328034502fd92e738deb40516d16564b850c0bbc4e052c3df88b5b8cd58e51c93b46a94bea049a3f23f4a022c038864cab
   languageName: node
   linkType: hard
 
-"property-information@npm:^6.0.0":
-  version: 6.5.0
-  resolution: "property-information@npm:6.5.0"
-  checksum: 10/fced94f3a09bf651ad1824d1bdc8980428e3e480e6d01e98df6babe2cc9d45a1c52eee9a7736d2006958f9b394eb5964dedd37e23038086ddc143fc2fd5e426c
-  languageName: node
-  linkType: hard
-
 "proto-list@npm:~1.2.1":
   version: 1.2.4
   resolution: "proto-list@npm:1.2.4"
@@ -16167,17 +15548,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-error-boundary@npm:^4.0.13":
-  version: 4.0.13
-  resolution: "react-error-boundary@npm:4.0.13"
-  dependencies:
-    "@babel/runtime": "npm:^7.12.5"
-  peerDependencies:
-    react: ">=16.13.1"
-  checksum: 10/28fdf498a58621e21d93978c61719c52455bc00b778080259c5830fe003736153469ebc84f243d7989567b1196e25648c7592f7c8e47de47fcd7d12b875879b9
-  languageName: node
-  linkType: hard
-
 "react-fast-compare@npm:^2.0.1":
   version: 2.0.4
   resolution: "react-fast-compare@npm:2.0.4"
@@ -16219,45 +15589,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-is@npm:^17.0.0, react-is@npm:^17.0.1, react-is@npm:^17.0.2":
+"react-is@npm:^17.0.1, react-is@npm:^17.0.2":
   version: 17.0.2
   resolution: "react-is@npm:17.0.2"
   checksum: 10/73b36281e58eeb27c9cc6031301b6ae19ecdc9f18ae2d518bdb39b0ac564e65c5779405d623f1df9abf378a13858b79442480244bd579968afc1faf9a2ce5e05
   languageName: node
   linkType: hard
 
-"react-is@npm:^17.0.1 || ^18.0.0, react-is@npm:^18.0.0, react-is@npm:^18.2.0":
+"react-is@npm:^18.0.0, react-is@npm:^18.2.0":
   version: 18.3.1
   resolution: "react-is@npm:18.3.1"
   checksum: 10/d5f60c87d285af24b1e1e7eaeb123ec256c3c8bdea7061ab3932e3e14685708221bf234ec50b21e10dd07f008f1b966a2730a0ce4ff67905b3872ff2042aec22
   languageName: node
   linkType: hard
 
-"react-markdown@npm:^7.1.2":
-  version: 7.1.2
-  resolution: "react-markdown@npm:7.1.2"
-  dependencies:
-    "@types/hast": "npm:^2.0.0"
-    "@types/unist": "npm:^2.0.0"
-    comma-separated-tokens: "npm:^2.0.0"
-    hast-util-whitespace: "npm:^2.0.0"
-    prop-types: "npm:^15.0.0"
-    property-information: "npm:^6.0.0"
-    react-is: "npm:^17.0.0"
-    remark-parse: "npm:^10.0.0"
-    remark-rehype: "npm:^9.0.0"
-    space-separated-tokens: "npm:^2.0.0"
-    style-to-object: "npm:^0.3.0"
-    unified: "npm:^10.0.0"
-    unist-util-visit: "npm:^4.0.0"
-    vfile: "npm:^5.0.0"
-  peerDependencies:
-    "@types/react": ">=16"
-    react: ">=16"
-  checksum: 10/1d25ab55e1055fa616c425fcabdb2dc9eda810beb8845a29b3a4fd3290bc793aa67e902538436d13524db2b7e7546f30e327f128aa9bca6c24c577b8f2e84641
-  languageName: node
-  linkType: hard
-
 "react-router-dom@npm:^6.3.0":
   version: 6.25.1
   resolution: "react-router-dom@npm:6.25.1"
@@ -16325,30 +15670,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-waypoint@npm:^10.3.0":
-  version: 10.3.0
-  resolution: "react-waypoint@npm:10.3.0"
-  dependencies:
-    "@babel/runtime": "npm:^7.12.5"
-    consolidated-events: "npm:^1.1.0 || ^2.0.0"
-    prop-types: "npm:^15.0.0"
-    react-is: "npm:^17.0.1 || ^18.0.0"
-  peerDependencies:
-    react: ^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
-  checksum: 10/b862f0172bab8f62d16b9dd3486edf872f219ef33224e8473aec5198a1e64490a70904f1f15752140841ab49ae873f8d4dbdbf6e6cae1240d8ce30d0fb39ee8e
-  languageName: node
-  linkType: hard
-
-"react-webcam@npm:^7.2.0":
-  version: 7.2.0
-  resolution: "react-webcam@npm:7.2.0"
-  peerDependencies:
-    react: ">=16.2.0"
-    react-dom: ">=16.2.0"
-  checksum: 10/fe16756b9b71d4d2dcc40f337bd47fce977197a9ce37a453d9e691db870d0738fa4fe81db45fd8d3d81a06fd3b2f2fbafeacf9d5865c97568fa351969e4be70c
-  languageName: node
-  linkType: hard
-
 "react@npm:^18.1.0":
   version: 18.3.1
   resolution: "react@npm:18.3.1"
@@ -16537,29 +15858,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"remark-parse@npm:^10.0.0":
-  version: 10.0.2
-  resolution: "remark-parse@npm:10.0.2"
-  dependencies:
-    "@types/mdast": "npm:^3.0.0"
-    mdast-util-from-markdown: "npm:^1.0.0"
-    unified: "npm:^10.0.0"
-  checksum: 10/184f48956734a58a7e157d83233e532ea289697f5ecebd1fb082cce79e6d9f5b1d3da72462356b2b3b5843643cee890280ffe3d21c9d4ad2d7d5e20bb5de7f14
-  languageName: node
-  linkType: hard
-
-"remark-rehype@npm:^9.0.0":
-  version: 9.1.0
-  resolution: "remark-rehype@npm:9.1.0"
-  dependencies:
-    "@types/hast": "npm:^2.0.0"
-    "@types/mdast": "npm:^3.0.0"
-    mdast-util-to-hast: "npm:^11.0.0"
-    unified: "npm:^10.0.0"
-  checksum: 10/e47d0700b3ce0caf4183878c449590f9dc4845000113098b0c3d042ed54e94a209f52d39cde6a83171c28839ed52991464e6c6bf0509777f68999ffd30965d19
-  languageName: node
-  linkType: hard
-
 "remove-bom-buffer@npm:^3.0.0":
   version: 3.0.0
   resolution: "remove-bom-buffer@npm:3.0.0"
@@ -16873,15 +16171,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sade@npm:^1.7.3":
-  version: 1.8.1
-  resolution: "sade@npm:1.8.1"
-  dependencies:
-    mri: "npm:^1.1.0"
-  checksum: 10/1c67ba03c94083e0ae307ff5564ecb86c2104c0f558042fdaa40ea0054f91a63a9783f14069870f2f784336adabb70f90f22a84dc457b5a25e859aaadefe0910
-  languageName: node
-  linkType: hard
-
 "safe-array-concat@npm:^1.1.2":
   version: 1.1.2
   resolution: "safe-array-concat@npm:1.1.2"
@@ -17513,13 +16802,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"space-separated-tokens@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "space-separated-tokens@npm:2.0.2"
-  checksum: 10/202e97d7ca1ba0758a0aa4fe226ff98142073bcceeff2da3aad037968878552c3bbce3b3231970025375bbba5aee00c5b8206eda408da837ab2dc9c0f26be990
-  languageName: node
-  linkType: hard
-
 "spawn-command@npm:^0.0.2-1":
   version: 0.0.2
   resolution: "spawn-command@npm:0.0.2"
@@ -17931,15 +17213,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"style-to-object@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "style-to-object@npm:0.3.0"
-  dependencies:
-    inline-style-parser: "npm:0.1.1"
-  checksum: 10/7de13d6428719e6757e68b4788714c2b0eef189ac002697d961ce5357f03ab618f9b73562e7565c2fdd79c7594431602638462851d47046c6b925d722e0b3166
-  languageName: node
-  linkType: hard
-
 "stylehacks@npm:^5.1.1":
   version: 5.1.1
   resolution: "stylehacks@npm:5.1.1"
@@ -18074,22 +17347,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"systemjs-webpack-interop@npm:^2.3.7":
-  version: 2.3.7
-  resolution: "systemjs-webpack-interop@npm:2.3.7"
-  peerDependencies:
-    webpack: "*"
-  checksum: 10/740cf816ed0a66e54f70251cc4564be49481f6108d4c927c9f6b3718bf60a0f9c38896aca0656c1dcaadbd2138352362cf21aef985a0ae4dfbca1acef79dc69e
-  languageName: node
-  linkType: hard
-
-"systemjs@npm:^6.8.3":
-  version: 6.15.1
-  resolution: "systemjs@npm:6.15.1"
-  checksum: 10/9454c32515cdf7b033cac547233b161d6154abc020a1a97afc8654a01d63cf2bc51101869807aa7f8529aae98475a2cb4522c1e31da6d33832c8e12f00ee4e18
-  languageName: node
-  linkType: hard
-
 "tabbable@npm:^6.0.0, tabbable@npm:^6.2.0":
   version: 6.2.0
   resolution: "tabbable@npm:6.2.0"
@@ -18275,13 +17532,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tiny-case@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "tiny-case@npm:1.0.3"
-  checksum: 10/3f7a30c39d5b0e1bc097b0b271bec14eb5b836093db034f35a0de26c14422380b50dc12bfd37498cf35b192f5df06f28a710712c87ead68872a9e37ad6f6049d
-  languageName: node
-  linkType: hard
-
 "tiny-warning@npm:^1.0.2":
   version: 1.0.3
   resolution: "tiny-warning@npm:1.0.3"
@@ -18437,13 +17687,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"trough@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "trough@npm:2.2.0"
-  checksum: 10/999c1cb3db6ec63e1663f911146a90125065da37f66ba342b031d53edb22a62f56c1f934bbc61a55b2b29dd74207544cfd78875b414665c1ffadcd9a9a009eeb
-  languageName: node
-  linkType: hard
-
 "ts-api-utils@npm:^1.0.1":
   version: 1.3.0
   resolution: "ts-api-utils@npm:1.3.0"
@@ -18586,13 +17829,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^2.19.0":
-  version: 2.19.0
-  resolution: "type-fest@npm:2.19.0"
-  checksum: 10/7bf9e8fdf34f92c8bb364c0af14ca875fac7e0183f2985498b77be129dc1b3b1ad0a6b3281580f19e48c6105c037fb966ad9934520c69c6434d17fd0af4eed78
-  languageName: node
-  linkType: hard
-
 "type-is@npm:~1.6.18":
   version: 1.6.18
   resolution: "type-is@npm:1.6.18"
@@ -18766,21 +18002,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unified@npm:^10.0.0":
-  version: 10.1.2
-  resolution: "unified@npm:10.1.2"
-  dependencies:
-    "@types/unist": "npm:^2.0.0"
-    bail: "npm:^2.0.0"
-    extend: "npm:^3.0.0"
-    is-buffer: "npm:^2.0.0"
-    is-plain-obj: "npm:^4.0.0"
-    trough: "npm:^2.0.0"
-    vfile: "npm:^5.0.0"
-  checksum: 10/6cffebcefc3290be26d25a58ba714cda943142782baf320fddf374ca3a319bdaabb006f96df4be17b8b367f5e6f6e113b1027c52ef66154846a7a110550f6688
-  languageName: node
-  linkType: hard
-
 "unique-filename@npm:^2.0.0":
   version: 2.0.1
   resolution: "unique-filename@npm:2.0.1"
@@ -18836,70 +18057,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unist-builder@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "unist-builder@npm:3.0.1"
-  dependencies:
-    "@types/unist": "npm:^2.0.0"
-  checksum: 10/960ed682deb1ef55e75ac861134593a12dc570325ce3e99e270071a6941e71591dde8991df7546e612e2b474609d57beb05ec3082266ee92e7e4f1c82f4bf383
-  languageName: node
-  linkType: hard
-
-"unist-util-generated@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "unist-util-generated@npm:2.0.1"
-  checksum: 10/0528642918683f1518ab7a50cf8c900df10d8717b58bd2fb05aab29393b1c4050fd2740792f18d477b52f942bfb0e6e00023e985c0a7bd63859d3d836b56e4ce
-  languageName: node
-  linkType: hard
-
-"unist-util-is@npm:^5.0.0":
-  version: 5.2.1
-  resolution: "unist-util-is@npm:5.2.1"
-  dependencies:
-    "@types/unist": "npm:^2.0.0"
-  checksum: 10/c10f6c07aad4f4830ffa8ea82b42a2c8d5cd36c7555e27889e5fee953040af321e4e6f4e52c4edb606604de75d7230a5f4bc7b71b8ac3e874a26ab595c2057e4
-  languageName: node
-  linkType: hard
-
-"unist-util-position@npm:^4.0.0":
-  version: 4.0.4
-  resolution: "unist-util-position@npm:4.0.4"
-  dependencies:
-    "@types/unist": "npm:^2.0.0"
-  checksum: 10/aedbc5d112cdab85b752a7dacd8f04233655f00e08948a42f6e49682467c6fc0c531c91acc71188da5ac8acfea9e67d72bc054127d1c4b76b31792cfb5132423
-  languageName: node
-  linkType: hard
-
-"unist-util-stringify-position@npm:^3.0.0":
-  version: 3.0.3
-  resolution: "unist-util-stringify-position@npm:3.0.3"
-  dependencies:
-    "@types/unist": "npm:^2.0.0"
-  checksum: 10/07913e4fd77fe57d95f8b2f771354f97a29082229c1ad14ceedce6bbc77b2d784ca8296563335471cdca97915e548204bd6f098ea5b808b822b4b54087662cfb
-  languageName: node
-  linkType: hard
-
-"unist-util-visit-parents@npm:^5.1.1":
-  version: 5.1.3
-  resolution: "unist-util-visit-parents@npm:5.1.3"
-  dependencies:
-    "@types/unist": "npm:^2.0.0"
-    unist-util-is: "npm:^5.0.0"
-  checksum: 10/5381fc57a129d478d983b988d86b72a1266d6f91fc608562b00bfa76596128d6e4d1c2b26ced64d96e55eb5d27d620081b4ee9703979bab63e1210789e781372
-  languageName: node
-  linkType: hard
-
-"unist-util-visit@npm:^4.0.0":
-  version: 4.1.2
-  resolution: "unist-util-visit@npm:4.1.2"
-  dependencies:
-    "@types/unist": "npm:^2.0.0"
-    unist-util-is: "npm:^5.0.0"
-    unist-util-visit-parents: "npm:^5.1.1"
-  checksum: 10/e3b20c6b1f5ae1b7b40bbf9be49103a342d98fad98bdf958110c20d72e5923bd3f12966b6702459bc61ab832facb5af418a79af87cefa7a8a41b892369678b13
-  languageName: node
-  linkType: hard
-
 "universalify@npm:^0.1.0":
   version: 0.1.2
   resolution: "universalify@npm:0.1.2"
@@ -19055,20 +18212,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uvu@npm:^0.5.0":
-  version: 0.5.6
-  resolution: "uvu@npm:0.5.6"
-  dependencies:
-    dequal: "npm:^2.0.0"
-    diff: "npm:^5.0.0"
-    kleur: "npm:^4.0.3"
-    sade: "npm:^1.7.3"
-  bin:
-    uvu: bin.js
-  checksum: 10/66ba25afc6732249877f9f4f8b6146f3aaa97538c51cf498f55825d602c33dbb903e02c7e1547cbca6bdfbb609e07eb7ea758b5156002ac2dd5072f00606f8d9
-  languageName: node
-  linkType: hard
-
 "v8-to-istanbul@npm:^9.0.1":
   version: 9.3.0
   resolution: "v8-to-istanbul@npm:9.3.0"
@@ -19111,28 +18254,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vfile-message@npm:^3.0.0":
-  version: 3.1.4
-  resolution: "vfile-message@npm:3.1.4"
-  dependencies:
-    "@types/unist": "npm:^2.0.0"
-    unist-util-stringify-position: "npm:^3.0.0"
-  checksum: 10/423ca87f4427a403e4688d7ec663a2e6add694eefac47c945746463377428c7553bc613058841f1da83e18b68af886d3dd11cb96d582b5cc3c98e11efb7e55e9
-  languageName: node
-  linkType: hard
-
-"vfile@npm:^5.0.0":
-  version: 5.3.7
-  resolution: "vfile@npm:5.3.7"
-  dependencies:
-    "@types/unist": "npm:^2.0.0"
-    is-buffer: "npm:^2.0.0"
-    unist-util-stringify-position: "npm:^3.0.0"
-    vfile-message: "npm:^3.0.0"
-  checksum: 10/d8f59b419d4c83b3ed24f500cf02393149b728f8803f88519c18fe0733f62544fa9ab0d8425a8bc7835181d848b9ce29c014168dc45af72f416074bbe475f643
-  languageName: node
-  linkType: hard
-
 "vinyl-fs@npm:^3.0.2":
   version: 3.0.3
   resolution: "vinyl-fs@npm:3.0.3"
@@ -20173,18 +19294,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yup@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "yup@npm:1.4.0"
-  dependencies:
-    property-expr: "npm:^2.0.5"
-    tiny-case: "npm:^1.0.3"
-    toposort: "npm:^2.0.2"
-    type-fest: "npm:^2.19.0"
-  checksum: 10/3d1277e5e1fff4d8130e525c7361f54874ca848ebd427a0aa66606952e3370b9947d84a1ea0b943f389649e886d26b1349930889727489460d6f2f86c2a26e77
-  languageName: node
-  linkType: hard
-
 "zod@npm:^3.22.2":
   version: 3.23.8
   resolution: "zod@npm:3.23.8"