diff --git a/apps/starter-templates/next-js-starter/package.json b/apps/starter-templates/next-js-starter/package.json
index 433d9f37e..1e32cce93 100644
--- a/apps/starter-templates/next-js-starter/package.json
+++ b/apps/starter-templates/next-js-starter/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"scripts": {
 		"dev": "next dev --turbopack",
-		"build": "next build --turbopack",
+		"build": "next build",
 		"start": "next start"
 	},
 	"dependencies": {
diff --git a/apps/starter-templates/next-js-starter/src/app/demo/_actions.ts b/apps/starter-templates/next-js-starter/src/app/demo/_actions.ts
index e19860fe8..ac9165700 100644
--- a/apps/starter-templates/next-js-starter/src/app/demo/_actions.ts
+++ b/apps/starter-templates/next-js-starter/src/app/demo/_actions.ts
@@ -2,18 +2,8 @@
 
 import { getRootAgent } from "@/agents";
 
-let agentRunner: Awaited<ReturnType<typeof getRootAgent>>["runner"];
-
-async function getAgentRunner() {
-	if (!agentRunner) {
-		const { runner } = await getRootAgent();
-		agentRunner = runner;
-	}
-	return agentRunner;
-}
-
 export async function askAgent(message: string) {
-	const runner = await getAgentRunner();
+	const { runner } = await getRootAgent();
 	const result = await runner.ask(message);
 	return result;
 }
diff --git a/apps/starter-templates/next-js-starter/src/components/ui/card.tsx b/apps/starter-templates/next-js-starter/src/components/ui/card.tsx
deleted file mode 100644
index 4722c0e3e..000000000
--- a/apps/starter-templates/next-js-starter/src/components/ui/card.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import * as React from "react";
-
-import { cn } from "@/lib/utils";
-
-function Card({ className, ...props }: React.ComponentProps<"div">) {
-	return (
-		<div
-			data-slot="card"
-			className={cn(
-				"bg-card text-card-foreground flex flex-col gap-6 rounded-xl border py-6 shadow-sm",
-				className,
-			)}
-			{...props}
-		/>
-	);
-}
-
-function CardHeader({ className, ...props }: React.ComponentProps<"div">) {
-	return (
-		<div
-			data-slot="card-header"
-			className={cn(
-				"@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-2 px-6 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6",
-				className,
-			)}
-			{...props}
-		/>
-	);
-}
-
-function CardTitle({ className, ...props }: React.ComponentProps<"div">) {
-	return (
-		<div
-			data-slot="card-title"
-			className={cn("leading-none font-semibold", className)}
-			{...props}
-		/>
-	);
-}
-
-function CardDescription({ className, ...props }: React.ComponentProps<"div">) {
-	return (
-		<div
-			data-slot="card-description"
-			className={cn("text-muted-foreground text-sm", className)}
-			{...props}
-		/>
-	);
-}
-
-function CardAction({ className, ...props }: React.ComponentProps<"div">) {
-	return (
-		<div
-			data-slot="card-action"
-			className={cn(
-				"col-start-2 row-span-2 row-start-1 self-start justify-self-end",
-				className,
-			)}
-			{...props}
-		/>
-	);
-}
-
-function CardContent({ className, ...props }: React.ComponentProps<"div">) {
-	return (
-		<div
-			data-slot="card-content"
-			className={cn("px-6", className)}
-			{...props}
-		/>
-	);
-}
-
-function CardFooter({ className, ...props }: React.ComponentProps<"div">) {
-	return (
-		<div
-			data-slot="card-footer"
-			className={cn("flex items-center px-6 [.border-t]:pt-6", className)}
-			{...props}
-		/>
-	);
-}
-
-export {
-	Card,
-	CardHeader,
-	CardFooter,
-	CardTitle,
-	CardAction,
-	CardDescription,
-	CardContent,
-};