diff --git a/application/Espo/Resources/metadata/app/client.json b/application/Espo/Resources/metadata/app/client.json
index 68c3e1b2e9..a0bfba2e4d 100644
--- a/application/Espo/Resources/metadata/app/client.json
+++ b/application/Espo/Resources/metadata/app/client.json
@@ -1,8 +1,7 @@
 {
     "scriptList": [
         "client/lib/espo-libs.min.js",
-        "client/lib/espo.min.js",
-        "client/lib/espo-templates.min.js"
+        "client/lib/espo.min.js"
     ],
     "developerModeScriptList": [
         "client/src/loader.js",
diff --git a/frontend/bundle-config.json b/frontend/bundle-config.json
index 6f60fc427f..0e2ac00a29 100644
--- a/frontend/bundle-config.json
+++ b/frontend/bundle-config.json
@@ -1,7 +1,6 @@
 {
     "order": [
         "main",
-        "templates",
         "admin",
         "crm",
         "wysiwyg",
@@ -39,44 +38,6 @@
                 "client/src/acl/*.js"
             ]
         },
-        "templates": {
-            "templatePatterns": [
-                "client/res/templates/*.tpl",
-                "client/res/templates/site/**/*.tpl",
-                "client/res/templates/record/**/*.tpl",
-                "client/res/templates/note/**/*.tpl",
-                "client/res/templates/stream/**/*.tpl",
-                "client/res/templates/notification/*.tpl",
-                "client/res/templates/global-search/*.tpl",
-                "client/res/templates/fields/address/*.tpl",
-                "client/res/templates/fields/array/*.tpl",
-                "client/res/templates/fields/attachments-multiple/*.tpl",
-                "client/res/templates/fields/base/*.tpl",
-                "client/res/templates/fields/bool/*.tpl",
-                "client/res/templates/fields/currency/*.tpl",
-                "client/res/templates/fields/date/*.tpl",
-                "client/res/templates/fields/datetime/*.tpl",
-                "client/res/templates/fields/datetime-short/*.tpl",
-                "client/res/templates/fields/duration/*.tpl",
-                "client/res/templates/fields/email/*.tpl",
-                "client/res/templates/fields/enum/*.tpl",
-                "client/res/templates/fields/phone/*.tpl",
-                "client/res/templates/fields/file/*.tpl",
-                "client/res/templates/fields/float/*.tpl",
-                "client/res/templates/fields/int/*.tpl",
-                "client/res/templates/fields/link/*.tpl",
-                "client/res/templates/fields/link-multiple/*.tpl",
-                "client/res/templates/fields/link-parent/*.tpl",
-                "client/res/templates/fields/multi-enum/*.tpl",
-                "client/res/templates/fields/person-name/*.tpl",
-                "client/res/templates/fields/text/*.tpl",
-                "client/res/templates/fields/url/*.tpl",
-                "client/res/templates/fields/user/*.tpl",
-                "client/res/templates/fields/user-with-avatar/*.tpl",
-                "client/res/templates/fields/varchar/*.tpl",
-                "client/res/templates/fields/wysiwyg/*.tpl"
-            ]
-        },
         "admin": {
             "patterns": [
                 "client/src/views/admin/**/*.js",
@@ -96,22 +57,12 @@
                 "client/src/controllers/api-user.js",
                 "client/src/controllers/role.js",
                 "client/src/controllers/portal-role.js"
-            ],
-            "templatePatterns": [
-                "client/res/templates/admin/**/*.tpl",
-                "client/res/templates/lead-capture/**/*.tpl",
-                "client/res/templates/scheduled-job/**/*.tpl",
-                "client/res/templates/settings/**/*.tpl",
-                "client/res/templates/settings/**/*.tpl"
             ]
         },
         "crm": {
             "patterns": [
                 "client/modules/crm/src/**/*.js"
             ],
-            "templatePatterns": [
-                "client/modules/crm/res/templates/**/*.tpl"
-            ],
             "lookupPatterns": [
                 "client/modules/crm/src/**/*.js"
             ]
@@ -179,9 +130,6 @@
             "patterns": [
                 "client/src/**/*.js"
             ],
-            "templatePatterns": [
-                "client/res/templates/**/*.tpl"
-            ],
             "noDuplicates": true
         }
     },
diff --git a/js/bundler-general.js b/js/bundler-general.js
index 6b11daa984..96f56ab7b4 100644
--- a/js/bundler-general.js
+++ b/js/bundler-general.js
@@ -186,13 +186,11 @@ class BundlerGeneral {
             modules = data.modules;
             bundledFiles = data.files;
 
-            /*if (params.libs) {
-                contents = this.#bundleLibs(params.libs) + '\n' + contents;
-            }*/
-
             notBundledModules = data.notBundledModules;
         }
 
+        // Pre-compiled templates turned out to be slower if too many are bundled.
+        // To be used sparingly.
         if (params.templatePatterns) {
             let ignoreFiles = params.noDuplicates ? [].concat(alreadyBundled.templateFiles) : [];
 
@@ -214,36 +212,6 @@ class BundlerGeneral {
             notBundledModules: notBundledModules,
         };
     }
-
-    /**
-     * @param {string[]} libs
-     * @return {string}
-     */
-    /*#bundleLibs(libs) {
-        let files = [];
-
-        this.libs
-            .filter(item => libs.includes(item.key))
-            .forEach(item => {
-                if (item.src) {
-                    files.push(item.src);
-
-                    return;
-                }
-
-                if (!item.files) {
-                    return;
-                }
-
-                item.files.forEach(item => {
-                    files.push(item.src);
-                });
-            });
-
-        let contents = files.map(file => fs.readFileSync(file, 'utf-8'));
-
-        return contents.join('\n');
-    }*/
 }
 
 module.exports = BundlerGeneral;