diff --git a/README.md b/README.md
index ef679e726..dc626d83b 100644
--- a/README.md
+++ b/README.md
@@ -644,7 +644,7 @@ Adding the `--with-vercel-static` flag to the build script will produce static s
 ```
 {
   "scripts": {
-    "build": "waku build --with-ssr --with-vercel-static"
+    "build": "waku build --with-vercel-static"
   }
 }
 ```
@@ -665,7 +665,7 @@ Adding the `--with-netlify-static` flag to the build script will produce static
 ```
 {
   "scripts": {
-    "build": "waku build --with-ssr --with-netlify-static"
+    "build": "waku build --with-netlify-static"
   }
 }
 ```
diff --git a/docs/builder/aws-lambda.mdx b/docs/builder/aws-lambda.mdx
index 64f3d508c..2c4461cb3 100644
--- a/docs/builder/aws-lambda.mdx
+++ b/docs/builder/aws-lambda.mdx
@@ -59,7 +59,7 @@ custom:
     # add custom hooks
     hooks:
       before:package:createDeploymentArtifacts:
-        - pnpm waku build --with-ssr --with-aws-lambda
+        - pnpm waku build --with-aws-lambda
 ```
 
 This configuration will include all files from the `./private` directory in the final deployment.
@@ -196,7 +196,7 @@ export class WakuStack extends cdk.Stack {
             tryBundle(outputDir) {
               spawnSync(
                 'pnpm',
-                ['exec', 'waku', 'build', '--with-ssr', '--with-aws-lambda'],
+                ['exec', 'waku', 'build', '--with-aws-lambda'],
                 { stdio: 'inherit' },
               );
               cpSync('dist', outputDir, { recursive: true, dereference: true });
diff --git a/e2e/07_router_standalone.spec.ts b/e2e/07_router_standalone.spec.ts
index 31dfeed20..10699f056 100644
--- a/e2e/07_router_standalone.spec.ts
+++ b/e2e/07_router_standalone.spec.ts
@@ -69,7 +69,7 @@ test.describe('07_router standalone', () => {
     test(`should prod work ${withSSR ? 'with SSR' : ''}`, async ({ page }) => {
       test.fixme(withSSR, 'SSR is not working in standalone');
       execSync(
-        `node ${join(standaloneDir, './node_modules/waku/dist/cli.js')} build${withSSR ? ' --with-ssr' : ''}`,
+        `node ${join(standaloneDir, './node_modules/waku/dist/cli.js')} build`,
         {
           cwd: standaloneDir,
           stdio: 'inherit',
@@ -77,7 +77,7 @@ test.describe('07_router standalone', () => {
       );
       const port = await getFreePort();
       const cp = exec(
-        `node ${join(standaloneDir, './node_modules/waku/dist/cli.js')} start${withSSR ? ' --with-ssr' : ''}`,
+        `node ${join(standaloneDir, './node_modules/waku/dist/cli.js')} start`,
         {
           cwd: standaloneDir,
           env: {
@@ -95,7 +95,7 @@ test.describe('07_router standalone', () => {
       test.fixme(withSSR, 'SSR is not working in standalone');
       const port = await getFreePort();
       const cp = exec(
-        `node ${join(standaloneDir, './node_modules/waku/dist/cli.js')} dev${withSSR ? ' --with-ssr' : ''}`,
+        `node ${join(standaloneDir, './node_modules/waku/dist/cli.js')} dev`,
         {
           cwd: standaloneDir,
           env: {
diff --git a/e2e/examples-smoke.spec.ts b/e2e/examples-smoke.spec.ts
index cfde5b24b..14bb19e09 100644
--- a/e2e/examples-smoke.spec.ts
+++ b/e2e/examples-smoke.spec.ts
@@ -23,33 +23,19 @@ const commands = [
   {
     command: 'dev',
   },
-  {
-    command: 'dev --with-ssr',
-  },
   {
     build: 'build',
     command: 'start',
   },
-  {
-    build: 'build --with-ssr',
-    command: 'start --with-ssr',
-  },
 ];
 
 const specialExamples = [
   {
     name: '08_cookies',
     commands: [
-      {
-        command: 'node dev.js --with-ssr',
-      },
       {
         command: 'node dev.js',
       },
-      {
-        build: 'waku build --with-ssr',
-        command: 'node start.js --with-ssr',
-      },
       {
         build: 'waku build',
         command: 'node start.js',
diff --git a/e2e/fixtures/ssr-basic/package.json b/e2e/fixtures/ssr-basic/package.json
index 83ee50b85..58cd0ed5b 100644
--- a/e2e/fixtures/ssr-basic/package.json
+++ b/e2e/fixtures/ssr-basic/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",
diff --git a/e2e/fixtures/ssr-swr/package.json b/e2e/fixtures/ssr-swr/package.json
index dff278807..ed71abfe8 100644
--- a/e2e/fixtures/ssr-swr/package.json
+++ b/e2e/fixtures/ssr-swr/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",
diff --git a/e2e/fixtures/ssr-target-bundle/package.json b/e2e/fixtures/ssr-target-bundle/package.json
index 2484ab882..d0bc1077b 100644
--- a/e2e/fixtures/ssr-target-bundle/package.json
+++ b/e2e/fixtures/ssr-target-bundle/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",
diff --git a/e2e/ssr-basic.spec.ts b/e2e/ssr-basic.spec.ts
index 63b15849c..4f5d8eca5 100644
--- a/e2e/ssr-basic.spec.ts
+++ b/e2e/ssr-basic.spec.ts
@@ -11,11 +11,11 @@ const waku = fileURLToPath(
 
 const commands = [
   {
-    command: 'dev --with-ssr',
+    command: 'dev',
   },
   {
-    build: 'build --with-ssr',
-    command: 'start --with-ssr',
+    build: 'build',
+    command: 'start',
   },
 ];
 
diff --git a/e2e/ssr-swr.spec.ts b/e2e/ssr-swr.spec.ts
index c070a4dc1..b5f7ad95e 100644
--- a/e2e/ssr-swr.spec.ts
+++ b/e2e/ssr-swr.spec.ts
@@ -11,11 +11,11 @@ const waku = fileURLToPath(
 
 const commands = [
   {
-    command: 'dev --with-ssr',
+    command: 'dev',
   },
   {
-    build: 'build --with-ssr',
-    command: 'start --with-ssr',
+    build: 'build',
+    command: 'start',
   },
 ];
 
diff --git a/e2e/ssr-target-bundle.spec.ts b/e2e/ssr-target-bundle.spec.ts
index 7d7316ff8..bea1ac182 100644
--- a/e2e/ssr-target-bundle.spec.ts
+++ b/e2e/ssr-target-bundle.spec.ts
@@ -12,11 +12,11 @@ const waku = fileURLToPath(
 
 const commands = [
   {
-    command: 'dev --with-ssr',
+    command: 'dev',
   },
   {
-    build: 'build --with-ssr',
-    command: 'start --with-ssr',
+    build: 'build',
+    command: 'start',
   },
 ];
 
@@ -65,7 +65,7 @@ for (const { build, command } of commands) {
     });
 
     test('image exists in folder public/assets', async () => {
-      test.skip(command.startsWith('dev '));
+      test.skip(command.startsWith('dev'));
       const imagePath = path.join(cwd, 'dist', 'public', 'assets');
       const files = await readdir(imagePath);
       const imageExists = files.some((file) =>
@@ -75,7 +75,7 @@ for (const { build, command } of commands) {
     });
 
     test('json public linked exists in folder public/assets', async () => {
-      test.skip(command.startsWith('dev '));
+      test.skip(command.startsWith('dev'));
       const imagePath = path.join(cwd, 'dist', 'public', 'assets');
       const files = await readdir(imagePath);
       const imageExists = files.some((file) =>
@@ -85,7 +85,7 @@ for (const { build, command } of commands) {
     });
 
     test('json private NOT exists in folder public/assets', async () => {
-      test.skip(command.startsWith('dev '));
+      test.skip(command.startsWith('dev'));
       const imagePath = path.join(cwd, 'dist', 'public', 'assets');
       const files = await readdir(imagePath);
       const imageExists = files.some((file) =>
diff --git a/examples/01_template/package.json b/examples/01_template/package.json
index f5013c0f9..d9a8afac2 100644
--- a/examples/01_template/package.json
+++ b/examples/01_template/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",
diff --git a/examples/02_demo/package.json b/examples/02_demo/package.json
index 656ba73fe..0efb2676d 100644
--- a/examples/02_demo/package.json
+++ b/examples/02_demo/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",
diff --git a/examples/03_minimal/package.json b/examples/03_minimal/package.json
index 06a744bd1..572255012 100644
--- a/examples/03_minimal/package.json
+++ b/examples/03_minimal/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",
diff --git a/examples/04_promise/package.json b/examples/04_promise/package.json
index 06a744bd1..572255012 100644
--- a/examples/04_promise/package.json
+++ b/examples/04_promise/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",
diff --git a/examples/05_actions/package.json b/examples/05_actions/package.json
index 2db6ade78..4a6022340 100644
--- a/examples/05_actions/package.json
+++ b/examples/05_actions/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",
diff --git a/examples/06_nesting/package.json b/examples/06_nesting/package.json
index 06a744bd1..572255012 100644
--- a/examples/06_nesting/package.json
+++ b/examples/06_nesting/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",
diff --git a/examples/07_router/package.json b/examples/07_router/package.json
index 7f4dd1574..51a7454d0 100644
--- a/examples/07_router/package.json
+++ b/examples/07_router/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",
diff --git a/examples/08_cookies/package.json b/examples/08_cookies/package.json
index 41a1f5e5f..7dfab6b33 100644
--- a/examples/08_cookies/package.json
+++ b/examples/08_cookies/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "cookie": "0.6.0",
diff --git a/examples/09_cssmodules/package.json b/examples/09_cssmodules/package.json
index 06a744bd1..572255012 100644
--- a/examples/09_cssmodules/package.json
+++ b/examples/09_cssmodules/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",
diff --git a/examples/10_fs-router/package.json b/examples/10_fs-router/package.json
index 27b964699..352f64293 100644
--- a/examples/10_fs-router/package.json
+++ b/examples/10_fs-router/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "glob": "10.3.10",
diff --git a/examples/11_form/package.json b/examples/11_form/package.json
index 06a744bd1..572255012 100644
--- a/examples/11_form/package.json
+++ b/examples/11_form/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",
diff --git a/examples/12_css/package.json b/examples/12_css/package.json
index c6515d939..463ee61a9 100644
--- a/examples/12_css/package.json
+++ b/examples/12_css/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "@stylexjs/stylex": "0.5.1",
diff --git a/examples/13_path-alias/package.json b/examples/13_path-alias/package.json
index 6fff95519..261bdcea1 100644
--- a/examples/13_path-alias/package.json
+++ b/examples/13_path-alias/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",
diff --git a/examples/14_react-tweet/package.json b/examples/14_react-tweet/package.json
index c75e654a6..2505f07e4 100644
--- a/examples/14_react-tweet/package.json
+++ b/examples/14_react-tweet/package.json
@@ -4,9 +4,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "react": "18.3.0-canary-6c3b8dbfe-20240226",
diff --git a/packages/waku/package.json b/packages/waku/package.json
index 179a0a4ec..32643fd5f 100644
--- a/packages/waku/package.json
+++ b/packages/waku/package.json
@@ -29,14 +29,6 @@
       "types": "./dist/middleware/*.d.ts",
       "default": "./dist/middleware/*.js"
     },
-    "./prd": {
-      "types": "./dist/prd.d.ts",
-      "default": "./dist/prd.js"
-    },
-    "./dev": {
-      "types": "./dist/dev.d.ts",
-      "default": "./dist/dev.js"
-    },
     "./node-loader": {
       "types": "./dist/node-loader.d.ts",
       "default": "./dist/node-loader.js"
diff --git a/packages/waku/src/cli.ts b/packages/waku/src/cli.ts
index c0400cfca..95444d0a2 100644
--- a/packages/waku/src/cli.ts
+++ b/packages/waku/src/cli.ts
@@ -10,8 +10,6 @@ import * as dotenv from 'dotenv';
 
 import type { Config } from './config.js';
 import { resolveConfig } from './lib/config.js';
-import { honoMiddleware as honoDevMiddleware } from './lib/old-wrappers/hono-dev.js';
-import { honoMiddleware as honoPrdMiddleware } from './lib/old-wrappers/hono-prd.js';
 import { runner } from './lib/hono/runner.js';
 import { build } from './lib/builder/build.js';
 
@@ -25,9 +23,6 @@ const { values, positionals } = parseArgs({
   args: process.argv.slice(2),
   allowPositionals: true,
   options: {
-    'with-ssr': {
-      type: 'boolean',
-    },
     'with-vercel': {
       type: 'boolean',
     },
@@ -71,16 +66,15 @@ if (values.version) {
 } else if (values.help) {
   displayUsage();
 } else {
-  const ssr = !!values['with-ssr'];
   switch (cmd) {
     case 'dev':
-      await runDev({ ssr });
+      await runDev();
       break;
     case 'build':
       await runBuild();
       break;
     case 'start':
-      await runStart({ ssr });
+      await runStart();
       break;
     default:
       if (cmd) {
@@ -91,17 +85,10 @@ if (values.version) {
   }
 }
 
-async function runDev(options: { ssr: boolean }) {
+async function runDev() {
   const config = await loadConfig();
   const app = new Hono();
-  if (!process.env.WAKU_OLD_MIDDLEWARE) {
-    app.use('*', runner({ cmd: 'dev', config, env: process.env as any }));
-  } else {
-    app.use(
-      '*',
-      honoDevMiddleware({ ...options, config, env: process.env as any }),
-    );
-  }
+  app.use('*', runner({ cmd: 'dev', config, env: process.env as any }));
   const port = parseInt(process.env.PORT || '3000', 10);
   await startServer(app, port);
 }
@@ -130,39 +117,14 @@ async function runBuild() {
   });
 }
 
-async function runStart(options: { ssr: boolean }) {
+async function runStart() {
   const config = await loadConfig();
   const { distDir, publicDir, entriesJs } = await resolveConfig(config);
   const loadEntries = () =>
     import(pathToFileURL(path.resolve(distDir, entriesJs)).toString());
   const app = new Hono();
   app.use('*', serveStatic({ root: path.join(distDir, publicDir) }));
-  if (!process.env.WAKU_OLD_MIDDLEWARE) {
-    app.use(
-      '*',
-      runner({ cmd: 'start', loadEntries, env: process.env as any }),
-    );
-  } else {
-    app.use(
-      '*',
-      honoPrdMiddleware({
-        ...options,
-        config,
-        loadEntries,
-        env: process.env as any,
-      }),
-    );
-  }
-  if (!options.ssr) {
-    // history api fallback
-    app.use(
-      '*',
-      serveStatic({
-        root: path.join(distDir, publicDir),
-        rewriteRequestPath: () => '/',
-      }),
-    );
-  }
+  app.use('*', runner({ cmd: 'start', loadEntries, env: process.env as any }));
   app.notFound((c) => {
     // FIXME better implementation using node stream?
     const file = path.join(distDir, publicDir, '404.html');
@@ -206,7 +168,6 @@ Commands:
   start       Start the production server
 
 Options:
-  --with-ssr            Use opt-in SSR
   --with-vercel         Output for Vercel on build
   --with-netlify        Output for Netlify on build
   --with-cloudflare     Output for Cloudflare on build
diff --git a/packages/waku/src/dev.ts b/packages/waku/src/dev.ts
deleted file mode 100644
index 2e717dc2e..000000000
--- a/packages/waku/src/dev.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { honoMiddleware as unstable_honoMiddleware } from './lib/old-wrappers/hono-dev.js';
-export { connectMiddleware as unstable_connectMiddleware } from './lib/old-wrappers/connect-dev.js';
-
-export { build as unstable_build } from './lib/builder/build.js';
diff --git a/packages/waku/src/lib/builder/build.ts b/packages/waku/src/lib/builder/build.ts
index 95f8775b8..726ce62ea 100644
--- a/packages/waku/src/lib/builder/build.ts
+++ b/packages/waku/src/lib/builder/build.ts
@@ -39,8 +39,7 @@ import {
   getSsrConfig,
 } from '../renderers/rsc-renderer.js';
 import { renderHtml } from '../renderers/html-renderer.js';
-import { CLIENT_MODULE_MAP } from '../handlers/handler-dev.js';
-import { CLIENT_PREFIX } from '../handlers/handler-prd.js';
+import { CLIENT_MODULE_MAP, CLIENT_PREFIX } from '../middleware/ssr.js';
 import { rscIndexPlugin } from '../plugins/vite-plugin-rsc-index.js';
 import { rscAnalyzePlugin } from '../plugins/vite-plugin-rsc-analyze.js';
 import { nonjsResolvePlugin } from '../plugins/vite-plugin-nonjs-resolve.js';
diff --git a/packages/waku/src/lib/handlers/handler-dev.ts b/packages/waku/src/lib/handlers/handler-dev.ts
deleted file mode 100644
index 5caff6e9a..000000000
--- a/packages/waku/src/lib/handlers/handler-dev.ts
+++ /dev/null
@@ -1,278 +0,0 @@
-import { Readable, Writable } from 'node:stream';
-import { createServer as createViteServer } from 'vite';
-import viteReact from '@vitejs/plugin-react';
-
-import type { Config } from '../../config.js';
-import { resolveConfig } from '../config.js';
-import {
-  joinPath,
-  fileURLToFilePath,
-  decodeFilePathFromAbsolute,
-} from '../utils/path.js';
-import { endStream } from '../utils/stream.js';
-import { renderHtml } from '../renderers/html-renderer.js';
-import { decodeInput, hasStatusCode } from '../renderers/utils.js';
-import {
-  initializeWorker,
-  registerHotUpdateCallback,
-  renderRscWithWorker,
-  getSsrConfigWithWorker,
-} from '../renderers/dev-worker-api.js';
-import { patchReactRefresh } from '../plugins/patch-react-refresh.js';
-import { rscIndexPlugin } from '../plugins/vite-plugin-rsc-index.js';
-import { rscHmrPlugin, hotUpdate } from '../plugins/vite-plugin-rsc-hmr.js';
-import { rscEnvPlugin } from '../plugins/vite-plugin-rsc-env.js';
-import { rscPrivatePlugin } from '../plugins/vite-plugin-rsc-private.js';
-import type { BaseReq, BaseRes, Handler } from './types.js';
-import { mergeUserViteConfig } from '../utils/merge-vite-config.js';
-
-export const CLIENT_MODULE_MAP = {
-  react: 'react',
-  'rd-server': 'react-dom/server.edge',
-  'rsdw-client': 'react-server-dom-webpack/client.edge',
-  'waku-client': 'waku/client',
-};
-export type CLIENT_MODULE_KEY = keyof typeof CLIENT_MODULE_MAP;
-
-export function createHandler<
-  Req extends BaseReq,
-  Res extends BaseRes,
->(options: {
-  config?: Config;
-  ssr?: boolean;
-  env?: Record<string, string>;
-  unstable_prehook?: (req: Req, res: Res) => Record<string, unknown>;
-  unstable_posthook?: (
-    req: Req,
-    res: Res,
-    context: Record<string, unknown>,
-  ) => void;
-}): Handler<Req, Res> {
-  const { ssr, unstable_prehook, unstable_posthook } = options;
-  if (!unstable_prehook && unstable_posthook) {
-    throw new Error('prehook is required if posthook is provided');
-  }
-  (globalThis as any).__WAKU_PRIVATE_ENV__ = options.env || {};
-  const configPromise = resolveConfig(options.config || {});
-  const vitePromise = configPromise.then(async (config) => {
-    const mergedViteConfig = await mergeUserViteConfig({
-      base: config.basePath,
-      plugins: [
-        patchReactRefresh(viteReact()),
-        rscEnvPlugin({ config }),
-        rscPrivatePlugin(config),
-        rscIndexPlugin(config),
-        rscHmrPlugin(),
-        { name: 'nonjs-resolve-plugin' }, // dummy to match with dev-worker-impl.ts
-        { name: 'rsc-transform-plugin' }, // dummy to match with dev-worker-impl.ts
-        { name: 'rsc-delegate-plugin' }, // dummy to match with dev-worker-impl.ts
-      ],
-      optimizeDeps: {
-        include: ['react-server-dom-webpack/client', 'react-dom'],
-        exclude: ['waku'],
-        entries: [
-          `${config.srcDir}/${config.entriesJs}`.replace(/\.js$/, '.*'),
-        ],
-      },
-      ssr: {
-        external: [
-          'waku',
-          'waku/client',
-          'waku/server',
-          'waku/router/client',
-          'waku/router/server',
-        ],
-      },
-      server: { middlewareMode: true },
-    });
-    const vite = await createViteServer(mergedViteConfig);
-    initializeWorker(config);
-    registerHotUpdateCallback((payload) => hotUpdate(vite, payload));
-    return vite;
-  });
-
-  const loadServerFile = async (fileURL: string) => {
-    const vite = await vitePromise;
-    return vite.ssrLoadModule(fileURLToFilePath(fileURL));
-  };
-
-  const transformIndexHtml = async (pathname: string) => {
-    const vite = await vitePromise;
-    const encoder = new TextEncoder();
-    const decoder = new TextDecoder();
-    let headSent = false;
-    return new TransformStream({
-      transform(chunk, controller) {
-        if (!(chunk instanceof Uint8Array)) {
-          throw new Error('Unknown chunk type');
-        }
-        if (!headSent) {
-          headSent = true;
-          let data = decoder.decode(chunk);
-          // FIXME without removing async, Vite will move it
-          // to the proxy cache, which breaks __WAKU_PUSH__.
-          data = data.replace(/<script type="module" async>/, '<script>');
-          return new Promise<void>((resolve, reject) => {
-            vite
-              .transformIndexHtml(pathname, data)
-              .then((result) => {
-                controller.enqueue(encoder.encode(result));
-                resolve();
-              })
-              .catch(reject);
-          });
-        }
-        controller.enqueue(chunk);
-      },
-      flush() {
-        if (!headSent) {
-          throw new Error('head not yet sent');
-        }
-      },
-    });
-  };
-
-  const willBeHandledByVite = async (pathname: string) => {
-    const vite = await vitePromise;
-    try {
-      const result = await vite.transformRequest(pathname);
-      return !!result;
-    } catch {
-      return false;
-    }
-  };
-
-  return async (req, res, next) => {
-    const [{ middleware: _removed, ...config }, vite] = await Promise.all([
-      configPromise,
-      vitePromise,
-    ]);
-    const basePrefix = config.basePath + config.rscPath + '/';
-    const handleError = async (err: unknown) => {
-      if (hasStatusCode(err)) {
-        res.setStatus(err.statusCode);
-      } else {
-        console.info('Cannot render RSC', err);
-        res.setStatus(500);
-      }
-      await endStream(res.stream, String(err));
-    };
-    let context: Record<string, unknown> | undefined;
-    try {
-      context = unstable_prehook?.(req, res);
-    } catch (e) {
-      await handleError(e);
-      return;
-    }
-    if (req.url.pathname.startsWith(basePrefix)) {
-      const { method, contentType } = req;
-      if (method !== 'GET' && method !== 'POST') {
-        throw new Error(`Unsupported method '${method}'`);
-      }
-      try {
-        const input = decodeInput(req.url.pathname.slice(basePrefix.length));
-        const readable = await renderRscWithWorker({
-          input,
-          searchParams: req.url.searchParams,
-          method,
-          contentType,
-          config,
-          context,
-          body: req.stream,
-        });
-        unstable_posthook?.(req, res, context!);
-        await readable.pipeTo(res.stream);
-      } catch (e) {
-        await handleError(e);
-      }
-      return;
-    }
-    if (ssr && !(await willBeHandledByVite(req.url.pathname))) {
-      try {
-        const readable = await renderHtml({
-          config,
-          pathname: req.url.pathname,
-          searchParams: req.url.searchParams,
-          htmlHead: config.htmlHead,
-          renderRscForHtml: async (input, searchParams) => {
-            const readable = await renderRscWithWorker({
-              input,
-              searchParams,
-              method: 'GET',
-              contentType: undefined,
-              config,
-              context,
-            });
-            return readable;
-          },
-          getSsrConfigForHtml: (pathname, searchParams) =>
-            getSsrConfigWithWorker({ config, pathname, searchParams }),
-          loadClientModule: (key) => import(CLIENT_MODULE_MAP[key]),
-          isDev: true,
-          rootDir: vite.config.root,
-          loadServerFile,
-        });
-        if (readable) {
-          unstable_posthook?.(req, res, context!);
-          res.setHeader('content-type', 'text/html; charset=utf-8');
-          await readable
-            .pipeThrough(await transformIndexHtml(req.url.pathname))
-            .pipeTo(res.stream);
-          return;
-        }
-      } catch (e) {
-        await handleError(e);
-        return;
-      }
-    }
-    // HACK re-export "?v=..." URL to avoid dual module hazard.
-    const viteUrl = req.url.toString().slice(req.url.origin.length);
-    const fname = viteUrl.startsWith(config.basePath + '@fs/')
-      ? decodeFilePathFromAbsolute(
-          viteUrl.slice(config.basePath.length + '@fs'.length),
-        )
-      : joinPath(vite.config.root, viteUrl);
-    for (const item of vite.moduleGraph.idToModuleMap.values()) {
-      if (
-        item.file === fname &&
-        item.url !== viteUrl &&
-        !item.url.includes('?html-proxy')
-      ) {
-        const { code } = (await vite.transformRequest(item.url))!;
-        res.setHeader('Content-Type', 'application/javascript');
-        res.setStatus(200);
-        let exports = `export * from "${item.url}";`;
-        // `export *` does not re-export `default`
-        if (code.includes('export default')) {
-          exports += `export { default } from "${item.url}";`;
-        }
-        await endStream(res.stream, exports);
-        return;
-      }
-    }
-    const viteReq: any = Readable.fromWeb(req.stream as any);
-    viteReq.method = req.method;
-    viteReq.url = viteUrl;
-    viteReq.headers = { 'content-type': req.contentType };
-    const viteRes: any = Writable.fromWeb(res.stream as any);
-    Object.defineProperty(viteRes, 'statusCode', {
-      set(code) {
-        res.setStatus(code);
-      },
-    });
-    const headers = new Map<string, string>();
-    viteRes.setHeader = (name: string, value: string) => {
-      headers.set(name, value);
-      res.setHeader(name, value);
-    };
-    viteRes.getHeader = (name: string) => headers.get(name);
-    viteRes.writeHead = (code: number, headers?: Record<string, string>) => {
-      res.setStatus(code);
-      for (const [name, value] of Object.entries(headers || {})) {
-        viteRes.setHeader(name, value);
-      }
-    };
-    vite.middlewares(viteReq, viteRes, next);
-    return;
-  };
-}
diff --git a/packages/waku/src/lib/handlers/handler-prd.ts b/packages/waku/src/lib/handlers/handler-prd.ts
deleted file mode 100644
index ad5814c9e..000000000
--- a/packages/waku/src/lib/handlers/handler-prd.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import type { EntriesPrd } from '../../server.js';
-import type { Config } from '../../config.js';
-import { resolveConfig } from '../config.js';
-import { getPathMapping } from '../utils/path.js';
-import { endStream } from '../utils/stream.js';
-import { renderHtml } from '../renderers/html-renderer.js';
-import { decodeInput, hasStatusCode, deepFreeze } from '../renderers/utils.js';
-import { renderRsc, getSsrConfig } from '../renderers/rsc-renderer.js';
-import type { BaseReq, BaseRes, Handler } from './types.js';
-
-export const CLIENT_PREFIX = 'client/';
-
-export function createHandler<
-  Req extends BaseReq,
-  Res extends BaseRes,
->(options: {
-  config?: Config;
-  ssr?: boolean;
-  env?: Record<string, string>;
-  unstable_prehook?: (req: Req, res: Res) => Record<string, unknown>;
-  unstable_posthook?: (
-    req: Req,
-    res: Res,
-    context: Record<string, unknown>,
-  ) => void;
-  loadEntries: () => Promise<EntriesPrd>;
-}): Handler<Req, Res> {
-  const { config, ssr, unstable_prehook, unstable_posthook, loadEntries } =
-    options;
-  if (!unstable_prehook && unstable_posthook) {
-    throw new Error('prehook is required if posthook is provided');
-  }
-  (globalThis as any).__WAKU_PRIVATE_ENV__ = options.env || {};
-  const configPromise = resolveConfig(config || {});
-  const entries = loadEntries();
-
-  return async (req, res, next) => {
-    const config = await configPromise;
-    const basePrefix = config.basePath + config.rscPath + '/';
-    const handleError = async (err: unknown) => {
-      if (hasStatusCode(err)) {
-        res.setStatus(err.statusCode);
-      } else {
-        console.info('Cannot render RSC', err);
-        res.setStatus(500);
-      }
-      await endStream(res.stream);
-    };
-    let context: Record<string, unknown> | undefined;
-    try {
-      context = unstable_prehook?.(req, res);
-    } catch (e) {
-      await handleError(e);
-      return;
-    }
-    if (req.url.pathname.startsWith(basePrefix)) {
-      const { method, contentType } = req;
-      if (method !== 'GET' && method !== 'POST') {
-        throw new Error(`Unsupported method '${method}'`);
-      }
-      try {
-        const input = decodeInput(req.url.pathname.slice(basePrefix.length));
-        const readable = await renderRsc(
-          {
-            config,
-            input,
-            searchParams: req.url.searchParams,
-            method,
-            context,
-            body: req.stream,
-            contentType,
-          },
-          {
-            isDev: false,
-            entries: await entries,
-          },
-        );
-        unstable_posthook?.(req, res, context!);
-        deepFreeze(context);
-        await readable.pipeTo(res.stream);
-        return;
-      } catch (e) {
-        await handleError(e);
-        return;
-      }
-    }
-    if (ssr) {
-      try {
-        const resolvedEntries = await entries;
-        const { dynamicHtmlPaths } = resolvedEntries;
-        const htmlHead = dynamicHtmlPaths.find(([pathSpec]) =>
-          getPathMapping(pathSpec, req.url.pathname),
-        )?.[1];
-        if (htmlHead) {
-          const readable = await renderHtml({
-            config,
-            pathname: req.url.pathname,
-            searchParams: req.url.searchParams,
-            htmlHead,
-            renderRscForHtml: (input, searchParams) =>
-              renderRsc(
-                {
-                  config,
-                  input,
-                  searchParams,
-                  method: 'GET',
-                  context,
-                },
-                {
-                  isDev: false,
-                  entries: resolvedEntries,
-                },
-              ),
-            getSsrConfigForHtml: (pathname, searchParams) =>
-              getSsrConfig(
-                {
-                  config,
-                  pathname,
-                  searchParams,
-                },
-                {
-                  isDev: false,
-                  entries: resolvedEntries,
-                },
-              ),
-            loadClientModule: (key) =>
-              resolvedEntries.loadModule(CLIENT_PREFIX + key),
-            isDev: false,
-            loadModule: resolvedEntries.loadModule,
-          });
-          if (readable) {
-            unstable_posthook?.(req, res, context!);
-            deepFreeze(context);
-            res.setHeader('content-type', 'text/html; charset=utf-8');
-            await readable.pipeTo(res.stream);
-            return;
-          }
-        }
-      } catch (e) {
-        await handleError(e);
-        return;
-      }
-    }
-    next();
-  };
-}
diff --git a/packages/waku/src/lib/handlers/types.ts b/packages/waku/src/lib/handlers/types.ts
deleted file mode 100644
index a9f6ba78c..000000000
--- a/packages/waku/src/lib/handlers/types.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-export type BaseReq = {
-  stream: ReadableStream;
-  url: URL;
-  method: string;
-  contentType: string | undefined;
-};
-
-export type BaseRes = {
-  stream: WritableStream;
-  setHeader: (name: string, value: string) => void;
-  setStatus: (code: number) => void;
-};
-
-export type Handler<Req extends BaseReq, Res extends BaseRes> = (
-  req: Req,
-  res: Res,
-  next: (err?: unknown) => void,
-) => void;
diff --git a/packages/waku/src/lib/old-wrappers/connect-dev.ts b/packages/waku/src/lib/old-wrappers/connect-dev.ts
deleted file mode 100644
index 7823a9130..000000000
--- a/packages/waku/src/lib/old-wrappers/connect-dev.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { connectWrapper } from './connect-utils.js';
-import { createHandler } from '../handlers/handler-dev.js';
-
-export function connectMiddleware(...args: Parameters<typeof createHandler>) {
-  return connectWrapper(createHandler(...args));
-}
diff --git a/packages/waku/src/lib/old-wrappers/connect-prd.ts b/packages/waku/src/lib/old-wrappers/connect-prd.ts
deleted file mode 100644
index 5baf3f30c..000000000
--- a/packages/waku/src/lib/old-wrappers/connect-prd.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { connectWrapper } from './connect-utils.js';
-import { createHandler } from '../handlers/handler-prd.js';
-
-export function connectMiddleware(...args: Parameters<typeof createHandler>) {
-  return connectWrapper(createHandler(...args));
-}
diff --git a/packages/waku/src/lib/old-wrappers/connect-utils.ts b/packages/waku/src/lib/old-wrappers/connect-utils.ts
deleted file mode 100644
index 0ed9b062b..000000000
--- a/packages/waku/src/lib/old-wrappers/connect-utils.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import type { IncomingMessage, ServerResponse } from 'node:http';
-
-import type { BaseReq, BaseRes, Handler } from '../handlers/types.js';
-
-export const connectWrapper = (
-  m: Handler<
-    BaseReq & { orig: IncomingMessage },
-    BaseRes & { orig: ServerResponse }
-  >,
-) => {
-  return async (
-    connectReq: IncomingMessage,
-    connectRes: ServerResponse,
-    next: (err?: unknown) => void,
-  ) => {
-    const { Readable, Writable } = await import('node:stream');
-    const req: BaseReq & { orig: IncomingMessage } = {
-      stream: Readable.toWeb(connectReq) as any,
-      method: connectReq.method || '',
-      url: new URL(connectReq.url || '', `http://${connectReq.headers.host}`),
-      contentType: connectReq.headers['content-type'],
-      orig: connectReq,
-    };
-    const res: BaseRes & { orig: ServerResponse } = {
-      stream: Writable.toWeb(connectRes),
-      setStatus: (code) => (connectRes.statusCode = code),
-      setHeader: (name, value) => connectRes.setHeader(name, value),
-      orig: connectRes,
-    };
-    m(req, res, next);
-  };
-};
diff --git a/packages/waku/src/lib/old-wrappers/hono-dev.ts b/packages/waku/src/lib/old-wrappers/hono-dev.ts
deleted file mode 100644
index 88c0c854b..000000000
--- a/packages/waku/src/lib/old-wrappers/hono-dev.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { Env, Input } from 'hono';
-
-import { honoWrapper } from './hono-utils.js';
-import { createHandler } from '../handlers/handler-dev.js';
-
-export function honoMiddleware<
-  // FIXME type defaults are weird
-  E extends Env = never,
-  P extends string = string,
-  I extends Input = Record<string, never>,
->(...args: Parameters<typeof createHandler>) {
-  return honoWrapper<E, P, I>(createHandler(...args));
-}
diff --git a/packages/waku/src/lib/old-wrappers/hono-prd.ts b/packages/waku/src/lib/old-wrappers/hono-prd.ts
deleted file mode 100644
index 297a6e15e..000000000
--- a/packages/waku/src/lib/old-wrappers/hono-prd.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { Env, Input } from 'hono';
-
-import { honoWrapper } from './hono-utils.js';
-import { createHandler } from '../handlers/handler-prd.js';
-
-export function honoMiddleware<
-  // FIXME type defaults are weird
-  E extends Env = never,
-  P extends string = string,
-  I extends Input = Record<string, never>,
->(...args: Parameters<typeof createHandler>) {
-  return honoWrapper<E, P, I>(createHandler(...args));
-}
diff --git a/packages/waku/src/lib/old-wrappers/hono-utils.ts b/packages/waku/src/lib/old-wrappers/hono-utils.ts
deleted file mode 100644
index 1b329df5d..000000000
--- a/packages/waku/src/lib/old-wrappers/hono-utils.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import type { MiddlewareHandler, Context, Env, Input } from 'hono';
-
-import type { BaseReq, BaseRes, Handler } from '../handlers/types.js';
-
-const createEmptyReadableStream = () =>
-  new ReadableStream({
-    start(controller) {
-      controller.close();
-    },
-  });
-
-const createStreamPair = (
-  callback: (redable: ReadableStream | null) => void,
-) => {
-  let controller: ReadableStreamDefaultController | undefined;
-  const readable = new ReadableStream({
-    start(c) {
-      controller = c;
-    },
-    cancel() {
-      controller = undefined;
-    },
-  });
-  let hasData = false;
-  const writable = new WritableStream({
-    write(chunk) {
-      if (!controller) {
-        return;
-      }
-      controller.enqueue(chunk);
-      if (!hasData) {
-        hasData = true;
-        callback(readable);
-      }
-    },
-    close() {
-      if (!controller) {
-        return;
-      }
-      controller.close();
-      if (!hasData) {
-        callback(null);
-      }
-    },
-  });
-  return writable;
-};
-
-export const honoWrapper = <E extends Env, P extends string, I extends Input>(
-  m: Handler<
-    BaseReq & { c: Context<E, P, I> },
-    BaseRes & { c: Context<E, P, I> }
-  >,
-): MiddlewareHandler<E, P, I> => {
-  return (c, next) =>
-    new Promise((resolve) => {
-      const req: BaseReq & { c: Context<E, P, I> } = {
-        stream: c.req.raw.body || createEmptyReadableStream(),
-        method: c.req.method,
-        url: new URL(c.req.url),
-        contentType: c.req.header('content-type'),
-        c,
-      };
-      const writable = createStreamPair((readable) => {
-        resolve(c.body(readable));
-      });
-      const res: BaseRes & { c: Context<E, P, I> } = {
-        stream: writable,
-        setStatus: (code) => c.status(code as any), // FIXME avoid any
-        setHeader: (name, value) => c.header(name, value),
-        c,
-      };
-      m(req, res, () => next().then(resolve));
-    });
-};
diff --git a/packages/waku/src/lib/renderers/html-renderer.ts b/packages/waku/src/lib/renderers/html-renderer.ts
index 273e6458a..6115df691 100644
--- a/packages/waku/src/lib/renderers/html-renderer.ts
+++ b/packages/waku/src/lib/renderers/html-renderer.ts
@@ -12,7 +12,7 @@ import { injectRSCPayload } from 'rsc-html-stream/server';
 import type * as WakuClientType from '../../client.js';
 import type { EntriesPrd } from '../../server.js';
 import type { ResolvedConfig } from '../config.js';
