diff --git a/dist/commands/dev/index.js b/dist/commands/dev/index.js
index d8fd4c5..acdf15f 100644
--- a/dist/commands/dev/index.js
+++ b/dist/commands/dev/index.js
@@ -20,10 +20,6 @@ export default function () {
         }
         catch (error) { }
         await bunextInit();
-        // await allPagesBunBundler();
-        await allPagesESBuildContextBundler({
-            post_build_fn: serverPostBuildFn,
-        });
         await startServer();
     });
 }
diff --git a/dist/commands/start/index.js b/dist/commands/start/index.js
index cd2dadb..be8edc0 100644
--- a/dist/commands/start/index.js
+++ b/dist/commands/start/index.js
@@ -2,8 +2,6 @@ import { Command } from "commander";
 import startServer from "../../functions/server/start-server";
 import { log } from "../../utils/log";
 import bunextInit from "../../functions/bunext-init";
-import allPagesBunBundler from "../../functions/bundler/all-pages-bun-bundler";
-import allPagesESBuildContextBundler from "../../functions/bundler/all-pages-esbuild-context-bundler";
 export default function () {
     return new Command("start")
         .description("Start production server")
@@ -11,8 +9,6 @@ export default function () {
         process.env.NODE_ENV = "production";
         log.info("Starting production server ...");
         await bunextInit();
-        // await allPagesBunBundler();
-        await allPagesESBuildContextBundler();
         await startServer();
     });
 }
diff --git a/dist/functions/bundler/all-pages-esbuild-context-bundler.js b/dist/functions/bundler/all-pages-esbuild-context-bundler.js
index 4c61601..dfa659c 100644
--- a/dist/functions/bundler/all-pages-esbuild-context-bundler.js
+++ b/dist/functions/bundler/all-pages-esbuild-context-bundler.js
@@ -50,6 +50,7 @@ export default async function allPagesESBuildContextBundler(params) {
         ],
         jsx: "automatic",
         splitting: true,
+        treeShaking: true,
         logLevel: "silent",
         // logLevel: "silent",
         // logLevel: dev ? "error" : "silent",
diff --git a/dist/functions/bunext-init.js b/dist/functions/bunext-init.js
index 288daa8..ebde354 100644
--- a/dist/functions/bunext-init.js
+++ b/dist/functions/bunext-init.js
@@ -5,6 +5,8 @@ import isDevelopment from "../utils/is-development";
 import { log } from "../utils/log";
 import cron from "./server/cron";
 import watcherEsbuildCTX from "./server/watcher-esbuild-ctx";
+import allPagesESBuildContextBundler from "./bundler/all-pages-esbuild-context-bundler";
+import serverPostBuildFn from "./server/server-post-build-fn";
 const dirNames = grabDirNames();
 const { PAGES_DIR } = dirNames;
 export default async function bunextInit() {
@@ -23,9 +25,13 @@ export default async function bunextInit() {
     global.ROUTER = router;
     const is_dev = isDevelopment();
     if (is_dev) {
+        await allPagesESBuildContextBundler({
+            post_build_fn: serverPostBuildFn,
+        });
         watcherEsbuildCTX();
     }
     else {
+        await allPagesESBuildContextBundler();
         cron();
     }
 }
diff --git a/package.json b/package.json
index 7799da2..2efcab6 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "@moduletrace/bunext",
     "module": "index.ts",
     "type": "module",
-    "version": "1.0.44",
+    "version": "1.0.45",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "exports": {
diff --git a/src/commands/dev/index.ts b/src/commands/dev/index.ts
index 141ca13..bbd0438 100644
--- a/src/commands/dev/index.ts
+++ b/src/commands/dev/index.ts
@@ -25,12 +25,6 @@ export default function () {
 
             await bunextInit();
 
-            // await allPagesBunBundler();
-
-            await allPagesESBuildContextBundler({
-                post_build_fn: serverPostBuildFn,
-            });
-
             await startServer();
         });
 }
diff --git a/src/commands/start/index.ts b/src/commands/start/index.ts
index 5e8bdd0..bf11427 100644
--- a/src/commands/start/index.ts
+++ b/src/commands/start/index.ts
@@ -2,8 +2,6 @@ import { Command } from "commander";
 import startServer from "../../functions/server/start-server";
 import { log } from "../../utils/log";
 import bunextInit from "../../functions/bunext-init";
-import allPagesBunBundler from "../../functions/bundler/all-pages-bun-bundler";
-import allPagesESBuildContextBundler from "../../functions/bundler/all-pages-esbuild-context-bundler";
 
 export default function () {
     return new Command("start")
@@ -14,9 +12,6 @@ export default function () {
 
             await bunextInit();
 
-            // await allPagesBunBundler();
-            await allPagesESBuildContextBundler();
-
             await startServer();
         });
 }
diff --git a/src/functions/bundler/all-pages-esbuild-context-bundler.ts b/src/functions/bundler/all-pages-esbuild-context-bundler.ts
index 867b69d..2996274 100644
--- a/src/functions/bundler/all-pages-esbuild-context-bundler.ts
+++ b/src/functions/bundler/all-pages-esbuild-context-bundler.ts
@@ -73,6 +73,7 @@ export default async function allPagesESBuildContextBundler(params?: Params) {
         ],
         jsx: "automatic",
         splitting: true,
+        treeShaking: true,
         logLevel: "silent",
         // logLevel: "silent",
         // logLevel: dev ? "error" : "silent",
diff --git a/src/functions/bunext-init.ts b/src/functions/bunext-init.ts
index c39d70e..23747d3 100644
--- a/src/functions/bunext-init.ts
+++ b/src/functions/bunext-init.ts
@@ -13,6 +13,8 @@ import { log } from "../utils/log";
 import cron from "./server/cron";
 import type { BuildContext } from "esbuild";
 import watcherEsbuildCTX from "./server/watcher-esbuild-ctx";
+import allPagesESBuildContextBundler from "./bundler/all-pages-esbuild-context-bundler";
+import serverPostBuildFn from "./server/server-post-build-fn";
 
 /**
  * # Declare Global Variables
@@ -60,8 +62,12 @@ export default async function bunextInit() {
     const is_dev = isDevelopment();
 
     if (is_dev) {
+        await allPagesESBuildContextBundler({
+            post_build_fn: serverPostBuildFn,
+        });
         watcherEsbuildCTX();
     } else {
+        await allPagesESBuildContextBundler();
         cron();
     }
 }