diff --git a/extension/.babelrc b/extension/.babelrc
index 72aeeb79..0d42ef44 100644
--- a/extension/.babelrc
+++ b/extension/.babelrc
@@ -4,5 +4,5 @@
     "@babel/preset-react",
     "@babel/preset-typescript"
   ],
-  "plugins": [["@babel/plugin-proposal-class-properties"]]
+  "plugins": ["@babel/plugin-proposal-class-properties"]
 }
diff --git a/extension/package.json b/extension/package.json
index dff1c8ed..adcfb30c 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -32,6 +32,7 @@
     "type-check": "tsc --noEmit"
   },
   "dependencies": {
+    "@babel/polyfill": "^7.12.1",
     "@redux-devtools/app": "^1.0.0-8",
     "@redux-devtools/core": "^3.9.0",
     "@redux-devtools/instrument": "^1.11.0",
@@ -49,8 +50,6 @@
     "redux": "^4.1.1"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-decorators": "^7.14.5",
-    "@babel/polyfill": "^7.12.1",
     "@babel/register": "^7.15.3",
     "bestzip": "^2.2.0",
     "chromedriver": "^91.0.1",
diff --git a/extension/webpack/base.config.js b/extension/webpack/base.config.js
index 122b22a3..b7151873 100644
--- a/extension/webpack/base.config.js
+++ b/extension/webpack/base.config.js
@@ -31,9 +31,7 @@ const baseConfig = (params) => ({
   },
   plugins: [
     new webpack.DefinePlugin(params.globals),
-    ...(params.plugins
-      ? params.plugins
-      : [new webpack.optimize.ModuleConcatenationPlugin()]),
+    ...(params.plugins ? params.plugins : []),
   ].concat(
     params.copy
       ? new CopyPlugin({
diff --git a/yarn.lock b/yarn.lock
index 71860a1a..029cc338 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -688,7 +688,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-decorators@npm:^7.12.12, @babel/plugin-proposal-decorators@npm:^7.14.5":
+"@babel/plugin-proposal-decorators@npm:^7.12.12":
   version: 7.14.5
   resolution: "@babel/plugin-proposal-decorators@npm:7.14.5"
   dependencies:
@@ -25882,7 +25882,6 @@ fsevents@^1.2.7:
   version: 0.0.0-use.local
   resolution: "remotedev-redux-devtools-extension@workspace:extension"
   dependencies:
-    "@babel/plugin-proposal-decorators": ^7.14.5
     "@babel/polyfill": ^7.12.1
     "@babel/register": ^7.15.3
     "@redux-devtools/app": ^1.0.0-8