diff --git a/mailnews/local/public/nsIPop3IncomingServer.idl b/mailnews/local/public/nsIPop3IncomingServer.idl
index b733b63aee..9229ad871a 100644
--- a/mailnews/local/public/nsIPop3IncomingServer.idl
+++ b/mailnews/local/public/nsIPop3IncomingServer.idl
@@ -19,11 +19,9 @@ interface nsIPop3IncomingServer : nsISupports {
   attribute unsigned long pop3CapabilityFlags;
   attribute boolean deleteByAgeFromServer;
   attribute long numDaysToLeaveOnServer;
-  attribute nsIPop3Protocol runningProtocol;
   // client adds uidls to mark one by one, then calls markMessages
   void addUidlToMark(in string aUidl, in int32_t newStatus);
   void markMessages();
-  attribute boolean authenticated;
   /* account to which this server defers storage, for global inbox */
   attribute ACString deferredToAccount;
   // whether get new mail in deferredToAccount gets
diff --git a/mailnews/local/public/nsIPop3Sink.idl b/mailnews/local/public/nsIPop3Sink.idl
index dbea627a55..0291329a2c 100644
--- a/mailnews/local/public/nsIPop3Sink.idl
+++ b/mailnews/local/public/nsIPop3Sink.idl
@@ -12,8 +12,6 @@ interface nsIURI;
 [scriptable, uuid(ceabfc6b-f139-4c25-890f-efb7c3069d40)]
 interface nsIPop3Sink : nsISupports {
 
-  attribute boolean userAuthenticated;
-  attribute AUTF8String mailAccountURL;
   attribute boolean buildMessageUri;
   attribute AUTF8String messageUri;
   attribute AUTF8String baseMessageUri;
@@ -26,14 +24,10 @@ interface nsIPop3Sink : nsISupports {
   void abortMailDelivery(in nsIPop3Protocol protocol);
 
   void incorporateBegin(in string uidlString, in unsigned long flags);
-
   void incorporateWrite(in string block, in long length);
-
   void incorporateComplete(in nsIMsgWindow aMsgWindow, in int32_t aSize);
   void incorporateAbort(in boolean uidlDownload);
 
-  void biffGetNewMail();
-
   /**
    * Tell the pop3sink how many messages we're going to download.
    *
@@ -43,8 +37,6 @@ interface nsIPop3Sink : nsISupports {
 
   void setBiffStateAndUpdateFE(in unsigned long biffState, in long numNewMessages, in boolean notify);
 
-  void setSenderAuthedFlag(in boolean authed);
-
   attribute nsIPop3IncomingServer popServer;
   attribute nsIMsgFolder folder;
 };
diff --git a/mailnews/local/src/nsPop3Sink.cpp b/mailnews/local/src/nsPop3Sink.cpp
index cf9e30d9ed..22dc2640a8 100644
--- a/mailnews/local/src/nsPop3Sink.cpp
+++ b/mailnews/local/src/nsPop3Sink.cpp
@@ -45,7 +45,6 @@ mozilla::LazyLogModule POP3LOGMODULE("POP3");
 NS_IMPL_ISUPPORTS(nsPop3Sink, nsIPop3Sink)
 
 nsPop3Sink::nsPop3Sink() {
-  m_authed = false;
   m_biffState = 0;
   m_numNewMessages = 0;
   m_numNewMessagesInFolder = 0;
@@ -62,31 +61,6 @@ nsPop3Sink::~nsPop3Sink() {
   ReleaseFolderLock();
 }
 
-nsresult nsPop3Sink::SetUserAuthenticated(bool authed) {
-  m_authed = authed;
-  m_popServer->SetAuthenticated(authed);
-  return NS_OK;
-}
-
-nsresult nsPop3Sink::GetUserAuthenticated(bool* authed) {
-  return m_popServer->GetAuthenticated(authed);
-}
-
-nsresult nsPop3Sink::SetSenderAuthedFlag(bool authed) {
-  m_authed = authed;
-  return NS_OK;
-}
-
-nsresult nsPop3Sink::SetMailAccountURL(const nsACString& urlString) {
-  m_accountUrl.Assign(urlString);
-  return NS_OK;
-}
-
-nsresult nsPop3Sink::GetMailAccountURL(nsACString& urlString) {
-  urlString.Assign(m_accountUrl);
-  return NS_OK;
-}
-
 partialRecord::partialRecord() : m_msgDBHdr(nullptr) {}
 
 partialRecord::~partialRecord() {}
@@ -673,13 +647,6 @@ nsPop3Sink::IncorporateAbort(bool uidlDownload) {
   return rv;
 }
 
-nsresult nsPop3Sink::BiffGetNewMail() {
-#ifdef DEBUG
-  printf("Biff get new mail.\n");
-#endif
-  return NS_OK;
-}
-
 nsresult nsPop3Sink::SetBiffStateAndUpdateFE(uint32_t aBiffState,
                                              int32_t numNewMessages,
                                              bool notify) {
diff --git a/mailnews/local/src/nsPop3Sink.h b/mailnews/local/src/nsPop3Sink.h
index fad86d63e7..9ea4e6b2ce 100644
--- a/mailnews/local/src/nsPop3Sink.h
+++ b/mailnews/local/src/nsPop3Sink.h
@@ -44,8 +44,6 @@ class nsPop3Sink : public nsIPop3Sink {
   nsresult WriteLineToMailbox(const nsACString& buffer);
   nsresult ReleaseFolderLock();
 
-  bool m_authed;
-  nsCString m_accountUrl;
   uint32_t m_biffState;
   int32_t m_numNewMessages;
   int32_t m_numNewMessagesInFolder;
diff --git a/mailnews/local/test/unit/test_bug457168.js b/mailnews/local/test/unit/test_bug457168.js
index 96945b4078..6b2ec41b88 100644
--- a/mailnews/local/test/unit/test_bug457168.js
+++ b/mailnews/local/test/unit/test_bug457168.js
@@ -75,11 +75,7 @@ function checkBusy() {
   }
 
   // If the server hasn't quite finished, just delay a little longer.
-  if (
-    incomingServer.serverBusy ||
-    (incomingServer instanceof Ci.nsIPop3IncomingServer &&
-      incomingServer.runningProtocol)
-  ) {
+  if (incomingServer.serverBusy) {
     do_timeout(20, checkBusy);
     return;
   }
diff --git a/mailnews/local/test/unit/test_pop3AuthMethods.js b/mailnews/local/test/unit/test_pop3AuthMethods.js
index 0ad9b6f39d..26d082ca8e 100644
--- a/mailnews/local/test/unit/test_pop3AuthMethods.js
+++ b/mailnews/local/test/unit/test_pop3AuthMethods.js
@@ -117,11 +117,7 @@ function checkBusy() {
   }
 
   // If the server hasn't quite finished, just delay a little longer.
-  if (
-    incomingServer.serverBusy ||
-    (incomingServer instanceof Ci.nsIPop3IncomingServer &&
-      incomingServer.runningProtocol)
-  ) {
+  if (incomingServer.serverBusy) {
     do_timeout(20, checkBusy);
     return;
   }
diff --git a/mailnews/local/test/unit/test_pop3GSSAPIFail.js b/mailnews/local/test/unit/test_pop3GSSAPIFail.js
index cb69a21620..2ff133a14e 100644
--- a/mailnews/local/test/unit/test_pop3GSSAPIFail.js
+++ b/mailnews/local/test/unit/test_pop3GSSAPIFail.js
@@ -106,11 +106,7 @@ function checkBusy() {
   }
 
   // If the server hasn't quite finished, just delay a little longer.
-  if (
-    incomingServer.serverBusy ||
-    (incomingServer instanceof Ci.nsIPop3IncomingServer &&
-      incomingServer.runningProtocol)
-  ) {
+  if (incomingServer.serverBusy) {
     do_timeout(20, checkBusy);
     return;
   }
diff --git a/mailnews/local/test/unit/test_pop3GetNewMail.js b/mailnews/local/test/unit/test_pop3GetNewMail.js
index c108244ee1..f0ecf9eb69 100644
--- a/mailnews/local/test/unit/test_pop3GetNewMail.js
+++ b/mailnews/local/test/unit/test_pop3GetNewMail.js
@@ -81,11 +81,7 @@ function checkBusy() {
   }
 
   // If the server hasn't quite finished, just delay a little longer.
-  if (
-    incomingServer.serverBusy ||
-    (incomingServer instanceof Ci.nsIPop3IncomingServer &&
-      incomingServer.runningProtocol)
-  ) {
+  if (incomingServer.serverBusy) {
     do_timeout(20, checkBusy);
     return;
   }
diff --git a/mailnews/local/test/unit/test_pop3Password.js b/mailnews/local/test/unit/test_pop3Password.js
index 896cd7194b..64e9599c2d 100644
--- a/mailnews/local/test/unit/test_pop3Password.js
+++ b/mailnews/local/test/unit/test_pop3Password.js
@@ -76,11 +76,7 @@ function checkBusy() {
   }
 
   // If the server hasn't quite finished, just delay a little longer.
-  if (
-    incomingServer.serverBusy ||
-    (incomingServer instanceof Ci.nsIPop3IncomingServer &&
-      incomingServer.runningProtocol)
-  ) {
+  if (incomingServer.serverBusy) {
     do_timeout(20, checkBusy);
     return;
   }
diff --git a/mailnews/local/test/unit/test_pop3Password2.js b/mailnews/local/test/unit/test_pop3Password2.js
index 5dcfb88032..2d62014dea 100644
--- a/mailnews/local/test/unit/test_pop3Password2.js
+++ b/mailnews/local/test/unit/test_pop3Password2.js
@@ -78,11 +78,7 @@ function checkBusy() {
   }
 
   // If the server hasn't quite finished, just delay a little longer.
-  if (
-    incomingServer.serverBusy ||
-    (incomingServer instanceof Ci.nsIPop3IncomingServer &&
-      incomingServer.runningProtocol)
-  ) {
+  if (incomingServer.serverBusy) {
     do_timeout(20, checkBusy);
     return;
   }
diff --git a/mailnews/local/test/unit/test_pop3ServerBrokenCRAMFail.js b/mailnews/local/test/unit/test_pop3ServerBrokenCRAMFail.js
index 79cae0069c..105f3fb0a0 100644
--- a/mailnews/local/test/unit/test_pop3ServerBrokenCRAMFail.js
+++ b/mailnews/local/test/unit/test_pop3ServerBrokenCRAMFail.js
@@ -42,11 +42,7 @@ var urlListener = {
 
 function checkBusy() {
   // If the server hasn't quite finished, just delay a little longer.
-  if (
-    incomingServer.serverBusy ||
-    (incomingServer instanceof Ci.nsIPop3IncomingServer &&
-      incomingServer.runningProtocol)
-  ) {
+  if (incomingServer.serverBusy) {
     do_timeout(20, checkBusy);
     return;
   }
diff --git a/mailnews/test/resources/POP3pump.js b/mailnews/test/resources/POP3pump.js
index ea21125195..f0807e0374 100644
--- a/mailnews/test/resources/POP3pump.js
+++ b/mailnews/test/resources/POP3pump.js
@@ -176,11 +176,7 @@ POP3Pump.prototype._checkBusy = function() {
   }
 
   // If the server hasn't quite finished, just delay a little longer.
-  if (
-    this._incomingServer.serverBusy ||
-    (this._incomingServer instanceof Ci.nsIPop3IncomingServer &&
-      this._incomingServer.runningProtocol)
-  ) {
+  if (this._incomingServer.serverBusy) {
     do_timeout(20, _checkPumpBusy);
     return;
   }