diff --git a/app/[lang]/(live)/@footer/error.tsx b/app/[lang]/(live)/@footer/error.tsx
deleted file mode 100644
index 74d55466e..000000000
--- a/app/[lang]/(live)/@footer/error.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-"use client"
-
-import { env } from "@/env/client"
-
-export default function Error({
-  error,
-}: {
-  error: Error & { digest?: string }
-  reset: () => void
-}) {
-  return (
-    <section>
-      <pre>Unable to render footer</pre>
-      {env.NEXT_PUBLIC_NODE_ENV === "development" && (
-        <div>
-          <div>{error.message}</div>
-          <pre>{error.stack}</pre>
-        </div>
-      )}
-    </section>
-  )
-}
diff --git a/app/[lang]/(live)/@footer/page.tsx b/app/[lang]/(live)/@footer/page.tsx
deleted file mode 100644
index 6bbb494b5..000000000
--- a/app/[lang]/(live)/@footer/page.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { env } from "@/env/server"
-
-import CurrentFooter from "@/components/Current/Footer"
-import Footer, { preload } from "@/components/Footer"
-
-import type { LangParams, PageArgs } from "@/types/params"
-
-export default function FooterSlot({}: PageArgs<LangParams>) {
-  if (env.HIDE_FOR_NEXT_RELEASE) {
-    return <CurrentFooter />
-  }
-
-  preload()
-
-  return <Footer />
-}
diff --git a/app/[lang]/(live)/@header/error.tsx b/app/[lang]/(live)/@header/error.tsx
deleted file mode 100644
index 1ca166561..000000000
--- a/app/[lang]/(live)/@header/error.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-"use client"
-
-import { env } from "@/env/client"
-
-export default function Error({
-  error,
-}: {
-  error: Error & { digest?: string }
-  reset: () => void
-}) {
-  return (
-    <section>
-      <pre>Unable to render header</pre>
-      {env.NEXT_PUBLIC_NODE_ENV === "development" && (
-        <div>
-          <div>{error.message}</div>
-          <pre>{error.stack}</pre>
-        </div>
-      )}
-    </section>
-  )
-}
diff --git a/app/[lang]/(live)/@header/page.tsx b/app/[lang]/(live)/@header/page.tsx
deleted file mode 100644
index ccdc4e65d..000000000
--- a/app/[lang]/(live)/@header/page.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Suspense } from "react"
-
-import { env } from "@/env/server"
-
-import CurrentHeader from "@/components/Current/Header"
-import HeaderFallback from "@/components/Current/Header/HeaderFallback"
-import Header from "@/components/Header"
-
-import type { LangParams, PageArgs } from "@/types/params"
-
-export default function HeaderPage({}: PageArgs<LangParams>) {
-  if (env.HIDE_FOR_NEXT_RELEASE) {
-    return (
-      <Suspense fallback={<HeaderFallback />}>
-        <CurrentHeader />
-      </Suspense>
-    )
-  }
-
-  return <Header />
-}
diff --git a/middlewares/cmsContent.ts b/middlewares/cmsContent.ts
index 166098679..5f5409e0c 100644
--- a/middlewares/cmsContent.ts
+++ b/middlewares/cmsContent.ts
@@ -18,17 +18,13 @@ export const middleware: NextMiddleware = async (request) => {
 
   const pathWithoutTrailingSlash = removeTrailingSlash(nextUrl.pathname)
 
-  const contentTypePathName = pathWithoutTrailingSlash.replace(`/${lang}`, "")
-
   const isPreview = request.nextUrl.pathname.includes("/preview")
 
   const incomingPathName = isPreview
-    ? contentTypePathName.replace("/preview", "")
-    : contentTypePathName
+    ? pathWithoutTrailingSlash.replace("/preview", "")
+    : pathWithoutTrailingSlash
 
-  let { contentType, uid } = await getUidAndContentTypeByPath(
-    pathWithoutTrailingSlash
-  )
+  let { contentType, uid } = await getUidAndContentTypeByPath(incomingPathName)
 
   const searchParams = new URLSearchParams(request.nextUrl.searchParams)
 
@@ -62,7 +58,7 @@ export const middleware: NextMiddleware = async (request) => {
 
   if (!contentType || !uid) {
     throw notFound(
-      `Unable to resolve CMS entry for locale "${lang}": ${contentTypePathName}`
+      `Unable to resolve CMS entry for page "${pathWithoutTrailingSlash}"`
     )
   }
   const headers = getDefaultRequestHeaders(request)
@@ -87,6 +83,7 @@ export const middleware: NextMiddleware = async (request) => {
   }
 
   if (isCurrent) {
+    const contentTypePathName = pathWithoutTrailingSlash.replace(`/${lang}`, "")
     searchParams.set("uid", uid)
     searchParams.set("uri", contentTypePathName)
     return NextResponse.rewrite(