diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
index a1dc21cb3a..403c717721 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
@@ -476,9 +476,7 @@ synchronized void setFloodfillEnabledFromMonitor(boolean yes) {
     }
 
     @Override
-    public boolean floodfillEnabled() { 
-        if (isMultihomeDb())
-            return _context.netDb().floodfillEnabled();
+    public boolean floodfillEnabled() {
         return _floodfillEnabled;
     }
     
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseSegmentor.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseSegmentor.java
index bd42337a42..69e8744366 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseSegmentor.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseSegmentor.java
@@ -289,33 +289,6 @@ public FloodfillNetworkDatabaseFacade clientNetDB(Hash id) {
         return mainNetDB();
     }
 
-    /**
-     * look up the dbid of the client or clients with the given signing
-     * public key
-     * 
-     * @since 0.9.60
-     * @return non-null
-     */
-    @Override
-    public List<Hash> lookupClientBySigningPublicKey(SigningPublicKey spk) {
-        List<Hash> rv = new ArrayList<>();
-        for (Hash subdb : _context.clientManager().getPrimaryHashes()) {
-            FloodfillNetworkDatabaseFacade fndf = _context.clientManager().getClientFloodfillNetworkDatabaseFacade(subdb);
-            if (fndf == null)
-                continue;
-            // if (subdb.startsWith("clients_"))
-            // TODO: see if we can access only one subDb at a time when we need
-            // to look up a client by SPK. We mostly need this for managing blinded
-            // and encrypted keys in the Keyring Config UI page. See also
-            // ConfigKeyringHelper
-            BlindData bd = fndf.getBlindData(spk);
-            if (bd != null) {
-                rv.add(subdb);
-            }
-        }
-        return rv;
-    }
-
     /**
      * get all the subDbs and return them in a Set. This includes the main netDb
      * and the possible-multihomes netDb
@@ -357,19 +330,4 @@ private Set<FloodfillNetworkDatabaseFacade> getClientSubNetDBs() {
         rv.addAll(_context.clientManager().getClientFloodfillNetworkDatabaseFacades());
         return rv;
     }
-
-    /**
-     * list of the BlindData objects for all known clients
-     * 
-     * @since 0.9.60
-     * @return non-null
-     */
-    @Override
-    public List<BlindData> getLocalClientsBlindData() {
-        List<BlindData> rv = new ArrayList<>();
-        for (FloodfillNetworkDatabaseFacade subdb : getClientSubNetDBs()) {
-            rv.addAll(subdb.getBlindData());
-        }
-        return rv;
-    }
 }
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
index 5d1cfb88e2..273100a71f 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
@@ -972,13 +972,6 @@ public long getLastRouterInfoPublishTime() {
         return _lastRIPublishTime;
     }
 
-    public boolean matchClientKey(Hash key) {
-        if ((_localKey != null) && (_localKey.equals(key)))
-            return true;
-        else
-            return false;
-    }
-
     /**
      * Persist the local router's info (as updated) into netDb/my.info, since
      * ./router.info isn't always updated.  This also allows external applications
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/SegmentedNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/SegmentedNetworkDatabaseFacade.java
index f80e68aaea..46bc86d834 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/SegmentedNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/SegmentedNetworkDatabaseFacade.java
@@ -195,15 +195,6 @@ public Set<LeaseSet> getLeasesKnownToClients() {
      * */
     public ReseedChecker reseedChecker() {
         return mainNetDB().reseedChecker();
-    };
-    /**
-     * For console ConfigKeyringHelper
-     * 
-     * @return non-null
-     * @since 0.9.60
-     */
-    public List<Hash> lookupClientBySigningPublicKey(SigningPublicKey spk) {
-        return Collections.emptyList();
     }
     /**
      * For console ConfigKeyringHelper