diff --git a/next.config.ts b/next.config.ts
index 517c438532..1d0afeba7c 100644
--- a/next.config.ts
+++ b/next.config.ts
@@ -42,7 +42,6 @@ const nextConfig: NextConfig = {
   devIndicators: false,
   experimental: {
     cpus: 1,
-    optimizePackageImports: ["lucide-react"],
   },
   poweredByHeader: false,
   turbopack: {
diff --git a/src/app/documents/[id]/loading.tsx b/src/app/documents/[id]/loading.tsx
deleted file mode 100644
index 81ca711676..0000000000
--- a/src/app/documents/[id]/loading.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function Loading() {
-  return (
-    <div className="flex h-screen items-center justify-center bg-[color:var(--background)]">
-      <div className="h-8 w-8 animate-spin rounded-full border-4 border-[color:var(--accent)] border-t-transparent" />
-    </div>
-  );
-}
diff --git a/src/app/documents/[id]/page.tsx b/src/app/documents/[id]/page.tsx
index b6de4af8b5..0950bc1fb1 100644
--- a/src/app/documents/[id]/page.tsx
+++ b/src/app/documents/[id]/page.tsx
@@ -1,9 +1,4 @@
-import dynamic from "next/dynamic";
-
-const DocumentViewer = dynamic(
-  () => import("@/components/DocumentViewer").then((m) => m.DocumentViewer),
-  { ssr: false },
-);
+import { DocumentViewer } from "@/components/DocumentViewer";
 
 export default async function DocumentPage({
   params,
diff --git a/src/app/loading.tsx b/src/app/loading.tsx
deleted file mode 100644
index 81ca711676..0000000000
--- a/src/app/loading.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function Loading() {
-  return (
-    <div className="flex h-screen items-center justify-center bg-[color:var(--background)]">
-      <div className="h-8 w-8 animate-spin rounded-full border-4 border-[color:var(--accent)] border-t-transparent" />
-    </div>
-  );
-}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 73ba714477..40d4f1a758 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,11 +1,6 @@
-import dynamic from "next/dynamic";
+import { ClinicalDashboard } from "@/components/clinical-dashboard";
 import { isAppModeId, isAppModeVisible, type AppModeId } from "@/lib/app-modes";
 
-const ClinicalDashboard = dynamic(
-  () => import("@/components/clinical-dashboard").then((m) => m.ClinicalDashboard),
-  { ssr: false },
-);
-
 type HomeProps = {
   searchParams?: Promise<{
     mode?: string | string[];
diff --git a/src/components/ClinicalDashboard.tsx b/src/components/ClinicalDashboard.tsx
index b87bee2de1..eaee4b8d3a 100644
--- a/src/components/ClinicalDashboard.tsx
+++ b/src/components/ClinicalDashboard.tsx
@@ -53,7 +53,6 @@ import {
 import {
   type CSSProperties,
   FormEvent,
-  memo,
   useCallback,
   useEffect,
   useMemo,
@@ -510,7 +509,7 @@ function subscribeAuthEmail(onStoreChange: () => void) {
   };
 }
 
-const SourceImage = memo(function SourceImage({
+function SourceImage({
   endpoint,
   caption,
   className = "max-h-52",
@@ -610,7 +609,7 @@ const SourceImage = memo(function SourceImage({
       className={cn(className, "w-full rounded-lg object-contain")}
     />
   );
-});
+}
 
 function ScopeAndGovernanceNotice({
   scope,