diff --git a/apps/web/app/(use-page-wrapper)/apps/page.tsx b/apps/web/app/(use-page-wrapper)/apps/page.tsx
new file mode 100644
index 0000000000..5a5a74cdee
--- /dev/null
+++ b/apps/web/app/(use-page-wrapper)/apps/page.tsx
@@ -0,0 +1,27 @@
+import { withAppDirSsr } from "app/WithAppDirSsr";
+import { PageProps } from "app/_types";
+import { _generateMetadata } from "app/_utils";
+import { cookies, headers } from "next/headers";
+
+import { getServerSideProps } from "@lib/apps/getServerSideProps";
+import { buildLegacyCtx } from "@lib/buildLegacyCtx";
+
+import AppsPage from "~/apps/apps-view";
+
+export const generateMetadata = async () => {
+  return await _generateMetadata(
+    (t) => t("app_store"),
+    (t) => t("app_store_description")
+  );
+};
+
+const getData = withAppDirSsr(getServerSideProps);
+
+const ServerPage = async ({ params, searchParams }: PageProps) => {
+  const context = buildLegacyCtx(headers(), cookies(), params, searchParams);
+
+  const props = await getData(context);
+  return <AppsPage {...props} />;
+};
+
+export default ServerPage;
diff --git a/apps/web/app/availability/[schedule]/page.tsx b/apps/web/app/(use-page-wrapper)/availability/[schedule]/page.tsx
similarity index 96%
rename from apps/web/app/availability/[schedule]/page.tsx
rename to apps/web/app/(use-page-wrapper)/availability/[schedule]/page.tsx
index 1966814577..b3bd4d233a 100644
--- a/apps/web/app/availability/[schedule]/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/availability/[schedule]/page.tsx
@@ -1,6 +1,5 @@
 import type { PageProps } from "app/_types";
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 import { notFound } from "next/navigation";
 import { cache } from "react";
 import { z } from "zod";
@@ -89,4 +88,4 @@ const Page = async ({ params }: PageProps) => {
   );
 };
 
-export default WithLayout({ ServerPage: Page });
+export default Page;
diff --git a/apps/web/app/availability/page.tsx b/apps/web/app/(use-page-wrapper)/availability/page.tsx
similarity index 91%
rename from apps/web/app/availability/page.tsx
rename to apps/web/app/(use-page-wrapper)/availability/page.tsx
index e32e6e2b26..b57cb67683 100644
--- a/apps/web/app/availability/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/availability/page.tsx
@@ -1,5 +1,4 @@
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 import { notFound } from "next/navigation";
 
 // import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
@@ -36,4 +35,4 @@ const Page = async () => {
   }
 };
 
