diff --git a/security/manager/locales/en-US/chrome/pippki/PageInfoOverlay.dtd b/security/manager/locales/en-US/chrome/pippki/PageInfoOverlay.dtd
deleted file mode 100644
index 175ede11cbb4..000000000000
--- a/security/manager/locales/en-US/chrome/pippki/PageInfoOverlay.dtd
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Terry Hayes <thayes@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!ENTITY pageInfo.securityTab           "Security">
-<!ENTITY pageInfo.securityTab.accesskey "S">
-<!ENTITY pageInfo.securityHeader        "Security information for this page">
-<!ENTITY pageInfo.view.label            "View">
-<!ENTITY pageInfo.view.accesskey        "V">
diff --git a/security/manager/locales/en-US/chrome/pippki/PrefOverlay.dtd b/security/manager/locales/en-US/chrome/pippki/PrefOverlay.dtd
deleted file mode 100644
index c821842353e5..000000000000
--- a/security/manager/locales/en-US/chrome/pippki/PrefOverlay.dtd
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Terry Hayes <thayes@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!ENTITY  masterpass.label             "Master Passwords">
-<!ENTITY  security.label               "Privacy and Security">
-<!ENTITY  ssl.label                    "SSL">
-<!ENTITY  certs.label                  "Certificates">
-<!ENTITY  validation.label             "Validation">
diff --git a/security/manager/locales/en-US/chrome/pippki/pref-masterpass.dtd b/security/manager/locales/en-US/chrome/pippki/pref-masterpass.dtd
deleted file mode 100644
index c583fb38ec04..000000000000
--- a/security/manager/locales/en-US/chrome/pippki/pref-masterpass.dtd
+++ /dev/null
@@ -1,58 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Terry Hayes <thayes@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!ENTITY  pref.masterpass.title                  "Master Passwords">
-<!ENTITY  managepassword.caption                 "Master Password Timeout">
-<!ENTITY  managepassword.text                    "&brandShortName; will ask for your master password:">
-<!ENTITY  managepassword.askfirsttime            "The first time it is needed">
-<!ENTITY  managepassword.askfirsttime.accesskey  "T">
-<!ENTITY  managepassword.askeverytime            "Every time it is needed">
-<!ENTITY  managepassword.askeverytime.accesskey  "E">
-<!ENTITY  managepassword.asktimeout              "If it has not been used for ">
-<!ENTITY  managepassword.asktimeout.accesskey    "n">
-<!ENTITY  managepassword.timeout.unit            "minutes or longer">
-
-<!ENTITY  changepassword.caption                 "Change Master Password">
-<!ENTITY  changepassword.text                    "Your master password protects sensitive information such as web passwords and certificates.">
-<!ENTITY  changepassword.button                  "Change Password…">
-<!ENTITY  changepassword.accesskey               "C">
-
-<!ENTITY  resetpassword.caption                  "Reset Master Password">
-<!ENTITY  resetpassword.text                     "If you reset your master password, all of your stored web and e-mail passwords, form data, personal certificates, and private keys will be lost.">
-<!ENTITY  resetpassword.button                   "Reset Password">
-<!ENTITY  resetpassword.accesskey                "R">
diff --git a/security/manager/locales/en-US/chrome/pippki/pref-security.dtd b/security/manager/locales/en-US/chrome/pippki/pref-security.dtd
deleted file mode 100644
index 7f49c2e8413a..000000000000
--- a/security/manager/locales/en-US/chrome/pippki/pref-security.dtd
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Terry Hayes <thayes@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!ENTITY  resetsettings.label      "Reset Settings">
-<!ENTITY  resetpreferences.label   "Reset Preferences…">
-<!ENTITY  managecerts.caption      "Manage Certificates">
-<!ENTITY  managecerts.text         "Use the Certificate Manager to manage your personal certificates, as well as those of other people and certificate authorities.">
-<!ENTITY  managecerts.button       "Manage Certificates…">
-<!ENTITY  managecerts.accesskey    "M">
-<!ENTITY  managedevices.caption    "Manage Security Devices">
-<!ENTITY  managedevices.text       "Use this button to manage your security devices, such as smart cards.">
-<!ENTITY  managedevices.button     "Manage Security Devices…">
-<!ENTITY  managedevices.accesskey  "S">
-
-<!ENTITY  ssl.label                "SSL">
-
-<!ENTITY  pref.certs.title         "Certificates">
-<!ENTITY  certs.label              "Certificates">
diff --git a/security/manager/locales/en-US/chrome/pippki/pref-ssl.dtd b/security/manager/locales/en-US/chrome/pippki/pref-ssl.dtd
deleted file mode 100644
index 427175258ae3..000000000000
--- a/security/manager/locales/en-US/chrome/pippki/pref-ssl.dtd
+++ /dev/null
@@ -1,68 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Terry Hayes <thayes@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!ENTITY  SSLProtocolVersions.caption       "SSL Protocol Versions">
-<!ENTITY  SSLWarnings.caption               "SSL Warnings">
-<!ENTITY  SSLClientAuthMethod.caption       "Client Certificate Selection">
-
-<!ENTITY pref.ssl.title                     "Secure Sockets Layer (SSL)">
-<!ENTITY enable.ssl3                        "Enable SSL version 3">
-<!ENTITY enable.ssl3.accesskey              "3">
-<!ENTITY enable.tls                         "Enable TLS">
-<!ENTITY enable.tls.accesskey               "T">
-
-<!ENTITY warn.description                   "&brandShortName; can alert you to the security status of the web page you are viewing. Set &brandShortName; to show a warning and ask permission before:">
-<!ENTITY warn.enteringsecure                "Loading a page that supports encryption">
-<!ENTITY warn.enteringsecure.accesskey      "L">
-<!ENTITY warn.enteringweak                  "Loading a page that uses low-grade encryption">
-<!ENTITY warn.enteringweak.accesskey        "o">
-<!ENTITY warn.insecurepost                  "Sending form data from an unencrypted page to an unencrypted page">
-<!ENTITY warn.insecurepost.accesskey        "S">
-<!ENTITY warn.leavingsecure                 "Leaving a page that supports encryption">
-<!ENTITY warn.leavingsecure.accesskey       "a">
-<!ENTITY warn.secureredirect                "Redirecting from one encrypted page to another">
-<!ENTITY warn.secureredirecttoinsecure      "Redirecting from an encrypted page to an unencrypted page">
-<!ENTITY warn.viewmixed                     "Viewing a page with an encrypted/unencrypted mix">
-<!ENTITY warn.viewmixed.accesskey           "V">
-
-<!ENTITY certselect.description             "Decide how &brandShortName; selects a security certificate to present to web sites that require one:">
-<!ENTITY certselect.auto                    "Select Automatically">
-<!ENTITY certselect.auto.accesskey          "A">
-<!ENTITY certselect.ask                     "Ask Every Time">
-<!ENTITY certselect.ask.accesskey           "E">
-
diff --git a/security/manager/locales/en-US/chrome/pippki/pref-validation.dtd b/security/manager/locales/en-US/chrome/pippki/validation.dtd
similarity index 73%
rename from security/manager/locales/en-US/chrome/pippki/pref-validation.dtd
rename to security/manager/locales/en-US/chrome/pippki/validation.dtd
index 706d13176177..460a9f7a1934 100644
--- a/security/manager/locales/en-US/chrome/pippki/pref-validation.dtd
+++ b/security/manager/locales/en-US/chrome/pippki/validation.dtd
@@ -35,12 +35,6 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
-<!ENTITY  pref.validation.title                   "Validation">
-
-<!ENTITY  validation.crl.caption                  "CRL">
-<!ENTITY  validation.crl.description              "Use the CRL Manager to manage the Certificate Revocation Lists (CRL) that are stored in your certificate database.">
-<!ENTITY  validation.managecrls.button            "Manage CRLs…">
-<!ENTITY  validation.managecrls.accesskey         "M">
 <!ENTITY  validation.crlmanager.label             "Manage CRLs">
 <!ENTITY  validation.crlmanager.description       "These Certificate Revocation Lists (CRL) are stored in your certificate database:">
 <!ENTITY  validation.crlname.label                "Name">
