diff --git a/.hgignore b/.hgignore
index 4ae8f59f..40d211a3 100644
--- a/.hgignore
+++ b/.hgignore
@@ -25,5 +25,5 @@ syntax: glob
 syntax: regexp
 
 ## For rejects
-\.(orig|rej)$
+\.(orig|rej|bak|diff)$
 
diff --git a/common/modules/commandline-handler.jsm b/common/modules/commandline-handler.jsm
deleted file mode 100644
index 87c7529f..00000000
--- a/common/modules/commandline-handler.jsm
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) 2009 by Doug Kearns
-//
-// This work is licensed for reuse under an MIT license. Details are
-// given in the LICENSE.txt file included with this file.
-
-var EXPORTED_SYMBOLS = ["CommandLineHandler", "NSGetModule"];
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-var CommandLineHandler;
-
-function initCommandLineHandler(Name) {
-    var name = Name.toLowerCase();
-    CommandLineHandler = function CommandLineHandler() {
-        this.wrappedJSObject = this;
-    }
-    CommandLineHandler.prototype = {
-
-        classDescription: Name + " Command-line Handler",
-
-        classID: Components.ID("{16dc34f7-6d22-4aa4-a67f-2921fb5dcb69}"),
-
-        contractID: "@mozilla.org/commandlinehandler/general-startup;1?type=" + name,
-
-        _xpcom_categories: [{
-            category: "command-line-handler",
-            entry: "m-" + name
-        }],
-
-        QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsICommandLineHandler]),
-
-        handle: function (commandLine) {
-            // TODO: handle remote launches differently?
-            try {
-                this.optionValue = commandLine.handleFlagWithParam(name, false);
-            }
-            catch (e) {
-                //"vimperator: option -vimperator requires an argument"
-            }
-        }
-    };
-}
-
-function NSGetModule(compMgr, fileSpec) XPCOMUtils.generateModule([CommandLineHandler])
-
-// vim: set ft=javascript fdm=marker sw=4 ts=4 et:
diff --git a/vimperator/locale/en-US/help.js b/vimperator/locale/en-US/help.js
deleted file mode 100644
index 1c75072e..00000000
--- a/vimperator/locale/en-US/help.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2009 by Doug Kearns <dougkearns@gmail.com>
-//
-// This work is licensed for reuse under an MIT license. Details are
-// given in the LICENSE.txt file included with this file.
-
-
-function checkFragment() {
-    let frag = document.location.hash.substr(1);
-    if (!frag || document.getElementById(frag))
-        return;
-    let elem = document.evaluate('//*[@class="tag" and text()="' + frag + '"]', document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null).snapshotItem(0);
-    if (elem)
-        window.content.scrollTo(0, window.content.scrollY + elem.getBoundingClientRect().top - 10); // 10px context
-}
-
-document.addEventListener("load", checkFragment, true);
-window.addEventListener("message", function (event) {
-    if (event.data == "fragmentChange")
-        checkFragment();
-}, true);
-
-document.addEventListener("click", function (event) {
-    let evt = document.createEvent("UIEvents");
-    evt.initEvent("liberatorHelpLink", true, true);
-    event.target.dispatchEvent(evt);
-}, true);
-
-// vim: set fdm=marker sw=4 ts=4 et: