diff --git a/configs/client-default.js b/configs/client-default.js
index 69e09db0..a72c3721 100644
--- a/configs/client-default.js
+++ b/configs/client-default.js
@@ -754,7 +754,6 @@ module.exports = function(options) {
             packagePath: "plugins/c9.ide.behaviors/page",
             staticPrefix: staticPrefix + "/plugins/c9.ide.behaviors"
         },
-        "plugins/c9.ide.browsersupport/browsersupport",
         {
             packagePath: "plugins/c9.ide.preferences/preferences",
             staticPrefix: staticPrefix + "/plugins/c9.ide.preferences"
diff --git a/package.json b/package.json
index fa3a91c1..98a86fc9 100644
--- a/package.json
+++ b/package.json
@@ -58,8 +58,8 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#a475368d6d",
-        "c9.ide.language.core": "#233a0b4023",
+        "c9.ide.language": "#f62951109c",
+        "c9.ide.language.core": "#2945e91cb6",
         "c9.ide.language.css": "#46ad561506",
         "c9.ide.language.generic": "#b47cbe58f9",
         "c9.ide.language.html": "#6ecb73a17b",
@@ -67,19 +67,19 @@
         "c9.ide.language.javascript": "#b82f16e56a",
         "c9.ide.language.javascript.immediate": "#82c426dbca",
         "c9.ide.language.javascript.eslint": "#cb9e3f5a8e",
-        "c9.ide.language.javascript.tern": "#4dedbbef74",
+        "c9.ide.language.javascript.tern": "#0545a6385d",
         "c9.ide.language.javascript.infer": "#b9c2e4bdb8",
-        "c9.ide.language.jsonalyzer": "#72954f8da1",
+        "c9.ide.language.jsonalyzer": "#a32369793c",
         "c9.ide.language.codeintel": "#4e0a272229",
         "c9.ide.collab": "#79b094a770",
         "c9.ide.local": "#9169fec157",
         "c9.ide.find": "#a2dfc3e306",
         "c9.ide.find.infiles": "#488db22ee1",
         "c9.ide.find.replace": "#47a84af707",
-        "c9.ide.run.debug": "#3a13207ef8",
+        "c9.ide.run.debug": "#b7ad699bff",
         "c9.automate": "#47e2c429c9",
         "c9.ide.ace.emmet": "#6dc4585e02",
-        "c9.ide.ace.gotoline": "#a8ff07c8f4",
+        "c9.ide.ace.gotoline": "#dcbe58d549",
         "c9.ide.ace.keymaps": "#334a65192f",
         "c9.ide.ace.repl": "#4b88a85b7b",
         "c9.ide.ace.split": "#0ae0151c78",
@@ -120,7 +120,7 @@
         "c9.ide.theme.flat": "#81dadeee55",
         "c9.ide.threewaymerge": "#229382aa0b",
         "c9.ide.undo": "#b028bcb4d5",
-        "c9.ide.upload": "#a3da59803d",
+        "c9.ide.upload": "#428de5c35b",
         "c9.ide.welcome": "#5b86c44e92",
         "c9.ide.guide": "#df7c89e449"
     }
diff --git a/plugins/c9.ide.browsersupport/browsersupport.js b/plugins/c9.ide.browsersupport/browsersupport.js
deleted file mode 100644
index 48e6dac9..00000000
--- a/plugins/c9.ide.browsersupport/browsersupport.js
+++ /dev/null
@@ -1,118 +0,0 @@
-define(function(require, exports, module) {
-    "use strict";
-    
-    main.consumes = ["Plugin"];
-    main.provides = ["browsersupport"];
-    return main;
-
-    function main(options, imports, register) {
-        var Plugin = imports.Plugin;
-        
-        require("ace/lib/es5-shim");
-        require("ace/lib/es6-shim");
-        var useragent = require("ace/lib/useragent");
-        var dom = require("ace/lib/dom");
-        
-        if (useragent.isGecko)
-            dom.addCssClass(document.body, "ua_gecko");
-        else if (useragent.isWebkit)
-            dom.addCssClass(document.body, "ua_webkit");
-        else if (useragent.isIE)
-            dom.addCssClass(document.body, "ua_ie");
-
-        function getIEVersion() {
-            return useragent.isIE;
-        }
-
-        var plugin = new Plugin("Ajax.org", main.consumes);
-        
-        /**
-         * Browser compatibility support.
-         */
-        plugin.freezePublicAPI({
-            /**
-             * Gets Internet Explorer's major version, e.g. 10,
-             * or returns null if a different browser is used.
-             * 
-             * @return {Number}
-             */
-            getIEVersion: getIEVersion
-        });
-        register(null, { browsersupport: plugin });
-    }
-});
-
-// Support __defineGetter__ et al. on IE9
-// (always triggers when packed)
-try {
-   if (!Object.prototype.__defineGetter__ &&
-        Object.defineProperty({},"x",{get: function(){return true}}).x) {
-        
-        // Setter    
-        Object.defineProperty(
-            Object.prototype, 
-            "__defineSetter__",
-            {
-                enumerable: false, 
-                configurable: true,
-                value: function(name,func) {
-                    Object.defineProperty(this,name,{set:func,enumerable: true,configurable: true});
-                    
-                    // Adding the property to the list (for __lookupSetter__)
-                    if (!this.setters) this.setters = {};
-                    this.setters[name] = func;
-                }
-            }
-        );
-        
-        // Lookupsetter
-        Object.defineProperty(
-            Object.prototype, 
-            "__lookupSetter__",
-            {
-                enumerable: false, 
-                configurable: true,
-                value: function(name) {
-                    if (!this.setters) return false;
-                    return this.setters[name];
-                }
-            }
-        );
-        
-        // Getter    
-        Object.defineProperty(
-            Object.prototype, 
-            "__defineGetter__",
-            {
-                enumerable: false, 
-                configurable: true,
-                value: function(name,func) {
-                    Object.defineProperty(this,name,{get:func,enumerable: true,configurable: true});
-                    
-                    // Adding the property to the list (for __lookupSetter__)
-                    if (!this.getters) this.getters = {};
-                    this.getters[name] = func;
-                }
-            }
-        );
-        
-        // Lookupgetter
-        Object.defineProperty(
-            Object.prototype, 
-            "__lookupGetter__",
-            {
-                enumerable: false, 
-                configurable: true,
-                value: function(name) {
-                    if (!this.getters) return false;
-                    return this.getters[name];
-                }
-            }
-        );
-        
-   }
-} catch (defPropException) {
-   // Forget about it
-}
-
-
diff --git a/plugins/c9.ide.plugins/manager.js b/plugins/c9.ide.plugins/manager.js
index 1eceb48c..4c338003 100644
--- a/plugins/c9.ide.plugins/manager.js
+++ b/plugins/c9.ide.plugins/manager.js
@@ -77,7 +77,7 @@ define(function(require, exports, module) {
             "c9.ide.console":1,"c9.ide.editors":1,"c9.ide.dialog.common":1,
             "c9.ide.dialog.file":1,"c9.ide.dialog.login":1,"c9.ide.errorhandler":1,
             "c9.ide.help":1,"c9.ide.keys":1,"c9.ide.restore":1,"c9.ide.watcher":1,
-            "c9.ide.tree":1, "c9.ide.info":1, "c9.ide.browsersupport":1,
+            "c9.ide.tree":1, "c9.ide.info":1,
             "c9.ide.layout.classic":1, "c9.ide.terminal":1, "c9.ide.ace":1,
             "c9.ide.clipboard":1, "c9.nodeapi":1
         };