diff --git a/frontend/khaleesi/app/khaleesi/auth/login.tsx b/frontend/khaleesi/app/khaleesi/auth/login.tsx
index fcf6ad21..69daca2e 100644
--- a/frontend/khaleesi/app/khaleesi/auth/login.tsx
+++ b/frontend/khaleesi/app/khaleesi/auth/login.tsx
@@ -5,7 +5,6 @@ import { useContext } from 'react'
 import { AppContext } from '../home/document'
 import { breadcrumb } from '../navigation/breadcrumb'
 import { loginNavigationData } from '../navigation/commonNavigationData'
-import { Session } from './session.server'
 
 
 export const handle = {
@@ -23,6 +22,7 @@ export const meta: MetaFunction = () => {
 }
 
 export const action = async ({ request }: ActionFunctionArgs): Promise<any> => {  // eslint-disable-line @typescript-eslint/no-explicit-any, max-len
+  const { Session } = await import('./session.server')
   const session = new Session()
   await session.init(request)
   const form = await request.formData()
diff --git a/frontend/khaleesi/app/khaleesi/auth/logout.tsx b/frontend/khaleesi/app/khaleesi/auth/logout.tsx
index 12fa32a5..36f528a6 100644
--- a/frontend/khaleesi/app/khaleesi/auth/logout.tsx
+++ b/frontend/khaleesi/app/khaleesi/auth/logout.tsx
@@ -4,7 +4,6 @@ import { useContext } from 'react'
 import { AppContext } from '../home/document'
 import { breadcrumb } from '../navigation/breadcrumb'
 import { logoutNavigationData } from '../navigation/commonNavigationData'
-import { Session } from './session.server'
 
 
 export const handle = {
@@ -22,6 +21,7 @@ export const meta: MetaFunction = () => {
 }
 
 export const action = async ({ request }: ActionFunctionArgs): Promise<TypedResponse<any>> => {  // eslint-disable-line @typescript-eslint/no-explicit-any, max-len
+  const { Session } = await import('./session.server')
   const session = new Session()
   await session.init(request)
   return session.destroy('/')
diff --git a/frontend/khaleesi/app/khaleesi/home/document.tsx b/frontend/khaleesi/app/khaleesi/home/document.tsx
index fd37c0c1..7f5b5541 100644
--- a/frontend/khaleesi/app/khaleesi/home/document.tsx
+++ b/frontend/khaleesi/app/khaleesi/home/document.tsx
@@ -23,7 +23,6 @@ import {
   topNavigationData,
   bottomNavigationData,
 } from '../navigation/commonNavigationData'
-import { Session } from '../auth/session.server'
 
 
 export const handle = {
@@ -46,6 +45,7 @@ type LoaderType = {
 }
 
 export const loader = async ({ request }: LoaderFunctionArgs): Promise<LoaderType> => {
+  const { Session } = await import('../auth/session.server')
   const session = new Session()
   await session.init(request)
   return {
diff --git a/frontend/khaleesi_frontend_tests/app/routes/kitchen.cookbook._index.tsx b/frontend/khaleesi_frontend_tests/app/routes/kitchen.cookbook._index.tsx
index e73e4147..d181cf57 100644
--- a/frontend/khaleesi_frontend_tests/app/routes/kitchen.cookbook._index.tsx
+++ b/frontend/khaleesi_frontend_tests/app/routes/kitchen.cookbook._index.tsx
@@ -1,6 +1,5 @@
 import type { MetaFunction } from '@remix-run/node'
 import { useLoaderData } from '@remix-run/react'
-import { SAWYER } from '../khaleesi/grpc/sawmill.server'
 import type { khaleesi } from '../khaleesi/proto/proto'
 
 export const meta: MetaFunction = () => {
@@ -11,6 +10,7 @@ export const meta: MetaFunction = () => {
 }
 
 export async function loader(): Promise<khaleesi.core.sawmill.EventsList> {
+  const { SAWYER } = await import('../khaleesi/grpc/sawmill.server')
   return SAWYER.getEvents()
 }