@@ -71,17 +65,3 @@
 <!ENTITY  crl.autoupdate.fail.cnt.label           "Previous Consecutive Update Failures: ">
 <!ENTITY  crl.autoupdate.fail.reason.label        "Details of Last Update Failure: ">
 <!ENTITY  edit.button                             "Settings">
-
-<!ENTITY validation.ocsp.caption                  "OCSP">
-<!ENTITY enableOCSP.label                         "Use the Online Certificate Status Protocol (OCSP) to confirm the current validity of certificates">
-<!ENTITY enableOCSP.accesskey                     "U">
-<!ENTITY certOCSP2.label                          "Validate a certificate if it specifies an OCSP server">
-<!ENTITY certOCSP2.accesskey                      "V">
-<!ENTITY proxyOCSP2.label                         "Validate all certificates using the following OCSP server:">
-<!ENTITY proxyOCSP2.accesskey                     "a">
-<!ENTITY serviceURL.label                         "Service URL:">
-<!ENTITY serviceURL.accesskey                     "S">
-<!ENTITY signingCA.label                          "Response Signer:">
-<!ENTITY signingCA.accesskey                      "R">
-<!ENTITY validation.requireOCSP.description       "When an OCSP server connection fails, treat the certificate as invalid">
-<!ENTITY validation.requireOCSP.accesskey         "W">
diff --git a/security/manager/locales/jar.mn b/security/manager/locales/jar.mn
index be66b2af0932..34c0ff593bbb 100644
--- a/security/manager/locales/jar.mn
+++ b/security/manager/locales/jar.mn
@@ -12,12 +12,7 @@
   locale/@AB_CD@/pipnss/nsserrors.properties  (%chrome/pipnss/nsserrors.properties)
   locale/@AB_CD@/pipnss/security.properties   (%chrome/pipnss/security.properties)
   locale/@AB_CD@/pippki/pippki.dtd            (%chrome/pippki/pippki.dtd)
-  locale/@AB_CD@/pippki/pref-ssl.dtd          (%chrome/pippki/pref-ssl.dtd)
   locale/@AB_CD@/pippki/pippki.properties     (%chrome/pippki/pippki.properties)
-  locale/@AB_CD@/pippki/PrefOverlay.dtd       (%chrome/pippki/PrefOverlay.dtd)
-  locale/@AB_CD@/pippki/pref-security.dtd     (%chrome/pippki/pref-security.dtd)
-  locale/@AB_CD@/pippki/PageInfoOverlay.dtd   (%chrome/pippki/PageInfoOverlay.dtd)
   locale/@AB_CD@/pippki/certManager.dtd       (%chrome/pippki/certManager.dtd)
   locale/@AB_CD@/pippki/deviceManager.dtd     (%chrome/pippki/deviceManager.dtd)
