diff --git a/appveyor.yml b/appveyor.yml
index 15853b005c..620b03ad0f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -60,7 +60,7 @@ artifacts:
 - path: dist/dist-opera-%APPVEYOR_BUILD_NUMBER%.zip
 - path: dist/dist-chrome-%APPVEYOR_BUILD_NUMBER%.zip
 - path: dist/dist-firefox-%APPVEYOR_BUILD_NUMBER%.zip
-- path: dist/dist-edge-%APPVEYOR_BUILD_NUMBER%.appx
+- path: dist/dist-edge-%APPVEYOR_BUILD_NUMBER%.zip
 #- path: dist/dist-safari-%APPVEYOR_BUILD_NUMBER%.zip
 - path: dist/browser-source-%APPVEYOR_BUILD_NUMBER%.zip
 - path: coverage/coverage-%APPVEYOR_BUILD_NUMBER%.zip
diff --git a/gulpfile.js b/gulpfile.js
index 2d60e06dad..98917519be 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -7,7 +7,6 @@ const gulp = require('gulp'),
     child = require('child_process'),
     zip = require('gulp-zip'),
     manifest = require('./src/manifest.json'),
-    xmlpoke = require('gulp-xmlpoke'),
     del = require('del'),
     fs = require('fs');
 
@@ -34,9 +33,6 @@ const filters = {
     webExt: [
         '!build/manifest.json'
     ],
-    edge: [
-        '!build/edge/**/*'
-    ],
     nonSafariApp: [
         '!build/background.html',
         '!build/popup/index.html'
@@ -57,7 +53,7 @@ function distFileName(browserName, ext) {
 
 function dist(browserName, manifest) {
     return gulp.src(paths.build + '**/*')
-        .pipe(filter(['**'].concat(filters.edge).concat(filters.fonts).concat(filters.safari)))
+        .pipe(filter(['**'].concat(filters.fonts).concat(filters.safari)))
         .pipe(gulpif('popup/index.html', replace('__BROWSER__', 'browser_' + browserName)))
         .pipe(gulpif('manifest.json', jeditor(manifest)))
         .pipe(zip(distFileName(browserName, 'zip')))
@@ -66,7 +62,6 @@ function dist(browserName, manifest) {
 
 function distFirefox() {
     return dist('firefox', (manifest) => {
-        delete manifest['-ms-preload'];
         delete manifest.content_security_policy;
         removeShortcuts(manifest);
         return manifest;
@@ -75,7 +70,6 @@ function distFirefox() {
 
 function distOpera() {
     return dist('opera', (manifest) => {
-        delete manifest['-ms-preload'];
         delete manifest.applications;
         delete manifest.content_security_policy;
         removeShortcuts(manifest);
@@ -85,7 +79,16 @@ function distOpera() {
 
 function distChrome() {
     return dist('chrome', (manifest) => {
-        delete manifest['-ms-preload'];
+        delete manifest.applications;
+        delete manifest.content_security_policy;
+        delete manifest.sidebar_action;
+        delete manifest.commands._execute_sidebar_action;
+        return manifest;
+    });
+}
+
+function distEdge() {
+    return dist('edge', (manifest) => {
         delete manifest.applications;
         delete manifest.content_security_policy;
         delete manifest.sidebar_action;
@@ -103,71 +106,6 @@ function removeShortcuts(manifest) {
     }
 }
 
-// Since Edge extensions require makeappx to be run we temporarily store it in a folder.
-function distEdge(cb) {
-    const edgePath = paths.dist + 'Edge/';
-    const extensionPath = edgePath + 'Extension/';
-    const fileName = distFileName('edge', 'appx');
-    const appxPath = paths.dist + fileName;
-
-    return del([edgePath, appxPath])
-        .then(() => edgeCopyBuild(paths.build + '**/*', extensionPath))
-        .then(() => edgeCopyAssets('./store/windows/**/*', edgePath))
-        .then(() => {
-            // makeappx.exe must be in your system's path already
-            const proc = child.spawn('makeappx.exe', [
-                'pack',
-                '/h',
-                'SHA256',
-                '/d',
-                edgePath,
-                '/p',
-                appxPath]);
-            stdOutProc(proc);
-            return new Promise((resolve) => proc.on('close', resolve));
-        }).then(() => {
-            return cb;
-        }, () => {
-            return cb;
-        });
-}
-
-function edgeCopyBuild(source, dest) {
-    return new Promise((resolve, reject) => {
-        gulp.src(source)
-            .on('error', reject)
-            .pipe(filter(['**'].concat(filters.fonts).concat(filters.safari)))
-            .pipe(gulpif('popup/index.html', replace('__BROWSER__', 'browser_edge')))
-            .pipe(gulpif('manifest.json', jeditor((manifest) => {
-                delete manifest.applications;
-                delete manifest.sidebar_action;
-                delete manifest.commands._execute_sidebar_action;
-                delete manifest.content_security_policy;
-                return manifest;
-            })))
-            .pipe(gulp.dest(dest))
-            .on('end', resolve);
-    });
-}
-
-function edgeCopyAssets(source, dest) {
-    return new Promise((resolve, reject) => {
-        gulp.src(source)
-            .on('error', reject)
-            .pipe(gulpif('AppxManifest.xml', xmlpoke({
-                replacements: [{
-                    xpath: '/p:Package/p:Identity/@Version',
-                    value: manifest.version + '.0',
-                    namespaces: {
-                        'p': 'http://schemas.microsoft.com/appx/manifest/foundation/windows10'
-                    }
-                }]
-            })))
-            .pipe(gulp.dest(dest))
-            .on('end', resolve);
-    });
-}
-
 function distSafariMas(cb) {
     return distSafariApp(cb, 'mas');
 }
@@ -254,7 +192,7 @@ function safariCopyBuild(source, dest) {
     return new Promise((resolve, reject) => {
         gulp.src(source)
             .on('error', reject)
-            .pipe(filter(['**'].concat(filters.edge).concat(filters.fonts)
+            .pipe(filter(['**'].concat(filters.fonts)
                 .concat(filters.webExt).concat(filters.nonSafariApp)))
             .pipe(gulp.dest(dest))
             .on('end', resolve);
diff --git a/package-lock.json b/package-lock.json
index a5def7b927..6f4968c8f7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1868,12 +1868,6 @@
         "tweetnacl": "^0.14.3"
       }
     },
-    "beeper": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
-      "dev": true
-    },
     "better-assert": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
@@ -3045,12 +3039,6 @@
         }
       }
     },
-    "clone-stats": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-      "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-      "dev": true
-    },
     "cloneable-readable": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.2.tgz",
@@ -3527,12 +3515,6 @@
       "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
       "dev": true
     },
-    "dateformat": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
-      "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
-      "dev": true
-    },
     "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -3866,41 +3848,6 @@
       "version": "git+https://github.com/duosecurity/duo_web_sdk.git#410a9186cc34663c4913b17d6528067cd3331f1d",
       "from": "git+https://github.com/duosecurity/duo_web_sdk.git"
     },
-    "duplexer2": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "~1.1.9"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
-      }
-    },
     "duplexify": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz",
@@ -7101,95 +7048,6 @@
         "replacestream": "^4.0.0"
       }
     },
-    "gulp-util": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-      "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
-      "dev": true,
-      "requires": {
-        "array-differ": "^1.0.0",
-        "array-uniq": "^1.0.2",
-        "beeper": "^1.0.0",
-        "chalk": "^1.0.0",
-        "dateformat": "^2.0.0",
-        "fancy-log": "^1.1.0",
-        "gulplog": "^1.0.0",
-        "has-gulplog": "^0.1.0",
-        "lodash._reescape": "^3.0.0",
-        "lodash._reevaluate": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.template": "^3.0.0",
-        "minimist": "^1.1.0",
-        "multipipe": "^0.1.2",
-        "object-assign": "^3.0.0",
-        "replace-ext": "0.0.1",
-        "through2": "^2.0.0",
-        "vinyl": "^0.5.0"
-      },
-      "dependencies": {
-        "object-assign": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-          "dev": true
-        }
-      }
-    },
-    "gulp-xmlpoke": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/gulp-xmlpoke/-/gulp-xmlpoke-0.2.1.tgz",
-      "integrity": "sha512-cAQso4o3N+q0HWnk0L+T+i7BrpqyLZOUGyF/meFsXuYpsMLUmFcMRX+TtTO2VW1WSfdKLaci3EGh+BvaY6+bDw==",
-      "dev": true,
-      "requires": {
-        "gulp-util": "~3.0.1",
-        "lodash": "~2.4.1",
-        "through2": "~0.6.1",
-        "xmldom": "~0.1.19",
-        "xpath": "0.0.7"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "lodash": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
-          "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        },
-        "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-          "dev": true,
-          "requires": {
-            "readable-stream": ">=1.0.33-1 <1.1.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
-          }
-        }
-      }
-    },
     "gulp-zip": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-4.2.0.tgz",
@@ -7368,15 +7226,6 @@
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true
     },
-    "has-gulplog": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
-      "dev": true,
-      "requires": {
-        "sparkles": "^1.0.0"
-      }
-    },
     "has-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
