diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/layout.tsx
index 8901b1ef3a..6818a92b50 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/layout.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/layout.tsx
@@ -37,10 +37,10 @@ export default async function Layout({ children, params }: LayoutProps) {
 						path: `/${orgId}/risk/${riskId}`,
 						label: t("risk.overview"),
 					},
-					{
-						path: `/${orgId}/risk/${riskId}/comments`,
-						label: t("common.comments.title"),
-					},
+					// {
+					// 	path: `/${orgId}/risk/${riskId}/comments`,
+					// 	label: t("common.comments.title"),
+					// },
 				]}
 			/>
 			<main className="mt-8">{children}</main>
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/page.tsx
index 82c9925aec..e69099a7ea 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/page.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/page.tsx
@@ -1,21 +1,12 @@
-import { auth } from "@comp/auth";
-import { Loading } from "@/components/frameworks/loading";
 import { InherentRiskChart } from "@/components/risks/charts/inherent-risk-chart";
 import { ResidualRiskChart } from "@/components/risks/charts/residual-risk-chart";
 import { RiskOverview } from "@/components/risks/risk-overview";
 import type { RiskTaskType } from "@/components/tables/risk-tasks/columns";
-import { DataTable } from "@/components/tables/risk-tasks/data-table";
-import {
-	NoResults,
-	NoTasks,
-} from "@/components/tables/risk-tasks/empty-states";
-import { FilterToolbar } from "@/components/tables/risk-tasks/filter-toolbar";
 import { getServerColumnHeaders } from "@/components/tables/risk-tasks/server-columns";
-import { useUsers } from "@/hooks/use-users";
 import { getI18n } from "@/locales/server";
+import { auth } from "@comp/auth";
 import { db } from "@comp/db";
 import type { TaskStatus } from "@comp/db/types";
-import { Card, CardContent, CardHeader, CardTitle } from "@comp/ui/card";
 import type { Metadata } from "next";
 import { setStaticParamsLocale } from "next-international/server";
 import { headers } from "next/headers";
@@ -68,7 +59,7 @@ export default async function RiskPage({ searchParams, params }: PageProps) {
 		<div className="flex flex-col gap-4">
 			<RiskOverview risk={risk} assignees={assignees} />
 
-			<Card>
+			{/* <Card>
 				<CardHeader>
 					<CardTitle>
 						<div className="flex items-center justify-between gap-2">
@@ -99,7 +90,7 @@ export default async function RiskPage({ searchParams, params }: PageProps) {
 						)}
 					</div>
 				</CardContent>
-			</Card>
+			</Card> */}
 
 			<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
 				<InherentRiskChart risk={risk} />
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/layout.tsx
index 58162efeee..a7ca1c753c 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/layout.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/layout.tsx
@@ -50,10 +50,10 @@ export default async function Layout({ children, params }: LayoutProps) {
 						path: `/${orgId}/vendors/${vendorId}`,
 						label: vendor.name,
 					},
-					{
-						path: `/${orgId}/vendors/${vendorId}/comments`,
-						label: t("common.comments.title"),
-					},
+					// {
+					// 	path: `/${orgId}/vendors/${vendorId}/comments`,
+					// 	label: t("common.comments.title"),
+					// },
 				]}
 			/>
 			<main className="mt-8">{children}</main>