diff --git a/src/language/LanguageManager.js b/src/language/LanguageManager.js
index 9870b12a32a..eb779ecc1b0 100644
--- a/src/language/LanguageManager.js
+++ b/src/language/LanguageManager.js
@@ -46,7 +46,7 @@
  *     language.setLineComment("--");
  *     language.setBlockComment("{-", "-}");
  *
- * Some CodeMirror modes define variations of themselves. The are called MIME modes.
+ * Some CodeMirror modes define variations of themselves. They are called MIME modes.
  * To find out existing MIME modes, search for "CodeMirror.defineMIME" in thirdparty/CodeMirror2/mode
  * For instance, C++, C# and Java all use the clike mode.
  * You can refine the mode definition by specifying the MIME mode as well:
@@ -462,18 +462,15 @@ define(function (require, exports, module) {
     html._setLanguageForMode("xml", html);
     
     // Currently we override the above mentioned "xml" in TokenUtils.getModeAt, instead returning "html".
-    // When the CSSInlineEditor and the hint providers are no longer based on moded, this can be changed.
+    // When the CSSInlineEditor and the hint providers are no longer based on modes, this can be changed.
     // But for now, we need to associate this madeup "html" mode with our HTML language object.
     _setLanguageForMode("html", html);
     
     // The fallback language for unknown modes and file extensions
     _fallbackLanguage = getLanguage("unknown");
     
-    
     // Public methods
-    module.exports = {
-        defineLanguage:              defineLanguage,
-        getLanguage:                 getLanguage,
-        getLanguageForFileExtension: getLanguageForFileExtension
-    };
+    exports.defineLanguage               = defineLanguage;
+    exports.getLanguage                  = getLanguage;
+    exports.getLanguageForFileExtension  = getLanguageForFileExtension;
 });
\ No newline at end of file
diff --git a/src/utils/ExtensionLoader.js b/src/utils/ExtensionLoader.js
index 3febfb84ead..b1869017fb6 100644
--- a/src/utils/ExtensionLoader.js
+++ b/src/utils/ExtensionLoader.js
@@ -41,8 +41,6 @@ define(function (require, exports, module) {
     var _init       = false,
         /** @type {Object<string, Object>}  Stores require.js contexts of extensions */
         contexts    = {},
-        /** @type {Object<string, string>}  Stores what entry points where used to load an extension (usually "main" to load main.js) */
-        entryPoints = {},
         srcPath     = FileUtils.getNativeBracketsDirectoryPath();
     
     // The native directory path ends with either "test" or "src". We need "src" to
@@ -96,7 +94,6 @@ define(function (require, exports, module) {
                 locale: brackets.getLocale()
             });
         contexts[name] = extensionRequire;
-        entryPoints[name] = entryPoint;
 
         // console.log("[Extension] starting to load " + config.baseUrl);