@@ -8934,18 +8783,6 @@
       "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
       "dev": true
     },
-    "lodash._basetostring": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
-      "dev": true
-    },
-    "lodash._basevalues": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
-      "dev": true
-    },
     "lodash._bindcallback": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
@@ -8975,30 +8812,6 @@
       "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
       "dev": true
     },
-    "lodash._reescape": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
-      "dev": true
-    },
-    "lodash._reevaluate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
-      "dev": true
-    },
-    "lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-      "dev": true
-    },
-    "lodash._root": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
-      "dev": true
-    },
     "lodash.assign": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
@@ -9032,15 +8845,6 @@
         "lodash.restparam": "^3.0.0"
       }
     },
-    "lodash.escape": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-      "dev": true,
-      "requires": {
-        "lodash._root": "^3.0.0"
-      }
-    },
     "lodash.isarguments": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
@@ -9082,33 +8886,6 @@
       "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=",
       "dev": true
     },
-    "lodash.template": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-      "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
-      "dev": true,
-      "requires": {
-        "lodash._basecopy": "^3.0.0",
-        "lodash._basetostring": "^3.0.0",
-        "lodash._basevalues": "^3.0.0",
-        "lodash._isiterateecall": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.escape": "^3.0.0",
-        "lodash.keys": "^3.0.0",
-        "lodash.restparam": "^3.0.0",
-        "lodash.templatesettings": "^3.0.0"
-      }
-    },
-    "lodash.templatesettings": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-      "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
-      "dev": true,
-      "requires": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.escape": "^3.0.0"
-      }
-    },
     "log4js": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.1.0.tgz",
