diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml
index 0f588568bbc..1104d7f480d 100644
--- a/.github/workflows/cypress.yaml
+++ b/.github/workflows/cypress.yaml
@@ -1,8 +1,6 @@
 name: Cypress Tests
 
 on:
-  schedule:
-    - cron: "30 22 * * *"
   pull_request:
     branches:
       - develop
@@ -17,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        containers: [1, 2, 3, 4, 5, 6, 7, 8]
+        containers: [1, 2, 3, 4]
     env:
       REACT_CARE_API_URL: http://localhost:9000
     steps:
@@ -136,4 +134,4 @@ jobs:
         if: steps.pr_origin.outputs.is_forked == 'true'
         with:
           name: cypress-videos
-          path: cypress/videos
+          path: cypress/videos
\ No newline at end of file
diff --git a/cypress/pageobject/Users/UserSearch.ts b/cypress/pageobject/Users/UserSearch.ts
index d72c00c0de7..1292395fce3 100644
--- a/cypress/pageobject/Users/UserSearch.ts
+++ b/cypress/pageobject/Users/UserSearch.ts
@@ -23,7 +23,7 @@ export class UserPage {
   }
 
   checkUsernameText(username: string) {
-    cy.get(this.usernameText).should("have.text", username);
+    cy.get(this.usernameText).should("contain.text", username);
   }
 
   checkUsernameBadgeVisibility(shouldBeVisible: boolean) {
diff --git a/src/CAREUI/display/Timeline.tsx b/src/CAREUI/display/Timeline.tsx
index eb5f4c56ae5..aa3fd06e7de 100644
--- a/src/CAREUI/display/Timeline.tsx
+++ b/src/CAREUI/display/Timeline.tsx
@@ -1,14 +1,15 @@
-import { createContext, useContext } from "react";
-import { useTranslation } from "react-i18next";
-import { PerformedByModel } from "@/components/HCX/misc";
-import { classNames, formatName } from "../../Utils/utils";
 import CareIcon, { IconName } from "../icons/CareIcon";
+import { classNames, formatName } from "../../Utils/utils";
+import { createContext, useContext } from "react";
+
 import RecordMeta from "./RecordMeta";
+import { UserBareMinimum } from "@/components/Users/models";
+import { useTranslation } from "react-i18next";
 
 export interface TimelineEvent<TType = string> {
   type: TType;
   timestamp: string;
-  by: PerformedByModel | undefined;
+  by: UserBareMinimum | undefined;
   icon: IconName;
   iconStyle?: string;
   iconWrapperStyle?: string;
diff --git a/src/PluginEngine.tsx b/src/PluginEngine.tsx
index 43b8e558f8f..a56fe21b5b8 100644
--- a/src/PluginEngine.tsx
+++ b/src/PluginEngine.tsx
@@ -1,8 +1,8 @@
+import { CareAppsContext, useCareApps } from "@/common/hooks/useCareApps";
 /* eslint-disable i18next/no-literal-string */
 import React, { Suspense } from "react";
-import { CareAppsContext, useCareApps } from "@/common/hooks/useCareApps";
-import { pluginMap } from "./pluginTypes";
-import { UserAssignedModel } from "@/components/Users/models";
+import { SupportedPluginComponents, pluginMap } from "./pluginTypes";
+
 import ErrorBoundary from "@/components/Common/ErrorBoundary";
 
 export default function PluginEngine({
@@ -27,25 +27,28 @@ export default function PluginEngine({
   );
 }
 
-export function PLUGIN_DoctorConnectButtons({
-  user,
-}: {
-  user: UserAssignedModel;
-}) {
+type PluginProps<K extends keyof SupportedPluginComponents> =
+  React.ComponentProps<SupportedPluginComponents[K]>;
+
+export function PLUGIN_Component<K extends keyof SupportedPluginComponents>({
+  __name,
+  ...props
+}: { __name: K } & PluginProps<K>) {
   const plugins = useCareApps();
+
   return (
-    <div>
-      {plugins.map((plugin, index) => {
-        const DoctorConnectButtons = plugin.components.DoctorConnectButtons;
-        if (!DoctorConnectButtons) {
+    <>
+      {plugins.map((plugin) => {
+        const Component = plugin.components[
+          __name
+        ] as React.ComponentType<unknown>;
+
+        if (!Component) {
           return null;
         }
-        return (
-          <div key={index}>
-            <DoctorConnectButtons user={user} />
-          </div>
-        );
+
+        return <Component {...props} key={plugin.plugin} />;
       })}
-    </div>
+    </>
   );
 }
diff --git a/src/Redux/api.tsx b/src/Redux/api.tsx
index adb0f98a7b2..a2794e35203 100644
--- a/src/Redux/api.tsx
+++ b/src/Redux/api.tsx
@@ -72,11 +72,7 @@ import {
   NotificationData,
   PNconfigData,
 } from "@/components/Notifications/models";
-import {
-  HCXClaimModel,
-  HCXCommunicationModel,
-  HCXPolicyModel,
-} from "@/components/HCX/models";
+import { HCXPolicyModel } from "@/components/HCX/models";
 import { ICD11DiagnosisModel } from "@/components/Diagnosis/types";
 import { Investigation } from "@/components/Facility/Investigations/Reports/types";
 import { PaginatedResponse } from "../Utils/request/types";
@@ -104,7 +100,6 @@ import {
   IHealthFacility,
   IpartialUpdateHealthFacilityTBody,
 } from "@/components/ABDM/types/health-facility";
-import { PMJAYPackageItem } from "@/components/Common/PMJAYProcedurePackageAutocomplete";
 import { InsurerOptionModel } from "@/components/HCX/InsurerAutocomplete";
 
 /**
@@ -1696,117 +1691,6 @@ const routes = {
         TRes: Type<HCXPolicyModel>(),
       },
     },
-
-    claims: {
-      list: {
-        path: "/api/hcx/claim/",
-        method: "GET",
-        TRes: Type<PaginatedResponse<HCXClaimModel>>(),
-      },
-
-      create: {
-        path: "/api/hcx/claim/",
-        method: "POST",
-        TBody: Type<{
-          policy: string;
-          items: {
-            id: string;
-            price: number;
-            category?: string;
-            name: string;
-          }[];
-          consultation: string;
-          use: "preauthorization" | "claim";
-        }>(),
-        TRes: Type<HCXClaimModel>(),
-      },
-
-      get: {
-        path: "/api/hcx/claim/{external_id}/",
-        method: "GET",
-      },
-
-      update: {
-        path: "/api/hcx/claim/{external_id}/",
-        method: "PUT",
-      },
-
-      partialUpdate: {
-        path: "/api/hcx/claim/{external_id}/",
-        method: "PATCH",
-      },
-
-      delete: {
-        path: "/api/hcx/claim/{external_id}/",
-        method: "DELETE",
-      },
-
-      listPMJYPackages: {
-        path: "/api/hcx/pmjy_packages/",
-        method: "GET",
-        TRes: Type<PMJAYPackageItem[]>(),
-      },
-
-      makeClaim: {
-        path: "/api/hcx/make_claim/",
-        method: "POST",
-        TBody: Type<{ claim: string }>(),
-        TRes: Type<unknown>(),
-      },
-    },
-
-    communications: {
-      list: {
-        path: "/api/hcx/communication/",
-        method: "GET",
-        TRes: Type<PaginatedResponse<HCXCommunicationModel>>(),
-      },
-
-      create: {
-        path: "/api/hcx/communication/",
-        method: "POST",
-        TRes: Type<HCXCommunicationModel>(),
-        TBody: Type<{
-          claim: string;
-          content: {
-            type: string;
-            data: string;
-          }[];
-        }>(),
-      },
-
-      get: {
-        path: "/api/hcx/communication/{external_id}/",
-        method: "GET",
-        TRes: Type<HCXCommunicationModel>(),
-      },
-
-      update: {
-        path: "/api/hcx/communication/{external_id}/",
-        method: "PUT",
-        TRes: Type<HCXCommunicationModel>(),
-      },
-
-      partialUpdate: {
-        path: "/api/hcx/communication/{external_id}/",
-        method: "PATCH",
-        TRes: Type<HCXCommunicationModel>(),
-      },
-
-      delete: {
-        path: "/api/hcx/communication/{external_id}/",
-        method: "DELETE",
-      },
-
-      send: {
-        path: "/api/hcx/send_communication/",
-        method: "POST",
-        TRes: Type<void>(),
-        TBody: Type<{
-          communication: string;
-        }>(),
-      },
-    },
   },
 } as const;
 
diff --git a/src/Routers/AppRouter.tsx b/src/Routers/AppRouter.tsx
index 5a7b2cbb312..7275c7c2860 100644
--- a/src/Routers/AppRouter.tsx
+++ b/src/Routers/AppRouter.tsx
@@ -1,32 +1,30 @@
-import { useRedirect, useRoutes, usePath, Redirect } from "raviger";
-import { useState, useEffect } from "react";
-
-import ShowPushNotification from "@/components/Notifications/ShowPushNotification";
-import { NoticeBoard } from "@/components/Notifications/NoticeBoard";
-import Error404 from "@/components/ErrorPages/404";
 import {
   DesktopSidebar,
   MobileSidebar,
   SIDEBAR_SHRINK_PREFERENCE_KEY,
   SidebarShrinkContext,
 } from "@/components/Common/Sidebar/Sidebar";
+import { Redirect, usePath, useRedirect, useRoutes } from "raviger";
+import { useEffect, useState } from "react";
+
+import ABDMFacilityRecords from "@/components/ABDM/ABDMFacilityRecords";
+import AssetRoutes from "./routes/AssetRoutes";
 import { BLACKLISTED_PATHS } from "@/common/constants";
-import SessionExpired from "@/components/ErrorPages/SessionExpired";
+import ConsultationRoutes from "./routes/ConsultationRoutes";
+import Error404 from "@/components/ErrorPages/404";
+import FacilityRoutes from "./routes/FacilityRoutes";
 import HealthInformation from "@/components/ABDM/HealthInformation";
-import ABDMFacilityRecords from "@/components/ABDM/ABDMFacilityRecords";
-
-import UserRoutes from "./routes/UserRoutes";
+import IconIndex from "../CAREUI/icons/Index";
+import { NoticeBoard } from "@/components/Notifications/NoticeBoard";
 import PatientRoutes from "./routes/PatientRoutes";
+import ResourceRoutes from "./routes/ResourceRoutes";
 import SampleRoutes from "./routes/SampleRoutes";
-import FacilityRoutes from "./routes/FacilityRoutes";
-import ConsultationRoutes from "./routes/ConsultationRoutes";
-import HCXRoutes from "./routes/HCXRoutes";
+import SessionExpired from "@/components/ErrorPages/SessionExpired";
 import ShiftingRoutes from "./routes/ShiftingRoutes";
-import AssetRoutes from "./routes/AssetRoutes";
-import ResourceRoutes from "./routes/ResourceRoutes";
-import { usePluginRoutes } from "@/common/hooks/useCareApps";
+import ShowPushNotification from "@/components/Notifications/ShowPushNotification";
+import UserRoutes from "./routes/UserRoutes";
 import careConfig from "@careConfig";
-import IconIndex from "../CAREUI/icons/Index";
+import { usePluginRoutes } from "@/common/hooks/useCareApps";
 
 export type RouteParams<T extends string> =
   T extends `${string}:${infer Param}/${infer Rest}`
@@ -78,16 +76,12 @@ export default function AppRouter() {
 
   let routes = Routes;
 
-  if (careConfig.hcx.enabled) {
-    routes = { ...HCXRoutes, ...routes };
-  }
-
   useRedirect("/user", "/users");
 
   // Merge in Plugin Routes
   routes = {
-    ...routes,
     ...pluginRoutes,
+    ...routes,
   };
 
   const pages = useRoutes(routes) || <Error404 />;
diff --git a/src/Routers/routes/HCXRoutes.tsx b/src/Routers/routes/HCXRoutes.tsx
deleted file mode 100644
index 00339161a24..00000000000
--- a/src/Routers/routes/HCXRoutes.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import ConsultationClaims from "@/components/Facility/ConsultationClaims";
-import { AppRoutes } from "../AppRouter";
-
-const HCXRoutes: AppRoutes = {
-  "/facility/:facilityId/patient/:patientId/consultation/:consultationId/claims":
-    ({ facilityId, patientId, consultationId }) => (
-      <ConsultationClaims
-        facilityId={facilityId}
-        patientId={patientId}
-        consultationId={consultationId}
-      />
-    ),
-};
-
-export default HCXRoutes;
diff --git a/src/Utils/types.ts b/src/Utils/types.ts
index 5ac29c5862c..71ddd41330e 100644
--- a/src/Utils/types.ts
+++ b/src/Utils/types.ts
@@ -1,11 +1,11 @@
-import { PerformedByModel } from "@/components/HCX/misc";
+import { UserBareMinimum } from "@/components/Users/models";
 
 export interface BaseModel {
   readonly id: string;
   readonly modified_date: string;
   readonly created_date: string;
-  readonly created_by: PerformedByModel;
-  readonly updated_by: PerformedByModel;
+  readonly created_by: UserBareMinimum;
+  readonly updated_by: UserBareMinimum;
 }
 
 export type Writable<T> = {
diff --git a/src/components/Assets/AssetManage.tsx b/src/components/Assets/AssetManage.tsx
index 05eab3a4dec..0ee4f107d40 100644
--- a/src/components/Assets/AssetManage.tsx
+++ b/src/components/Assets/AssetManage.tsx
@@ -432,7 +432,7 @@ const AssetManage = (props: AssetManageProps) => {
                 data-testid="asset-update-button"
                 authorizeFor={NonReadOnlyUsers}
               >
-                <CareIcon icon="l-pen" className="mr-1 h-4" />
+                <CareIcon icon="l-pen" className="text-lg" />
                 {t("update")}
               </ButtonV2>
               {asset?.asset_class &&
@@ -449,7 +449,7 @@ const AssetManage = (props: AssetManageProps) => {
                     id="configure-asset"
                     data-testid="asset-configure-button"
                   >
-                    <CareIcon icon="l-setting" className="h-4" />
+                    <CareIcon icon="l-setting" className="text-lg" />
                     {t("configure")}
                   </ButtonV2>
                 )}
@@ -459,10 +459,9 @@ const AssetManage = (props: AssetManageProps) => {
                   onClick={() => setShowDeleteDialog(true)}
                   variant="danger"
                   data-testid="asset-delete-button"
-                  className="inline-flex"
                 >
-                  <CareIcon icon="l-trash" className="h-4" />
-                  <span className="md:hidden">{t("delete")}</span>
+                  <CareIcon icon="l-trash" className="text-lg" />
+                  <span>{t("delete")}</span>
                 </ButtonV2>
               )}
             </div>
diff --git a/src/components/Assets/AssetTypes.tsx b/src/components/Assets/AssetTypes.tsx
index 2f8e086a813..24f3f3e9352 100644
--- a/src/components/Assets/AssetTypes.tsx
+++ b/src/components/Assets/AssetTypes.tsx
@@ -1,7 +1,7 @@
-import { IconName } from "../../CAREUI/icons/CareIcon";
 import { BedModel } from "../Facility/models";
-import { PerformedByModel } from "../HCX/misc";
+import { IconName } from "../../CAREUI/icons/CareIcon";
 import { PatientModel } from "../Patient/models";
+import { UserBareMinimum } from "@/components/Users/models";
 
 export enum AssetLocationType {
   OTHER = "OTHER",
@@ -169,7 +169,7 @@ export interface AssetServiceEdit {
   serviced_on: string;
   note: string;
   edited_on: string;
-  edited_by: PerformedByModel;
+  edited_by: UserBareMinimum;
 }
 export interface AssetService {
   id: string;
diff --git a/src/components/CameraFeed/ConfigureCamera.tsx b/src/components/CameraFeed/ConfigureCamera.tsx
index 03b627d48ce..c0cb19e6a23 100644
--- a/src/components/CameraFeed/ConfigureCamera.tsx
+++ b/src/components/CameraFeed/ConfigureCamera.tsx
@@ -391,14 +391,22 @@ export default function ConfigureCamera(props: Props) {
                 >
                   <TextFormField
                     name="preset-name"
-                    className="py-4"
+                    className="w-full py-4"
                     value={presetName}
                     onChange={({ value }) => setPresetName(value)}
                     errorClassName="hidden"
                     placeholder={t("preset_name_placeholder")}
                     suggestions={presetNameSuggestions}
+                    clearable={true}
                   />
+
                   <div className="cui-form-button-group">
+                    <Cancel
+                      onClick={() => {
+                        setCreatePreset(undefined);
+                        setPresetName("");
+                      }}
+                    />
                     <Submit
                       onClick={async () => {
                         const { res } = await request(FeedRoutes.createPreset, {
diff --git a/src/components/CameraFeed/routes.ts b/src/components/CameraFeed/routes.ts
index db983d6a383..bffcb0fc9b0 100644
--- a/src/components/CameraFeed/routes.ts
+++ b/src/components/CameraFeed/routes.ts
@@ -1,9 +1,10 @@
-import { Type } from "../../Redux/api";
+import { OperationAction, PTZPayload } from "./useOperateCamera";
+
+import { AssetBedModel } from "../Assets/AssetTypes";
 import { PaginatedResponse } from "../../Utils/request/types";
+import { Type } from "../../Redux/api";
+import { UserBareMinimum } from "@/components/Users/models";
 import { WritableOnly } from "../../Utils/types";
-import { AssetBedModel } from "../Assets/AssetTypes";
-import { PerformedByModel } from "../HCX/misc";
-import { OperationAction, PTZPayload } from "./useOperateCamera";
 
 export type GetStatusResponse = {
   result: {
@@ -32,8 +33,8 @@ export type CameraPreset = {
   name: string;
   readonly asset_bed: AssetBedModel;
   position: PTZPayload;
-  readonly created_by: PerformedByModel;
-  readonly updated_by: PerformedByModel;
+  readonly created_by: UserBareMinimum;
+  readonly updated_by: UserBareMinimum;
   readonly created_date: string;
   readonly modified_date: string;
   readonly is_migrated: boolean;
diff --git a/src/components/Common/Avatar.tsx b/src/components/Common/Avatar.tsx
index 1d20c3ad18f..7a7ded17265 100644
--- a/src/components/Common/Avatar.tsx
+++ b/src/components/Common/Avatar.tsx
@@ -78,6 +78,7 @@ const Avatar: React.FC<AvatarProps> = ({
           xmlns="http://www.w3.org/2000/svg"
           version="1.1"
           viewBox="0 0 100 100"
+          className="aspect-square h-full w-full object-cover"
         >
           <text
             fill="black"
diff --git a/src/components/Common/PMJAYProcedurePackageAutocomplete.tsx b/src/components/Common/PMJAYProcedurePackageAutocomplete.tsx
deleted file mode 100644
index 0da23ac3d18..00000000000
--- a/src/components/Common/PMJAYProcedurePackageAutocomplete.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import {
-  FormFieldBaseProps,
-  useFormFieldPropsResolver,
-} from "../Form/FormFields/Utils";
-
-import { Autocomplete } from "../Form/FormFields/Autocomplete";
-import FormField from "../Form/FormFields/FormField";
-import routes from "../../Redux/api";
-import { useState } from "react";
-import useQuery from "../../Utils/request/useQuery";
-import { mergeQueryOptions } from "../../Utils/utils";
-
-export type PMJAYPackageItem = {
-  name?: string;
-  code?: string;
-  price?: number;
-  package_name?: string;
-};
-
-type Props = FormFieldBaseProps<PMJAYPackageItem>;
-
-export default function PMJAYProcedurePackageAutocomplete(props: Props) {
-  const field = useFormFieldPropsResolver(props);
-
-  const [query, setQuery] = useState("");
-
-  const { data, loading } = useQuery(routes.hcx.claims.listPMJYPackages, {
-    query: { query, limit: 10 },
-  });
-
-  return (
-    <FormField field={field}>
-      <Autocomplete
-        required
-        id={field.id}
-        disabled={field.disabled}
-        value={field.value}
-        onChange={field.handleChange}
-        options={mergeQueryOptions(
-          (field.value ? [field.value] : []).map((o) => ({
-            ...o,
-            price:
-              o.price && parseFloat(o.price?.toString().replaceAll(",", "")),
-          })),
-          data ?? [],
-          (obj) => obj.code,
-        )}
-        optionLabel={optionLabel}
-        optionDescription={optionDescription}
-        optionValue={(option) => option}
-        onQuery={setQuery}
-        isLoading={loading}
-      />
-    </FormField>
-  );
-}
-
-const optionLabel = (option: PMJAYPackageItem) => {
-  if (option.name) return option.name;
-  if (option.package_name) return `${option.package_name} (Package)`;
-  return "Unknown";
-};
-
-const optionDescription = (option: PMJAYPackageItem) => {
-  const code = option.code || "Unknown";
-  const packageName = option.package_name || "Unknown";
-  return `Package: ${packageName} (${code})`;
-};
diff --git a/src/components/Common/RelativeDateUserMention.tsx b/src/components/Common/RelativeDateUserMention.tsx
index b2fc8b2e241..f68f002eee5 100644
--- a/src/components/Common/RelativeDateUserMention.tsx
+++ b/src/components/Common/RelativeDateUserMention.tsx
@@ -1,10 +1,11 @@
-import CareIcon from "../../CAREUI/icons/CareIcon";
 import { formatDateTime, formatName, relativeDate } from "../../Utils/utils";
-import { PerformedByModel } from "../HCX/misc";
+
+import CareIcon from "../../CAREUI/icons/CareIcon";
+import { UserBareMinimum } from "@/components/Users/models";
 
 function RelativeDateUserMention(props: {
   actionDate?: string;
-  user?: PerformedByModel;
+  user?: UserBareMinimum;
   tooltipPosition?: "top" | "bottom" | "left" | "right";
   withoutSuffix?: boolean;
 }) {
diff --git a/src/components/Diagnosis/types.ts b/src/components/Diagnosis/types.ts
index 694e7a482d6..4a67e28efab 100644
--- a/src/components/Diagnosis/types.ts
+++ b/src/components/Diagnosis/types.ts
@@ -1,4 +1,4 @@
-import { PerformedByModel } from "../HCX/misc";
+import { UserBareMinimum } from "@/components/Users/models";
 
 export type ICD11DiagnosisModel = {
   id: string;
@@ -33,7 +33,7 @@ export interface ConsultationDiagnosis {
   verification_status: ConditionVerificationStatus;
   is_principal: boolean;
   readonly is_migrated: boolean;
-  readonly created_by: PerformedByModel;
+  readonly created_by: UserBareMinimum;
   readonly created_date: string;
   readonly modified_date: string;
 }
diff --git a/src/components/Facility/ConsultationClaims.tsx b/src/components/Facility/ConsultationClaims.tsx
deleted file mode 100644
index a449f4c18f1..00000000000
--- a/src/components/Facility/ConsultationClaims.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import * as Notification from "../../Utils/Notifications";
-
-import ClaimCard from "../HCX/ClaimCard";
-import CreateClaimCard from "../HCX/CreateClaimCard";
-import PageTitle from "@/components/Common/PageTitle";
-import { navigate } from "raviger";
-import routes from "../../Redux/api";
-import { useMessageListener } from "@/common/hooks/useMessageListener";
-import useQuery from "../../Utils/request/useQuery";
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-
-export interface IConsultationClaimsProps {
-  facilityId: string;
-  patientId: string;
-  consultationId: string;
-}
-
-export default function ConsultationClaims({
-  facilityId,
-  consultationId,
-  patientId,
-}: IConsultationClaimsProps) {
-  const { t } = useTranslation();
-
-  const [isCreateLoading, setIsCreateLoading] = useState(false);
-
-  const { data: claimsResult, refetch: refetchClaims } = useQuery(
-    routes.hcx.claims.list,
-    {
-      query: {
-        ordering: "-modified_date",
-        consultation: consultationId,
-      },
-      onResponse: (res) => {
-        if (!isCreateLoading) return;
-
-        if (res.data?.results) {
-          Notification.Success({
-            msg: t("claim__fetched_claim_approval_results"),
-          });
-          return;
-        }
-
-        Notification.Error({
-          msg: t("claim__error_fetching_claim_approval_results"),
-        });
-      },
-    },
-  );
-
-  useMessageListener((data) => {
-    if (
-      data.type === "MESSAGE" &&
-      (data.from === "claim/on_submit" || data.from === "preauth/on_submit") &&
-      data.message === "success"
-    ) {
-      refetchClaims();
-    }
-  });
-
-  return (
-    <div className="relative flex flex-col pb-2">
-      <PageTitle
-        title={t("Claims")}
-        className="grow-0 pl-6"
-        onBackClick={() => {
-          navigate(
-            `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}`,
-          );
-          return false;
-        }}
-      />
-
-      <div className="mx-auto flex w-full max-w-5xl flex-col justify-center gap-16">
-        <div className="rounded-lg bg-white p-8">
-          <CreateClaimCard
-            consultationId={consultationId}
-            patientId={patientId}
-            isCreating={isCreateLoading}
-            setIsCreating={setIsCreateLoading}
-          />
-        </div>
-
-        <div className="mx-auto flex w-full max-w-3xl flex-col gap-8">
-          {claimsResult?.results.map((claim) => (
-            <div className="rounded-lg bg-white p-8">
-              <ClaimCard claim={claim} />
-            </div>
-          ))}
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/src/components/Facility/ConsultationDoctorNotes/index.tsx b/src/components/Facility/ConsultationDoctorNotes/index.tsx
index f422eca2763..517c3eca619 100644
--- a/src/components/Facility/ConsultationDoctorNotes/index.tsx
+++ b/src/components/Facility/ConsultationDoctorNotes/index.tsx
@@ -128,7 +128,7 @@ const ConsultationDoctorNotes = (props: ConsultationDoctorNotesProps) => {
       backUrl={`/facility/${facilityId}/patient/${patientId}`}
     >
       <div className="relative mx-3 my-2 flex grow flex-col overflow-hidden rounded-lg border border-secondary-300 bg-white p-2 sm:mx-10 sm:my-5 sm:p-5">
-        <div className="absolute inset-x-0 top-0 flex bg-secondary-200 text-sm shadow-md">
+        <div className="absolute inset-x-0 top-0 z-10 flex bg-secondary-200 text-sm shadow-md">
           {keysOf(PATIENT_NOTES_THREADS).map((current) => (
             <button
               id={`patient-note-tab-${current}`}
diff --git a/src/components/Facility/DischargeModal.tsx b/src/components/Facility/DischargeModal.tsx
index b5c15dc98d2..e3240c08751 100644
--- a/src/components/Facility/DischargeModal.tsx
+++ b/src/components/Facility/DischargeModal.tsx
@@ -5,32 +5,28 @@ import { useEffect, useState } from "react";
 
 import CareIcon from "../../CAREUI/icons/CareIcon";
 import CircularProgress from "@/components/Common/components/CircularProgress";
-import ClaimCard from "../HCX/ClaimCard";
+import ConfirmDialog from "@/components/Common/ConfirmDialog";
 import { ConsultationModel } from "./models";
-import CreateClaimCard from "../HCX/CreateClaimCard";
 import { DISCHARGE_REASONS } from "@/common/constants";
+import DateFormField from "../Form/FormFields/DateFormField";
 import DialogModal from "@/components/Common/Dialog";
+import { EditDiagnosesBuilder } from "../Diagnosis/ConsultationDiagnosisBuilder/ConsultationDiagnosisBuilder";
 import { FacilityModel } from "./models";
 import { FacilitySelect } from "@/components/Common/FacilitySelect";
 import { FieldError } from "../Form/FieldValidators";
 import { FieldLabel } from "../Form/FormFields/FormField";
-import { HCXClaimModel } from "../HCX/models";
+import Loading from "@/components/Common/Loading";
+import { PLUGIN_Component } from "@/PluginEngine";
 import PrescriptionBuilder from "../Medicine/PrescriptionBuilder";
 import { SelectFormField } from "../Form/FormFields/SelectFormField";
 import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
 import TextFormField from "../Form/FormFields/TextFormField";
 import dayjs from "../../Utils/dayjs";
-import { useMessageListener } from "@/common/hooks/useMessageListener";
+import request from "../../Utils/request/request";
+import routes from "../../Redux/api";
+import useConfirmedAction from "@/common/hooks/useConfirmedAction";
 import useQuery from "../../Utils/request/useQuery";
 import { useTranslation } from "react-i18next";
-import useConfirmedAction from "@/common/hooks/useConfirmedAction";
-import ConfirmDialog from "@/components/Common/ConfirmDialog";
-import routes from "../../Redux/api";
-import { EditDiagnosesBuilder } from "../Diagnosis/ConsultationDiagnosisBuilder/ConsultationDiagnosisBuilder";
-import Loading from "@/components/Common/Loading";
-import careConfig from "@careConfig";
-import DateFormField from "../Form/FormFields/DateFormField";
-import request from "../../Utils/request/request";
 
 interface PreDischargeFormInterface {
   new_discharge_reason: number | null;
@@ -76,40 +72,10 @@ const DischargeModal = ({
       referred_to_external: !referred_to?.id ? referred_to?.name : null,
       referred_to: referred_to?.id ? referred_to.id : null,
     });
-  const [latestClaim, setLatestClaim] = useState<HCXClaimModel>();
-  const [isCreateClaimLoading, setIsCreateClaimLoading] = useState(false);
   const [isSendingDischargeApi, setIsSendingDischargeApi] = useState(false);
   const [facility, setFacility] = useState<FacilityModel | null>(referred_to);
   const [errors, setErrors] = useState<any>({});
 
-  const { refetch: refetchLatestClaim } = useQuery(routes.hcx.claims.list, {
-    query: {
-      consultation: consultationData.id,
-      ordering: "-modified_date",
-      use: "claim",
-      outcome: "complete",
-      limit: 1,
-    },
-    onResponse: (res) => {
-      if (!isCreateClaimLoading) return;
-
-      setIsCreateClaimLoading(false);
-
-      if (res?.data?.results?.length !== 0) {
-        setLatestClaim(res?.data?.results[0]);
-        Notification.Success({
-          msg: t("claim__fetched_claim_approval_results"),
-        });
-        return;
-      }
-
-      setLatestClaim(undefined);
-      Notification.Success({
-        msg: t("claim__error_fetching_claim_approval_results"),
-      });
-    },
-  });
-
   useEffect(() => {
     setPreDischargeForm((prev) => ({
       ...prev,
@@ -131,16 +97,6 @@ const DischargeModal = ({
   const discharge_reason =
     new_discharge_reason ?? preDischargeForm.new_discharge_reason;
 
-  useMessageListener((data) => {
-    if (
-      data.type === "MESSAGE" &&
-      (data.from === "claim/on_submit" || data.from === "preauth/on_submit") &&
-      data.message === "success"
-    ) {
-      refetchLatestClaim();
-    }
-  });
-
   const validate = () => {
     if (!new_discharge_reason && !discharge_reason) {
       setErrors({
@@ -408,23 +364,10 @@ const DischargeModal = ({
           error={errors?.discharge_notes}
         />
 
-        {careConfig.hcx.enabled && (
-          // TODO: if policy and approved pre-auth exists
-          <div className="my-5 rounded p-5 shadow">
-            <h2 className="mb-2">Claim Insurance</h2>
-            {latestClaim ? (
-              <ClaimCard claim={latestClaim} />
-            ) : (
-              <CreateClaimCard
-                consultationId={consultationData.id ?? ""}
-                patientId={consultationData.patient ?? ""}
-                use="claim"
-                isCreating={isCreateClaimLoading}
-                setIsCreating={setIsCreateClaimLoading}
-              />
-            )}
-          </div>
-        )}
+        <PLUGIN_Component
+          __name="AdditionalDischargeProcedures"
+          consultation={consultationData}
+        />
 
         <div className="py-4">
           <span className="text-secondary-700">
diff --git a/src/components/Facility/DoctorVideoSlideover.tsx b/src/components/Facility/DoctorVideoSlideover.tsx
index b45bdbeb59e..0ed5e7df877 100644
--- a/src/components/Facility/DoctorVideoSlideover.tsx
+++ b/src/components/Facility/DoctorVideoSlideover.tsx
@@ -1,22 +1,23 @@
-import React, { useState } from "react";
-import SlideOver from "../../CAREUI/interactive/SlideOver";
-import { UserAssignedModel } from "../Users/models";
-import { SkillObjectModel } from "../Users/models";
 import CareIcon, { IconName } from "../../CAREUI/icons/CareIcon";
+import React, { useState } from "react";
 import {
   classNames,
   formatName,
   isUserOnline,
   relativeTime,
 } from "../../Utils/utils";
-import useAuthUser from "@/common/hooks/useAuthUser";
-import { triggerGoal } from "../../Integrations/Plausible";
-import { Warn } from "../../Utils/Notifications";
+
+import Loading from "@/components/Common/Loading";
+import { PLUGIN_Component } from "@/PluginEngine";
+import { SkillObjectModel } from "../Users/models";
+import SlideOver from "../../CAREUI/interactive/SlideOver";
 import Switch from "../../CAREUI/interactive/Switch";
-import useQuery from "../../Utils/request/useQuery";
+import { UserAssignedModel } from "../Users/models";
+import { Warn } from "../../Utils/Notifications";
 import routes from "../../Redux/api";
-import Loading from "@/components/Common/Loading";
-import { PLUGIN_DoctorConnectButtons } from "@/PluginEngine";
+import { triggerGoal } from "../../Integrations/Plausible";
+import useAuthUser from "@/common/hooks/useAuthUser";
+import useQuery from "../../Utils/request/useQuery";
 
 const UserGroups = {
   ALL: "All",
@@ -367,7 +368,7 @@ function DoctorConnectButtons(props: {
           <CareIcon icon="l-phone-alt" id="phone-icon" className="h-5 w-5" />
         </div>
       </a>
-      <PLUGIN_DoctorConnectButtons user={user} />
+      <PLUGIN_Component __name="DoctorConnectButtons" user={user} />
     </div>
   );
 }
diff --git a/src/components/Facility/SpokeFacilityEditor.tsx b/src/components/Facility/SpokeFacilityEditor.tsx
index a6dfe9e00aa..bf07ec4e9bb 100644
--- a/src/components/Facility/SpokeFacilityEditor.tsx
+++ b/src/components/Facility/SpokeFacilityEditor.tsx
@@ -78,7 +78,8 @@ export default function SpokeFacilityEditor(props: SpokeFacilityEditorProps) {
     setItem: (item: FacilitySpokeModel | FacilitySpokeRequest) => void,
     processing: boolean,
   ) => {
-    const [selectedFacility, setSelectedFacility] = useState<FacilityModel>();
+    const [selectedFacility, setSelectedFacility] =
+      useState<FacilityModel | null>(null);
 
     useEffect(() => {
       setItem({ ...item, spoke: selectedFacility?.id });
@@ -99,7 +100,7 @@ export default function SpokeFacilityEditor(props: SpokeFacilityEditorProps) {
             showNOptions={8}
             selected={selectedFacility}
             setSelected={(v) =>
-              v && !Array.isArray(v) && setSelectedFacility(v)
+              (v === null || !Array.isArray(v)) && setSelectedFacility(v)
             }
             errors=""
             className="w-full"
diff --git a/src/components/Facility/models.tsx b/src/components/Facility/models.tsx
index 37461b056e8..84617e35ed7 100644
--- a/src/components/Facility/models.tsx
+++ b/src/components/Facility/models.tsx
@@ -23,7 +23,6 @@ import { UserBareMinimum } from "../Users/models";
 import { InvestigationType } from "@/components/Common/prescription-builder/InvestigationBuilder";
 import { ProcedureType } from "@/components/Common/prescription-builder/ProcedureBuilder";
 import { RouteToFacility } from "@/components/Common/RouteToFacilitySelect";
-import { PerformedByModel } from "../HCX/misc";
 
 export interface LocalBodyModel {
   id: number;
@@ -713,8 +712,8 @@ export interface ShiftingModel {
   ambulance_number: string;
   comments: string;
   created_date: string;
-  created_by_object: PerformedByModel;
-  last_edited_by_object: PerformedByModel;
+  created_by_object: UserBareMinimum;
+  last_edited_by_object: UserBareMinimum;
   is_assigned_to_user: boolean;
   created_by: number;
   last_edited_by: number;
@@ -746,15 +745,15 @@ export interface ResourceModel {
   status: string;
   sub_category: string;
   title: string;
-  assigned_to_object: PerformedByModel | null;
-  created_by_object: PerformedByModel | null;
+  assigned_to_object: UserBareMinimum | null;
+  created_by_object: UserBareMinimum | null;
   created_date: string;
-  last_edited_by_object: PerformedByModel;
+  last_edited_by_object: UserBareMinimum;
 }
 
 export interface CommentModel {
   id: string;
-  created_by_object: PerformedByModel;
+  created_by_object: UserBareMinimum;
   created_date: string;
   modified_date: string;
   comment: string;
diff --git a/src/components/Form/AutoCompleteAsync.tsx b/src/components/Form/AutoCompleteAsync.tsx
index ddec1503042..839a74c880c 100644
--- a/src/components/Form/AutoCompleteAsync.tsx
+++ b/src/components/Form/AutoCompleteAsync.tsx
@@ -100,7 +100,7 @@ const AutoCompleteAsync = (props: Props) => {
         immediate
       >
         <div className="relative mt-1">
-          <div className="flex">
+          <div className="relative flex">
             <ComboboxInput
               id={id}
               name={name}
@@ -125,12 +125,12 @@ const AutoCompleteAsync = (props: Props) => {
             />
             {!disabled && (
               <ComboboxButton className="absolute inset-y-0 right-0 flex items-center pr-2">
-                <div className="absolute right-0 top-1 mr-2 flex items-center text-lg text-secondary-900">
+                <div className="absolute right-0 mr-2 flex items-center text-lg text-secondary-900">
                   {hasSelection && !loading && !required && (
                     <div className="tooltip" id="clear-button">
                       <CareIcon
                         icon="l-times-circle"
-                        className="mb-[-5px] h-4 w-4 text-secondary-800 transition-colors duration-200 ease-in-out hover:text-secondary-500"
+                        className="h-4 w-4 text-secondary-800 transition-colors duration-200 ease-in-out hover:text-secondary-500"
                         onClick={(e) => {
                           e.preventDefault();
                           onChange(null);
@@ -142,16 +142,9 @@ const AutoCompleteAsync = (props: Props) => {
                     </div>
                   )}
                   {loading ? (
-                    <CareIcon
-                      icon="l-spinner"
-                      className="-mb-1.5 animate-spin"
-                    />
+                    <CareIcon icon="l-spinner" className="animate-spin" />
                   ) : (
-                    <CareIcon
-                      id="dropdown-toggle"
-                      icon="l-angle-down"
-                      className="-mb-1.5"
-                    />
+                    <CareIcon id="dropdown-toggle" icon="l-angle-down" />
                   )}
                 </div>
               </ComboboxButton>
diff --git a/src/components/Form/FormFields/TextFormField.tsx b/src/components/Form/FormFields/TextFormField.tsx
index a3663358a56..81e1edea9d0 100644
--- a/src/components/Form/FormFields/TextFormField.tsx
+++ b/src/components/Form/FormFields/TextFormField.tsx
@@ -24,6 +24,7 @@ export type TextFormFieldProps = FormFieldBaseProps<string> &
     trailingPadding?: string | undefined;
     leadingPadding?: string | undefined;
     suggestions?: string[];
+    clearable?: boolean | undefined;
   };
 
 const TextFormField = forwardRef((props: TextFormFieldProps, ref) => {
@@ -41,24 +42,36 @@ const TextFormField = forwardRef((props: TextFormFieldProps, ref) => {
   };
 
   let child = (
-    <input
-      {...props}
-      ref={ref as React.Ref<HTMLInputElement>}
-      id={field.id}
-      className={classNames(
-        "cui-input-base peer",
-        hasLeading && (props.leadingPadding || "pl-10"),
-        hasTrailing && (props.trailingPadding || "pr-10"),
-        field.error && "border-danger-500",
-        props.inputClassName,
+    <div className="relative">
+      <input
+        {...props}
+        ref={ref as React.Ref<HTMLInputElement>}
+        id={field.id}
+        className={classNames(
+          "cui-input-base peer",
+          hasLeading && (props.leadingPadding || "pl-10"),
+          hasTrailing && (props.trailingPadding || "pr-10"),
+          field.error && "border-danger-500",
+          props.inputClassName,
+        )}
+        disabled={field.disabled}
+        type={props.type === "password" ? getPasswordFieldType() : props.type}
+        name={field.name}
+        value={field.value}
+        required={field.required}
+        onChange={(e) => field.handleChange(e.target.value)}
+      />
+      {props.clearable && field.value && (
+        <button
+          type="button"
+          className="absolute right-2 top-1/2 -translate-y-1/2 transform text-gray-500"
+          onClick={() => field.handleChange("")}
+          aria-label="Clear input"
+        >
+          <CareIcon icon="l-times-circle" className="text-lg" />
+        </button>
       )}
-      disabled={field.disabled}
-      type={props.type === "password" ? getPasswordFieldType() : props.type}
-      name={field.name}
-      value={field.value}
-      required={field.required}
-      onChange={(e) => field.handleChange(e.target.value)}
-    />
+    </div>
   );
 
   if (props.type === "password") {
diff --git a/src/components/HCX/ClaimCard.tsx b/src/components/HCX/ClaimCard.tsx
deleted file mode 100644
index b45e7b3d503..00000000000
--- a/src/components/HCX/ClaimCard.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { useLayoutEffect, useRef, useState } from "react";
-
-import CareIcon from "../../CAREUI/icons/CareIcon";
-import ClaimCardCommunication from "./ClaimCardCommunication";
-import ClaimCardInfo from "./ClaimCardInfo";
-import { HCXClaimModel } from "./models";
-
-interface IProps {
-  claim: HCXClaimModel;
-}
-
-export default function ClaimCard({ claim }: IProps) {
-  const [showMessages, setShowMessages] = useState(false);
-  const [containerDimensions, setContainerDimensions] = useState({
-    width: 0,
-    height: 0,
-  });
-  const cardContainerRef = useRef<HTMLDivElement>(null);
-
-  useLayoutEffect(() => {
-    if (cardContainerRef.current) {
-      setContainerDimensions({
-        width: cardContainerRef.current.offsetWidth,
-        height: cardContainerRef.current.offsetHeight,
-      });
-    }
-  }, [cardContainerRef]);
-
-  return (
-    <>
-      <div className="relative flex justify-end">
-        <CareIcon
-          icon={showMessages ? "l-info-circle" : "l-chat"}
-          className="absolute right-0 top-0 z-30 h-7 w-7 cursor-pointer text-gray-600 hover:text-gray-800"
-          onClick={() => setShowMessages((prev) => !prev)}
-        />
-      </div>
-      {showMessages ? (
-        <div
-          style={{ ...containerDimensions }}
-          className="relative w-full px-2 lg:px-8"
-        >
-          <ClaimCardCommunication claim={claim} />
-        </div>
-      ) : (
-        <div
-          ref={cardContainerRef}
-          className="w-full px-2 lg:px-8" // TODO: add a card flip animation
-        >
-          <ClaimCardInfo claim={claim} />
-        </div>
-      )}
-    </>
-  );
-}
diff --git a/src/components/HCX/ClaimCardCommunication.tsx b/src/components/HCX/ClaimCardCommunication.tsx
deleted file mode 100644
index 39edd63ce62..00000000000
--- a/src/components/HCX/ClaimCardCommunication.tsx
+++ /dev/null
@@ -1,300 +0,0 @@
-import * as Notification from "../../Utils/Notifications";
-
-import { HCXClaimModel, HCXCommunicationModel } from "./models";
-
-import ButtonV2 from "@/components/Common/components/ButtonV2";
-import CareIcon from "../../CAREUI/icons/CareIcon";
-import { FileUploadModel } from "../Patient/models";
-import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
-import { classNames } from "../../Utils/utils";
-import request from "../../Utils/request/request";
-import routes from "../../Redux/api";
-import useFileUpload from "../../Utils/useFileUpload";
-import useQuery from "../../Utils/request/useQuery";
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-
-interface IProps {
-  claim: HCXClaimModel;
-}
-
-export default function ClaimCardCommunication({ claim }: IProps) {
-  const { t } = useTranslation();
-  const [inputText, setInputText] = useState("");
-  const [isSendingCommunication, setIsSendingCommunication] = useState(false);
-
-  const {
-    Input,
-    files,
-    error,
-    removeFile,
-    clearFiles,
-    handleFileUpload,
-    validateFiles,
-  } = useFileUpload({
-    multiple: true,
-    type: "COMMUNICATION",
-    allowedExtensions: [".pdf", ".jpg", ".jpeg", ".png"],
-  });
-
-  const { data: communicationsResult, refetch: refetchCommunications } =
-    useQuery(routes.hcx.communications.list, {
-      query: {
-        claim: claim.id,
-        ordering: "-created_date",
-      },
-    });
-
-  const handleSubmit = async () => {
-    if (!claim.id) return;
-
-    if (!validateFiles()) return;
-
-    setIsSendingCommunication(true);
-
-    const { res, data } = await request(routes.hcx.communications.create, {
-      body: {
-        claim: claim.id,
-        content: [
-          {
-            type: "text",
-            data: inputText,
-          },
-        ],
-      },
-    });
-
-    if (res?.status === 201 && data) {
-      await handleFileUpload(data.id as string);
-
-      const { res } = await request(routes.hcx.communications.send, {
-        body: {
-          communication: data.id,
-        },
-      });
-
-      if (res?.ok) {
-        Notification.Success({ msg: t("communication__sent_to_hcx") });
-
-        await refetchCommunications();
-
-        setInputText("");
-        clearFiles();
-      }
-    }
-
-    setIsSendingCommunication(false);
-  };
-
-  return (
-    <div className="flex h-full !w-full flex-col justify-end">
-      <CommunicationChatInterface
-        communications={communicationsResult?.results ?? []}
-      />
-
-      <div className="flex w-full items-center gap-3 max-md:flex-col">
-        <div className="relative w-full flex-1">
-          <div className="absolute bottom-full flex max-w-full items-center gap-2 overflow-x-auto rounded-md bg-white p-2">
-            {files.map((file, i) => (
-              <div
-                key={file.name}
-                className="flex min-w-36 max-w-36 items-center gap-2"
-              >
-                <div>
-                  {file.type.includes("image") ? (
-                    <img
-                      src={URL.createObjectURL(file)}
-                      alt={file.name}
-                      className="h-10 w-10 rounded object-cover"
-                    />
-                  ) : (
-                    <div className="flex h-10 w-10 items-center justify-center rounded bg-gray-300">
-                      <CareIcon icon="l-file" className="h-5 w-5" />
-                    </div>
-                  )}
-                </div>
-                <div>
-                  <p className="w-24 truncate text-sm">{file.name}</p>
-                  <div className="flex !items-center gap-2.5">
-                    <p className="text-xs text-gray-500">
-                      {(file.size / 1024).toFixed(2)} KB
-                    </p>
-                    <button
-                      onClick={() => {
-                        removeFile(i);
-                      }}
-                    >
-                      <CareIcon
-                        icon="l-trash"
-                        className="h-4 w-4 text-danger-500"
-                      />
-                    </button>
-                  </div>
-                </div>
-              </div>
-            ))}
-          </div>
-          <TextAreaFormField
-            name="message"
-            value={inputText}
-            onChange={(e) => setInputText(e.value)}
-            placeholder={t("enter_message")}
-            rows={1}
-            className="-mb-3 flex-1"
-          />
-        </div>
-        <div className="flex items-center justify-center max-md:w-full">
-          <label className="button-size-default button-shape-square button-primary-default inline-flex h-min w-full cursor-pointer items-center justify-center gap-2 whitespace-pre font-medium outline-offset-1 transition-all duration-200 ease-in-out">
-            <CareIcon icon="l-paperclip" className="h-5 w-5" />
-            <span className="md:hidden">{t("add_attachments")}</span>
-            <Input />
-          </label>
-        </div>
-        <ButtonV2
-          disabled={!inputText}
-          loading={isSendingCommunication}
-          onClick={handleSubmit}
-          className="max-md:w-full"
-        >
-          {t("send_message")}
-        </ButtonV2>
-      </div>
-      {error && (
-        <p className="pt-1.5 text-xs font-medium text-danger-600">{error}</p>
-      )}
-    </div>
-  );
-}
-
-interface ICommunicationChatInterfaceProps {
-  communications: HCXCommunicationModel[];
-}
-
-function CommunicationChatInterface({
-  communications,
-}: ICommunicationChatInterfaceProps) {
-  return (
-    <div className="my-3 flex h-full w-full flex-col-reverse gap-4 overflow-y-auto">
-      {communications?.map((communication) => (
-        <CommunicationChatMessage communication={communication} />
-      ))}
-    </div>
-  );
-}
-
-interface ICommunicationChatMessageProps {
-  communication: HCXCommunicationModel;
-}
-
-function CommunicationChatMessage({
-  communication,
-}: ICommunicationChatMessageProps) {
-  const { t } = useTranslation();
-  const [attachments, setAttachments] = useState<null | FileUploadModel[]>(
-    null,
-  );
-  const [isFetchingAttachments, setIsFetchingAttachments] = useState(false);
-  const [isDownloadingAttachment, setIsDownloadingAttachment] = useState(false);
-
-  return (
-    <div
-      className={classNames(
-        "mb-4 flex flex-col gap-2",
-        communication.created_by ? "items-end pr-2" : "items-start pl-2",
-      )}
-    >
-      {communication.content?.map((message) => (
-        <p
-          className={classNames(
-            "ml-2 px-4 py-3 text-white",
-            communication.created_by
-              ? "rounded-bl-3xl rounded-tl-3xl rounded-tr-xl bg-blue-400"
-              : "rounded-br-3xl rounded-tl-xl rounded-tr-3xl bg-gray-500",
-          )}
-        >
-          {message.data}
-        </p>
-      ))}
-      {attachments ? (
-        <div className="flex max-w-full items-center gap-2 overflow-x-auto pb-2.5">
-          {attachments.length === 0 ? (
-            <p className="text-sm text-secondary-600">
-              {t("no_attachments_found")}
-            </p>
-          ) : (
-            attachments.map((attachment) => (
-              <div
-                key={attachment.id}
-                className="flex min-w-36 max-w-36 items-center gap-2"
-              >
-                <div>
-                  <div className="flex h-10 w-10 items-center justify-center rounded bg-gray-300">
-                    <CareIcon icon="l-file" className="h-5 w-5" />
-                  </div>
-                </div>
-                <div className="flex flex-col items-start gap-1">
-                  <p className="w-24 truncate text-sm">{attachment.name}</p>
-                  <button
-                    disabled={isDownloadingAttachment}
-                    onClick={async () => {
-                      if (!attachment.id) return;
-
-                      setIsDownloadingAttachment(true);
-
-                      const { res, data } = await request(
-                        routes.retrieveUpload,
-                        {
-                          query: {
-                            file_type: "COMMUNICATION",
-                            associating_id: communication.id,
-                          },
-                          pathParams: { id: attachment.id },
-                        },
-                      );
-
-                      if (res?.ok) {
-                        const url = data?.read_signed_url;
-                        window.open(url, "_blank");
-                      }
-
-                      setIsDownloadingAttachment(false);
-                    }}
-                    className="cursor-pointer text-xs text-blue-500 hover:text-blue-700 hover:underline"
-                  >
-                    {t("open")}
-                  </button>
-                </div>
-              </div>
-            ))
-          )}
-        </div>
-      ) : (
-        <button
-          onClick={async () => {
-            setIsFetchingAttachments(true);
-
-            const { res, data } = await request(routes.viewUpload, {
-              query: {
-                file_type: "COMMUNICATION",
-                associating_id: communication.id,
-                is_archived: false,
-              },
-            });
-
-            if (res?.ok) {
-              Notification.Success({
-                msg: t("fetched_attachments_successfully"),
-              });
-              setAttachments(data?.results ?? []);
-            }
-
-            setIsFetchingAttachments(false);
-          }}
-          className="cursor-pointer text-sm text-secondary-700 hover:text-secondary-900 hover:underline"
-        >
-          {isFetchingAttachments ? t("fetching") + "..." : t("see_attachments")}
-        </button>
-      )}
-    </div>
-  );
-}
diff --git a/src/components/HCX/ClaimCardInfo.tsx b/src/components/HCX/ClaimCardInfo.tsx
deleted file mode 100644
index 1b348a28f4f..00000000000
--- a/src/components/HCX/ClaimCardInfo.tsx
+++ /dev/null
@@ -1,168 +0,0 @@
-import { classNames, formatCurrency, formatDateTime } from "../../Utils/utils";
-
-import { HCXClaimModel } from "./models";
-import { useTranslation } from "react-i18next";
-
-interface IProps {
-  claim: HCXClaimModel;
-}
-
-const claimStatus = {
-  PENDING: "pending",
-  APPROVED: "approved",
-  REJECTED: "rejected",
-};
-
-export default function ClaimCardInfo({ claim }: IProps) {
-  const { t } = useTranslation();
-
-  const status =
-    claim.outcome === "Complete"
-      ? claim.error_text
-        ? claimStatus.REJECTED
-        : claimStatus.APPROVED
-      : claimStatus.PENDING;
-
-  return (
-    <>
-      <div className="sm:flex sm:items-end">
-        <div className="sm:flex-auto">
-          <h1 className="text-xl font-semibold text-secondary-700">
-            #{claim.id?.slice(0, 5)}
-          </h1>
-
-          <p className="mt-2 text-sm text-secondary-700">
-            {t("created_on")}{" "}
-            <time dateTime={claim.created_date}>
-              {formatDateTime(claim.created_date ?? "")}
-            </time>
-            .
-          </p>
-        </div>
-        <div className="mt-4 flex flex-row-reverse items-center justify-center gap-3 max-sm:justify-end sm:ml-16 sm:mt-0">
-          {claim.use && (
-            <span className="rounded bg-primary-100 p-1 px-2 text-sm font-bold text-primary-500 shadow">
-              {claim.use}
-            </span>
-          )}
-          <span
-            className={classNames(
-              "rounded p-1 px-2 text-sm font-bold text-white shadow",
-              status === claimStatus.APPROVED && "bg-primary-400",
-              status === claimStatus.REJECTED && "bg-danger-400",
-              status === claimStatus.PENDING && "bg-yellow-400",
-            )}
-          >
-            {t(`claim__status__${status}`)}
-          </span>
-        </div>
-      </div>
-      <div className="mt-6 grid gap-4 sm:grid-cols-2">
-        <div className="text-center">
-          <h2 className="text-lg font-bold text-secondary-800">
-            {claim.policy_object?.policy_id || "NA"}
-          </h2>
-          <p className="text-sm text-secondary-500">{t("policy__policy_id")}</p>
-        </div>
-        <div className="text-center">
-          <h2 className="text-lg font-bold text-secondary-800">
-            {claim.policy_object?.subscriber_id || "NA"}
-          </h2>
-          <p className="text-sm text-secondary-500">
-            {t("policy__subscriber_id")}
-          </p>
-        </div>
-        <div className="text-center">
-          <h2 className="text-lg font-bold text-secondary-800">
-            {claim.policy_object?.insurer_id?.split("@").shift() || "NA"}
-          </h2>
-          <p className="text-sm text-secondary-500">
-            {t("policy__insurer_id")}
-          </p>
-        </div>
-        <div className="text-center">
-          <h2 className="text-lg font-bold text-secondary-800">
-            {claim.policy_object?.insurer_name || "NA"}
-          </h2>
-          <p className="text-sm text-secondary-500">
-            {t("policy__insurer_name")}
-          </p>
-        </div>
-      </div>
-      <div className="-mx-6 mt-8 flow-root sm:mx-0">
-        <table className="min-w-full divide-y divide-secondary-300">
-          <thead>
-            <tr>
-              <th
-                scope="col"
-                className="py-3.5 pl-6 pr-3 text-left text-sm font-semibold text-secondary-900 sm:pl-0"
-              >
-                {t("claim__items")}
-              </th>
-              <th></th>
-              <th></th>
-              <th
-                scope="col"
-                className="py-3.5 pl-3 pr-6 text-right text-sm font-semibold text-secondary-900 sm:pr-0"
-              >
-                {t("claim__item__price")}
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            {claim.items?.map((item) => (
-              <tr key={item.id} className="border-b border-secondary-200">
-                <td className="py-4 pl-6 pr-3 text-sm sm:pl-0">
-                  <div className="font-medium text-secondary-900">
-                    {item.name}
-                  </div>
-                  <div className="mt-0.5 text-secondary-500">{item.id}</div>
-                </td>
-                <td></td>
-                <td></td>
-                <td className="py-4 pl-3 pr-6 text-right text-sm text-secondary-500 sm:pr-0">
-                  {formatCurrency(item.price)}
-                </td>
-              </tr>
-            ))}
-          </tbody>
-          <tfoot>
-            <tr>
-              <th
-                scope="row"
-                colSpan={3}
-                className="table-cell pl-6 pr-3 pt-6 text-right text-sm font-normal text-secondary-500 sm:pl-0"
-              >
-                {t("claim__total_claim_amount")}
-              </th>
-              <td className="pl-3 pr-6 pt-6 text-right text-sm text-secondary-500 sm:pr-0">
-                {claim.total_claim_amount &&
-                  formatCurrency(claim.total_claim_amount)}
-              </td>
-            </tr>
-
-            <tr>
-              <th
-                scope="row"
-                colSpan={3}
-                className="table-cell pl-6 pr-3 pt-4 text-right text-sm font-semibold text-secondary-900 sm:pl-0"
-              >
-                {t("claim__total_approved_amount")}
-              </th>
-              <td className="pl-3 pr-6 pt-4 text-right text-sm font-semibold text-secondary-900 sm:pr-0">
-                {claim.total_amount_approved
-                  ? formatCurrency(claim.total_amount_approved)
-                  : "NA"}
-              </td>
-            </tr>
-          </tfoot>
-        </table>
-      </div>
-      {claim.error_text && (
-        <div className="mt-4 text-center text-sm font-bold text-red-500">
-          {claim.error_text}
-        </div>
-      )}
-    </>
-  );
-}
diff --git a/src/components/HCX/ClaimCreatedModal.tsx b/src/components/HCX/ClaimCreatedModal.tsx
deleted file mode 100644
index 4edd4fb11f8..00000000000
--- a/src/components/HCX/ClaimCreatedModal.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import * as Notification from "../../Utils/Notifications";
-
-import CareIcon from "../../CAREUI/icons/CareIcon";
-import DialogModal from "@/components/Common/Dialog";
-import { FileUpload } from "../Files/FileUpload";
-import { HCXClaimModel } from "./models";
-import { Submit } from "@/components/Common/components/ButtonV2";
-import request from "../../Utils/request/request";
-import routes from "../../Redux/api";
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-
-interface Props {
-  claim: HCXClaimModel;
-  show: boolean;
-  onClose: () => void;
-}
-
-export default function ClaimCreatedModal({ claim, ...props }: Props) {
-  const { t } = useTranslation();
-
-  const [isMakingClaim, setIsMakingClaim] = useState(false);
-
-  const { use } = claim;
-
-  const handleSubmit = async () => {
-    setIsMakingClaim(true);
-
-    const { res } = await request(routes.hcx.claims.makeClaim, {
-      body: { claim: claim.id },
-    });
-
-    if (res?.ok) {
-      Notification.Success({ msg: `${use} requested` });
-      props.onClose();
-    }
-
-    setIsMakingClaim(false);
-  };
-  return (
-    <DialogModal
-      show={props.show}
-      onClose={props.onClose}
-      title={t("add_attachments")}
-      description={`${t("claim__use__claim")}: #${claim.id?.slice(0, 5)}`}
-      className="w-full max-w-screen-lg"
-      titleAction={
-        <Submit disabled={isMakingClaim} onClick={handleSubmit}>
-          {isMakingClaim && (
-            <CareIcon icon="l-spinner" className="animate-spin" />
-          )}
-          {isMakingClaim
-            ? t("claim__requesting_claim")
-            : t("claim__request_claim")}
-        </Submit>
-      }
-    >
-      <div className="p-4 pt-8">
-        <FileUpload type="CLAIM" claimId={claim.id} />
-      </div>
-    </DialogModal>
-  );
-}
diff --git a/src/components/HCX/ClaimsItemsBuilder.tsx b/src/components/HCX/ClaimsItemsBuilder.tsx
deleted file mode 100644
index b4158c4443b..00000000000
--- a/src/components/HCX/ClaimsItemsBuilder.tsx
+++ /dev/null
@@ -1,163 +0,0 @@
-import {
-  FieldChangeEvent,
-  FormFieldBaseProps,
-  useFormFieldPropsResolver,
-} from "../Form/FormFields/Utils";
-import FormField, { FieldLabel } from "../Form/FormFields/FormField";
-
-import AutocompleteFormField from "../Form/FormFields/Autocomplete";
-import ButtonV2 from "@/components/Common/components/ButtonV2";
-import CareIcon from "../../CAREUI/icons/CareIcon";
-import { HCXItemModel } from "./models";
-import { ITEM_CATEGORIES } from "./constants";
-import PMJAYProcedurePackageAutocomplete from "@/components/Common/PMJAYProcedurePackageAutocomplete";
-import TextFormField from "../Form/FormFields/TextFormField";
-import { useTranslation } from "react-i18next";
-
-type Props = FormFieldBaseProps<HCXItemModel[]>;
-
-export default function ClaimsItemsBuilder(props: Props) {
-  const { t } = useTranslation();
-
-  const field = useFormFieldPropsResolver(props);
-
-  const handleUpdate = (index: number) => {
-    return (event: FieldChangeEvent<any>) => {
-      if (event.name === "hbp") {
-        field.handleChange(
-          (props.value || [])?.map((obj, i) =>
-            i === index
-              ? {
-                  ...obj,
-                  id: event.value.code,
-                  name: event.value.name,
-                  price: event.value.price,
-                }
-              : obj,
-          ),
-        );
-      } else {
-        field.handleChange(
-          (props.value || [])?.map((obj, i) =>
-            i === index ? { ...obj, [event.name]: event.value } : obj,
-          ),
-        );
-      }
-    };
-  };
-
-  const handleRemove = (index: number) => {
-    return () => {
-      field.handleChange((props.value || [])?.filter((obj, i) => i !== index));
-    };
-  };
-
-  return (
-    <FormField field={field}>
-      <div className="flex flex-col gap-3">
-        {props.value?.map((obj, index) => {
-          return (
-            <div
-              key={index}
-              className="rounded-lg border-2 border-dashed border-secondary-200 p-4"
-            >
-              <div className="flex items-center justify-between">
-                <FieldLabel className="my-auto !font-bold">
-                  {t("claim__item")} {index + 1}
-                </FieldLabel>
-                {!props.disabled && (
-                  <ButtonV2
-                    variant="danger"
-                    type="button"
-                    ghost
-                    onClick={handleRemove(index)}
-                    disabled={props.disabled}
-                  >
-                    {t("remove")}
-                    <CareIcon icon="l-trash-alt" className="text-lg" />
-                  </ButtonV2>
-                )}
-              </div>
-
-              <div className="p-2">
-                <AutocompleteFormField
-                  className="w-full"
-                  required
-                  name="category"
-                  label={t("claim__item__category")}
-                  options={ITEM_CATEGORIES}
-                  optionLabel={(o) => o.display}
-                  optionValue={(o) => o.code}
-                  value={obj.category}
-                  onChange={handleUpdate(index)}
-                  disabled={props.disabled}
-                  errorClassName="hidden"
-                />
-
-                <div className="mt-2 grid grid-cols-4 gap-2 max-sm:grid-cols-1">
-                  {obj.category === "HBP" && !obj.id ? (
-                    <>
-                      <PMJAYProcedurePackageAutocomplete
-                        required
-                        className="col-span-full"
-                        labelClassName="text-sm text-secondary-700"
-                        label={t("claim__item__procedure")}
-                        name="hbp"
-                        value={obj}
-                        onChange={handleUpdate(index)}
-                        errorClassName="hidden"
-                      />
-                    </>
-                  ) : (
-                    <>
-                      <TextFormField
-                        className="col-span-1"
-                        required
-                        name="id"
-                        label={t("claim__item__id")}
-                        placeholder={t("claim__item__id__example")}
-                        onChange={handleUpdate(index)}
-                        value={obj.id}
-                        disabled={props.disabled}
-                        errorClassName="hidden"
-                      />
-                      <TextFormField
-                        className="col-span-2"
-                        required
-                        name="name"
-                        label={t("claim__item__name")}
-                        placeholder={t("claim__item__name__example")}
-                        value={obj.name}
-                        onChange={handleUpdate(index)}
-                        disabled={props.disabled}
-                        errorClassName="hidden"
-                      />
-                      <TextFormField
-                        className="col-span-1"
-                        required
-                        type="number"
-                        name="price"
-                        min={0}
-                        label={t("claim__item__price")}
-                        placeholder={t("claim__item__price__example")}
-                        value={obj.price?.toString()}
-                        onChange={(event) =>
-                          handleUpdate(index)({
-                            name: event.name,
-                            value: parseFloat(event.value),
-                          })
-                        }
-                        disabled={props.disabled}
-                        errorClassName="hidden"
-                      />
-                    </>
-                  )}
-                </div>
-              </div>
-            </div>
-          );
-        })}
-      </div>
-    </FormField>
-  );
-}
diff --git a/src/components/HCX/CreateClaimCard.tsx b/src/components/HCX/CreateClaimCard.tsx
deleted file mode 100644
index 7d4b7d3edb0..00000000000
--- a/src/components/HCX/CreateClaimCard.tsx
+++ /dev/null
@@ -1,262 +0,0 @@
-import * as Notification from "../../Utils/Notifications";
-
-import ButtonV2, { Submit } from "@/components/Common/components/ButtonV2";
-import { HCXClaimModel, HCXItemModel, HCXPolicyModel } from "./models";
-import { classNames, formatCurrency } from "../../Utils/utils";
-
-import CareIcon from "../../CAREUI/icons/CareIcon";
-import ClaimCreatedModal from "./ClaimCreatedModal";
-import ClaimsItemsBuilder from "./ClaimsItemsBuilder";
-import DialogModal from "@/components/Common/Dialog";
-import HCXPolicyEligibilityCheck from "./PolicyEligibilityCheck";
-import PatientInsuranceDetailsEditor from "./PatientInsuranceDetailsEditor";
-import { ProcedureType } from "@/components/Common/prescription-builder/ProcedureBuilder";
-import { SelectFormField } from "../Form/FormFields/SelectFormField";
-import request from "../../Utils/request/request";
-import routes from "../../Redux/api";
-import useQuery from "../../Utils/request/useQuery";
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-
-interface Props {
-  consultationId: string;
-  patientId: string;
-  setIsCreating: (creating: boolean) => void;
-  isCreating: boolean;
-  use?: "preauthorization" | "claim";
-}
-
-export default function CreateClaimCard({
-  consultationId,
-  patientId,
-  setIsCreating,
-  isCreating,
-  use = "preauthorization",
-}: Props) {
-  const { t } = useTranslation();
-
-  const [showAddPolicy, setShowAddPolicy] = useState(false);
-  const [policy, setPolicy] = useState<HCXPolicyModel>();
-  const [items, setItems] = useState<HCXItemModel[]>();
-  const [itemsError, setItemsError] = useState<string>();
-  const [createdClaim, setCreatedClaim] = useState<HCXClaimModel>();
-  const [use_, setUse_] = useState(use);
-
-  const { res: consultationRes, data: consultationData } = useQuery(
-    routes.getConsultation,
-    { pathParams: { id: consultationId }, prefetch: !!consultationId },
-  );
-
-  const autoFill = async (policy?: HCXPolicyModel) => {
-    if (!policy) {
-      setItems([]);
-      return;
-    }
-
-    const { res, data: latestApprovedPreAuth } = await request(
-      routes.hcx.claims.list,
-      {
-        query: {
-          consultation: consultationId,
-          policy: policy.id,
-          ordering: "-modified_date",
-          use: "preauthorization",
-          outcome: "complete",
-          limit: 1,
-        },
-      },
-    );
-
-    if (res?.ok && latestApprovedPreAuth?.results.length !== 0) {
-      setItems(latestApprovedPreAuth?.results[0].items ?? []);
-      return;
-    }
-    if (consultationRes?.ok && Array.isArray(consultationData?.procedure)) {
-      setItems(
-        consultationData.procedure.map((obj: ProcedureType) => {
-          return {
-            id: obj.procedure ?? "",
-            name: obj.procedure ?? "",
-            price: 0.0,
-            category: "900000", // provider's packages
-          };
-        }),
-      );
-    } else {
-      setItems([]);
-    }
-  };
-
-  const validate = () => {
-    if (!policy) {
-      Notification.Error({ msg: t("select_policy") });
-      return false;
-    }
-    if (policy?.outcome !== "Complete") {
-      Notification.Error({ msg: t("select_eligible_policy") });
-      return false;
-    }
-    if (!items || items.length === 0) {
-      setItemsError(t("claim__item__add_at_least_one"));
-      return false;
-    }
-    if (items?.some((p) => !p.id || !p.name || p.price === 0 || !p.category)) {
-      setItemsError(t("claim__item__fill_all_details"));
-      return false;
-    }
-
-    return true;
-  };
-
-  const handleSubmit = async () => {
-    if (!validate()) return;
-
-    setIsCreating(true);
-
-    const { res, data } = await request(routes.hcx.claims.create, {
-      body: {
-        policy: policy?.id,
-        items,
-        consultation: consultationId,
-        use: use_,
-      },
-      silent: true,
-    });
-
-    if (res?.ok && data) {
-      setItems([]);
-      setItemsError(undefined);
-      setPolicy(undefined);
-      setCreatedClaim(data);
-    } else {
-      Notification.Error({ msg: t(`claim__failed_to_create_${use_}`) });
-    }
-
-    setIsCreating(false);
-  };
-
-  return (
-    <div className="flex flex-col gap-8">
-      {createdClaim && (
-        <ClaimCreatedModal
-          show
-          claim={createdClaim}
-          onClose={() => setCreatedClaim(undefined)}
-        />
-      )}
-      <DialogModal
-        title={t("edit_policy")}
-        show={showAddPolicy}
-        onClose={() => setShowAddPolicy(false)}
-        description={t("edit_policy_description")}
-        className="w-full max-w-screen-md"
-      >
-        <PatientInsuranceDetailsEditor
-          patient={patientId}
-          onCancel={() => setShowAddPolicy(false)}
-        />
-      </DialogModal>
-
-      {/* Check Insurance Policy Eligibility */}
-      <div className="flex flex-col gap-4">
-        <div className="flex items-center justify-between gap-2 pb-4 max-sm:flex-col max-sm:items-start">
-          <h1 className="text-lg font-bold">{t("check_policy_eligibility")}</h1>
-          <ButtonV2
-            className="w-fit"
-            onClick={() => setShowAddPolicy(true)}
-            ghost
-            border
-          >
-            <CareIcon icon="l-edit-alt" className="text-lg" />
-            {t("edit_policy")}
-          </ButtonV2>
-        </div>
-        <HCXPolicyEligibilityCheck
-          patient={patientId}
-          onEligiblePolicySelected={(policy) => {
-            setPolicy(policy);
-            autoFill(policy);
-          }}
-        />
-      </div>
-
-      {/* Procedures */}
-      <div className="flex flex-col gap-4">
-        <div className="flex w-full items-center justify-between">
-          <h1 className="text-left text-lg font-bold">{t("claim__items")}</h1>
-          <ButtonV2
-            type="button"
-            variant="alert"
-            border
-            ghost={items?.length !== 0}
-            disabled={items === undefined || !policy}
-            onClick={() =>
-              setItems([...(items ?? []), { name: "", id: "", price: 0 }])
-            }
-          >
-            <CareIcon icon="l-plus" className="text-lg" />
-            <span>{t("claim__add_item")}</span>
-          </ButtonV2>
-        </div>
-        <span
-          className={classNames(
-            policy ? "opacity-0" : "opacity-100",
-            "text-secondary-700 transition-opacity duration-300 ease-in-out",
-          )}
-        >
-          {t("select_policy_to_add_items")}
-        </span>
-        <ClaimsItemsBuilder
-          disabled={items === undefined || !policy}
-          name="items"
-          value={items}
-          onChange={({ value }) => setItems(value)}
-          error={itemsError}
-        />
-        <div className="text-right sm:pr-8">
-          {t("total_amount")} :{" "}
-          {items ? (
-            <span className="font-bold tracking-wider">
-              {formatCurrency(
-                items.map((p) => p.price).reduce((a, b) => a + b, 0.0),
-              )}
-            </span>
-          ) : (
-            "--"
-          )}
-        </div>
-      </div>
-
-      <div className="mt-4 flex items-center justify-between max-sm:flex-col">
-        <SelectFormField
-          name="use"
-          label={t("claim__use")}
-          labelClassName="max-sm:hidden"
-          options={[
-            {
-              id: "preauthorization",
-              label: t("claim__use__preauthorization"),
-            },
-            { id: "claim", label: t("claim__use__claim") },
-          ]}
-          value={use_}
-          onChange={({ value }) => setUse_(value)}
-          position="below"
-          className="w-52 max-sm:w-full"
-          optionLabel={(value) => value.label}
-          optionValue={(value) => value.id as "preauthorization" | "claim"}
-        />
-        <Submit
-          disabled={items?.length === 0 || !policy || isCreating}
-          onClick={handleSubmit}
-          className="w-52 max-sm:w-full"
-        >
-          {isCreating && <CareIcon icon="l-spinner" className="animate-spin" />}
-          {isCreating
-            ? t(`claim__creating_${use_}`)
-            : t(`claim__create_${use_}`)}
-        </Submit>
-      </div>
-    </div>
-  );
-}
diff --git a/src/components/HCX/InsuranceDetailsBuilder.tsx b/src/components/HCX/InsuranceDetailsBuilder.tsx
index 1d963200ee3..ca7473c9dc1 100644
--- a/src/components/HCX/InsuranceDetailsBuilder.tsx
+++ b/src/components/HCX/InsuranceDetailsBuilder.tsx
@@ -10,11 +10,11 @@ import CareIcon from "../../CAREUI/icons/CareIcon";
 import { HCXPolicyModel } from "./models";
 import InsurerAutocomplete from "./InsurerAutocomplete";
 import TextFormField from "../Form/FormFields/TextFormField";
+import careConfig from "@careConfig";
 import { classNames } from "../../Utils/utils";
 import request from "../../Utils/request/request";
 import routes from "../../Redux/api";
 import { useTranslation } from "react-i18next";
-import careConfig from "@careConfig";
 
 type Props = FormFieldBaseProps<HCXPolicyModel[]> & { gridView?: boolean };
 
diff --git a/src/components/HCX/constants.ts b/src/components/HCX/constants.ts
deleted file mode 100644
index ed4235a3386..00000000000
--- a/src/components/HCX/constants.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-interface ItemCategory {
-  code: string;
-  system: string;
-  display: string;
-}
-
-export const ITEM_CATEGORIES: ItemCategory[] = [
-  {
-    code: "100000",
-    system: "https://irdai.gov.in/benefit-billing-group-code",
-    display: "Room & Nursing Charges",
-  },
-  {
-    code: "200000",
-    system: "https://irdai.gov.in/benefit-billing-group-code",
-    display: "ICU Charges",
-  },
-  {
-    code: "300000",
-    system: "https://irdai.gov.in/benefit-billing-group-code",
-    display: "OT Charges",
-  },
-  {
-    code: "400000",
-    system: "https://irdai.gov.in/benefit-billing-group-code",
-    display: "Medicine & Consumables Charges",
-  },
-  {
-    code: "500000",
-    system: "https://irdai.gov.in/benefit-billing-group-code",
-    display: "Professional Fees Charges",
-  },
-  {
-    code: "600000",
-    system: "https://irdai.gov.in/benefit-billing-group-code",
-    display: "Investigation Charges",
-  },
-  {
-    code: "700000",
-    system: "https://irdai.gov.in/benefit-billing-group-code",
-    display: "Ambulance Charges",
-  },
-  {
-    code: "800000",
-    system: "https://irdai.gov.in/benefit-billing-group-code",
-    display: "Miscellaneous Charges",
-  },
-  {
-    code: "900000",
-    system: "https://irdai.gov.in/benefit-billing-group-code",
-    display: "Provider Package Charges",
-  },
-  {
-    code: "HBP",
-    system: "https://pmjay.gov.in/benefit-billing-group-code",
-    display: "NHA Package Charges",
-  },
-];
diff --git a/src/components/HCX/misc.ts b/src/components/HCX/misc.ts
deleted file mode 100644
index dba0a290b85..00000000000
--- a/src/components/HCX/misc.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { UserBareMinimum } from "../Users/models";
-
-export type PerformedByModel = UserBareMinimum;
diff --git a/src/components/HCX/models.ts b/src/components/HCX/models.ts
index e75fc28214d..416b3ec6abe 100644
--- a/src/components/HCX/models.ts
+++ b/src/components/HCX/models.ts
@@ -1,9 +1,6 @@
-import { ConsultationModel } from "../Facility/models";
-import { PatientModel } from "../Patient/models";
-import { PerformedByModel } from "./misc";
-
-export type HCXPriority = "Immediate" | "Normal" | "Deferred";
+import { PatientModel } from "@/components/Patient/models";
 
+export type HCXPolicyPriority = "Immediate" | "Normal" | "Deferred";
 export type HCXPolicyStatus =
   | "Active"
   | "Cancelled"
@@ -29,60 +26,10 @@ export interface HCXPolicyModel {
   insurer_id?: string;
   insurer_name?: string;
   status?: HCXPolicyStatus;
-  priority?: HCXPriority;
+  priority?: HCXPolicyPriority;
   purpose?: HCXPolicyPurpose;
   outcome?: HCXPolicyOutcome;
   error_text?: string;
   created_date?: string;
   modified_date?: string;
 }
-
-export interface HCXCommunicationModel {
-  id?: string;
-  identifier?: string;
-  claim?: string;
-  claim_object?: HCXClaimModel;
-  content?: { type: string; data: string }[];
-  created_by?: string | null;
-  last_modified_by?: string | null;
-  created_date?: string;
-  modified_date?: string;
-}
-
-export interface HCXItemModel {
-  id: string;
-  name: string;
-  price: number;
-  category?: string;
-}
-
-export type HCXClaimUse = "Claim" | "Pre Authorization" | "Pre Determination";
-export type HCXClaimStatus = HCXPolicyStatus;
-export type HCXClaimType =
-  | "Institutional"
-  | "Oral"
-  | "Pharmacy"
-  | "Professional"
-  | "Vision";
-export type HCXClaimOutcome = HCXPolicyOutcome;
-
-export interface HCXClaimModel {
-  id?: string;
-  consultation: string;
-  consultation_object?: ConsultationModel;
-  policy: string;
-  policy_object?: HCXPolicyModel;
-  items?: HCXItemModel[];
-  total_claim_amount?: number;
-  total_amount_approved?: number;
-  use?: HCXClaimUse;
-  status?: HCXClaimStatus;
-  priority?: HCXPriority;
-  type?: HCXClaimType;
-  outcome?: HCXClaimOutcome;
-  error_text?: string;
-  created_by?: PerformedByModel;
-  last_modified_by?: PerformedByModel;
-  created_date?: string;
-  modified_date?: string;
-}
diff --git a/src/components/HCX/validators.ts b/src/components/HCX/validators.ts
index 5d5c979a405..3f10ac156d1 100644
--- a/src/components/HCX/validators.ts
+++ b/src/components/HCX/validators.ts
@@ -1,6 +1,6 @@
-import { t } from "i18next";
 import { FieldValidator } from "../Form/FieldValidators";
 import { HCXPolicyModel } from "./models";
+import { t } from "i18next";
 
 const HCXPolicyValidator: FieldValidator<HCXPolicyModel> = (
   value,
diff --git a/src/components/Medicine/models.ts b/src/components/Medicine/models.ts
index bb596e88b3e..68e34d09798 100644
--- a/src/components/Medicine/models.ts
+++ b/src/components/Medicine/models.ts
@@ -1,5 +1,5 @@
-import { PerformedByModel } from "../HCX/misc";
 import { PRESCRIPTION_ROUTES } from "./CreatePrescriptionForm";
+import { UserBareMinimum } from "@/components/Users/models";
 
 export const DOSAGE_UNITS = [
   "mg",
@@ -29,7 +29,7 @@ interface BasePrescription {
   readonly prescription_type?: "DISCHARGE" | "REGULAR";
   readonly discontinued: boolean;
   discontinued_reason?: string;
-  readonly prescribed_by: PerformedByModel;
+  readonly prescribed_by: UserBareMinimum;
   readonly discontinued_date: string;
   readonly last_administration?: MedicineAdministrationRecord;
   readonly is_migrated: boolean;
@@ -72,8 +72,8 @@ export type MedicineAdministrationRecord = {
   notes: string;
   dosage?: DosageValue;
   administered_date?: string;
-  readonly administered_by: PerformedByModel;
-  readonly archived_by: PerformedByModel | undefined;
+  readonly administered_by: UserBareMinimum;
+  readonly archived_by: UserBareMinimum | undefined;
   readonly archived_on: string | undefined;
   readonly created_date: string;
   readonly modified_date: string;
diff --git a/src/components/Patient/InsuranceDetails.tsx b/src/components/Patient/InsuranceDetails.tsx
index 58efe498712..d90c5dbcd27 100644
--- a/src/components/Patient/InsuranceDetails.tsx
+++ b/src/components/Patient/InsuranceDetails.tsx
@@ -1,10 +1,10 @@
 import { HCXPolicyModel } from "../HCX/models";
 import { InsuranceDetialsCard } from "./InsuranceDetailsCard";
+import Loading from "@/components/Common/Loading";
 import Page from "@/components/Common/components/Page";
 import routes from "../../Redux/api";
 import useQuery from "../../Utils/request/useQuery";
 
-import Loading from "@/components/Common/Loading";
 interface IProps {
   facilityId: string;
   id: string;
diff --git a/src/components/Patient/PatientConsentRecords.tsx b/src/components/Patient/PatientConsentRecords.tsx
index 9850cfe0b2c..aa6f45b761c 100644
--- a/src/components/Patient/PatientConsentRecords.tsx
+++ b/src/components/Patient/PatientConsentRecords.tsx
@@ -219,7 +219,8 @@ export default function PatientConsentRecords(props: {
                   onClick={fileUpload.clearFiles}
                   disabled={fileUpload.uploading}
                 >
-                  <CareIcon icon="l-trash-alt" className="" />
+                  <CareIcon icon="l-trash" className="text-lg" />
+                  <span>{t("delete")}</span>
                 </ButtonV2>
               </>
             ) : (
diff --git a/src/components/Patient/PatientHome.tsx b/src/components/Patient/PatientHome.tsx
index d95c6d1df21..fe91bc4e17d 100644
--- a/src/components/Patient/PatientHome.tsx
+++ b/src/components/Patient/PatientHome.tsx
@@ -591,7 +591,7 @@ export const PatientHome = (props: any) => {
                       </p>
                     </div>
                   )}
-                <div className="mb-6 rounded-sm bg-white p-2 text-center shadow">
+                <div className="my-3 rounded-sm bg-white p-2 text-center shadow md:my-0 md:mb-6">
                   <div className="flex justify-between">
                     <div className="w-1/2 border-r-2">
                       <div className="text-sm font-normal leading-5 text-secondary-500">
diff --git a/src/components/Patient/PatientInfoCard.tsx b/src/components/Patient/PatientInfoCard.tsx
index bdc8b0e672d..f5bae4aba54 100644
--- a/src/components/Patient/PatientInfoCard.tsx
+++ b/src/components/Patient/PatientInfoCard.tsx
@@ -1,10 +1,5 @@
 import * as Notification from "../../Utils/Notifications";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "@/components/ui/tooltip";
+
 import {
   CONSULTATION_SUGGESTION,
   DISCHARGE_REASONS,
@@ -13,11 +8,14 @@ import {
   TELEMEDICINE_ACTIONS,
 } from "@/common/constants";
 import { ConsultationModel, PatientCategory } from "../Facility/models";
-import { Switch, MenuItem, Field, Label } from "@headlessui/react";
+import { Field, Label, MenuItem, Switch } from "@headlessui/react";
 import { Link, navigate } from "raviger";
-import { useState } from "react";
-import CareIcon from "../../CAREUI/icons/CareIcon";
-import dayjs from "../../Utils/dayjs";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
 import {
   classNames,
   formatDate,
@@ -26,29 +24,33 @@ import {
   formatPatientAge,
   humanizeStrings,
 } from "../../Utils/utils";
+
 import ABHAProfileModal from "../ABDM/ABHAProfileModal";
-import DialogModal from "@/components/Common/Dialog";
-import ButtonV2 from "@/components/Common/components/ButtonV2";
+import { AbhaNumberModel } from "../ABDM/types/abha";
+import { AuthorizedForConsultationRelatedActions } from "../../CAREUI/misc/AuthorizedChild";
 import Beds from "../Facility/Consultations/Beds";
+import ButtonV2 from "@/components/Common/components/ButtonV2";
+import CareIcon from "../../CAREUI/icons/CareIcon";
+import DialogModal from "@/components/Common/Dialog";
+import DischargeModal from "../Facility/DischargeModal";
+import DischargeSummaryModal from "../Facility/DischargeSummaryModal";
+import DropdownMenu from "@/components/Common/components/Menu";
+import FetchRecordsModal from "../ABDM/FetchRecordsModal";
+import LinkAbhaNumber from "../ABDM/LinkAbhaNumber/index";
+import { Mews } from "../Facility/Consultations/Mews";
+import { PLUGIN_Component } from "@/PluginEngine";
 import { PatientModel } from "./models";
+import { SkillModel } from "../Users/models";
+import careConfig from "@careConfig";
+import { cn } from "@/lib/utils.js";
+import dayjs from "../../Utils/dayjs";
 import request from "../../Utils/request/request";
 import routes from "../../Redux/api";
-import DropdownMenu from "@/components/Common/components/Menu";
 import { triggerGoal } from "../../Integrations/Plausible";
-
 import useAuthUser from "@/common/hooks/useAuthUser";
-import { Mews } from "../Facility/Consultations/Mews";
-import DischargeSummaryModal from "../Facility/DischargeSummaryModal";
-import DischargeModal from "../Facility/DischargeModal";
-import { useTranslation } from "react-i18next";
 import useQuery from "../../Utils/request/useQuery";
-import FetchRecordsModal from "../ABDM/FetchRecordsModal";
-import { AbhaNumberModel } from "../ABDM/types/abha";
-import { SkillModel } from "../Users/models";
-import { AuthorizedForConsultationRelatedActions } from "../../CAREUI/misc/AuthorizedChild";
-import LinkAbhaNumber from "../ABDM/LinkAbhaNumber/index";
-import careConfig from "@careConfig";
-import { cn } from "@/lib/utils.js";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
 
 const formatSkills = (arr: SkillModel[]) => {
   const skills = arr.map((skill) => skill.skill_object.name);
@@ -673,27 +675,25 @@ export default function PatientInfoCard(props: {
                     "l-file-medical",
                     consultation?.id,
                   ],
-                ]
-                  .concat(
-                    careConfig.hcx.enabled
-                      ? [
-                          [
-                            `/facility/${patient.facility}/patient/${patient.id}/consultation/${consultation?.id}/claims`,
-                            "Claims",
-                            "l-copy-landscape",
-                            consultation?.id,
-                          ],
-                        ]
-                      : [],
-                  )
-                  .map(
-                    (action: any, i) =>
-                      action[3] && (
-                        <div key={i}>
-                          <Link
-                            key={i}
-                            className="dropdown-item-primary pointer-events-auto m-2 flex cursor-pointer items-center justify-start gap-2 rounded border-0 p-2 text-sm font-normal transition-all duration-200 ease-in-out"
-                            href={
+                ].map(
+                  (action: any, i) =>
+                    action[3] && (
+                      <div key={i}>
+                        <Link
+                          key={i}
+                          className="dropdown-item-primary pointer-events-auto m-2 flex cursor-pointer items-center justify-start gap-2 rounded border-0 p-2 text-sm font-normal transition-all duration-200 ease-in-out"
+                          href={
+                            !["Treatment Summary", "Consent Records"].includes(
+                              action[1],
+                            ) &&
+                            consultation?.admitted &&
+                            !consultation?.current_bed &&
+                            i === 1
+                              ? ""
+                              : `${action[0]}`
+                          }
+                          onClick={() => {
+                            if (
                               ![
                                 "Treatment Summary",
                                 "Consent Records",
@@ -701,47 +701,35 @@ export default function PatientInfoCard(props: {
                               consultation?.admitted &&
                               !consultation?.current_bed &&
                               i === 1
-                                ? ""
-                                : `${action[0]}`
-                            }
-                            onClick={() => {
-                              if (
-                                ![
-                                  "Treatment Summary",
-                                  "Consent Records",
-                                ].includes(action[1]) &&
-                                consultation?.admitted &&
-                                !consultation?.current_bed &&
-                                i === 1
-                              ) {
-                                Notification.Error({
-                                  msg: "Please assign a bed to the patient",
-                                });
-                                setOpen(true);
-                              }
-                              triggerGoal("Patient Card Button Clicked", {
-                                buttonName: action[1],
-                                consultationId: consultation?.id,
-                                userId: authUser?.id,
+                            ) {
+                              Notification.Error({
+                                msg: "Please assign a bed to the patient",
                               });
-                            }}
-                          >
-                            <CareIcon
-                              icon={action[2]}
-                              className="text-lg text-primary-500"
-                            />
-                            <span>{action[1]}</span>
-                          </Link>
-                          {action?.[4]?.[0] && (
-                            <>
-                              <p className="mt-1 text-xs text-red-500">
-                                {action[4][1]}
-                              </p>
-                            </>
-                          )}
-                        </div>
-                      ),
-                  )}
+                              setOpen(true);
+                            }
+                            triggerGoal("Patient Card Button Clicked", {
+                              buttonName: action[1],
+                              consultationId: consultation?.id,
+                              userId: authUser?.id,
+                            });
+                          }}
+                        >
+                          <CareIcon
+                            icon={action[2]}
+                            className="text-lg text-primary-500"
+                          />
+                          <span>{action[1]}</span>
+                        </Link>
+                        {action?.[4]?.[0] && (
+                          <>
+                            <p className="mt-1 text-xs text-red-500">
+                              {action[4][1]}
+                            </p>
+                          </>
+                        )}
+                      </div>
+                    ),
+                )}
               </div>
 
               <div>
@@ -926,6 +914,13 @@ export default function PatientInfoCard(props: {
                   )}
                 </MenuItem>
               </div>
+
+              <PLUGIN_Component
+                __name="ManagePatientOptions"
+                patient={patient}
+                consultation={consultation}
+              />
+
               <div className="px-4 py-2">
                 <Field as="div" className="flex items-center">
                   <Switch
diff --git a/src/components/Patient/PatientNotes.tsx b/src/components/Patient/PatientNotes.tsx
index 9edbbd2b5d8..9aaa4e79d42 100644
--- a/src/components/Patient/PatientNotes.tsx
+++ b/src/components/Patient/PatientNotes.tsx
@@ -111,7 +111,7 @@ const PatientNotes = (props: PatientNotesProps) => {
       backUrl={`/facility/${facilityId}/patient/${patientId}`}
     >
       <div className="relative mx-3 my-2 flex grow flex-col rounded-lg border border-secondary-300 bg-white p-2 sm:mx-10 sm:my-5 sm:p-5">
-        <div className="absolute inset-x-0 top-0 flex bg-secondary-200 text-sm shadow-md">
+        <div className="absolute inset-x-0 top-0 z-10 flex bg-secondary-200 text-sm shadow-md">
           {keysOf(PATIENT_NOTES_THREADS).map((current) => (
             <button
               id={`patient-note-tab-${current}`}
diff --git a/src/components/Patient/PatientRegister.tsx b/src/components/Patient/PatientRegister.tsx
index a3a8287dd34..bd5b1a2fab8 100644
--- a/src/components/Patient/PatientRegister.tsx
+++ b/src/components/Patient/PatientRegister.tsx
@@ -17,6 +17,13 @@ import {
   RequiredFieldValidator,
 } from "../Form/FieldValidators";
 import { FieldErrorText, FieldLabel } from "../Form/FormFields/FormField";
+import { Occupation, PatientMeta, PatientModel } from "./models";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
 import {
   compareBy,
   dateQueryString,
@@ -25,17 +32,13 @@ import {
   parsePhoneNumber,
   scrollTo,
 } from "../../Utils/utils";
-import { useCallback, useReducer, useRef, useState } from "react";
-import { navigate } from "raviger";
 import { statusType, useAbortableEffect } from "@/common/utils";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "@/components/ui/tooltip";
+import { useCallback, useReducer, useRef, useState } from "react";
+
+import { AbhaNumberModel } from "../ABDM/types/abha";
 import AccordionV2 from "@/components/Common/components/AccordionV2";
 import AutocompleteFormField from "../Form/FormFields/Autocomplete";
+import { Button } from "@/components/ui/button";
 import ButtonV2 from "@/components/Common/components/ButtonV2";
 import CareIcon from "../../CAREUI/icons/CareIcon";
 import CheckBoxFormField from "../Form/FormFields/CheckBoxFormField";
@@ -46,38 +49,35 @@ import DialogModal from "@/components/Common/Dialog";
 import DuplicatePatientDialog from "../Facility/DuplicatePatientDialog";
 import Error404 from "../ErrorPages/404";
 import Form from "../Form/Form";
+import { FormContextValue } from "../Form/FormContext";
 import { HCXPolicyModel } from "../HCX/models";
 import HCXPolicyValidator from "../HCX/validators";
 import { ILocalBodies } from "../ExternalResult/models";
 import InsuranceDetailsBuilder from "../HCX/InsuranceDetailsBuilder";
-import { PatientModel, Occupation, PatientMeta } from "./models";
+import LinkAbhaNumber from "../ABDM/LinkAbhaNumber/index";
+import Loading from "@/components/Common/Loading";
+import PageTitle from "@/components/Common/PageTitle";
 import PhoneNumberFormField from "../Form/FormFields/PhoneNumberFormField";
 import RadioFormField from "../Form/FormFields/RadioFormField";
+import { RestoreDraftButton } from "@/Utils/AutoSave";
 import { SelectFormField } from "../Form/FormFields/SelectFormField";
 import SelectMenuV2 from "../Form/SelectMenuV2";
 import Spinner from "@/components/Common/Spinner";
 import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
 import TextFormField from "../Form/FormFields/TextFormField";
 import TransferPatientDialog from "../Facility/TransferPatientDialog";
+import careConfig from "@careConfig";
 import { startCase, toLower } from "lodash-es";
 import countryList from "@/common/static/countries.json";
 import { debounce } from "lodash-es";
+import { navigate } from "raviger";
 import request from "../../Utils/request/request";
 import routes from "../../Redux/api";
 import useAppHistory from "@/common/hooks/useAppHistory";
 import useAuthUser from "@/common/hooks/useAuthUser";
 import useQuery from "../../Utils/request/useQuery";
 import { useTranslation } from "react-i18next";
-import LinkAbhaNumber from "../ABDM/LinkAbhaNumber/index";
-import { AbhaNumberModel } from "../ABDM/types/abha";
 import { validatePincode } from "@/common/validation";
-import careConfig from "@careConfig";
-import { Button } from "@/components/ui/button";
-
-import Loading from "@/components/Common/Loading";
-import PageTitle from "@/components/Common/PageTitle";
-import { RestoreDraftButton } from "@/Utils/AutoSave";
-import { FormContextValue } from "../Form/FormContext";
 
 type PatientForm = PatientModel &
   PatientMeta & { age?: number; is_postpartum?: boolean };
diff --git a/src/components/Patient/SampleDetails.tsx b/src/components/Patient/SampleDetails.tsx
index aaf524ef0ae..d74b83dff67 100644
--- a/src/components/Patient/SampleDetails.tsx
+++ b/src/components/Patient/SampleDetails.tsx
@@ -273,7 +273,7 @@ export const SampleDetails = ({ id }: DetailRoute) => {
       backUrl="/sample"
       options={
         sampleDetails?.patient && (
-          <div className="flex justify-end">
+          <div className="my-2 flex justify-center md:justify-end">
             <ButtonV2
               href={`/patient/${sampleDetails.patient}/test_sample/${id}/icmr_sample`}
             >
diff --git a/src/components/Patient/models.tsx b/src/components/Patient/models.tsx
index 8c27199461b..b4f35c4dc9b 100644
--- a/src/components/Patient/models.tsx
+++ b/src/components/Patient/models.tsx
@@ -1,5 +1,3 @@
-import { ConsultationModel, PatientCategory } from "../Facility/models";
-import { PerformedByModel } from "../HCX/misc";
 import {
   APPETITE_CHOICES,
   BLADDER_DRAINAGE_CHOICES,
@@ -25,6 +23,9 @@ import {
   URINATION_FREQUENCY_CHOICES,
   VENTILATOR_MODE_OPTIONS,
 } from "@/common/constants";
+import { ConsultationModel, PatientCategory } from "../Facility/models";
+
+import { UserBareMinimum } from "@/components/Users/models";
 
 export interface FlowModel {
   id?: number;
@@ -130,8 +131,8 @@ export interface PatientModel {
   fit_for_blood_donation?: boolean;
   date_declared_positive?: string;
   is_declared_positive?: boolean;
-  last_edited?: PerformedByModel;
-  created_by?: PerformedByModel;
+  last_edited?: UserBareMinimum;
+  created_by?: UserBareMinimum;
   assigned_to?: { first_name?: string; username?: string; last_name?: string };
   assigned_to_object?: AssignedToObjectModel;
   occupation?: Occupation;
@@ -325,8 +326,8 @@ export interface DailyRoundsModel {
   rounds_type?: (typeof DailyRoundTypes)[number];
   last_updated_by_telemedicine?: boolean;
   created_by_telemedicine?: boolean;
-  created_by?: PerformedByModel;
-  last_edited_by?: PerformedByModel;
+  created_by?: UserBareMinimum;
+  last_edited_by?: UserBareMinimum;
   bed?: string;
   pain_scale_enhanced?: IPainScale[];
   in_prone_position?: boolean;
@@ -429,13 +430,13 @@ export interface FileUploadModel {
   associating_id?: string;
   created_date?: string;
   upload_completed?: boolean;
-  uploaded_by?: PerformedByModel;
+  uploaded_by?: UserBareMinimum;
   file_category?: FileCategory;
   read_signed_url?: string;
   is_archived?: boolean;
   archive_reason?: string;
   extension?: string;
-  archived_by?: PerformedByModel;
+  archived_by?: UserBareMinimum;
   archived_datetime?: string;
 }
 
diff --git a/src/components/Resource/ResourceBoard.tsx b/src/components/Resource/ResourceBoard.tsx
index 0f790a8b3b6..f69fd02b555 100644
--- a/src/components/Resource/ResourceBoard.tsx
+++ b/src/components/Resource/ResourceBoard.tsx
@@ -71,6 +71,7 @@ export default function BoardView() {
             value={qParams.title}
             onChange={(e) => updateQuery({ [e.name]: e.value })}
             placeholder={t("search_resource")}
+            className="w-full md:w-60"
           />
           <Tabs
             tabs={[
diff --git a/src/components/Shifting/ShiftDetails.tsx b/src/components/Shifting/ShiftDetails.tsx
index 666bd1bcb38..77250f71e17 100644
--- a/src/components/Shifting/ShiftDetails.tsx
+++ b/src/components/Shifting/ShiftDetails.tsx
@@ -90,7 +90,7 @@ export default function ShiftDetails(props: { id: string }) {
       "\n" +
       t("age") +
       ":" +
-      +(data?.patient_object
+      (data?.patient_object
         ? formatPatientAge(data.patient_object, true)
         : "") +
       "\n" +
diff --git a/src/components/Shifting/ShiftingBoard.tsx b/src/components/Shifting/ShiftingBoard.tsx
index 417f8ef747e..ee65090191a 100644
--- a/src/components/Shifting/ShiftingBoard.tsx
+++ b/src/components/Shifting/ShiftingBoard.tsx
@@ -97,6 +97,7 @@ export default function BoardView() {
             value={qParams.patient_name}
             onChange={(e) => updateQuery({ [e.name]: e.value })}
             placeholder={t("search_patient")}
+            className="w-full md:w-60"
           />
 
           <Tabs
diff --git a/src/pluginTypes.ts b/src/pluginTypes.ts
index 06f75eacb6b..a8d6abb7fb2 100644
--- a/src/pluginTypes.ts
+++ b/src/pluginTypes.ts
@@ -1,21 +1,36 @@
-import { LazyExoticComponent } from "react";
-import { UserAssignedModel } from "@/components/Users/models";
 import { AppRoutes } from "./Routers/AppRouter";
+import { ConsultationModel } from "@/components/Facility/models";
 import { INavItem } from "@/components/Common/Sidebar/Sidebar";
+import { LazyExoticComponent } from "react";
+import { PatientModel } from "@/components/Patient/models";
+import { UserAssignedModel } from "@/components/Users/models";
 import { pluginMap } from "./pluginMap";
 
 // Define the available plugins
-export type AvailablePlugin = "@apps/care_livekit_fe";
+export type AvailablePlugin = "@apps/care_livekit_fe" | "@apps/care_hcx_fe";
 
-export type AvailablePluginManifest = "@app-manifest/care_livekit_fe";
+export type AvailablePluginManifest =
+  | "@app-manifest/care_livekit_fe"
+  | "@app-manifest/care_hcx_fe";
 
 export type DoctorConnectButtonComponentType = React.FC<{
   user: UserAssignedModel;
 }>;
 
+export type ManagePatientOptionsComponentType = React.FC<{
+  consultation: ConsultationModel | undefined;
+  patient: PatientModel;
+}>;
+
+export type AdditionalDischargeProceduresComponentType = React.FC<{
+  consultation: ConsultationModel;
+}>;
+
 // Define supported plugin components
 export type SupportedPluginComponents = {
   DoctorConnectButtons: DoctorConnectButtonComponentType;
+  ManagePatientOptions: ManagePatientOptionsComponentType;
+  AdditionalDischargeProcedures: AdditionalDischargeProceduresComponentType;
 };
 
 // Create a type for lazy-loaded components
diff --git a/tailwind.config.js b/tailwind.config.js
index 3df126955a1..32b25642022 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -83,7 +83,11 @@ module.exports = {
       },
     },
   },
-  content: ["./src/**/*.{html,md,js,jsx,ts,tsx,res}", "./index.html"],
+  content: [
+    "./src/**/*.{html,md,js,jsx,ts,tsx,res}",
+    "./apps/**/*.{html,md,js,jsx,ts,tsx,res}",
+    "./index.html",
+  ],
   plugins: [
     require("@tailwindcss/forms"),
     require("@tailwindcss/typography"),