diff --git a/.eslintrc.json b/.eslintrc.json
index 5d579fc3..25643394 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -51,14 +51,13 @@
         "react-hooks/rules-of-hooks": "error",
         "react-hooks/exhaustive-deps": "warn"
     },
-    {
-        "overrides": [
-          {
-            "files": ["**/__tests__/**/*"],
-            "env": {
-              "jest": true
-            }
-          }
-        ]
-    }
+    "overrides": [
+        {
+        "files": ["**/__tests__/**/*"],
+        "env": {
+            "jest": true
+        }
+        }
+    ]
+
 }
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index bff9e724..1578eb41 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -15,7 +15,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 20
 
       # ESLint must be in `package.json`
       - name: Install Node.js linting dependencies
diff --git a/patientsearch/src/js/components/Error.js b/patientsearch/src/js/components/Error.js
index f7992cd8..d6526fe0 100644
--- a/patientsearch/src/js/components/Error.js
+++ b/patientsearch/src/js/components/Error.js
@@ -19,8 +19,8 @@ const useStyles = makeStyles((theme) => ({
 }));
 
 export default function ErrorMessage(props) {
-  if (!props.message) return null;
   const classes = useStyles();
+  if (!props.message) return null;
   return (
     <div
       className={classes.root}
diff --git a/patientsearch/src/js/components/FormattedInput.js b/patientsearch/src/js/components/FormattedInput.js
index 07ca5869..31740bcf 100644
--- a/patientsearch/src/js/components/FormattedInput.js
+++ b/patientsearch/src/js/components/FormattedInput.js
@@ -16,6 +16,8 @@ const useStyles = makeStyles((theme) => ({
   },
 }));
 const TextMaskCustom = forwardRef((props, setRef) => {
+  /* eslint-disable no-unused-vars  */
+  /* eslint-disable react/prop-types */
   const { ownerState, ...other } = props;
   return (
     <MaskedInput
diff --git a/patientsearch/src/js/components/UrineScreen.js b/patientsearch/src/js/components/UrineScreen.js
index c98d8f28..daba35a4 100644
--- a/patientsearch/src/js/components/UrineScreen.js
+++ b/patientsearch/src/js/components/UrineScreen.js
@@ -276,7 +276,6 @@ export default function UrineScreen(props) {
           type: type,
           text: text,
           date: date,
-          index: index,
           patientId: getPatientId(),
         };
       });
diff --git a/patientsearch/src/js/helpers/test-utils.js b/patientsearch/src/js/helpers/test-utils.js
index fb7337b6..f7021a3e 100644
--- a/patientsearch/src/js/helpers/test-utils.js
+++ b/patientsearch/src/js/helpers/test-utils.js
@@ -2,6 +2,7 @@ import React from "react";
 import { render } from "@testing-library/react";
 import ProjectThemeProvider from "../context/ProjectThemeProvider";
 
+/* eslint-disable react/prop-types */
 const AllTheProviders = ({ children }) => {
   return (
       <ProjectThemeProvider>{children}</ProjectThemeProvider>
diff --git a/webpack.config.js b/webpack.config.js
index 2a23b096..71abb578 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -4,7 +4,6 @@ const TerserWebpackPlugin = require("terser-webpack-plugin");
 const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
 //const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const HtmlWebpackPlugin = require("html-webpack-plugin");
-const { CleanWebpackPlugin } = require("clean-webpack-plugin");
 const FileManagerPlugin = require("filemanager-webpack-plugin");
 const NodePolyfillPlugin = require("node-polyfill-webpack-plugin");
 /* document title is being populated at runtime, this is just a placeholder */
@@ -29,6 +28,7 @@ module.exports = (env) => {
         util: require.resolve("util/"),
         stream: require.resolve("stream-browserify"),
       },
+      extensions: [".js", ".jsx", ".css"]
     },
     devtool: isDevelopment? "eval" : "nosources-cheap-source-map",
     mode: isDevelopment?"development":"production",
@@ -59,9 +59,6 @@ module.exports = (env) => {
       filename: "app.bundle.[name]-[hash:6].js",
       publicPath: "/static/js/",
     },
-    resolve: {
-      extensions: [".js", ".jsx", ".css"],
-    },
     module: {
       rules: [
         //parse css files
@@ -108,9 +105,6 @@ module.exports = (env) => {
     },
     plugins: [
       new NodePolyfillPlugin(),
-      // new CleanWebpackPlugin({
-      //   cleanOnceBeforeBuildPatterns: [path.join(__dirname, "/patientsearch/dist")]
-      // }),
       new HtmlWebpackPlugin({
         title: appTitle,
         template: templateFilePath,