@@ -9802,15 +9579,6 @@
         "minimatch": "^3.0.0"
       }
     },
-    "multipipe": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
-      "dev": true,
-      "requires": {
-        "duplexer2": "0.0.2"
-      }
-    },
     "mute-stdout": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
@@ -11337,12 +11105,6 @@
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
       "dev": true
     },
-    "replace-ext": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-      "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-      "dev": true
-    },
     "replace-homedir": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
@@ -13509,17 +13271,6 @@
         "extsprintf": "^1.2.0"
       }
     },
-    "vinyl": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-      "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-      "dev": true,
-      "requires": {
-        "clone": "^1.0.0",
-        "clone-stats": "^0.0.1",
-        "replace-ext": "0.0.1"
-      }
-    },
     "vinyl-fs": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
@@ -14946,24 +14697,12 @@
         "ultron": "~1.1.0"
       }
     },
-    "xmldom": {
-      "version": "0.1.27",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
-      "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=",
-      "dev": true
-    },
     "xmlhttprequest-ssl": {
       "version": "1.5.5",
       "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
       "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
       "dev": true
     },
-    "xpath": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.7.tgz",
-      "integrity": "sha1-IYmrI27TLT0s0crdhZkdkcE1tyA=",
-      "dev": true
-    },
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
diff --git a/package.json b/package.json
index 1de3dfaf65..8f0f40374f 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,6 @@
     "gulp-if": "^2.0.2",
     "gulp-json-editor": "^2.4.2",
     "gulp-replace": "^1.0.0",
-    "gulp-xmlpoke": "^0.2.1",
     "gulp-zip": "^4.2.0",
     "html-loader": "^0.5.5",
     "html-webpack-plugin": "^3.2.0",
diff --git a/src/manifest.json b/src/manifest.json
index 902a6777f1..0577d54cf9 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -111,10 +111,6 @@
   "web_accessible_resources": [
     "notification/bar.html"
   ],
-  "-ms-preload": {
-    "backgroundScript": "edge/backgroundScriptsAPIBridge.js",
-    "contentScript": "edge/contentScriptsAPIBridge.js"
-  },
   "applications": {
     "gecko": {
       "id": "{446900e4-71c2-419f-a6a7-df9c091e268b}",
diff --git a/tsconfig.json b/tsconfig.json
index b0e93eacb4..f5867ad1e5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -45,7 +45,6 @@
     "build.safariextension",
     "coverage",
     "store",
-    "src/edge",
     "jslib/src/services/nodeApi.service.ts",
     "jslib/src/services/lowdbStorage.service.ts"
   ]
diff --git a/webpack.config.js b/webpack.config.js
index 58a509d037..9cdf9495ca 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -97,7 +97,6 @@ const plugins = [
     new CopyWebpackPlugin([
         './src/manifest.json',
         { from: './src/_locales', to: '_locales' },
-        { from: './src/edge', to: 'edge' },
         { from: './src/images', to: 'images' },
         { from: './src/popup/images', to: 'popup/images' },
         { from: './src/content/autofill.css', to: 'content' },