diff --git a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java
index 2c34b40013aed9c11d80181a355e04167584d8d1..fab0c6d99dc3e250ea34b72e97c2a3c01a2b74e9 100644
--- a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java
+++ b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java
@@ -52,6 +52,7 @@ public class DeliveryInstructions extends DataStructureImpl {
     private final static int FLAG_MODE_TUNNEL = 3;
     
     /** @deprecated unused */
+    @Deprecated
     private final static long FLAG_ENCRYPTED = 128;
     private final static long FLAG_MODE = 96;
     private final static long FLAG_DELAY = 16;
@@ -84,24 +85,28 @@ public class DeliveryInstructions extends DataStructureImpl {
      * For cloves only (not tunnels), default false, unused
      * @deprecated unused
      */
+    @Deprecated
     public boolean getEncrypted() { return /* _encrypted */ false; }
     
     /**
      * For cloves only (not tunnels), default false, unused
      * @deprecated unused
      */
+    @Deprecated
     public void setEncrypted(boolean encrypted) { /* _encrypted = encrypted; */ }
 
     /**
      * For cloves only (not tunnels), default null, unused
      * @deprecated unused
      */
+    @Deprecated
     public SessionKey getEncryptionKey() { return /* _encryptionKey */ null; }
 
     /**
      * For cloves only (not tunnels), default null, unused
      * @deprecated unused
      */
+    @Deprecated
     public void setEncryptionKey(SessionKey key) { /* _encryptionKey = key; */ }
 
     /** default -1 */
@@ -132,29 +137,34 @@ public class DeliveryInstructions extends DataStructureImpl {
      * default false, unused
      * @deprecated unused
      */
+    @Deprecated
     public boolean getDelayRequested() { return _delayRequested; }
     
     /**
      * default false, unused
      * @deprecated unused
      */
+    @Deprecated
     public void setDelayRequested(boolean req) { _delayRequested = req; }
     
     /**
      * default 0, unused
      * @deprecated unused
      */
+    @Deprecated
     public long getDelaySeconds() { return _delaySeconds; }
     
     /**
      * default 0, unused
      * @deprecated unused
      */
+    @Deprecated
     public void setDelaySeconds(long seconds) { _delaySeconds = seconds; }
     
     /**
      * @deprecated unused
      */
+    @Deprecated
     public void readBytes(InputStream in) throws DataFormatException, IOException {
         long flags = DataHelper.readLong(in, 1);
         //if (_log.shouldLog(Log.DEBUG))
@@ -423,6 +433,7 @@ public class DeliveryInstructions extends DataStructureImpl {
     /**
      * @deprecated unused
      */
+    @Deprecated
     public void writeBytes(OutputStream out) throws DataFormatException, IOException {
         if ( (_deliveryMode < 0) || (_deliveryMode > FLAG_MODE_TUNNEL) ) throw new DataFormatException("Invalid data: mode = " + _deliveryMode);
         long flags = getFlags();
diff --git a/router/java/src/net/i2p/data/i2np/FastI2NPMessageImpl.java b/router/java/src/net/i2p/data/i2np/FastI2NPMessageImpl.java
index 912a9e2b9eff5dda42d0a2c3bb93c154b559e163..72f726a8bfb886dc9d185df8581baf6fd6b03c72 100644
--- a/router/java/src/net/i2p/data/i2np/FastI2NPMessageImpl.java
+++ b/router/java/src/net/i2p/data/i2np/FastI2NPMessageImpl.java
@@ -53,6 +53,7 @@ public abstract class FastI2NPMessageImpl extends I2NPMessageImpl {
      *  @deprecated unused
      *  @throws UnsupportedOperationException
      */
+    @Deprecated
     @Override
     public void readBytes(InputStream in) throws DataFormatException, IOException {
         throw new UnsupportedOperationException();
@@ -62,6 +63,7 @@ public abstract class FastI2NPMessageImpl extends I2NPMessageImpl {
      *  @deprecated unused
      *  @throws UnsupportedOperationException
      */
+    @Deprecated
     @Override
     public int readBytes(InputStream in, int type, byte buffer[]) throws I2NPMessageException, IOException {
         throw new UnsupportedOperationException();
@@ -118,6 +120,7 @@ public abstract class FastI2NPMessageImpl extends I2NPMessageImpl {
      *  @deprecated unused
      *  @throws UnsupportedOperationException
      */
+    @Deprecated
     @Override
     public void writeBytes(OutputStream out) throws DataFormatException, IOException {
         throw new UnsupportedOperationException();
diff --git a/router/java/src/net/i2p/data/i2np/GarlicClove.java b/router/java/src/net/i2p/data/i2np/GarlicClove.java
index d19435321e0e1f42c005af894894ff0c4c44447c..0d73ccf309ae4f57b3503b22dd8db721916847d2 100644
--- a/router/java/src/net/i2p/data/i2np/GarlicClove.java
+++ b/router/java/src/net/i2p/data/i2np/GarlicClove.java
@@ -60,6 +60,7 @@ public class GarlicClove extends DataStructureImpl {
      *  @deprecated unused, use byte array method to avoid copying
      *  @throws UnsupportedOperationException always
      */
+    @Deprecated
     public void readBytes(InputStream in) throws DataFormatException, IOException {
         throw new UnsupportedOperationException();
 /****
@@ -119,6 +120,7 @@ public class GarlicClove extends DataStructureImpl {
      *  @deprecated unused, use byte array method to avoid copying
      *  @throws UnsupportedOperationException always
      */
+    @Deprecated
     public void writeBytes(OutputStream out) throws DataFormatException, IOException {
         throw new UnsupportedOperationException();
 /****
diff --git a/router/java/src/net/i2p/data/i2np/I2NPMessage.java b/router/java/src/net/i2p/data/i2np/I2NPMessage.java
index c714700f368afc6188dd1b6102d2d10da260c847..af13f563ede5f3cd49492b592df6bf4920789bd7 100644
--- a/router/java/src/net/i2p/data/i2np/I2NPMessage.java
+++ b/router/java/src/net/i2p/data/i2np/I2NPMessage.java
@@ -48,6 +48,7 @@ public interface I2NPMessage extends DataStructure {
      * @throws IOException if there is a problem reading from the stream
      * @deprecated unused
      */
+    @Deprecated
     public int readBytes(InputStream in, int type, byte buffer[]) throws I2NPMessageException, IOException;
 
     /**
diff --git a/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java b/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java
index 224918ef48eca9a7a0f45df9f6e4d1cb6ebcc40d..16506d1a1f6992fd0383cd4dc57ef453d6046f4f 100644
--- a/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java
+++ b/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java
@@ -46,6 +46,7 @@ public class I2NPMessageHandler {
      * @throws I2NPMessageException if there is a problem handling the particular
      *          message - if it is an unknown type or has improper formatting, etc.
      */
+    @Deprecated
     public I2NPMessage readMessage(InputStream in) throws IOException, I2NPMessageException {
         if (_messageBuffer == null) _messageBuffer = new byte[38*1024]; // more than necessary
         try {
diff --git a/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java b/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java
index 062e310b12dbef001379b990b49289a7a8169025..851c0dc82b70b2ccf52ac02939cde16f97755638 100644
--- a/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java
+++ b/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java
@@ -58,6 +58,7 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
     private static final Map<Integer, Builder> _builders = new ConcurrentHashMap<Integer, Builder>(1);
 
     /** @deprecated unused */
+    @Deprecated
     public static final void registerBuilder(Builder builder, int type) { _builders.put(Integer.valueOf(type), builder); }
 
     /** interface for extending the types of messages handled - unused */
@@ -80,6 +81,7 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
      *
      *  @deprecated unused
      */
+    @Deprecated
     public void readBytes(InputStream in) throws DataFormatException, IOException {
         try {
             readBytes(in, -1, new byte[1024]);
@@ -112,6 +114,7 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
      *  @return total length of the message
      *  @deprecated unused
      */
+    @Deprecated
     public int readBytes(InputStream in, int type, byte buffer[]) throws I2NPMessageException, IOException {
         try {
             if (type < 0)
@@ -243,6 +246,7 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
      *
      *  @deprecated unused
      */
+    @Deprecated
     public void writeBytes(OutputStream out) throws DataFormatException, IOException {
         int size = getMessageSize();
         if (size < 15 + CHECKSUM_LENGTH) throw new DataFormatException("Unable to build the message");
diff --git a/router/java/src/net/i2p/data/i2np/I2NPMessageReader.java b/router/java/src/net/i2p/data/i2np/I2NPMessageReader.java
index d23a489d60964cbf7f3b37ddd0e139fecec9df51..05134f70746635fc59e20ee2fd1a48957633ada2 100644
--- a/router/java/src/net/i2p/data/i2np/I2NPMessageReader.java
+++ b/router/java/src/net/i2p/data/i2np/I2NPMessageReader.java
@@ -34,6 +34,7 @@ import net.i2p.util.Log;
  *
  * @author jrandom
  */
+@Deprecated
 public class I2NPMessageReader {
     private Log _log;
     private RouterContext _context;
@@ -70,12 +71,14 @@ public class I2NPMessageReader {
      * Have the already started reader pause its reading indefinitely
      * @deprecated unused
      */
+    @Deprecated
     public void pauseReading() { _reader.pauseRunner(); }
 
     /**
      * Resume reading after a pause
      * @deprecated unused
      */
+    @Deprecated
     public void resumeReading() { _reader.resumeRunner(); }
 
     /**
diff --git a/router/java/src/net/i2p/data/router/RouterAddress.java b/router/java/src/net/i2p/data/router/RouterAddress.java
index a350ef59365a5c14414b55f00a16d9e5483da92a..a81ae0202e7671c768e53f1f95fa7351f384d62f 100644
--- a/router/java/src/net/i2p/data/router/RouterAddress.java
+++ b/router/java/src/net/i2p/data/router/RouterAddress.java
@@ -112,6 +112,7 @@ public class RouterAddress extends DataStructureImpl {
      * @deprecated unused for now
      * @return null for never, or a Date
      */
+    @Deprecated
     public Date getExpiration() {
         //return _expiration;
         if (_expiration > 0)
@@ -127,6 +128,7 @@ public class RouterAddress extends DataStructureImpl {
      * @return 0 for never
      * @since 0.9.12
      */
+    @Deprecated
     public long getExpirationTime() {
         return _expiration;
     }
@@ -141,6 +143,7 @@ public class RouterAddress extends DataStructureImpl {
      * Unused for now, always null
      * @deprecated unused for now
      */
+    @Deprecated
     public void setExpiration(Date expiration) {
         _expiration = expiration.getDate();
     }
@@ -159,6 +162,7 @@ public class RouterAddress extends DataStructureImpl {
      * @throws IllegalStateException if was already set
      * @deprecated unused, use 3-arg constructor
      */
+    @Deprecated
     public void setTransportStyle(String transportStyle) {
         if (_transportStyle != null)
             throw new IllegalStateException();
@@ -171,6 +175,7 @@ public class RouterAddress extends DataStructureImpl {
      * @deprecated use getOptionsMap()
      * @return sorted, non-null, NOT a copy, do not modify
      */
+    @Deprecated
     public Properties getOptions() {
         return _options;
     }
@@ -199,6 +204,7 @@ public class RouterAddress extends DataStructureImpl {
      * @throws IllegalStateException if was already set
      * @deprecated unused, use 3-arg constructor
      */
+    @Deprecated
     public void setOptions(Properties options) {
         if (!_options.isEmpty())
             throw new IllegalStateException();
diff --git a/router/java/src/net/i2p/data/router/RouterInfo.java b/router/java/src/net/i2p/data/router/RouterInfo.java
index fdfd29136523397520f9b1b7cae8f83996b6173f..bc96fa853c312e553bb730ea3eb9d70c53f05da7 100644
--- a/router/java/src/net/i2p/data/router/RouterInfo.java
+++ b/router/java/src/net/i2p/data/router/RouterInfo.java
@@ -221,6 +221,7 @@ public class RouterInfo extends DatabaseEntry {
      *
      * @deprecated Implemented here but unused elsewhere
      */
+    @Deprecated
     public Set<Hash> getPeers() {
         if (_peers == null)
             return Collections.emptySet();
@@ -234,6 +235,7 @@ public class RouterInfo extends DatabaseEntry {
      * @deprecated Implemented here but unused elsewhere
      * @throws IllegalStateException if RouterInfo is already signed
      */
+    @Deprecated
     public void setPeers(Set<Hash> peers) {
         if (_signature != null)
             throw new IllegalStateException();
@@ -255,6 +257,7 @@ public class RouterInfo extends DatabaseEntry {
      * @deprecated use getOptionsMap()
      * @return sorted, non-null, NOT a copy, do not modify!!!
      */
+    @Deprecated
     public Properties getOptions() {
         return _options;
     }
diff --git a/router/java/src/net/i2p/router/Banlist.java b/router/java/src/net/i2p/router/Banlist.java
index 984be5ec6960683c2856e071f17897372414fbf8..716b9e1f76adc18945d1679388b67efa6e0a5933 100644
--- a/router/java/src/net/i2p/router/Banlist.java
+++ b/router/java/src/net/i2p/router/Banlist.java
@@ -294,6 +294,7 @@ public class Banlist {
     }
 
     /** @deprecated moved to router console */
+    @Deprecated
     public void renderStatusHTML(Writer out) throws IOException {
     }
 }
diff --git a/router/java/src/net/i2p/router/JobImpl.java b/router/java/src/net/i2p/router/JobImpl.java
index 25431e20b0b251309ddd922f11306f2673dd5659..54275fd19f07d8b291f30e2e96ead7aa59d4a976 100644
--- a/router/java/src/net/i2p/router/JobImpl.java
+++ b/router/java/src/net/i2p/router/JobImpl.java
@@ -48,6 +48,7 @@ public abstract class JobImpl implements Job {
      *  class list for no good reason. Logging in jobs is almost always
      *  set explicitly rather than by class name.
      */
+    @Deprecated
     void addedToQueue() {
         //if (_context.logManager().getLog(getClass()).shouldLog(Log.DEBUG))
         //    _addedBy = new Exception();
@@ -57,6 +58,7 @@ public abstract class JobImpl implements Job {
      *  @deprecated
      *  @return null always
      */
+    @Deprecated
     public Exception getAddedBy() { return null; }
     public long getMadeReadyOn() { return _madeReadyOn; }
     public void madeReady() { _madeReadyOn = _context.clock().now(); }
diff --git a/router/java/src/net/i2p/router/JobQueue.java b/router/java/src/net/i2p/router/JobQueue.java
index 141f348bf04d459762b5d849c9a5bb48e1a4d60b..0bf72ad9d03ae4b7131cb52c105b4519e800b2db 100644
--- a/router/java/src/net/i2p/router/JobQueue.java
+++ b/router/java/src/net/i2p/router/JobQueue.java
@@ -86,30 +86,35 @@ public class JobQueue {
     private long _lagWarning = DEFAULT_LAG_WARNING;
     private final static long DEFAULT_LAG_WARNING = 5*1000;
     /** @deprecated unimplemented */
+    @Deprecated
     private final static String PROP_LAG_WARNING = "router.jobLagWarning";
     
     /** if a job is this lagged, the router is hosed, so spit out a warning (dont shut it down) */
     private long _lagFatal = DEFAULT_LAG_FATAL;
     private final static long DEFAULT_LAG_FATAL = 30*1000;
     /** @deprecated unimplemented */
+    @Deprecated
     private final static String PROP_LAG_FATAL = "router.jobLagFatal";
     
     /** if a job takes this long to run, spit out a warning, but keep going */
     private long _runWarning = DEFAULT_RUN_WARNING;
     private final static long DEFAULT_RUN_WARNING = 5*1000;
     /** @deprecated unimplemented */
+    @Deprecated
     private final static String PROP_RUN_WARNING = "router.jobRunWarning";
     
     /** if a job takes this long to run, the router is hosed, so spit out a warning (dont shut it down) */
     private long _runFatal = DEFAULT_RUN_FATAL;
     private final static long DEFAULT_RUN_FATAL = 30*1000;
     /** @deprecated unimplemented */
+    @Deprecated
     private final static String PROP_RUN_FATAL = "router.jobRunFatal";
     
     /** don't enforce fatal limits until the router has been up for this long */
     private long _warmupTime = DEFAULT_WARMUP_TIME;
     private final static long DEFAULT_WARMUP_TIME = 10*60*1000;
     /** @deprecated unimplemented */
+    @Deprecated
     private final static String PROP_WARMUP_TIME = "router.jobWarmupTime";
     
     /** max ready and waiting jobs before we start dropping 'em */
@@ -118,6 +123,7 @@ public class JobQueue {
     private final static long MIN_LAG_TO_DROP = 500;
 
     /** @deprecated unimplemented */
+    @Deprecated
     private final static String PROP_MAX_WAITING_JOBS = "router.maxWaitingJobs";
 
     /** 
@@ -249,6 +255,7 @@ public class JobQueue {
      *
      * @deprecated unused
      */
+    @Deprecated
     public boolean isJobActive(Job job) {
         synchronized (_jobLock) {
             if (_readyJobs.contains(job) || _timedJobs.contains(job))
@@ -263,6 +270,7 @@ public class JobQueue {
     /**
      *  @deprecated contention - see JobTiming.setStartAfter() comments
      */
+    @Deprecated
     public void timingUpdated() {
         synchronized (_jobLock) {
             _jobLock.notifyAll();
@@ -346,6 +354,7 @@ public class JobQueue {
     }
 
     /** @deprecated do you really want to do this? */
+    @Deprecated
     public void restart() {
         synchronized (_jobLock) {
             _timedJobs.clear();
@@ -787,6 +796,7 @@ public class JobQueue {
     }
 
     /** @deprecated moved to router console */
+    @Deprecated
     public void renderStatusHTML(Writer out) throws IOException {
     }
 }
diff --git a/router/java/src/net/i2p/router/KeyManager.java b/router/java/src/net/i2p/router/KeyManager.java
index 3317b92903180a2a20356c426ae1396200869cf8..cda22114fd87f747e2009dd7d7e5c464c6767580 100644
--- a/router/java/src/net/i2p/router/KeyManager.java
+++ b/router/java/src/net/i2p/router/KeyManager.java
@@ -65,6 +65,7 @@ public class KeyManager {
      *
      *  @deprecated we never read keys in anymore
      */
+    @Deprecated
     public void startup() {
         // run inline so keys are loaded immediately
         (new SynchronizeKeysJob()).runJob();
diff --git a/router/java/src/net/i2p/router/MessageHistory.java b/router/java/src/net/i2p/router/MessageHistory.java
index 82d1af9df12f1a4a9a27e3e9f79f7120e8a4d46f..0666fc6103d60b97c40237038193f78f1005d7ad 100644
--- a/router/java/src/net/i2p/router/MessageHistory.java
+++ b/router/java/src/net/i2p/router/MessageHistory.java
@@ -77,6 +77,7 @@ public class MessageHistory {
     public boolean getDoLog() { return _doLog; }
     
     /** @deprecated unused */
+    @Deprecated
     void setPauseFlushes(boolean doPause) { _doPause = doPause; }
     String getFilename() { return _historyFile; }
     
diff --git a/router/java/src/net/i2p/router/OutNetMessage.java b/router/java/src/net/i2p/router/OutNetMessage.java
index 54434ac4b73b705d05ce6439b9e9b55ec7ef0ec2..fc6f8b71b8b91de174be9ecbbe4fbc515bacfba4 100644
--- a/router/java/src/net/i2p/router/OutNetMessage.java
+++ b/router/java/src/net/i2p/router/OutNetMessage.java
@@ -146,6 +146,7 @@ public class OutNetMessage implements CDPQEntry {
     }
 
     /** @deprecated unused */
+    @Deprecated
     public Map<String, Long> getTimestamps() {
         if (_log.shouldLog(Log.INFO)) {
             synchronized (this) {
@@ -157,6 +158,7 @@ public class OutNetMessage implements CDPQEntry {
     }
 
     /** @deprecated unused */
+    @Deprecated
     public Long getTimestamp(String eventName) {
         if (_log.shouldLog(Log.INFO)) {
             synchronized (this) {
@@ -178,6 +180,7 @@ public class OutNetMessage implements CDPQEntry {
      * @deprecated
      * @return null always
      */
+    @Deprecated
     public Exception getCreatedBy() { return null; }
     
     /**
diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index 03183a9949342d78a3954575752f5f3140d9149e..f250be3d5665682746575d73882ddbd84d8656ba 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -450,12 +450,14 @@ public class Router implements RouterClock.ClockShiftListener {
     public void setKillVMOnEnd(boolean shouldDie) { _killVMOnEnd = shouldDie; }
 
     /** @deprecated unused */
+    @Deprecated
     public boolean getKillVMOnEnd() { return _killVMOnEnd; }
     
     /** @return absolute path */
     public String getConfigFilename() { return _configFilename; }
 
     /** @deprecated unused */
+    @Deprecated
     public void setConfigFilename(String filename) { _configFilename = filename; }
     
     public String getConfigSetting(String name) { 
@@ -469,6 +471,7 @@ public class Router implements RouterClock.ClockShiftListener {
      *  @since 0.8.13
      *  @deprecated use saveConfig(String name, String value) or saveConfig(Map toAdd, Set toRemove)
      */
+    @Deprecated
     public void setConfigSetting(String name, String value) { 
             _config.put(name, value); 
     }
@@ -480,6 +483,7 @@ public class Router implements RouterClock.ClockShiftListener {
      *  @since 0.8.13
      *  @deprecated use saveConfig(String name, String value) or saveConfig(Map toAdd, Set toRemove)
      */
+    @Deprecated
     public void removeConfigSetting(String name) { 
             _config.remove(name); 
             // remove the backing default also
@@ -937,6 +941,7 @@ public class Router implements RouterClock.ClockShiftListener {
     public static final String PROP_FORCE_UNREACHABLE = "router.forceUnreachable";
 
     /** @deprecated unused */
+    @Deprecated
     public static final char CAPABILITY_NEW_TUNNEL = 'T';
     
     /**
diff --git a/router/java/src/net/i2p/router/RouterClock.java b/router/java/src/net/i2p/router/RouterClock.java
index 1d0418c154f3ea07d782f285712761e9fd2c8146..68a45ac6185be5845b5f1d288a6b599b1ba77a53 100644
--- a/router/java/src/net/i2p/router/RouterClock.java
+++ b/router/java/src/net/i2p/router/RouterClock.java
@@ -330,6 +330,7 @@ public class RouterClock extends Clock {
      *  @since 0.7.12
      *  @deprecated for debugging only
      */
+    @Deprecated
     public long getDeltaOffset() {
         return _desiredOffset - _offset;
     }
diff --git a/router/java/src/net/i2p/router/RouterContext.java b/router/java/src/net/i2p/router/RouterContext.java
index e29d2bb43259c5188734adf2eaeb03ff3d438815..ac15c1be43a53aad20c755e9a4c3e179c2eabf76 100644
--- a/router/java/src/net/i2p/router/RouterContext.java
+++ b/router/java/src/net/i2p/router/RouterContext.java
@@ -136,6 +136,7 @@ public class RouterContext extends I2PAppContext {
      * @since 0.8.4
      * @deprecated Use Router.saveConfig()
      */
+    @Deprecated
     public void setProperty(String propName, String value) {
     		_overrideProps.setProperty(propName, value);
     }
diff --git a/router/java/src/net/i2p/router/RouterDoSThrottle.java b/router/java/src/net/i2p/router/RouterDoSThrottle.java
index 3ef8cdab6e44ee255e927348ddef787ae8c8a816..57f5b7ddaa6ffab0cbe237e875c977cf0124df5a 100644
--- a/router/java/src/net/i2p/router/RouterDoSThrottle.java
+++ b/router/java/src/net/i2p/router/RouterDoSThrottle.java
@@ -10,6 +10,7 @@ import net.i2p.data.Hash;
  *
  * @deprecated unused
  */
+@Deprecated
 class RouterDoSThrottle extends RouterThrottleImpl {
     public RouterDoSThrottle(RouterContext context) {
         super(context);
diff --git a/router/java/src/net/i2p/router/RouterThrottleImpl.java b/router/java/src/net/i2p/router/RouterThrottleImpl.java
index 80473af2eb649e1addcc6b82423441958b20d6b6..e4cdfb88905cd9a95494cee42a91ffcf1489731d 100644
--- a/router/java/src/net/i2p/router/RouterThrottleImpl.java
+++ b/router/java/src/net/i2p/router/RouterThrottleImpl.java
@@ -102,6 +102,7 @@ public class RouterThrottleImpl implements RouterThrottle {
     }
     
     /** @deprecated unused, function moved to netdb */
+    @Deprecated
     public boolean acceptNetDbLookupRequest(Hash key) { 
         long lag = _context.jobQueue().getMaxLag();
         if (lag > JOB_LAG_LIMIT_NETDB) {
diff --git a/router/java/src/net/i2p/router/TunnelManagerFacade.java b/router/java/src/net/i2p/router/TunnelManagerFacade.java
index 5b3e000ac046141f95e26f05f80224ac1f6affde..cce1e5b8d4a0315d68ee52ed101d4a8a5731fa49 100644
--- a/router/java/src/net/i2p/router/TunnelManagerFacade.java
+++ b/router/java/src/net/i2p/router/TunnelManagerFacade.java
@@ -29,6 +29,7 @@ public interface TunnelManagerFacade extends Service {
      * @param id the tunnelId as seen at the gateway
      * @deprecated unused
      */
+    @Deprecated
     TunnelInfo getTunnelInfo(TunnelId id);
 
     /**
diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java
index 6665409a034c83d76b6d895d97b303a7e71bbfb7..b320f899565341ddc4ec74d6e4e91d0eafda073d 100644
--- a/router/java/src/net/i2p/router/client/ClientManager.java
+++ b/router/java/src/net/i2p/router/client/ClientManager.java
@@ -565,6 +565,7 @@ class ClientManager {
     }
     
     /** @deprecated unused */
+    @Deprecated
     public void renderStatusHTML(Writer out) throws IOException {
 /******
         StringBuilder buf = new StringBuilder(8*1024);
diff --git a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java
index 385d3bd2bef8e07431415d25565e39206cc5c581..b6ba9de182b1862bc2045cac68ed938b9938924b 100644
--- a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java
+++ b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java
@@ -235,6 +235,7 @@ public class ClientManagerFacadeImpl extends ClientManagerFacade implements Inte
     
     /** @deprecated unused */
     @Override
+    @Deprecated
     public void renderStatusHTML(Writer out) throws IOException { 
         if (_manager != null)
             _manager.renderStatusHTML(out); 
diff --git a/router/java/src/net/i2p/router/crypto/TransientSessionKeyManager.java b/router/java/src/net/i2p/router/crypto/TransientSessionKeyManager.java
index 15f0ec601691dc9d8f537d3f6105d5694839243c..606409c2c16c367149541048306dcf20128cf83e 100644
--- a/router/java/src/net/i2p/router/crypto/TransientSessionKeyManager.java
+++ b/router/java/src/net/i2p/router/crypto/TransientSessionKeyManager.java
@@ -450,6 +450,7 @@ public class TransientSessionKeyManager extends SessionKeyManager {
      * @deprecated unused and rather drastic
      */
     @Override
+    @Deprecated
     public void failTags(PublicKey target) {
         removeSession(target);
     }
diff --git a/router/java/src/net/i2p/router/dummy/DummyTunnelManagerFacade.java b/router/java/src/net/i2p/router/dummy/DummyTunnelManagerFacade.java
index 96dceea18e8aa95ac0259a70ec969af99cca639e..163c32a97fb971282bc5fac1f880fb1aa9540d43 100644
--- a/router/java/src/net/i2p/router/dummy/DummyTunnelManagerFacade.java
+++ b/router/java/src/net/i2p/router/dummy/DummyTunnelManagerFacade.java
@@ -30,6 +30,7 @@ import net.i2p.router.tunnel.pool.TunnelPool;
 public class DummyTunnelManagerFacade implements TunnelManagerFacade {
     
     /** @deprecated unused */
+    @Deprecated
     public TunnelInfo getTunnelInfo(TunnelId id) { return null; }
     public TunnelInfo selectInboundTunnel() { return null; }
     public TunnelInfo selectInboundTunnel(Hash destination) { return null; } 
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/ExploreKeySelectorJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/ExploreKeySelectorJob.java
index d3fe0198bf0eb96de31f08031f584399931a0e66..ba4b59f690b9402daade61491edbb537817dafa9 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/ExploreKeySelectorJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/ExploreKeySelectorJob.java
@@ -26,6 +26,7 @@ import net.i2p.util.Log;
  *
  * @deprecated unused, see comments in KNDF
  */
+@Deprecated
 class ExploreKeySelectorJob extends JobImpl {
     private Log _log;
     private KademliaNetworkDatabaseFacade _facade;
diff --git a/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java b/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java
index 74e96cd01a22c02812916d7f274d0bbde1e25013..30d69788586a303dbdf68b554cc6bc9efd167e7b 100644
--- a/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java
+++ b/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java
@@ -78,6 +78,7 @@ public class PeerManagerFacadeImpl implements PeerManagerFacade {
     }
 
     /** @deprecated unused */
+    @Deprecated
     public Hash selectRandomByCapability(char capability) { 
         //if (_manager == null) return null;
         //return _manager.selectRandomByCapability(capability); 
@@ -94,6 +95,7 @@ public class PeerManagerFacadeImpl implements PeerManagerFacade {
     }
 
     /** @deprecated moved to routerconsole */
+    @Deprecated
     public void renderStatusHTML(Writer out) throws IOException { 
     }
     
diff --git a/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java b/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java
index b0a9c7785d3d50fe21277512c83cf28b5f16f31b..3f9439492256ed368b26016f237ec6f936e903f0 100644
--- a/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java
+++ b/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java
@@ -357,6 +357,7 @@ public class ProfileManagerImpl implements ProfileManager {
      *  provide a simple summary of a number of peers, suitable for publication in the netDb
      *  @deprecated unused
      */
+    @Deprecated
     public Properties summarizePeers(int numPeers) {
 /****
         Set peers = new HashSet(numPeers);
diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
index 5e6e2f7a928f9d353b80b38d246ca2973af1c1f5..cf1b94c4c7fe0b94d98b98e36004eece16b29306 100644
--- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
+++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
@@ -240,6 +240,7 @@ public class ProfileOrganizer {
     public int countFastPeers() { return count(_fastPeers); }
     public int countHighCapacityPeers() { return count(_highCapacityPeers); }
     /** @deprecated use ProfileManager.getPeersByCapability('f').size() */
+    @Deprecated
     public int countWellIntegratedPeers() { return count(_wellIntegratedPeers); }
     public int countNotFailingPeers() { return count(_notFailingPeers); }
     public int countFailingPeers() { return count(_failingPeers); }
@@ -492,6 +493,7 @@ public class ProfileOrganizer {
      *
      * @deprecated unused
      */
+    @Deprecated
     public void selectWellIntegratedPeers(int howMany, Set<Hash> exclude, Set<Hash> matches) {
         selectWellIntegratedPeers(howMany, exclude, matches, 0);
     }
@@ -503,6 +505,7 @@ public class ProfileOrganizer {
      *             not be in the same tunnel. 0 = disable check; 1 = /8; 2 = /16; 3 = /24; 4 = exact IP match
      * @deprecated unused
      */
+    @Deprecated
     public void selectWellIntegratedPeers(int howMany, Set<Hash> exclude, Set<Hash> matches, int mask) {
         getReadLock();
         try {
diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java
index 209d7ba62c05fa3b71935b64286f3ecda0940a5b..02f4cabd31329465b595ad47cc6f59279b9a9673 100644
--- a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java
+++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java
@@ -114,9 +114,11 @@ public class FIFOBandwidthLimiter {
     //public void setMaxOutboundBytes(int numBytes) { _maxOutboundBytes = numBytes; }
 
     /** @deprecated unused for now, we are always limited */
+    @Deprecated
     void setInboundUnlimited(boolean isUnlimited) { _inboundUnlimited = isUnlimited; }
 
     /** @deprecated unused for now, we are always limited */
+    @Deprecated
     void setOutboundUnlimited(boolean isUnlimited) { _outboundUnlimited = isUnlimited; }
 
     /** @return smoothed one second rate */
@@ -735,6 +737,7 @@ public class FIFOBandwidthLimiter {
     }
 
     /** @deprecated not worth translating */
+    @Deprecated
     public void renderStatusHTML(Writer out) throws IOException {
 /*******
         long now = now();
diff --git a/router/java/src/net/i2p/router/transport/GetBidsJob.java b/router/java/src/net/i2p/router/transport/GetBidsJob.java
index aaa50ee45c484d9b434ec6798c3eebee9080c3fe..1471adeca01c82a02b7a95173ec03c3eaf75a009 100644
--- a/router/java/src/net/i2p/router/transport/GetBidsJob.java
+++ b/router/java/src/net/i2p/router/transport/GetBidsJob.java
@@ -29,6 +29,7 @@ class GetBidsJob extends JobImpl {
     /**
      *  @deprecated unused, see static getBids()
      */
+    @Deprecated
     public GetBidsJob(RouterContext ctx, TransportManager tmgr, OutNetMessage msg) {
         super(ctx);
         _log = ctx.logManager().getLog(GetBidsJob.class);
diff --git a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
index 9a5661b5f252d2cd3e6f2e72dbb19e52e2457626..f73634babef4fa839a37d0d6e5d27d59867f53d6 100644
--- a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
+++ b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
@@ -255,6 +255,7 @@ public class OutboundMessageRegistry {
     }
 
     /** @deprecated unused */
+    @Deprecated
     public void renderStatusHTML(Writer out) throws IOException {}
     
     private class CleanupTask extends SimpleTimer2.TimedEvent {
diff --git a/router/java/src/net/i2p/router/transport/Transport.java b/router/java/src/net/i2p/router/transport/Transport.java
index 41c19211c68f0f793837bbebe722675aafac21da..508435bf1b8dc4ee50169ff78dd3d7b40d2146c4 100644
--- a/router/java/src/net/i2p/router/transport/Transport.java
+++ b/router/java/src/net/i2p/router/transport/Transport.java
@@ -159,6 +159,7 @@ public interface Transport {
     /**
      * @deprecated unused
      */
+    @Deprecated
     public void recheckReachability();
 
     public boolean isBacklogged(Hash peer);
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java
index 238ec16fd2a347862b58a25b7e30fb186414f11a..f5647661c62aa23335963b7bb011575011ac3a8b 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java
@@ -328,6 +328,7 @@ class UDPPacket implements CDQEntry {
      *  @since 0.9.21
      *  @deprecated unused
      */
+    @Deprecated
     public synchronized void requestInboundBandwidth() {
         verifyNotReleased();
         _bandwidthRequest = _context.bandwidthLimiter().requestInbound(_packet.getLength(), "UDP receiver");
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java b/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java
index c7c9d90cc0bdcf75030d31c9b961b1f7e01f26ef..e0476a70a2ef26d91ab36fdf2d0c56f42691ea23 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java
@@ -849,6 +849,7 @@ class UDPPacketReader {
         }
         
         /** @deprecated unused */
+        @Deprecated
         public int readAliceIPSize() {
             int offset = readBodyOffset();
             offset += _message[offset] & 0xff;
@@ -856,6 +857,7 @@ class UDPPacketReader {
             return _message[offset] & 0xff;
         }
         /** @deprecated unused */
+        @Deprecated
         public void readAliceIP(byte target[], int targetOffset) {
             int offset = readBodyOffset();
             offset += _message[offset] & 0xff;
@@ -865,6 +867,7 @@ class UDPPacketReader {
             System.arraycopy(_message, offset, target, targetOffset, sz);
         }
         /** @deprecated unused */
+        @Deprecated
         public int readAlicePort() {
             int offset = readBodyOffset();
             offset += _message[offset] & 0xff;
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPSender.java b/router/java/src/net/i2p/router/transport/udp/UDPSender.java
index ebb2de795e098f74ce8277bec7fb98f62ecd5960..5ffff56dbb743c9de4912b1fcbaa4b24410acdfa 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPSender.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPSender.java
@@ -124,6 +124,7 @@ class UDPSender {
      * @param blockTime how long to block IGNORED
      * @deprecated use add(packet)
      */
+    @Deprecated
     public void add(UDPPacket packet, int blockTime) {
      /********
         //long expiration = _context.clock().now() + blockTime;
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
index 0202ee39fa8f72350d9e362d623aa92f471b0a51..85e6e3d1c86cd758e1b8b7963c7f6bb530a949bc 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -127,6 +127,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
     /** now unused, we pick a random port
      *  @deprecated unused
      */
+    @Deprecated
     public static final int DEFAULT_INTERNAL_PORT = 8887;
 
     /** define this to explicitly set an external IP address */
@@ -3102,6 +3103,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
      * @deprecated unused
      */
     @Override
+    @Deprecated
     public void recheckReachability() {
         // FIXME locking if we do this again
         //_testEvent.runTest();
diff --git a/router/java/src/net/i2p/router/tunnel/HashSetIVValidator.java b/router/java/src/net/i2p/router/tunnel/HashSetIVValidator.java
index e450f6827eb313890a96b4ca27f3ae11f8fd2c09..0c9f10efdeeff254b355776f1f08067c3a555314 100644
--- a/router/java/src/net/i2p/router/tunnel/HashSetIVValidator.java
+++ b/router/java/src/net/i2p/router/tunnel/HashSetIVValidator.java
@@ -11,6 +11,7 @@ import net.i2p.util.ConcurrentHashSet;
  *
  * @deprecated unused
  */
+@Deprecated
 class HashSetIVValidator implements IVValidator {
     private final Set<ByteArray> _received;
     
diff --git a/router/java/src/net/i2p/router/tunnel/HopProcessor.java b/router/java/src/net/i2p/router/tunnel/HopProcessor.java
index 9ba6218fd90dd5e9bec5b3093d65426977f6be05..92b985e631858e9457dab4797dd9dc9ccbac4106 100644
--- a/router/java/src/net/i2p/router/tunnel/HopProcessor.java
+++ b/router/java/src/net/i2p/router/tunnel/HopProcessor.java
@@ -34,6 +34,7 @@ class HopProcessor {
     /**
      *  @deprecated used only by unit tests
      */
+    @Deprecated
     HopProcessor(I2PAppContext ctx, HopConfig config) {
         this(ctx, config, createValidator());
     }
@@ -48,6 +49,7 @@ class HopProcessor {
     /**
      *  @deprecated used only by unit test constructor
      */
+    @Deprecated
     private static IVValidator createValidator() { 
         // yeah, we'll use an O(1) validator later (e.g. bloom filter)
         return new HashSetIVValidator();
diff --git a/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java b/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java
index 4a3c5eccbec7b95e2eafb12210483e7b3f426cd7..a45b1dd8dd650c7ca0b530ae7808878037abeb69 100644
--- a/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java
+++ b/router/java/src/net/i2p/router/tunnel/InboundEndpointProcessor.java
@@ -24,6 +24,7 @@ class InboundEndpointProcessor {
     /**
      *  @deprecated used only by unit tests
      */
+    @Deprecated
     InboundEndpointProcessor(RouterContext ctx, TunnelCreatorConfig cfg) {
         this(ctx, cfg, DummyValidator.getInstance());
     }
diff --git a/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java b/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java
index 19e84dc04d3cf7390ae1f4322de9cba0b23a1e0f..64668884e1a7392255512ed16d2b3e7d6cff8c94 100644
--- a/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java
+++ b/router/java/src/net/i2p/router/tunnel/TrivialPreprocessor.java
@@ -150,6 +150,7 @@ class TrivialPreprocessor implements TunnelGateway.QueuePreprocessor {
      *  are there follow up headers?
      *  @deprecated unimplemented
      */
+    @Deprecated
     private static final byte MASK_EXTENDED = FragmentHandler.MASK_EXTENDED;
     private static final byte MASK_TUNNEL = (byte)(FragmentHandler.TYPE_TUNNEL << 5);
     private static final byte MASK_ROUTER = (byte)(FragmentHandler.TYPE_ROUTER << 5);
diff --git a/router/java/src/net/i2p/router/tunnel/TrivialRouterPreprocessor.java b/router/java/src/net/i2p/router/tunnel/TrivialRouterPreprocessor.java
index b37baa8cea8ef9a4754662e9462def44ca84b640..01598f94a0652bd6143d270eb31d95c74aec35d0 100644
--- a/router/java/src/net/i2p/router/tunnel/TrivialRouterPreprocessor.java
+++ b/router/java/src/net/i2p/router/tunnel/TrivialRouterPreprocessor.java
@@ -9,6 +9,7 @@ import net.i2p.router.RouterContext;
  *
  * @deprecated unused
  */
+@Deprecated
 class TrivialRouterPreprocessor extends TrivialPreprocessor {
     
     public TrivialRouterPreprocessor(RouterContext ctx) {
diff --git a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
index 134c76802e439815853f8f6f3df33002cfa97bda..05df3e28d5427d3890deb98de0e5e7071c117bbf 100644
--- a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
+++ b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
@@ -949,6 +949,7 @@ public class TunnelDispatcher implements Service {
     }
     
     /** @deprecated moved to router console */
+    @Deprecated
     public void renderStatusHTML(Writer out) throws IOException {}    
     
     /**
diff --git a/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java b/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java
index 914e8bf39787319c10f231b1cf7a6280456c6ff9..027dc2cda8f306bd62401a77dc5f82ec8d717169 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/PooledTunnelCreatorConfig.java
@@ -75,6 +75,7 @@ class PooledTunnelCreatorConfig extends TunnelCreatorConfig {
     
 
     /** @deprecated unused, which makes _testJob unused - why is it here */
+    @Deprecated
     void setTestJob(TestJob job) { _testJob = job; }
     /** does nothing, to be deprecated */
     public void setExpireJob(Job job) { /* _expireJob = job; */ }
@@ -82,6 +83,7 @@ class PooledTunnelCreatorConfig extends TunnelCreatorConfig {
     /**
      * @deprecated Fix memory leaks caused by references if you need to use pairedTunnel
      */
+    @Deprecated
     public void setPairedTunnel(TunnelInfo tunnel) { /* _pairedTunnel = tunnel; */}
     // public TunnelInfo getPairedTunnel() { return _pairedTunnel; }
 }
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
index e2e54e6e1af9cb2f9129d21fef8c08b7e6339398..997b27b8e5e814650e096bddac3084386dad273c 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
@@ -254,6 +254,7 @@ public class TunnelPoolManager implements TunnelManagerFacade {
      *  Expensive (iterates through all tunnels of all pools) and unnecessary.
      *  @deprecated unused
      */
+    @Deprecated
     public TunnelInfo getTunnelInfo(TunnelId id) {
         TunnelInfo info = null;
         for (TunnelPool pool : _clientInboundPools.values()) {
@@ -646,6 +647,7 @@ public class TunnelPoolManager implements TunnelManagerFacade {
     public int getInboundBuildQueueSize() { return _handler.getInboundBuildQueueSize(); }
     
     /** @deprecated moved to routerconsole */
+    @Deprecated
     public void renderStatusHTML(Writer out) throws IOException {
     }
 
diff --git a/router/java/src/net/i2p/router/util/PriBlockingQueue.java b/router/java/src/net/i2p/router/util/PriBlockingQueue.java
index 7a46741c8ad6056602a32fb17a3543aea2d00112..2252e81c20bda59cb9b77c16cdd0413971ace77a 100644
--- a/router/java/src/net/i2p/router/util/PriBlockingQueue.java
+++ b/router/java/src/net/i2p/router/util/PriBlockingQueue.java
@@ -49,6 +49,7 @@ public class PriBlockingQueue<E extends PQEntry> extends PriorityBlockingQueue<E
      *  Returns false if full
      *  @deprecated use offer(o)
      */
+    @Deprecated
     @Override
     public boolean add(E o) {
         timestamp(o);
@@ -79,6 +80,7 @@ public class PriBlockingQueue<E extends PQEntry> extends PriorityBlockingQueue<E
      *  @param unit ignored
      *  @deprecated use offer(o)
      */
+    @Deprecated
     @Override
     public boolean offer(E o, long timeout, TimeUnit unit) {
         timestamp(o);
@@ -94,6 +96,7 @@ public class PriBlockingQueue<E extends PQEntry> extends PriorityBlockingQueue<E
      *  Non blocking. Does not add if full.
      *  @deprecated use offer(o)
      */
+    @Deprecated
     @Override
     public void put(E o) {
         timestamp(o);
diff --git a/router/java/src/org/cybergarage/upnp/Action.java b/router/java/src/org/cybergarage/upnp/Action.java
index a4a4bc78259b8af322380241bcb9e1f4e93a1b19..e5ab1559ce6a78aff1245535ab44258d78b07eee 100644
--- a/router/java/src/org/cybergarage/upnp/Action.java
+++ b/router/java/src/org/cybergarage/upnp/Action.java
@@ -227,6 +227,7 @@ public class Action
 	 *  - {@link #setInArgumentValues(ArgumentList)} <br/>
 	 *  - {@link #setOutArgumentValues(ArgumentList)} 
 	 */
+	@Deprecated
 	public void setArgumentValues(ArgumentList argList)
 	{
 		getArgumentList().set(argList);
diff --git a/router/java/src/org/cybergarage/upnp/ArgumentList.java b/router/java/src/org/cybergarage/upnp/ArgumentList.java
index c1251962d07b2050253f17040e7821750b493ea2..148d5c544a016bb702d6516702bff8720504cb75 100644
--- a/router/java/src/org/cybergarage/upnp/ArgumentList.java
+++ b/router/java/src/org/cybergarage/upnp/ArgumentList.java
@@ -62,6 +62,7 @@ public class ArgumentList extends Vector<Argument>
 	/**
 	 * @deprecated
 	 */
+	@Deprecated
 	public void set(ArgumentList inArgList)
 	{
 		int nInArgs = inArgList.size();