diff --git a/dom/base/Crypto.cpp b/dom/base/Crypto.cpp
index 4b19a51b511..53524c32f83 100644
--- a/dom/base/Crypto.cpp
+++ b/dom/base/Crypto.cpp
@@ -174,20 +174,6 @@ Crypto::ImportUserCertificates(const nsAString& aNickname,
   aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
 }
 
-void
-Crypto::PopChallengeResponse(const nsAString& aChallenge,
-                             nsAString& aReturn,
-                             ErrorResult& aRv)
-{
-  aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
-}
-
-void
-Crypto::Random(int32_t aNumBytes, nsAString& aReturn, ErrorResult& aRv)
-{
-  aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
-}
-
 void
 Crypto::SignText(JSContext* aContext,
                  const nsAString& aStringToSign,
@@ -205,12 +191,6 @@ Crypto::Logout(ErrorResult& aRv)
   aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
 }
 
-void
-Crypto::DisableRightClick(ErrorResult& aRv)
-{
-  aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
-}
-
 #endif
 
 /* static */ uint8_t*
diff --git a/dom/base/Crypto.h b/dom/base/Crypto.h
index 86228c77707..a88c5f7daa5 100644
--- a/dom/base/Crypto.h
+++ b/dom/base/Crypto.h
@@ -66,12 +66,6 @@ public:
                                       nsAString& aReturn,
                                       ErrorResult& aRv);
 
-  virtual void PopChallengeResponse(const nsAString& aChallenge,
-                                    nsAString& aReturn,
-                                    ErrorResult& aRv);
-
-  virtual void Random(int32_t aNumBytes, nsAString& aReturn, ErrorResult& aRv);
-
   virtual void SignText(JSContext* aContext,
                         const nsAString& aStringToSign,
                         const nsAString& aCaOption,
@@ -80,7 +74,6 @@ public:
 
   virtual void Logout(ErrorResult& aRv);
 
-  virtual void DisableRightClick(ErrorResult& aRv);
 #endif
 
   // WebIDL
diff --git a/dom/tests/mochitest/crypto/test_legacy.html b/dom/tests/mochitest/crypto/test_legacy.html
index 42894e73698..6be90e0410b 100644
--- a/dom/tests/mochitest/crypto/test_legacy.html
+++ b/dom/tests/mochitest/crypto/test_legacy.html
@@ -17,12 +17,7 @@ ok("generateCRMFRequest" in window.crypto,
    "generateCRMFRequest in window.crypto");
 ok("importUserCertificates" in window.crypto,
    "importUserCertificates in window.crypto");
-ok("popChallengeResponse" in window.crypto,
-   "popChallengeResponse in window.crypto");
-ok("random" in window.crypto, "random in window.crypto");
 ok("signText" in window.crypto, "signText in window.crypto");
-ok("disableRightClick" in window.crypto,
-   "disableRightClick in window.crypto");
 
 function jsCallback () {
 }
diff --git a/dom/tests/mochitest/crypto/test_no_legacy.html b/dom/tests/mochitest/crypto/test_no_legacy.html
index 0c10cca5a39..c6d5f820abb 100644
--- a/dom/tests/mochitest/crypto/test_no_legacy.html
+++ b/dom/tests/mochitest/crypto/test_no_legacy.html
@@ -17,12 +17,7 @@ ok(!("generateCRMFRequest" in window.crypto),
    "generateCRMFRequest not in window.crypto");
 ok(!("importUserCertificates" in window.crypto),
    "importUserCertificates not in window.crypto");
-ok(!("popChallengeResponse" in window.crypto),
-   "popChallengeResponse not in window.crypto");
-ok(!("random" in window.crypto), "random not in window.crypto");
 ok(!("signText" in window.crypto), "signText not in window.crypto");
-ok(!("disableRightClick" in window.crypto),
-   "disableRightClick not in window.crypto");
 
 </script>
 </body></html>
diff --git a/dom/webidl/Crypto.webidl b/dom/webidl/Crypto.webidl
index ff8bda87b0f..b781ca61036 100644
--- a/dom/webidl/Crypto.webidl
+++ b/dom/webidl/Crypto.webidl
@@ -39,21 +39,12 @@ interface CryptoLegacy {
                                    DOMString cmmfResponse,
                                    boolean doForcedBackup);
 
-  [Throws]
-  DOMString popChallengeResponse(DOMString challenge);
-
-  [Throws]
-  DOMString random(long numBytes);
-
   DOMString signText(DOMString stringToSign,
                      DOMString caOption,
                      ByteString... args);
 
   [Throws]
   void logout();
-
-  [Throws]
-  void disableRightClick();
 };
 
 Crypto implements CryptoLegacy;
diff --git a/security/manager/ssl/src/nsCrypto.cpp b/security/manager/ssl/src/nsCrypto.cpp
index 564d1b5c421..d947cdc9ca9 100644
--- a/security/manager/ssl/src/nsCrypto.cpp
+++ b/security/manager/ssl/src/nsCrypto.cpp
@@ -2445,20 +2445,6 @@ nsCrypto::ImportUserCertificates(const nsAString& aNickname,
   }
 }
 
-void
-nsCrypto::PopChallengeResponse(const nsAString& aChallenge,
-                               nsAString& aReturn,
-                               ErrorResult& aRv)
-{
-  aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
-}
-
-void
-nsCrypto::Random(int32_t aNumBytes, nsAString& aReturn, ErrorResult& aRv)
-{
-  aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
-}
-
 static void
 GetDocumentFromContext(JSContext *cx, nsIDocument **aDocument)
 {
@@ -2831,12 +2817,6 @@ nsCrypto::Logout(ErrorResult& aRv)
   }
 }
 
-void
-nsCrypto::DisableRightClick(ErrorResult& aRv)
-{
-  aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
-}
-
 CRMFObject::CRMFObject()
 {
   MOZ_COUNT_CTOR(CRMFObject);
diff --git a/security/manager/ssl/src/nsCrypto.h b/security/manager/ssl/src/nsCrypto.h
index 496389f3ed5..311bdbde361 100644
--- a/security/manager/ssl/src/nsCrypto.h
+++ b/security/manager/ssl/src/nsCrypto.h
@@ -80,14 +80,6 @@ public:
                                       nsAString& aReturn,
                                       mozilla::ErrorResult& aRv) MOZ_OVERRIDE;
 
-  virtual void PopChallengeResponse(const nsAString& aChallenge,
-                                    nsAString& aReturn,
-                                    mozilla::ErrorResult& aRv) MOZ_OVERRIDE;
-
-  virtual void Random(int32_t aNumBytes,
-                      nsAString& aReturn,
-                      mozilla::ErrorResult& aRv) MOZ_OVERRIDE;
-
   virtual void SignText(JSContext* aContext,
                         const nsAString& aStringToSign,
                         const nsAString& aCaOption,
@@ -96,8 +88,6 @@ public:
 
   virtual void Logout(mozilla::ErrorResult& aRv) MOZ_OVERRIDE;
 
-  virtual void DisableRightClick(mozilla::ErrorResult& aRv) MOZ_OVERRIDE;
-
 private:
   static already_AddRefed<nsIPrincipal> GetScriptPrincipal(JSContext *cx);