--- a/dom/u2f/U2F.h
+++ b/dom/u2f/U2F.h
@@ -5,31 +5,31 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_dom_U2F_h
 #define mozilla_dom_U2F_h
 
 #include "js/TypeDecls.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/CryptoBuffer.h"
 #include "mozilla/dom/Nullable.h"
 #include "mozilla/dom/U2FBinding.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/MozPromise.h"
 #include "mozilla/ReentrantMonitor.h"
 #include "mozilla/SharedThreadPool.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIU2FToken.h"
 #include "nsNSSShutDown.h"
 #include "nsPIDOMWindow.h"
 #include "nsProxyRelease.h"
 #include "nsWrapperCache.h"
 
 #include "U2FAuthenticator.h"
-#include "USBToken.h"
 
 namespace mozilla {
 namespace dom {
 
 class U2FRegisterCallback;
 class U2FSignCallback;
 
 // Defined in U2FBinding.h by the U2F.webidl; their use requires a JSContext.

--- a/dom/u2f/U2FAuthenticator.h
+++ b/dom/u2f/U2FAuthenticator.h
@@ -3,17 +3,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_dom_U2FAuthenticator_h
 #define mozilla_dom_U2FAuthenticator_h
 
 #include "nsIU2FToken.h"
-#include "USBToken.h"
 
 namespace mozilla {
 namespace dom {
 
  // These enumerations are defined in the FIDO U2F Javascript API under the
 // interface "ErrorCode" as constant integers, and thus in the U2F.webidl file.
 // Any changes to these must occur in both locations.
 enum class ErrorCode {

deleted file mode 100644
--- a/dom/u2f/USBToken.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "USBToken.h"
-
-namespace mozilla {
-namespace dom {
-
-USBToken::USBToken()
-  : mInitialized(false)
-{}
-
-USBToken::~USBToken()
-{}
-
-nsresult
-USBToken::Init()
-{
-  // This routine does nothing at present, but Bug 1245527 will
-  // integrate the upcoming USB HID service here, which will likely
-  // require an initialization upon load.
-  MOZ_ASSERT(!mInitialized);
-  if (mInitialized) {
-    return NS_OK;
-  }
-
-  mInitialized = true;
-  return NS_OK;
-}
-
-const nsString USBToken::mVersion = NS_LITERAL_STRING("U2F_V2");
-
-bool
-USBToken::IsCompatibleVersion(const nsString& aVersionParam) const
-{
-  MOZ_ASSERT(mInitialized);
-  return mVersion == aVersionParam;
-}
-
-bool
-USBToken::IsRegistered(const CryptoBuffer& aKeyHandle) const
-{
-  MOZ_ASSERT(mInitialized);
-  return false;
-}
-
-nsresult
-USBToken::Register(const Optional<Nullable<int32_t>>& opt_timeoutSeconds,
-                   const CryptoBuffer& /* aChallengeParam */,
-                   const CryptoBuffer& /* aApplicationParam */,
-                   CryptoBuffer& aRegistrationData) const
-{
-  MOZ_ASSERT(mInitialized);
-  return NS_ERROR_NOT_AVAILABLE;
-}
-
-nsresult
-USBToken::Sign(const Optional<Nullable<int32_t>>& opt_timeoutSeconds,
-               const CryptoBuffer& aApplicationParam,
-               const CryptoBuffer& aChallengeParam,
-               const CryptoBuffer& aKeyHandle,
-               CryptoBuffer& aSignatureData) const
-{
-  MOZ_ASSERT(mInitialized);
-  return NS_ERROR_NOT_AVAILABLE;
-}
-
-} // namespace dom
-} // namespace mozilla

deleted file mode 100644
--- a/dom/u2f/USBToken.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim:set ts=2 sw=2 sts=2 et cindent: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef mozilla_dom_USBToken_h
-#define mozilla_dom_USBToken_h
-
-#include "mozilla/dom/CryptoBuffer.h"
-
-namespace mozilla {
-namespace dom {
-
-// USBToken implements FIDO operations using a USB device.
-class USBToken final
-{
-public:
-  USBToken();
-
-  ~USBToken();
-
-  nsresult Init();
-
-  bool IsCompatibleVersion(const nsString& aVersionParam) const;
-
-  bool IsRegistered(const CryptoBuffer& aKeyHandle) const;
-
-  nsresult Register(const Optional<Nullable<int32_t>>& opt_timeoutSeconds,
-                    const CryptoBuffer& aApplicationParam,
-                    const CryptoBuffer& aChallengeParam,
-                    CryptoBuffer& aRegistrationData) const;
-
-  nsresult Sign(const Optional<Nullable<int32_t>>& opt_timeoutSeconds,
-                const CryptoBuffer& aApplicationParam,
-                const CryptoBuffer& aChallengeParam,
-                const CryptoBuffer& aKeyHandle,
-                CryptoBuffer& aSignatureData) const;
-
-private:
-  bool mInitialized;
-
-  static const nsString mVersion;
-};
-
-} // namespace dom
-} // namespace mozilla
-
-#endif // mozilla_dom_USBToken_h

--- a/dom/u2f/moz.build
+++ b/dom/u2f/moz.build
@@ -2,22 +2,20 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXPORTS.mozilla.dom += [
     'U2F.h',
     'U2FAuthenticator.h',
-    'USBToken.h',
 ]
 
 UNIFIED_SOURCES += [
     'U2F.cpp',
-    'USBToken.cpp',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/dom/base',