-import type { CLIENT_MODULE_KEY } from '../handlers/handler-dev.js';
+import type { CLIENT_MODULE_KEY } from '../middleware/ssr.js';
 import { concatUint8Arrays } from '../utils/stream.js';
 import {
   joinPath,
diff --git a/packages/waku/src/lib/utils/stream.ts b/packages/waku/src/lib/utils/stream.ts
index 93259366c..d70ccc5a4 100644
--- a/packages/waku/src/lib/utils/stream.ts
+++ b/packages/waku/src/lib/utils/stream.ts
@@ -1,11 +1,4 @@
-export const endStream = async (stream: WritableStream, message?: string) => {
-  const writer = stream.getWriter();
-  await writer.ready;
-  if (message) {
-    await writer.write(new TextEncoder().encode(message));
-  }
-  await writer.close();
-};
+// Utility functions for web streams (not Node.js streams)
 
 export const concatUint8Arrays = (arrs: Uint8Array[]): Uint8Array => {
   const len = arrs.reduce((acc, arr) => acc + arr.length, 0);
diff --git a/packages/waku/src/prd.ts b/packages/waku/src/prd.ts
deleted file mode 100644
index 2c430f663..000000000
--- a/packages/waku/src/prd.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { honoMiddleware as unstable_honoMiddleware } from './lib/old-wrappers/hono-prd.js';
-export { connectMiddleware as unstable_connectMiddleware } from './lib/old-wrappers/connect-prd.js';
diff --git a/packages/website/package.json b/packages/website/package.json
index 8f4f60fcc..e72d594fc 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -5,9 +5,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "dev": "waku dev --with-ssr",
-    "build": "waku build --with-ssr",
-    "start": "waku start --with-ssr"
+    "dev": "waku dev",
+    "build": "waku build",
+    "start": "waku start"
   },
   "dependencies": {
     "@sindresorhus/slugify": "^2.2.1",