diff --git a/src/Components/Assets/AssetTypes.tsx b/src/Components/Assets/AssetTypes.tsx
index 8b96b6beeb7..328f127e0c3 100644
--- a/src/Components/Assets/AssetTypes.tsx
+++ b/src/Components/Assets/AssetTypes.tsx
@@ -56,14 +56,6 @@ export const assetClassProps = {
   },
 };
 
-export interface AssetService {
-  id: string;
-  created_date: string;
-  modified_date: string;
-  serviced_on: string;
-  note: string;
-}
-
 export interface AssetData {
   id: string;
   name: string;
diff --git a/src/Components/ExternalResult/ExternalResultUpload.tsx b/src/Components/ExternalResult/ExternalResultUpload.tsx
index 20a2cec3341..8f6648c3133 100644
--- a/src/Components/ExternalResult/ExternalResultUpload.tsx
+++ b/src/Components/ExternalResult/ExternalResultUpload.tsx
@@ -1,4 +1,4 @@
-import _ from "lodash-es";
+import { startCase, camelCase } from "lodash-es";
 import { navigate } from "raviger";
 import { lazy, useState } from "react";
 import CSVReader from "react-csv-reader";
@@ -131,7 +131,7 @@ export default function ExternalResultUpload() {
                       ? errors.map((error: any) => {
                           return (
                             <div key={error[0][0]}>
-                              {_.startCase(_.camelCase(error[0][0]))} -{" "}
+                              {startCase(camelCase(error[0][0]))} -{" "}
                               {error[0][1]}
                             </div>
                           );
diff --git a/src/Components/Facility/Investigations/Reports/index.tsx b/src/Components/Facility/Investigations/Reports/index.tsx
index 9b3c29d40f8..620404b932b 100644
--- a/src/Components/Facility/Investigations/Reports/index.tsx
+++ b/src/Components/Facility/Investigations/Reports/index.tsx
@@ -1,5 +1,5 @@
 import * as Notification from "../../../../Utils/Notifications";
-import _ from "lodash-es";
+import { chain } from "lodash-es";
 import { Group, InvestigationType } from "..";
 import {
   getPatient,
@@ -174,7 +174,7 @@ const InvestigationReports = ({ id }: any) => {
       })
     );
 
-    const investigationList = _.chain(data)
+    const investigationList = chain(data)
       .compact()
       .flatten()
       .map((i) => ({
diff --git a/src/Components/Facility/Investigations/Reports/utils.tsx b/src/Components/Facility/Investigations/Reports/utils.tsx
index e57f3c42c53..46b95800339 100644
--- a/src/Components/Facility/Investigations/Reports/utils.tsx
+++ b/src/Components/Facility/Investigations/Reports/utils.tsx
@@ -1,20 +1,20 @@
-import _ from "lodash-es";
+import { memoize, chain, findIndex } from "lodash-es";
 import { InvestigationResponse } from "./types";
 
-export const transformData = _.memoize((data: InvestigationResponse) => {
-  const sessions = _.chain(data)
+export const transformData = memoize((data: InvestigationResponse) => {
+  const sessions = chain(data)
     .map((value) => value.session_object)
     .uniqBy("session_external_id")
     .orderBy("session_created_date", "desc")
     .value();
-  const groupByInvestigation = _.chain(data)
+  const groupByInvestigation = chain(data)
     .groupBy("investigation_object.external_id")
     .values()
     .value();
   const reqData = groupByInvestigation.map((value) => {
     const sessionValues = Array.from({ length: sessions.length });
     value.forEach((val) => {
-      const sessionIndex = _.findIndex(sessions, [
+      const sessionIndex = findIndex(sessions, [
         "session_external_id",
         val.session_object.session_external_id,
       ]);
@@ -55,7 +55,7 @@ export const transformData = _.memoize((data: InvestigationResponse) => {
   return { sessions, data: reqData };
 });
 
-export const getColorIndex = _.memoize(
+export const getColorIndex = memoize(
   ({ max, min, value }: { min?: number; max?: number; value?: number }) => {
     if (!max && min && value) {
       // 1 => yellow color
diff --git a/src/Components/Facility/Investigations/ShowInvestigation.tsx b/src/Components/Facility/Investigations/ShowInvestigation.tsx
index 00196bb6678..242ab298e5a 100644
--- a/src/Components/Facility/Investigations/ShowInvestigation.tsx
+++ b/src/Components/Facility/Investigations/ShowInvestigation.tsx
@@ -8,7 +8,7 @@ import {
 } from "../../../Redux/actions";
 import PageTitle from "../../Common/PageTitle";
 import InvestigationTable from "./InvestigationTable";
-import _ from "lodash-es";
+import { chain } from "lodash-es";
 import { set } from "lodash-es";
 import { navigate } from "raviger";
 import * as Notification from "../../../Utils/Notifications.js";
@@ -147,7 +147,7 @@ export default function ShowInvestigation(props: any) {
   };
 
   const handleUpdateCancel = useCallback(() => {
-    const changedValues = _.chain(state.initialValues)
+    const changedValues = chain(state.initialValues)
       .map((val: any, _key: string) => ({
         id: val?.id,
         initialValue: val?.notes || val?.value || null,
diff --git a/src/Components/Patient/SampleDetails.tsx b/src/Components/Patient/SampleDetails.tsx
index 9b08395a233..7dca7cce78f 100644
--- a/src/Components/Patient/SampleDetails.tsx
+++ b/src/Components/Patient/SampleDetails.tsx
@@ -7,7 +7,7 @@ import ButtonV2 from "../Common/components/ButtonV2";
 import Card from "../../CAREUI/display/Card";
 import { FileUpload } from "./FileUpload";
 import Page from "../Common/components/Page";
-import _ from "lodash-es";
+import { startCase, camelCase, capitalize } from "lodash-es";
 import { formatAge, formatDateTime } from "../../Utils/utils";
 import { getTestSample } from "../../Redux/actions";
 
@@ -259,11 +259,11 @@ export const SampleDetails = ({ id }: DetailRoute) => {
         <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
           <div>
             <span className="font-semibold leading-relaxed">Status: </span>{" "}
-            {_.startCase(_.camelCase(flow.status))}
+            {startCase(camelCase(flow.status))}
           </div>
           <div>
             <span className="font-semibold leading-relaxed">Label:</span>{" "}
-            {_.capitalize(flow.notes)}
+            {capitalize(flow.notes)}
           </div>
           <div>
             <span className="font-semibold leading-relaxed">Created On :</span>{" "}
@@ -347,7 +347,7 @@ export const SampleDetails = ({ id }: DetailRoute) => {
               <span className="font-semibold leading-relaxed">
                 Doctor&apos;s Name:{" "}
               </span>
-              {_.startCase(_.camelCase(sampleDetails.doctor_name))}
+              {startCase(camelCase(sampleDetails.doctor_name))}
             </div>
           )}
           {sampleDetails.diagnosis && (
@@ -430,7 +430,7 @@ export const SampleDetails = ({ id }: DetailRoute) => {
               <span className="font-semibold capitalize leading-relaxed">
                 Sample Type:{" "}
               </span>
-              {_.startCase(_.camelCase(sampleDetails.sample_type))}
+              {startCase(camelCase(sampleDetails.sample_type))}
             </div>
           )}
         </div>
diff --git a/src/Components/Patient/SampleTestCard.tsx b/src/Components/Patient/SampleTestCard.tsx
index 1ae1ff8671b..4cea2d48f56 100644
--- a/src/Components/Patient/SampleTestCard.tsx
+++ b/src/Components/Patient/SampleTestCard.tsx
@@ -6,7 +6,7 @@ import { SAMPLE_TEST_STATUS } from "../../Common/constants";
 import { patchSample } from "../../Redux/actions";
 import * as Notification from "../../Utils/Notifications";
 import UpdateStatusDialog from "./UpdateStatusDialog";
-import _ from "lodash-es";
+import { startCase, camelCase } from "lodash-es";
 import { formatDateTime } from "../../Utils/utils";
 import ButtonV2 from "../Common/components/ButtonV2";
 import { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
@@ -92,7 +92,7 @@ export const SampleTestCard = (props: SampleDetailsProps) => {
               Status{" "}
             </div>
             <div className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium leading-5">
-              {_.startCase(_.camelCase(itemData.status))}
+              {startCase(camelCase(itemData.status))}
             </div>
           </div>
         </div>
@@ -127,7 +127,7 @@ export const SampleTestCard = (props: SampleDetailsProps) => {
               Result{" "}
             </div>
             <div className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium leading-5">
-              {_.startCase(_.camelCase(itemData.result))}
+              {startCase(camelCase(itemData.result))}
             </div>
           </div>
         </div>
diff --git a/src/Utils/Notifications.js b/src/Utils/Notifications.js
index 188a2f7a61b..298622c35ca 100644
--- a/src/Utils/Notifications.js
+++ b/src/Utils/Notifications.js
@@ -1,6 +1,6 @@
 import { alert, Stack, defaultModules } from "@pnotify/core";
 import * as PNotifyMobile from "@pnotify/mobile";
-import _ from "lodash-es";
+import { startCase, camelCase } from "lodash-es";
 
 defaultModules.set(PNotifyMobile, {});
 
@@ -43,7 +43,7 @@ const notifyError = (error) => {
     errorMsg = error.detail;
   } else {
     for (let [key, value] of Object.entries(error)) {
-      let keyName = _.startCase(_.camelCase(key));
+      let keyName = startCase(camelCase(key));
       if (Array.isArray(value)) {
         const uniques = [...new Set(value)];
         errorMsg += `${keyName} - ${uniques.splice(0, 5).join(", ")}`;
diff --git a/src/index.tsx b/src/index.tsx
index 0c60d9ba2db..c603e92928d 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -7,6 +7,7 @@ import thunk from "redux-thunk";
 import { Provider } from "react-redux";
 import * as Sentry from "@sentry/browser";
 import "./style/index.css";
+// eslint-disable-next-line import/no-unresolved
 import { registerSW } from "virtual:pwa-register";
 
 if ("serviceWorker" in navigator) {
diff --git a/src/types/react-virtualized/index.d.ts b/src/types/react-virtualized/index.d.ts
index 40a4c38a475..f920f659341 100755
--- a/src/types/react-virtualized/index.d.ts
+++ b/src/types/react-virtualized/index.d.ts
@@ -1,3 +1,4 @@
+/* eslint-disable import/no-unresolved */
 // Type definitions for react-virtualized 9.21
 // Project: https://github.com/bvaughn/react-virtualized
 // Definitions by: Kalle Ott <https://github.com/kaoDev>