-export default WithLayout({ ServerPage: Page });
+export default Page;
diff --git a/apps/web/app/(use-page-wrapper)/availability/troubleshoot/layout.tsx b/apps/web/app/(use-page-wrapper)/availability/troubleshoot/layout.tsx
new file mode 100644
index 0000000000..1d9fe95878
--- /dev/null
+++ b/apps/web/app/(use-page-wrapper)/availability/troubleshoot/layout.tsx
@@ -0,0 +1,15 @@
+"use client";
+
+import React, { Suspense } from "react";
+
+import { ErrorBoundary, Icon } from "@calcom/ui";
+
+export default function TroubleshooterLayout({ children }: { children: React.ReactNode }) {
+  return (
+    <div className="flex flex-1 [&>*]:flex-1">
+      <ErrorBoundary>
+        <Suspense fallback={<Icon name="loader" />}>{children}</Suspense>
+      </ErrorBoundary>
+    </div>
+  );
+}
diff --git a/apps/web/app/availability/troubleshoot/page.tsx b/apps/web/app/(use-page-wrapper)/availability/troubleshoot/page.tsx
similarity index 51%
rename from apps/web/app/availability/troubleshoot/page.tsx
rename to apps/web/app/(use-page-wrapper)/availability/troubleshoot/page.tsx
index 7ea6a6d97d..245f685524 100644
--- a/apps/web/app/availability/troubleshoot/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/availability/troubleshoot/page.tsx
@@ -1,7 +1,6 @@
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 
-import Troubleshoot, { getLayout } from "~/availability/troubleshoot/troubleshoot-view";
+import Troubleshoot from "~/availability/troubleshoot/troubleshoot-view";
 
 export const generateMetadata = async () => {
   return await _generateMetadata(
@@ -10,4 +9,4 @@ export const generateMetadata = async () => {
   );
 };
 
-export default WithLayout({ getLayout, Page: Troubleshoot });
+export default Troubleshoot;
diff --git a/apps/web/app/event-types/[type]/page.tsx b/apps/web/app/(use-page-wrapper)/event-types/[type]/page.tsx
similarity index 56%
rename from apps/web/app/event-types/[type]/page.tsx
rename to apps/web/app/(use-page-wrapper)/event-types/[type]/page.tsx
index 2c151f3a27..44d7b43f87 100644
--- a/apps/web/app/event-types/[type]/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/event-types/[type]/page.tsx
@@ -1,15 +1,15 @@
 import { withAppDirSsr } from "app/WithAppDirSsr";
-import type { PageProps } from "app/_types";
+import type { PageProps as _PageProps } from "app/_types";
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 import { cookies, headers } from "next/headers";
 
 import { buildLegacyCtx } from "@lib/buildLegacyCtx";
+import type { PageProps as EventTypePageProps } from "@lib/event-types/[type]/getServerSideProps";
 import { getServerSideProps } from "@lib/event-types/[type]/getServerSideProps";
 
 import EventTypePageWrapper from "~/event-types/views/event-types-single-view";
 
-export const generateMetadata = async ({ params, searchParams }: PageProps) => {
+export const generateMetadata = async ({ params, searchParams }: _PageProps) => {
   const legacyCtx = buildLegacyCtx(headers(), cookies(), params, searchParams);
   const { eventType } = await getData(legacyCtx);
 
@@ -19,6 +19,13 @@ export const generateMetadata = async ({ params, searchParams }: PageProps) => {
   );
 };
 
-const getData = withAppDirSsr(getServerSideProps);
+const getData = withAppDirSsr<EventTypePageProps>(getServerSideProps);
 
-export default WithLayout({ getLayout: null, getData, Page: EventTypePageWrapper })<"P">;
+const ServerPage = async ({ params, searchParams }: _PageProps) => {
+  const legacyCtx = buildLegacyCtx(headers(), cookies(), params, searchParams);
+  const props = await getData(legacyCtx);
+
+  return <EventTypePageWrapper {...props} />;
+};
+
+export default ServerPage;
diff --git a/apps/web/app/event-types/page.tsx b/apps/web/app/(use-page-wrapper)/event-types/page.tsx
similarity index 90%
rename from apps/web/app/event-types/page.tsx
rename to apps/web/app/(use-page-wrapper)/event-types/page.tsx
index b504f3ca5d..ab4a0f7e16 100644
--- a/apps/web/app/event-types/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/event-types/page.tsx
@@ -1,6 +1,5 @@
 import type { PageProps } from "app/_types";
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 import { cookies, headers } from "next/headers";
 import { redirect } from "next/navigation";
 
@@ -30,4 +29,4 @@ const Page = async ({ params, searchParams }: PageProps) => {
   return <EventTypes />;
 };
 
-export default WithLayout({ ServerPage: Page })<"P">;
+export default Page;
diff --git a/apps/web/app/(use-page-wrapper)/getting-started/[[...step]]/page.tsx b/apps/web/app/(use-page-wrapper)/getting-started/[[...step]]/page.tsx
new file mode 100644
index 0000000000..0a347eae7c
--- /dev/null
+++ b/apps/web/app/(use-page-wrapper)/getting-started/[[...step]]/page.tsx
@@ -0,0 +1,31 @@
+import { withAppDirSsr } from "app/WithAppDirSsr";
+import type { PageProps as ServerPageProps } from "app/_types";
+import { _generateMetadata } from "app/_utils";
+import { cookies, headers } from "next/headers";
+
+import { APP_NAME } from "@calcom/lib/constants";
+
+import { buildLegacyCtx } from "@lib/buildLegacyCtx";
+import { getServerSideProps } from "@lib/getting-started/[[...step]]/getServerSideProps";
+
+import type { PageProps as ClientPageProps } from "~/getting-started/[[...step]]/onboarding-view";
+import Page from "~/getting-started/[[...step]]/onboarding-view";
+
+export const generateMetadata = async () => {
+  return await _generateMetadata(
+    (t) => `${APP_NAME} - ${t("getting_started")}`,
+    () => "",
+    true
+  );
+};
+
+const getData = withAppDirSsr<ClientPageProps>(getServerSideProps);
+
+const ServerPage = async ({ params, searchParams }: ServerPageProps) => {
+  const context = buildLegacyCtx(headers(), cookies(), params, searchParams);
+
+  const props = await getData(context);
+  return <Page {...props} />;
+};
+
+export default ServerPage;
diff --git a/apps/web/modules/insights/layout.tsx b/apps/web/app/(use-page-wrapper)/insights/layout.tsx
similarity index 88%
rename from apps/web/modules/insights/layout.tsx
rename to apps/web/app/(use-page-wrapper)/insights/layout.tsx
index 35c3f386e7..df6bd32be6 100644
--- a/apps/web/modules/insights/layout.tsx
+++ b/apps/web/app/(use-page-wrapper)/insights/layout.tsx
@@ -1,18 +1,17 @@
 "use client";
 
-import type { ReactElement } from "react";
+import { useSession } from "next-auth/react";
 
 import Shell from "@calcom/features/shell/Shell";
 import { UpgradeTip } from "@calcom/features/tips";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { trpc } from "@calcom/trpc";
 import { Button, ButtonGroup } from "@calcom/ui";
 import { Icon } from "@calcom/ui";
 
 export default function InsightsLayout({ children }: { children: React.ReactNode }) {
   const { t } = useLocale();
-  const { data: user } = trpc.viewer.me.useQuery();
+  const session = useSession();
 
   const features = [
     {
@@ -59,11 +58,9 @@ export default function InsightsLayout({ children }: { children: React.ReactNode
               </ButtonGroup>
             </div>
           }>
-          {!user ? null : children}
+          {!session.data?.user ? null : children}
         </UpgradeTip>
       </Shell>
     </div>
   );
 }
-
-export const getInsightsLayout = (page: ReactElement) => <InsightsLayout>{page}</InsightsLayout>;
diff --git a/apps/web/app/insights/page.tsx b/apps/web/app/(use-page-wrapper)/insights/page.tsx
similarity index 100%
rename from apps/web/app/insights/page.tsx
rename to apps/web/app/(use-page-wrapper)/insights/page.tsx
diff --git a/apps/web/app/insights/routing/page.tsx b/apps/web/app/(use-page-wrapper)/insights/routing/page.tsx
similarity index 100%
rename from apps/web/app/insights/routing/page.tsx
rename to apps/web/app/(use-page-wrapper)/insights/routing/page.tsx
diff --git a/apps/web/app/insights/virtual-queues/page.tsx b/apps/web/app/(use-page-wrapper)/insights/virtual-queues/page.tsx
similarity index 100%
rename from apps/web/app/insights/virtual-queues/page.tsx
rename to apps/web/app/(use-page-wrapper)/insights/virtual-queues/page.tsx
diff --git a/apps/web/app/signup/page.tsx b/apps/web/app/(use-page-wrapper)/signup/page.tsx
similarity index 55%
rename from apps/web/app/signup/page.tsx
rename to apps/web/app/(use-page-wrapper)/signup/page.tsx
index ff1a9cd80a..64005a84f8 100644
--- a/apps/web/app/signup/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/signup/page.tsx
@@ -1,7 +1,10 @@
 import { withAppDirSsr } from "app/WithAppDirSsr";
+import { PageProps } from "app/_types";
 import { _generateMetadata } from "app/_utils";
 import { WithLayout } from "app/layoutHOC";
+import { cookies, headers } from "next/headers";
 
+import { buildLegacyCtx } from "@lib/buildLegacyCtx";
 import { getServerSideProps } from "@lib/signup/getServerSideProps";
 
 import type { SignupProps } from "~/signup-view";
@@ -15,8 +18,11 @@ export const generateMetadata = async () =>
 
 const getData = withAppDirSsr<SignupProps>(getServerSideProps);
 
-export default WithLayout({
-  Page: Signup,
-  getLayout: null,
-  getData,
-})<"P">;
+const ServerPage = async ({ params, searchParams }: PageProps) => {
+  const context = buildLegacyCtx(headers(), cookies(), params, searchParams);
+
+  const props = await getData(context);
+  return <Signup {...props} />;
+};
+
+export default ServerPage;
diff --git a/apps/web/app/video/[uid]/page.tsx b/apps/web/app/(use-page-wrapper)/video/[uid]/page.tsx
similarity index 60%
rename from apps/web/app/video/[uid]/page.tsx
rename to apps/web/app/(use-page-wrapper)/video/[uid]/page.tsx
index 5e04b560ce..4e034265dc 100644
--- a/apps/web/app/video/[uid]/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/video/[uid]/page.tsx
@@ -1,12 +1,14 @@
 import { withAppDirSsr } from "app/WithAppDirSsr";
+import type { PageProps as ServerPageProps } from "app/_types";
 import { getTranslate } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
+import { cookies, headers } from "next/headers";
 
 import { APP_NAME, SEO_IMG_OGIMG_VIDEO, WEBSITE_URL } from "@calcom/lib/constants";
 
+import { buildLegacyCtx } from "@lib/buildLegacyCtx";
 import { getServerSideProps } from "@lib/video/[uid]/getServerSideProps";
 
-import type { PageProps } from "~/videos/views/videos-single-view";
+import type { PageProps as ClientPageProps } from "~/videos/views/videos-single-view";
 import VideosSingleView from "~/videos/views/videos-single-view";
 
 export const generateMetadata = async () => {
@@ -34,6 +36,13 @@ export const generateMetadata = async () => {
   };
 };
 
-const getData = withAppDirSsr<PageProps>(getServerSideProps);
+const getData = withAppDirSsr<ClientPageProps>(getServerSideProps);
 
-export default WithLayout({ getData, Page: VideosSingleView, getLayout: null })<"P">;
+const ServerPage = async ({ params, searchParams }: ServerPageProps) => {
+  const context = buildLegacyCtx(headers(), cookies(), params, searchParams);
+
+  const props = await getData(context);
+  return <VideosSingleView {...props} />;
+};
+
+export default ServerPage;
diff --git a/apps/web/app/(use-page-wrapper)/video/meeting-ended/[uid]/page.tsx b/apps/web/app/(use-page-wrapper)/video/meeting-ended/[uid]/page.tsx
new file mode 100644
index 0000000000..106a64803d
--- /dev/null
+++ b/apps/web/app/(use-page-wrapper)/video/meeting-ended/[uid]/page.tsx
@@ -0,0 +1,27 @@
+import { withAppDirSsr } from "app/WithAppDirSsr";
+import { PageProps as ServerPageProps } from "app/_types";
+import { _generateMetadata } from "app/_utils";
+import { cookies, headers } from "next/headers";
+
+import { buildLegacyCtx } from "@lib/buildLegacyCtx";
+import { getServerSideProps } from "@lib/video/meeting-ended/[uid]/getServerSideProps";
+
+import type { PageProps as ClientPageProps } from "~/videos/views/videos-meeting-ended-single-view";
+import MeetingEnded from "~/videos/views/videos-meeting-ended-single-view";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("meeting_unavailable"),
+    (t) => t("meeting_unavailable")
+  );
+
+const getData = withAppDirSsr<ClientPageProps>(getServerSideProps);
+
+const ServerPage = async ({ params, searchParams }: ServerPageProps) => {
+  const context = buildLegacyCtx(headers(), cookies(), params, searchParams);
+
+  const props = await getData(context);
+  return <MeetingEnded {...props} />;
+};
+
+export default ServerPage;
diff --git a/apps/web/app/video/meeting-not-started/[uid]/page.tsx b/apps/web/app/(use-page-wrapper)/video/meeting-not-started/[uid]/page.tsx
similarity index 54%
rename from apps/web/app/video/meeting-not-started/[uid]/page.tsx
rename to apps/web/app/(use-page-wrapper)/video/meeting-not-started/[uid]/page.tsx
index 33b216b659..c31aec6264 100644
--- a/apps/web/app/video/meeting-not-started/[uid]/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/video/meeting-not-started/[uid]/page.tsx
@@ -1,22 +1,23 @@
 import { withAppDirSsr } from "app/WithAppDirSsr";
-import type { PageProps as _PageProps } from "app/_types";
+import type { PageProps as ServerPageProps } from "app/_types";
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
+import { cookies, headers } from "next/headers";
 import { notFound } from "next/navigation";
 import { z } from "zod";
 
 import { BookingRepository } from "@calcom/lib/server/repository/booking";
 
+import { buildLegacyCtx } from "@lib/buildLegacyCtx";
 import { getServerSideProps } from "@lib/video/meeting-not-started/[uid]/getServerSideProps";
 
-import type { PageProps } from "~/videos/views/videos-meeting-not-started-single-view";
+import type { PageProps as ClientPageProps } from "~/videos/views/videos-meeting-not-started-single-view";
 import MeetingNotStarted from "~/videos/views/videos-meeting-not-started-single-view";
 
 const querySchema = z.object({
   uid: z.string(),
 });
 
-export const generateMetadata = async ({ params }: _PageProps) => {
+export const generateMetadata = async ({ params }: ServerPageProps) => {
   const parsed = querySchema.safeParse(params);
   if (!parsed.success) {
     notFound();
@@ -31,6 +32,13 @@ export const generateMetadata = async ({ params }: _PageProps) => {
   );
 };
 
-const getData = withAppDirSsr<PageProps>(getServerSideProps);
+const getData = withAppDirSsr<ClientPageProps>(getServerSideProps);
 
-export default WithLayout({ getData, Page: MeetingNotStarted, getLayout: null })<"P">;
+const ServerPage = async ({ params, searchParams }: ServerPageProps) => {
+  const context = buildLegacyCtx(headers(), cookies(), params, searchParams);
+
+  const props = await getData(context);
+  return <MeetingNotStarted {...props} />;
+};
+
+export default ServerPage;
diff --git a/apps/web/app/video/no-meeting-found/page.tsx b/apps/web/app/(use-page-wrapper)/video/no-meeting-found/page.tsx
similarity index 69%
rename from apps/web/app/video/no-meeting-found/page.tsx
rename to apps/web/app/(use-page-wrapper)/video/no-meeting-found/page.tsx
index 09823fb1d0..abb6e246c7 100644
--- a/apps/web/app/video/no-meeting-found/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/video/no-meeting-found/page.tsx
@@ -1,5 +1,4 @@
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 
 import NoMeetingFound from "~/videos/views/videos-no-meeting-found-single-view";
 
@@ -9,4 +8,4 @@ export const generateMetadata = async () =>
     (t) => t("no_meeting_found")
   );
 
-export default WithLayout({ Page: NoMeetingFound, getLayout: null })<"P">;
+export default NoMeetingFound;
diff --git a/apps/web/app/workflows/[workflow]/page.tsx b/apps/web/app/(use-page-wrapper)/workflows/[workflow]/page.tsx
similarity index 95%
rename from apps/web/app/workflows/[workflow]/page.tsx
rename to apps/web/app/(use-page-wrapper)/workflows/[workflow]/page.tsx
index 298dc20a02..590f3aee3e 100644
--- a/apps/web/app/workflows/[workflow]/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/workflows/[workflow]/page.tsx
@@ -1,6 +1,5 @@
 import type { PageProps } from "app/_types";
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 import type { Metadata } from "next";
 import { notFound } from "next/navigation";
 import { cache } from "react";
@@ -70,7 +69,7 @@ const Page = async ({ params }: PageProps) => {
   );
 };
 
-export default WithLayout({ getLayout: null, ServerPage: Page });
+export default Page;
 export const dynamic = "force-static";
 // generate segments on demand
 export const dynamicParams = true;
diff --git a/apps/web/app/workflows/page.tsx b/apps/web/app/(use-page-wrapper)/workflows/page.tsx
similarity index 91%
rename from apps/web/app/workflows/page.tsx
rename to apps/web/app/(use-page-wrapper)/workflows/page.tsx
index 2397d58adf..ea685fd9f2 100644
--- a/apps/web/app/workflows/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/workflows/page.tsx
@@ -1,6 +1,5 @@
 import type { PageProps } from "app/_types";
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 
 // import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 // import { getTeamsFiltersFromQuery } from "@calcom/features/filters/lib/getTeamsFiltersFromQuery";
@@ -37,4 +36,4 @@ const Page = async ({ params, searchParams }: PageProps) => {
   );
 };
 
-export default WithLayout({ getLayout: null, ServerPage: Page })<"P">;
+export default Page;
diff --git a/apps/web/app/apps/page.tsx b/apps/web/app/apps/page.tsx
deleted file mode 100644
index 7509cfb5fd..0000000000
--- a/apps/web/app/apps/page.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { withAppDirSsr } from "app/WithAppDirSsr";
-import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
-
-import { getServerSideProps } from "@lib/apps/getServerSideProps";
-
-import AppsPage from "~/apps/apps-view";
-
-export const generateMetadata = async () => {
-  return await _generateMetadata(
-    (t) => t("app_store"),
-    (t) => t("app_store_description")
-  );
-};
-
-export default WithLayout({
-  getData: withAppDirSsr(getServerSideProps),
-  Page: AppsPage,
-});
diff --git a/apps/web/app/getting-started/[[...step]]/page.tsx b/apps/web/app/getting-started/[[...step]]/page.tsx
deleted file mode 100644
index 7a1a5298e6..0000000000
--- a/apps/web/app/getting-started/[[...step]]/page.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { withAppDirSsr } from "app/WithAppDirSsr";
-import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
-
-import { APP_NAME } from "@calcom/lib/constants";
-
-import { getServerSideProps } from "@lib/getting-started/[[...step]]/getServerSideProps";
-
-import type { PageProps } from "~/getting-started/[[...step]]/onboarding-view";
-import Page from "~/getting-started/[[...step]]/onboarding-view";
-
-export const generateMetadata = async () => {
-  return await _generateMetadata(
-    (t) => `${APP_NAME} - ${t("getting_started")}`,
-    () => "",
-    true
-  );
-};
-
-export default WithLayout({
-  getLayout: null,
-  getData: withAppDirSsr<PageProps>(getServerSideProps),
-  Page,
-});
diff --git a/apps/web/app/insights/layout.tsx b/apps/web/app/insights/layout.tsx
deleted file mode 100644
index ad256d0356..0000000000
--- a/apps/web/app/insights/layout.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { WithLayout } from "app/layoutHOC";
-
-import { getInsightsLayout } from "~/insights/layout";
-
-export default WithLayout({ getLayout: getInsightsLayout });
diff --git a/apps/web/app/video/meeting-ended/[uid]/page.tsx b/apps/web/app/video/meeting-ended/[uid]/page.tsx
deleted file mode 100644
index eaefcfa5da..0000000000
--- a/apps/web/app/video/meeting-ended/[uid]/page.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { withAppDirSsr } from "app/WithAppDirSsr";
-import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
-
-import { getServerSideProps } from "@lib/video/meeting-ended/[uid]/getServerSideProps";
-
-import type { PageProps } from "~/videos/views/videos-meeting-ended-single-view";
-import MeetingEnded from "~/videos/views/videos-meeting-ended-single-view";
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    (t) => t("meeting_unavailable"),
-    (t) => t("meeting_unavailable")
-  );
-
-const getData = withAppDirSsr<PageProps>(getServerSideProps);
-
-export default WithLayout({ getData, Page: MeetingEnded, getLayout: null })<"P">;
diff --git a/apps/web/modules/availability/troubleshoot/troubleshoot-view.tsx b/apps/web/modules/availability/troubleshoot/troubleshoot-view.tsx
index 9827abd705..9d4971d325 100644
--- a/apps/web/modules/availability/troubleshoot/troubleshoot-view.tsx
+++ b/apps/web/modules/availability/troubleshoot/troubleshoot-view.tsx
@@ -26,6 +26,5 @@ function TroubleshooterPage() {
     </>
   );
 }
