diff --git a/core/java/src/net/i2p/I2PAppContext.java b/core/java/src/net/i2p/I2PAppContext.java
index 86c1dc907e53c18f8cd732d990e80332dd0c7846..1cdb6b29709789c43700487370bb2615b8895aa9 100644
--- a/core/java/src/net/i2p/I2PAppContext.java
+++ b/core/java/src/net/i2p/I2PAppContext.java
@@ -432,12 +432,14 @@ public class I2PAppContext {
         }
     }
     
+    /** @deprecated unused */
     public PetNameDB petnameDb() {
         if (!_petnameDbInitialized)
             initializePetnameDb();
         return _petnameDb;
     }
 
+    /** @deprecated unused */
     private void initializePetnameDb() {
         synchronized (this) {
             if (_petnameDb == null) {
diff --git a/core/java/src/net/i2p/client/naming/AddressDB.java b/core/java/src/net/i2p/client/naming/AddressDB.java
index 29b8cf7cb3ab0bc0f9dc8490ccc313c3a65adf04..c43ada589296afb6298bc30ff9c4607dad7374ba 100644
--- a/core/java/src/net/i2p/client/naming/AddressDB.java
+++ b/core/java/src/net/i2p/client/naming/AddressDB.java
@@ -7,6 +7,9 @@ import net.i2p.I2PAppContext;
 import net.i2p.data.Address;
 import net.i2p.util.Log;
 
+/**
+ *  @deprecated unused
+ */
 public abstract class AddressDB {
     
     private final static Log _log = new Log(NamingService.class);
diff --git a/core/java/src/net/i2p/client/naming/AddressDBNamingService.java b/core/java/src/net/i2p/client/naming/AddressDBNamingService.java
index 4dc65a10d2a4fe01bfa384625df1b2dc0a6c1f61..928212c895ca5973735553ce600b986eb85fbad0 100644
--- a/core/java/src/net/i2p/client/naming/AddressDBNamingService.java
+++ b/core/java/src/net/i2p/client/naming/AddressDBNamingService.java
@@ -6,6 +6,9 @@ import net.i2p.I2PAppContext;
 import net.i2p.data.Address;
 import net.i2p.data.Destination;
 
+/**
+ *  @deprecated unused
+ */
 public class AddressDBNamingService extends NamingService {
     
     private AddressDB _addressdb;
diff --git a/core/java/src/net/i2p/client/naming/DummyAddressDB.java b/core/java/src/net/i2p/client/naming/DummyAddressDB.java
index d7ee9bac1593e1b6dcafda901290960188d68243..e18a2b7adda9e8ea2bc02393bd225461fe26db9c 100644
--- a/core/java/src/net/i2p/client/naming/DummyAddressDB.java
+++ b/core/java/src/net/i2p/client/naming/DummyAddressDB.java
@@ -5,6 +5,9 @@ import java.util.Collection;
 import net.i2p.I2PAppContext;
 import net.i2p.data.Address;
 
+/**
+ *  @deprecated unused
+ */
 public class DummyAddressDB extends AddressDB {
 
     public DummyAddressDB(I2PAppContext context) {
diff --git a/core/java/src/net/i2p/client/naming/DummyNamingService.java b/core/java/src/net/i2p/client/naming/DummyNamingService.java
index dddd5915b3abc3a3d42b5e8e6232c64be0348f3d..ff0855c279f5515f6a5281c73f7d1d30ff80f1c2 100644
--- a/core/java/src/net/i2p/client/naming/DummyNamingService.java
+++ b/core/java/src/net/i2p/client/naming/DummyNamingService.java
@@ -27,9 +27,4 @@ class DummyNamingService extends NamingService {
     public Destination lookup(String hostname) {
         return lookupBase64(hostname);
     }
-    
-    @Override
-    public String reverseLookup(Destination dest) {
-        return null;
-    }
-}
\ No newline at end of file
+}
diff --git a/core/java/src/net/i2p/client/naming/EepGetNamingService.java b/core/java/src/net/i2p/client/naming/EepGetNamingService.java
index 6ce7ca17ba02fd9d4c608a3cd350d5c8fa39e32c..8ddeaa2480d1cfce62274853ac0b52beb282e774 100644
--- a/core/java/src/net/i2p/client/naming/EepGetNamingService.java
+++ b/core/java/src/net/i2p/client/naming/EepGetNamingService.java
@@ -136,9 +136,4 @@ public class EepGetNamingService extends NamingService {
         _log.error("Caught from: " + url + hostname);
         return null;
     }
-    
-    @Override
-    public String reverseLookup(Destination dest) {
-        return null;
-    }
 }
diff --git a/core/java/src/net/i2p/client/naming/ExecNamingService.java b/core/java/src/net/i2p/client/naming/ExecNamingService.java
index f014fa0d717ba337dd992b1b9855ea9bd30ba450..446e907c477af9f8fa6c64c8a6b4c5d9dad1061c 100644
--- a/core/java/src/net/i2p/client/naming/ExecNamingService.java
+++ b/core/java/src/net/i2p/client/naming/ExecNamingService.java
@@ -126,9 +126,4 @@ public class ExecNamingService extends NamingService {
         }
         return null;
     }
-    
-    @Override
-    public String reverseLookup(Destination dest) {
-        return null;
-    }
 }
diff --git a/core/java/src/net/i2p/client/naming/FilesystemAddressDB.java b/core/java/src/net/i2p/client/naming/FilesystemAddressDB.java
index cefbf5eea6d0048c7813946dfd9065470514555e..806b9e90add718a48e8b5ebc6f36d42a78c581b8 100644
--- a/core/java/src/net/i2p/client/naming/FilesystemAddressDB.java
+++ b/core/java/src/net/i2p/client/naming/FilesystemAddressDB.java
@@ -16,6 +16,9 @@ import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.util.Log;
 
+/**
+ *  @deprecated unused
+ */
 public class FilesystemAddressDB extends AddressDB {
 
     public final static String PROP_ADDRESS_DIR = "i2p.addressdir";
diff --git a/core/java/src/net/i2p/client/naming/HostsTxtNamingService.java b/core/java/src/net/i2p/client/naming/HostsTxtNamingService.java
index f89d56d09d4153cf05c730b7a844db293200466c..ff1b367fd055ae06fad46e10b94450f5688ecf49 100644
--- a/core/java/src/net/i2p/client/naming/HostsTxtNamingService.java
+++ b/core/java/src/net/i2p/client/naming/HostsTxtNamingService.java
@@ -138,6 +138,7 @@ public class HostsTxtNamingService extends NamingService {
         return null;
     }
 
+    /** @deprecated unused */
     @Override
     public String reverseLookup(Hash h) {
         List filenames = getFilenames();
diff --git a/core/java/src/net/i2p/client/naming/NamingService.java b/core/java/src/net/i2p/client/naming/NamingService.java
index fd627713926af57bc8036473d9a2c61175ecad4d..a7098d799335348048aa0fc73953b1d5f318cb79 100644
--- a/core/java/src/net/i2p/client/naming/NamingService.java
+++ b/core/java/src/net/i2p/client/naming/NamingService.java
@@ -61,7 +61,9 @@ public abstract class NamingService {
      * if none is known. It is safe for subclasses to always return
      * <code>null</code> if no reverse lookup is possible.
      */
-    public abstract String reverseLookup(Destination dest);
+    public String reverseLookup(Destination dest) { return null; };
+
+    /** @deprecated unused */
     public String reverseLookup(Hash h) { return null; };
 
     /**
diff --git a/core/java/src/net/i2p/client/naming/PetName.java b/core/java/src/net/i2p/client/naming/PetName.java
index 38d27b60837c893e9acbb3822457dca992b59435..cb0df4ab96ceefdadce22e3d31946571a4881a88 100644
--- a/core/java/src/net/i2p/client/naming/PetName.java
+++ b/core/java/src/net/i2p/client/naming/PetName.java
@@ -7,7 +7,7 @@ import java.util.StringTokenizer;
 import net.i2p.data.DataHelper;
 
 /**
- *
+ *  deprecated unused but can be instantiated through I2PAppContext
  */
 public class PetName {
     private String _name;
diff --git a/core/java/src/net/i2p/client/naming/PetNameDB.java b/core/java/src/net/i2p/client/naming/PetNameDB.java
index efa96e5d0a1250f0814bfa7e93d5856c2e9f3c90..cff2ab56ccddf16404715b0106f715984e70d1ed 100644
--- a/core/java/src/net/i2p/client/naming/PetNameDB.java
+++ b/core/java/src/net/i2p/client/naming/PetNameDB.java
@@ -19,7 +19,7 @@ import java.util.Set;
 
 
 /**
- *
+ *  deprecated unused but can be instantiated through I2PAppContext
  */
 public class PetNameDB {
     /** name (String) to PetName mapping */
diff --git a/core/java/src/net/i2p/client/naming/PetNameNamingService.java b/core/java/src/net/i2p/client/naming/PetNameNamingService.java
index ec59249a7ee832002df55f006859457f26f08850..a052315f39410664e92bdbcf012e1b051fc39dd2 100644
--- a/core/java/src/net/i2p/client/naming/PetNameNamingService.java
+++ b/core/java/src/net/i2p/client/naming/PetNameNamingService.java
@@ -5,6 +5,9 @@ import java.io.IOException;
 import net.i2p.I2PAppContext;
 import net.i2p.data.Destination;
 
+/**
+ *  @deprecated unused
+ */
 public class PetNameNamingService extends NamingService {
 
     private PetNameDB _petnameDb;