-  locale/@AB_CD@/pippki/pref-validation.dtd   (%chrome/pippki/pref-validation.dtd)
-  locale/@AB_CD@/pippki/pref-masterpass.dtd   (%chrome/pippki/pref-masterpass.dtd)
+  locale/@AB_CD@/pippki/validation.dtd        (%chrome/pippki/validation.dtd)
diff --git a/security/manager/pki/resources/content/PageInfoOverlay.xul b/security/manager/pki/resources/content/PageInfoOverlay.xul
deleted file mode 100644
index e3851dca6d38..000000000000
--- a/security/manager/pki/resources/content/PageInfoOverlay.xul
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Terry Hayes <thayes@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!-- This file extends "chrome://navigator/content/pageInfo.xul" -->
-
-<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/PageInfoOverlay.dtd">
-
-<overlay id="pipPageInfoOverlayID"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript">
-  <![CDATA[
-    var security = {
-      // Display the server certificate (static)
-      viewCert : function () {
-        var cert = security._cert;
-        viewCertHelper(window, cert);
-      },
-
-      _getSecurityInfo : function() {
-        const nsIX509Cert = Components.interfaces.nsIX509Cert;
-        const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
-        const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
-        const nsISSLStatusProvider = Components.interfaces.nsISSLStatusProvider;
-        const nsISSLStatus = Components.interfaces.nsISSLStatus;
-
-        // Get the window for this information
-        var w;
-        if ("arguments" in window && window.arguments.length > 0 &&
-            window.arguments[0] && window.arguments[0].doc)
-        {
-          w = window.arguments[0].doc.defaultView;
-          if (w != w.top) {
-            // We don't have separate info for a frame, return null until further notice
-            // (see bug 138479)
-            return null;
-          }
-        }
-        else if ("gBrowser" in window.opener)
-          w = window.opener.gBrowser.contentWindow;
-        else
-          w = window.opener.frames[0];
-
-        var hName = null;
-        try
-        {
-           hName = w.location.host;
-        } catch(exception){}
-
-        var ui = security._getSecurityUI();
-        var status = null;
-        var sp = null;
-        var isBroken = false;
-        if (ui) {
-          isBroken = (ui.state & Components.interfaces.nsIWebProgressListener.STATE_IS_BROKEN);
-          if (!(ui.state & Components.interfaces.nsIWebProgressListener.STATE_IS_INSECURE)) {
-            sp = ui.QueryInterface(nsISSLStatusProvider);
-            if (sp)
-              status = sp.SSLStatus;
-          }
-        }
-        if (status) {
-          status = status.QueryInterface(nsISSLStatus);
-        }
-        if (status) {
-          var cert = status.serverCert;
-          var issuerName;
-
-          issuerName = this.mapIssuerOrganization(cert.issuerOrganization);
-          if (!issuerName) issuerName = cert.issuerName;
-        
-          return {
-            hostName : hName,
-            cAName : issuerName,
-            encryptionAlgorithm : status.cipherName,
-            encryptionStrength : status.secretKeyLength,
-            isBroken : isBroken,
-            cert : cert
-          };
-        } else {
-          return {
-            hostName : hName,
-            cAName : "",
-            encryptionAlgorithm : "",
-            encryptionStrength : 0,
-            isBroken : isBroken,
-            cert : null
-          };
-        } 
-      },
-
-      // Find the secureBrowserUI object (if present)
-      _getSecurityUI : function() {
-        if ("gBrowser" in window.opener)
-          return window.opener.gBrowser.securityUI;
-        return null;
-      },
-
-      // Interface for mapping a certificate issuer organization to
-      // the value to be displayed.
-      // Bug 82017 - this implementation should be moved to pipnss C++ code
-      mapIssuerOrganization: function(name) {
-        if (!name) return null;
-
-        if (name == "RSA Data Security, Inc.") return "Verisign, Inc.";
-
-        // No mapping required
-        return name;
-      },
-
-      _cert : null
-    };
-
-    function securityOnLoad() {
-      var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-
-      var info = security._getSecurityInfo();
-      if (!info) {
-        document.getElementById("securityTab").setAttribute("hidden", true);
-        return;
-      }
-
-      var idHdr;
-      var message1;
-      var message2;
-
-      /* Set the identification messages */
-      if (info.cert)
-      {
-        idHdr = bundle.GetStringFromName("pageInfo_WebSiteVerified");
-        setText("security-identity", idHdr);
-
-        message1 = bundle.formatStringFromName("pageInfo_Identity_Verified", 
-                                [ info.hostName, info.cAName ],
-                                2);
-        setText("security-identity-text", message1);
-
-        var viewText = bundle.GetStringFromName("pageInfo_ViewCertificate");
-        setText("security-view-text", viewText);
-        security._cert = info.cert;
-      } else {
-        idHdr = bundle.GetStringFromName("pageInfo_SiteNotVerified");
-        setText("security-identity", idHdr);
-
-        document.getElementById("security-view-cert").setAttribute("disabled", "true");
-        document.getElementById("security-view-cert").setAttribute("hidden", "true");
-      }
-
-      var hdr;
-      var msg1;
-      var msg2;
-      
-      /* Set the encryption messages */
-      if (info.isBroken) {
-        hdr = bundle.GetStringFromName("pageInfo_MixedContent");
-        setText("security-privacy", hdr);
-
-        msg1 = bundle.GetStringFromName("pageInfo_Privacy_Mixed1");
-        setText("security-privacy-msg1", msg1);
-
-        msg2 = bundle.GetStringFromName("pageInfo_Privacy_None2");
-        setText("security-privacy-msg2", msg2);
-      } else if (info.encryptionStrength >= 90) {
-        hdr = bundle.formatStringFromName("pageInfo_StrongEncryption",
-                             [ info.encryptionAlgorithm, info.encryptionStrength+"" ], 2);
-        setText("security-privacy", hdr);
-
-        msg1 = bundle.GetStringFromName("pageInfo_Privacy_Strong1");
-        setText("security-privacy-msg1", msg1);
-
-        msg2 = bundle.GetStringFromName("pageInfo_Privacy_Strong2");
-        setText("security-privacy-msg2", msg2);
-
-        security._cert = info.cert;
-      } else if (info.encryptionStrength > 0) {
-        hdr = bundle.formatStringFromName("pageInfo_WeakEncryption",
-                             [ info.encryptionAlgorithm, info.encryptionStrength+"" ], 2);
-        setText("security-privacy", hdr);
-
-        msg1 = bundle.formatStringFromName("pageInfo_Privacy_Weak1",
-                                               [ info.hostName ], 1);
-        setText("security-privacy-msg1", msg1);
-
-        msg2 = bundle.GetStringFromName("pageInfo_Privacy_Weak2");
-        setText("security-privacy-msg2", msg2);
-      } else {
-        hdr = bundle.GetStringFromName("pageInfo_NoEncryption");
-        setText("security-privacy", hdr);
-
-        if(info.hostName != null)
-          msg1 = bundle.formatStringFromName("pageInfo_Privacy_None1", [ info.hostName ], 1);
-        else
-          msg1 = bundle.GetStringFromName("pageInfo_Privacy_None3");
-
-        setText("security-privacy-msg1", msg1);
-
-        msg2 = bundle.GetStringFromName("pageInfo_Privacy_None2");
-        setText("security-privacy-msg2", msg2);
-      }
-    }
-
-    /* Register for pageInfo onload calls */
-    onLoadRegistry.push(securityOnLoad);
-  ]]>
-  </script>
-  <tabs id="tabs">
-    <tab id="securityTab" label="&pageInfo.securityTab;"
-         accesskey="&pageInfo.securityTab.accesskey;"/>
-  </tabs>
-  <tabpanels id="tabpanels">
-    <vbox id="securityPanel" flex="1">
-      <description id="security-identity" class="header"/>
-      <description id="security-identity-text" flex="1"/>
-      <hbox align="center">
-        <button id="security-view-cert" label="&pageInfo.view.label;"
-                accesskey="&pageInfo.view.accesskey;" 
-                oncommand="security.viewCert();"/>
-        <description id="security-view-text" flex="1"/>
-      </hbox>
-      <separator class="groove"/>
-      <description id="security-privacy" class="header"/>
-      <vbox flex="1">
-        <description id="security-privacy-msg1"/>
-        <description id="security-privacy-msg2"/>
-      </vbox>
-    </vbox>
-  </tabpanels>
-</overlay>
diff --git a/security/manager/pki/resources/content/PrefOverlay.xul b/security/manager/pki/resources/content/PrefOverlay.xul
deleted file mode 100644
index 23f0f6ecbad9..000000000000
--- a/security/manager/pki/resources/content/PrefOverlay.xul
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Terry Hayes <thayes@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!-- This file overlays "chrome://communicator/content/pref/preftree.xul" -->
-
-<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/PrefOverlay.dtd">
-
-<overlay id="pipPrefOverlayID"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <treechildren id="securityChildren">
-    <treeitem id="masterpassItem">
-      <treerow>
-        <treecell url="chrome://pippki/content/pref-masterpass.xul"
-                      label="&masterpass.label;"/>
-      </treerow>
-    </treeitem>
-    <treeitem id="sslItem">
-      <treerow>
-        <treecell url="chrome://pippki/content/pref-ssl.xul"
-                      label="&ssl.label;"/>
-      </treerow>
-    </treeitem>
-    <treeitem id="certItem">
-      <treerow>
-        <treecell url="chrome://pippki/content/pref-certs.xul"
-                      label="&certs.label;"/>
-      </treerow>
-    </treeitem>
-    <treeitem id="validationItem">
-      <treerow>
-        <treecell url="chrome://pippki/content/pref-validation.xul"
-                      label="&validation.label;"/>
-      </treerow>
-    </treeitem>
-  </treechildren>
-</overlay>
diff --git a/security/manager/pki/resources/content/crlImportDialog.xul b/security/manager/pki/resources/content/crlImportDialog.xul
index fb5b8115f220..d89b1d53043f 100644
--- a/security/manager/pki/resources/content/crlImportDialog.xul
+++ b/security/manager/pki/resources/content/crlImportDialog.xul
@@ -38,7 +38,7 @@
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
-<!DOCTYPE dialog SYSTEM "chrome://pippki/locale/pref-validation.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://pippki/locale/validation.dtd">
 
 <dialog id="crlImportSuccess" 
   title="&crl.import.status.title;"