-export { getLayout } from "@calcom/features/troubleshooter/layout";
 
 export default TroubleshooterPage;
diff --git a/apps/web/playwright/event-types.e2e.ts b/apps/web/playwright/event-types.e2e.ts
index 002a6a3074..2293747285 100644
--- a/apps/web/playwright/event-types.e2e.ts
+++ b/apps/web/playwright/event-types.e2e.ts
@@ -75,6 +75,9 @@ test.describe("Event Types tests", () => {
       const eventTitle = `my recurring event ${nonce}`;
       await createNewEventType(page, { eventTitle });
 
+      // eslint-disable-next-line playwright/no-wait-for-timeout
+      await page.waitForTimeout(1000); // waits for 1 second
+
       await page.click("[data-testid=vertical-tab-recurring]");
       await expect(page.locator("[data-testid=recurring-event-collapsible]")).toBeHidden();
       await page.click("[data-testid=recurring-event-check]");
diff --git a/packages/features/troubleshooter/layout.tsx b/packages/features/troubleshooter/layout.tsx
deleted file mode 100644
index e6ef95938c..0000000000
--- a/packages/features/troubleshooter/layout.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import type { ComponentProps } from "react";
-import React, { Suspense } from "react";
-
-import type Shell from "@calcom/features/shell/Shell";
-import { ErrorBoundary, Icon } from "@calcom/ui";
-
-export default function TroubleshooterLayout({
-  children,
-}: { children: React.ReactNode } & ComponentProps<typeof Shell>) {
-  return (
-    <div className="flex flex-1 [&>*]:flex-1">
-      <ErrorBoundary>
-        <Suspense fallback={<Icon name="loader" />}>{children}</Suspense>
-      </ErrorBoundary>
-    </div>
-  );
-}
-
-export const getLayout = (page: React.ReactElement) => <TroubleshooterLayout>{page}</TroubleshooterLayout>;