diff --git a/TODO.md b/TODO.md
index 94a81474..2b14f85a 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,8 +2,6 @@
 
 ## Work in Progress
 
-- Switch to custom `tfjs` for main `human` ESM bundle
-
 <br>
 
 ### Models
@@ -32,6 +30,7 @@ Experimental support only until support is officially added in Chromium
 - Optical Flow: <https://docs.opencv.org/3.3.1/db/d7f/tutorial_js_lucas_kanade.html>
 - TFLite Models: <https://js.tensorflow.org/api_tflite/0.0.1-alpha.4/>
 - Histogram Equalization: Regular, Adaptive, Contrast Limited
+- Switch to custom `tfjs` for main `human` ESM bundle
 
 <br><hr><br>
 
diff --git a/build.json b/build.json
index 279008f8..293edc0b 100644
--- a/build.json
+++ b/build.json
@@ -109,6 +109,26 @@
         "sourcemap": true,
         "external": ["@tensorflow", "fs", "os", "buffer", "util"]
       },
+
+      {
+        "name": "tfjs/browser/esm/custom",
+        "platform": "browser",
+        "format": "esm",
+        "input": "tfjs/tf-custom.ts",
+        "output": "dist/tfjs.esm.js",
+        "sourcemap": true,
+        "external": ["fs", "os", "buffer", "util"]
+      },
+      {
+        "name": "human/browser/esm/custom",
+        "platform": "browser",
+        "format": "esm",
+        "input": "src/human.ts",
+        "output": "dist/human.custom.esm.js",
+        "sourcemap": true,
+        "external": ["fs", "os", "buffer", "util"]
+      },
+
       {
         "name": "tfjs/browser/esm/bundle",
         "platform": "browser",
diff --git a/tfjs/tf-browser.ts b/tfjs/tf-browser.ts
index 6d63dc48..003e1d78 100644
--- a/tfjs/tf-browser.ts
+++ b/tfjs/tf-browser.ts
@@ -3,29 +3,6 @@
  * @external
  */
 
-// export all from sources
-// requires treeShaking:ignore-annotations due to tfjs misconfiguration
-/*
-export * from '@tensorflow/tfjs-core/src/index';
-export * from '@tensorflow/tfjs-layers/src/index';
-export * from '@tensorflow/tfjs-converter/src/index';
-export * as data from '@tensorflow/tfjs-data/src/index';
-export * from '@tensorflow/tfjs-backend-cpu/src/index';
-export * from '@tensorflow/tfjs-backend-webgl/src/index';
-export * from '@tensorflow/tfjs-backend-wasm/src/index';
-*/
-
-// export all from build individual packages
-/*
-export * from '@tensorflow/tfjs-core/dist/index.js';
-export * from '@tensorflow/tfjs-layers/dist/index.js';
-export * from '@tensorflow/tfjs-converter/dist/index.js';
-export * as data from '@tensorflow/tfjs-data/dist/index.js';
-export * from '@tensorflow/tfjs-backend-cpu/dist/index.js';
-export * from '@tensorflow/tfjs-backend-webgl/dist/index.js';
-export * from '@tensorflow/tfjs-backend-wasm/dist/index.js';
-*/
-
 // export all from build bundle
 export * from '@tensorflow/tfjs/dist/index.js';
 export * from '@tensorflow/tfjs-backend-webgl/dist/index.js';