diff --git a/security/manager/pki/resources/content/crlManager.xul b/security/manager/pki/resources/content/crlManager.xul
index ce28e86b5902..f54234148f7f 100644
--- a/security/manager/pki/resources/content/crlManager.xul
+++ b/security/manager/pki/resources/content/crlManager.xul
@@ -40,7 +40,7 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 
 <!DOCTYPE dialog [
-    <!ENTITY % prefValDTD SYSTEM "chrome://pippki/locale/pref-validation.dtd">
+    <!ENTITY % prefValDTD SYSTEM "chrome://pippki/locale/validation.dtd">
     %prefValDTD;
     <!ENTITY % prefCertMgrDTD SYSTEM "chrome://pippki/locale/certManager.dtd">
     %prefCertMgrDTD;
diff --git a/security/manager/pki/resources/content/pref-certs.xul b/security/manager/pki/resources/content/pref-certs.xul
deleted file mode 100644
index e40a58fa2f93..000000000000
--- a/security/manager/pki/resources/content/pref-certs.xul
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0"?> 
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Terry Hayes <thayes@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-
-<!DOCTYPE page [
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-  <!ENTITY % prefSec SYSTEM "chrome://pippki/locale/pref-security.dtd">
-  <!ENTITY % prefSslDTD SYSTEM "chrome://pippki/locale/pref-ssl.dtd">
-  %brandDTD;
-  %prefSec;
-  %prefSslDTD;
-]>
-
-<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://pippki/content/pref-certs.xul');"
-      headertitle="&pref.certs.title;">
-
-  <!-- List elements to manage for prefs -->
-  <script type="application/x-javascript" src="chrome://pippki/content/pref-security.js"/>
-  <script type="application/x-javascript">
-  <![CDATA[
-    var _elementIDs = [ "certSelection" ];
-  ]]>
-  </script>
-
-  <groupbox align="start">
-    <caption label="&SSLClientAuthMethod.caption;"/>
-    <description> &certselect.description; </description>
-    <!-- Prefs -->
-    <radiogroup id="certSelection" orient="horizontal" preftype="string" 
-	        prefstring="security.default_personal_cert">
-    <radio label="&certselect.auto;" accesskey="&certselect.auto.accesskey;" value="Select Automatically"/>
-    <radio label="&certselect.ask;" accesskey="&certselect.ask.accesskey;" value="Ask Every Time"/>
-    </radiogroup>
-  </groupbox>
-
-  <!-- Certificate manager -->
-  <groupbox>
-    <caption label="&managecerts.caption;"/>
-    <description>&managecerts.text;</description>
-    <hbox align="center">
-      <button label="&managecerts.button;"
-              oncommand="openCertManager();" 
-              id="openCertManagerButton"
-              accesskey="&managecerts.accesskey;"
-              prefstring="security.disable_button.openCertManager"/>
-    </hbox>
-  </groupbox>
-
-  <!-- Device manager -->
-  <groupbox>
-    <caption label="&managedevices.caption;"/>
-    <description>&managedevices.text;</description>
-    <hbox align="center">
-      <button label="&managedevices.button;"
-              oncommand="openDeviceManager();"
-              id="openDeviceManagerButton"
-              accesskey="&managedevices.accesskey;"
-              prefstring="security.disable_button.openDeviceManager"/>
-    </hbox>
-  </groupbox>
-
-</page>
diff --git a/security/manager/pki/resources/content/pref-crlupdate.xul b/security/manager/pki/resources/content/pref-crlupdate.xul
index 2dd638a138e5..e71e4897b287 100644
--- a/security/manager/pki/resources/content/pref-crlupdate.xul
+++ b/security/manager/pki/resources/content/pref-crlupdate.xul
@@ -38,7 +38,7 @@
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
-<!DOCTYPE dialog SYSTEM "chrome://pippki/locale/pref-validation.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://pippki/locale/validation.dtd">
 
 <dialog id="crlUpdatePref" 
   title="&validation.crl.autoupdate.title;"
diff --git a/security/manager/pki/resources/content/pref-masterpass.js b/security/manager/pki/resources/content/pref-masterpass.js
deleted file mode 100644
index 2fa737415076..000000000000
--- a/security/manager/pki/resources/content/pref-masterpass.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Javier Delgadillo <javi@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-const nsIPK11Token = Components.interfaces.nsIPK11Token;
-const nsPK11TokenDB = "@mozilla.org/security/pk11tokendb;1";
-const nsIPK11TokenDB = Components.interfaces.nsIPK11TokenDB;
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-const nsDialogParamBlock = "@mozilla.org/embedcomp/dialogparam;1";
-
-var internal_token;
-
-function onMasterPasswordLoad()
-{
-  var tokendb = Components.classes[nsPK11TokenDB].getService(nsIPK11TokenDB);
-  internal_token = tokendb.getInternalKeyToken();
-  var askTimes = internal_token.getAskPasswordTimes();
-  switch (askTimes) {
-  case nsIPK11Token.ASK_FIRST_TIME:  askTimes = 0; break;
-  case nsIPK11Token.ASK_EVERY_TIME:  askTimes = 1; break;
-  case nsIPK11Token.ASK_EXPIRE_TIME: askTimes = 2; break;
-  }
-  var radiogroup = document.getElementById("passwordAskTimes");
-  var radioitem;
-  switch (askTimes) {
-  case 0: radioitem = document.getElementById("askFirstTime"); break;
-  case 1: radioitem = document.getElementById("askEveryTime"); break;
-  case 2: radioitem = document.getElementById("askTimeout"); break;
-  }
-  radiogroup.selectedItem = radioitem;
-  var timeout = internal_token.getAskPasswordTimeout();
-  var timeoutField = document.getElementById("passwordTimeout");
-  timeoutField.setAttribute("value", timeout);
-  
-  changePasswordSettings(false);
-}
-
-function changePasswordSettings(setFocus)
-{
-  var askTimes = 0;
-  var timeout = internal_token.getAskPasswordTimeout();
-  var timeoutField = document.getElementById("passwordTimeout");
-  var radiogroup = document.getElementById("passwordAskTimes");
-  switch ( radiogroup.value ) {
-  case "0": 
-    timeoutField.setAttribute("disabled", true);
-    askTimes = nsIPK11Token.ASK_FIRST_TIME;
-    break;
-  case "1": 
-    timeoutField.setAttribute("disabled", true);
-    askTimes = nsIPK11Token.ASK_EVERY_TIME;
-    break;
-  case "2":
-    timeoutField.removeAttribute("disabled");
-    if ( setFocus ) {
-      timeoutField.focus();
-    }
-    timeout = timeoutField.value;
-    var re = new RegExp("^[0-9]+$");
-    if (!re.test(timeout)) {
-      timeout = "1";
-    }
-    askTimes = nsIPK11Token.ASK_EXPIRE_TIME;
-    break;
-  }
-  internal_token.setAskPasswordDefaults(askTimes, timeout);
-
-  var askEveryTimeHidden = document.getElementById("askEveryTimeHidden");
-  askEveryTimeHidden.checked = (radiogroup.value == 1) ? true : false;
-}
-
-function ChangePW()
-{
-  var params = Components.classes[nsDialogParamBlock].createInstance(nsIDialogParamBlock);
-  params.SetString(1,"");
-  window.openDialog("chrome://pippki/content/changepassword.xul","",
-                    "chrome,centerscreen,modal",params);
-}
-
-function ResetPW()
-{
-  var params = Components.classes[nsDialogParamBlock].createInstance(nsIDialogParamBlock);
-  params.SetString(1,internal_token.tokenName);
-  window.openDialog("chrome://pippki/content/resetpassword.xul", "",
-                    "chrome,centerscreen,modal", params);
-}
diff --git a/security/manager/pki/resources/content/pref-masterpass.xul b/security/manager/pki/resources/content/pref-masterpass.xul
deleted file mode 100644
index f7a570b44608..000000000000
--- a/security/manager/pki/resources/content/pref-masterpass.xul
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0"?> 
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Ian McGreer <mcgreer@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-
-<!DOCTYPE page [
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-  <!ENTITY % prefPass SYSTEM "chrome://pippki/locale/pref-masterpass.dtd">
-  %brandDTD;
-  %prefPass;
-]>
-
-<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://pippki/content/pref-masterpass.xul'); onMasterPasswordLoad();"
-      headertitle="&pref.masterpass.title;">
-
-  <script type="application/x-javascript" src="chrome://pippki/content/pref-masterpass.js"/>
-
-  <!-- List elements to manage for prefs -->
-  <script type="application/x-javascript">
-  <![CDATA[
-    var _elementIDs = ["askEveryTimeHidden",
-                       "changePasswordButton",
-                       "resetPasswordButton",
-                       "passwordAskTimes",
-                       "passwordTimeout"];
-  ]]>
-  </script>
-            
-  <!-- Change Password -->
-  <groupbox>
-    <caption label="&changepassword.caption;"/>
-    <description>&changepassword.text;</description>
-    <hbox align="center">
-      <button label="&changepassword.button;"
-              oncommand="ChangePW();"
-              id="changePasswordButton"
-              accesskey="&changepassword.accesskey;"
-              prefstring="security.disable_button.changePassword"/>
-    </hbox>
-  </groupbox>
-
-  <!-- Password Prefs -->
-  <groupbox>
-
-    <checkbox id="askEveryTimeHidden"
-              prefstring="signon.expireMasterPassword"
-              hidden="true"/>
-
-    <caption label="&managepassword.caption;"/>
-    <description>&managepassword.text;</description>
-    <hbox align="center">
-      <radiogroup id="passwordAskTimes"
-                  prefstring="security.ask_for_password"
-                  flex="1">
-        <!-- note that these values are different than what NSS uses, which
-             are (0, -1, 1) respectively -->
-        <radio value="0" label="&managepassword.askfirsttime;" id="askFirstTime"
-               accesskey="&managepassword.askfirsttime.accesskey;"
-               style="margin: 0px;" oncommand="changePasswordSettings(false);"/>
-        <radio value="1" label="&managepassword.askeverytime;" id="askEveryTime"
-               accesskey="&managepassword.askeverytime.accesskey;"
-               style="margin: 0px;" oncommand="changePasswordSettings(false);"/>
-        <hbox align="center">
-          <radio value="2" label="&managepassword.asktimeout;" id="askTimeout"
-                 accesskey="&managepassword.asktimeout.accesskey;"
-                 style="margin: 0px;" oncommand="changePasswordSettings(true);"/>
-          <textbox id="passwordTimeout" size="4"
-                   preftype="int"
-                   prefstring="security.password_lifetime"
-                   oninput="changePasswordSettings(false);"/>
-          <label value="&managepassword.timeout.unit;" style="margin: 4px;"/>
-        </hbox>
-      </radiogroup>
-    </hbox>
-  </groupbox>
-
-  <!-- Reset Password -->
-  <groupbox>
-    <caption label="&resetpassword.caption;"/>
-    <description>&resetpassword.text;</description>
-    <hbox align="center">
-      <button label="&resetpassword.button;"
-              oncommand="ResetPW();"
-              id="resetPasswordButton"
-              accesskey="&resetpassword.accesskey;"
-              prefstring="security.disable_button.resetPassword"/>
-    </hbox>
-  </groupbox>
-
-</page>
diff --git a/security/manager/pki/resources/content/pref-security.js b/security/manager/pki/resources/content/pref-security.js
deleted file mode 100644
index 6651ed0575f0..000000000000
--- a/security/manager/pki/resources/content/pref-security.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Javier Delgadillo <javi@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-function openCertManager()
-{
-    //check for an existing certManager window and focus it; it's not application modal
-    const kWindowMediatorContractID = "@mozilla.org/appshell/window-mediator;1";
-    const kWindowMediatorIID = Components.interfaces.nsIWindowMediator;
-    const kWindowMediator = Components.classes[kWindowMediatorContractID].getService(kWindowMediatorIID);
-    var lastCertManager = kWindowMediator.getMostRecentWindow("mozilla:certmanager");
-    if (lastCertManager)
-      lastCertManager.focus();
-    else {
-      window.open('chrome://pippki/content/certManager.xul',  "",
-                  'chrome,centerscreen,resizable,dialog');
-    }
-}
-
-function openDeviceManager()
-{
-    //check for an existing deviceManger window and focus it; it's not application modal
-    const kWindowMediatorContractID = "@mozilla.org/appshell/window-mediator;1";
-    const kWindowMediatorIID = Components.interfaces.nsIWindowMediator;
-    const kWindowMediator = Components.classes[kWindowMediatorContractID].getService(kWindowMediatorIID);
-    var lastCertManager = kWindowMediator.getMostRecentWindow("mozilla:devicemanager");
-    if (lastCertManager)
-      lastCertManager.focus();
-    else {
-      window.open('chrome://pippki/content/device_manager.xul',  "devmgr",
-                  'chrome,centerscreen,resizable,dialog');
-    }
-}
diff --git a/security/manager/pki/resources/content/pref-ssl.xul b/security/manager/pki/resources/content/pref-ssl.xul
deleted file mode 100644
index 0cfca4704075..000000000000
--- a/security/manager/pki/resources/content/pref-ssl.xul
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0"?> 
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Terry Hayes <thayes@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-
-<!DOCTYPE page [
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-  <!ENTITY % prefSslDTD SYSTEM "chrome://pippki/locale/pref-ssl.dtd">
-  %brandDTD;
-  %prefSslDTD;
-]>
-
-<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://pippki/content/pref-ssl.xul');"
-      headertitle="&pref.ssl.title;">
-
-  <!-- List elements to manage for prefs -->
-  <script type="application/x-javascript">
-  <![CDATA[
-    var _elementIDs = ["enableSSL3", "enableTLS", 
-        "warnEnteringSecure", "warnEnteringWeak", 
-        "warnLeavingSecure", "warnInsecurePost",
-        "warnViewMixed" ];
-  ]]>
-  </script>
-            
-  <groupbox orient="horizontal">
-    <caption label="&SSLProtocolVersions.caption;"/>
-
-    <!-- Prefs -->
-    <vbox flex="1" align="start">
-      <checkbox id="enableSSL3" label="&enable.ssl3;"
-                accesskey="&enable.ssl3.accesskey;"
-                prefstring="security.enable_ssl3"/>
-      <checkbox id="enableTLS" label="&enable.tls;"
-                accesskey="&enable.tls.accesskey;"
-                prefstring="security.enable_tls"/>
-    </vbox>
-
-  </groupbox>
-
-  <groupbox align="start">
-    <caption label="&SSLWarnings.caption;"/>
-    <description>&warn.description;</description>
-    <!-- Prefs -->
-    <checkbox id="warnEnteringSecure" label="&warn.enteringsecure;"
-              accesskey="&warn.enteringsecure.accesskey;"
-              prefstring="security.warn_entering_secure"/>
-    <checkbox id="warnEnteringWeak" label="&warn.enteringweak;"
-              accesskey="&warn.enteringweak.accesskey;"
-              prefstring="security.warn_entering_weak"/>
-    <checkbox id="warnLeavingSecure" label="&warn.leavingsecure;"
-              accesskey="&warn.leavingsecure.accesskey;"
-              prefstring="security.warn_leaving_secure"/>
-    <checkbox id="warnInsecurePost" label="&warn.insecurepost;"
-              accesskey="&warn.insecurepost.accesskey;"
-              prefstring="security.warn_submit_insecure"/>
-    <checkbox id="warnViewMixed" label="&warn.viewmixed;"
-              accesskey="&warn.viewmixed.accesskey;"
-              prefstring="security.warn_viewing_mixed"
-              checked="true"/>
-  </groupbox>
-
-</page>
diff --git a/security/manager/pki/resources/content/pref-validation.js b/security/manager/pki/resources/content/pref-validation.js
deleted file mode 100644
index 5612bab5f5b6..000000000000
--- a/security/manager/pki/resources/content/pref-validation.js
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   David Drinan <ddrinan@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
-const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
-const nsIOCSPResponder = Components.interfaces.nsIOCSPResponder;
-const nsISupportsArray = Components.interfaces.nsISupportsArray;
-
-var certdb;
-var ocspResponders;
-var cacheRadio = 0;
-
-function onLoad()
-{
-  var ocspEntry;
-  var i;
-
-  certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
-  ocspResponders = certdb.getOCSPResponders();
-
-  var signersMenu = document.getElementById("signingCA");
-  var signersURL = document.getElementById("serviceURL");
-  for (i=0; i<ocspResponders.length; i++) {
-    ocspEntry = ocspResponders.queryElementAt(i, nsIOCSPResponder);
-    var menuItemNode = document.createElement("menuitem");
-    menuItemNode.setAttribute("value", ocspEntry.responseSigner);
-    menuItemNode.setAttribute("label", ocspEntry.responseSigner);
-    signersMenu.firstChild.appendChild(menuItemNode);
-  }
-
-  parent.initPanel('chrome://pippki/content/pref-validation.xul');
-
-  doEnabling(0);
-}
-
-function doEnabling(called_by)
-{
-  var signingCA = document.getElementById("signingCA");
-  var serviceURL = document.getElementById("serviceURL");
-  var securityOCSPEnabled = document.getElementById("securityOCSPEnabled");
-  var requireWorkingOCSP = document.getElementById("requireWorkingOCSP");
-  var enableOCSPBox = document.getElementById("enableOCSPBox");
-  var certOCSP = document.getElementById("certOCSP");
-  var proxyOCSP = document.getElementById("proxyOCSP");
-
-  var OCSPPrefValue = parseInt(securityOCSPEnabled.value);
-
-  if (called_by == 0) {
-    // the radio button changed, or we init the stored value from prefs
-    enableOCSPBox.checked = (OCSPPrefValue != 0);
-  }
-  else {
-    // the user toggled the checkbox to enable/disable OCSP
-    var new_val = 0;
-    if (enableOCSPBox.checked) {
-      // now enabled. if we have a cached radio val, restore it.
-      // if not, use the first setting
-      new_val = (cacheRadio > 0) ? cacheRadio : 1;
-    }
-    else {
-      // now disabled. remember current value
-      cacheRadio = OCSPPrefValue;
-    }
-    securityOCSPEnabled.value = OCSPPrefValue = new_val;
-  }
-
-  certOCSP.disabled = (OCSPPrefValue == 0);
-  proxyOCSP.disabled = (OCSPPrefValue == 0);
-  signingCA.disabled = serviceURL.disabled = OCSPPrefValue == 0 || OCSPPrefValue == 1;
-  requireWorkingOCSP.disabled = (OCSPPrefValue == 0);
-}
-
-function changeURL()
-{
-  var signersMenu = document.getElementById("signingCA");
-  var signersURL = document.getElementById("serviceURL");
-  var CA = signersMenu.getAttribute("value");
-  var i;
-  var ocspEntry;
-
-  for (i=0; i < ocspResponders.length; i++) {
-    ocspEntry = ocspResponders.queryElementAt(i, nsIOCSPResponder);
-    if (CA == ocspEntry.responseSigner) {
-      signersURL.setAttribute("value", ocspEntry.serviceURL);
-      break;
-    }
-  }
-}
-
-function openCrlManager()
-{
-    window.open('chrome://pippki/content/crlManager.xul',  "",
-                'chrome,centerscreen,resizable');
-}
-
diff --git a/security/manager/pki/resources/content/pref-validation.xul b/security/manager/pki/resources/content/pref-validation.xul
deleted file mode 100644
index 6c465d0398e2..000000000000
--- a/security/manager/pki/resources/content/pref-validation.xul
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0"?> 
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   David Drinan <ddrinan@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-
-<!DOCTYPE page [
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-  <!ENTITY % prefValidationDTD SYSTEM "chrome://pippki/locale/pref-validation.dtd">
-  %brandDTD;
-  %prefValidationDTD;
-]>
-
-<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="onLoad();"
-      headertitle="&pref.validation.title;">
-
-  <!-- List elements to manage for prefs -->
-  <script type="application/x-javascript">
-  <![CDATA[
-    var _elementIDs = ["securityOCSPEnabled", "serviceURL", "signingCA", "requireWorkingOCSP"];
-  ]]>
-  </script>
-            
-  <script type="application/x-javascript" src="chrome://pippki/content/pref-validation.js"/>
-
-  <groupbox>
-    <caption label="&validation.crl.caption;"/>
-    <description>&validation.crl.description;</description>
-    <hbox align="center">
-      <button label="&validation.managecrls.button;"
-              oncommand="openCrlManager();"
-              id="managecrlbutton"
-              accesskey="&validation.managecrls.accesskey;"
-              prefstring="security.OCSP.disable_button.managecrl"/>
-    </hbox>
-  </groupbox>
-
-  <groupbox align="start">
-    <caption label="&validation.ocsp.caption;"/>
-    <checkbox id="enableOCSPBox" label="&enableOCSP.label;"
-              accesskey="&enableOCSP.accesskey;" oncommand="doEnabling(1);"/>
-    <!-- Prefs -->
-    <radiogroup id="securityOCSPEnabled"
-                prefstring="security.OCSP.enabled">
-        <radio value="0" hidden="true"/>
-        <radio id="certOCSP" value="1" label="&certOCSP2.label;"
-               accesskey="&certOCSP2.accesskey;" oncommand="doEnabling(0);"/>
-        <radio id="proxyOCSP" value="2" label="&proxyOCSP2.label;"
-               accesskey="&proxyOCSP2.accesskey;" oncommand="doEnabling(0);"/>
-
-        <grid class="indent" flex="1">
-          <columns>
-          <column/>
-          <column flex="1"/>
-          </columns>
-          
-          <rows>
-            <row align="center">
-              <label value="&signingCA.label;"
-                     accesskey="&signingCA.accesskey;" control="signingCA"/>
-              <menulist id="signingCA" preftype="string" prefstring="security.OCSP.signingCA"
-                        flex="1" oncommand="changeURL()">
-                <menupopup/>
-              </menulist>
-            </row>
-            <row align="center">
-              <label value="&serviceURL.label;"
-                     accesskey="&serviceURL.accesskey;" control="serviceURL"/>
-              <textbox id="serviceURL" prefstring="security.OCSP.URL"/>
-            </row>
-         </rows>
-       </grid>
-    </radiogroup>
-    <separator class="thin"/>
-    <checkbox id="requireWorkingOCSP" label="&validation.requireOCSP.description;"
-                accesskey="&validation.requireOCSP.accesskey;"
-                prefstring="security.OCSP.require"/>
-
-  </groupbox>
-
-</page>
diff --git a/security/manager/pki/resources/jar.mn b/security/manager/pki/resources/jar.mn
index f70335da81cc..002bcc398917 100644
--- a/security/manager/pki/resources/jar.mn
+++ b/security/manager/pki/resources/jar.mn
@@ -9,13 +9,6 @@ pippki.jar:
     content/pippki/password.js               (content/password.js)
     content/pippki/resetpassword.xul         (content/resetpassword.xul)
     content/pippki/resetpassword.js          (content/resetpassword.js)
-    content/pippki/PrefOverlay.xul           (content/PrefOverlay.xul)
-    content/pippki/pref-security.js          (content/pref-security.js)
-    content/pippki/pref-ssl.xul              (content/pref-ssl.xul)
-    content/pippki/pref-certs.xul            (content/pref-certs.xul)
-#ifndef MOZ_PHOENIX
-    content/pippki/PageInfoOverlay.xul       (content/PageInfoOverlay.xul)
-#endif
     content/pippki/certerror.js              (content/certerror.js)
 *   content/pippki/certerror.xul             (content/certerror.xul)
     content/pippki/downloadcert.js           (content/downloadcert.js)
@@ -54,12 +47,8 @@ pippki.jar:
     content/pippki/choosetoken.js            (content/choosetoken.js)
     content/pippki/escrowWarn.xul            (content/escrowWarn.xul)
     content/pippki/escrowWarn.js             (content/escrowWarn.js)
-    content/pippki/pref-validation.xul       (content/pref-validation.xul)
-    content/pippki/pref-validation.js        (content/pref-validation.js)
     content/pippki/crlManager.xul            (content/crlManager.xul)
     content/pippki/crlManager.js             (content/crlManager.js)
-    content/pippki/pref-masterpass.js        (content/pref-masterpass.js)
-    content/pippki/pref-masterpass.xul       (content/pref-masterpass.xul)
     content/pippki/serverCrlNextupdate.js    (content/serverCrlNextupdate.js)
     content/pippki/serverCrlNextupdate.xul   (content/serverCrlNextupdate.xul)
     content/pippki/createCertInfo.xul        (content/createCertInfo.xul)