diff --git a/core/java/src/net/i2p/client/I2CPMessageProducer.java b/core/java/src/net/i2p/client/I2CPMessageProducer.java
index 574044c713ada1faace4539686bd9ebd88f007c3..f074e6e7e3187e8c3a60c4db0bb114bbf342ae36 100644
--- a/core/java/src/net/i2p/client/I2CPMessageProducer.java
+++ b/core/java/src/net/i2p/client/I2CPMessageProducer.java
@@ -9,7 +9,6 @@ package net.i2p.client;
*
*/
-import java.util.HashSet;
import java.util.Set;
import net.i2p.I2PAppContext;
diff --git a/core/java/src/net/i2p/stat/Rate.java b/core/java/src/net/i2p/stat/Rate.java
index c267860cff1d82fa718944d774c916c69355c17d..c1fd5602d88804d7bd2eb5ef396f33a40ba3494f 100644
--- a/core/java/src/net/i2p/stat/Rate.java
+++ b/core/java/src/net/i2p/stat/Rate.java
@@ -1,7 +1,6 @@
package net.i2p.stat;
import java.io.IOException;
-import java.io.OutputStream;
import java.util.Properties;
import net.i2p.util.Clock;
diff --git a/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java b/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java
index d2e444ceec44fff159c402fc73dffdd98424cba1..413e61a1339c22e77c010c1c656eb299d9c0dd5c 100644
--- a/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java
+++ b/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java
@@ -19,7 +19,6 @@ import net.i2p.I2PAppContext;
import net.i2p.data.DataFormatException;
import net.i2p.data.DataHelper;
import net.i2p.data.Hash;
-import net.i2p.data.RouterInfo;
import net.i2p.data.TunnelId;
import net.i2p.util.Log;
diff --git a/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java b/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java
index b74820eb8addf053724663826d2757fe82f54ae0..6bb332f329a24b08da277f54b6058328bea57873 100644
--- a/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java
+++ b/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java
@@ -8,19 +8,16 @@ package net.i2p.data.i2np;
*
*/
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import net.i2p.I2PAppContext;
import net.i2p.data.DataFormatException;
import net.i2p.data.DataHelper;
import net.i2p.data.Hash;
-import net.i2p.data.RouterInfo;
import net.i2p.util.Log;
/**
diff --git a/router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java b/router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java
index 179c028f53ec3e2313c3db2d34f7448e20e91668..b067be30c66e8d477cb79f78d908f12b1f1d6835 100644
--- a/router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java
+++ b/router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java
@@ -17,9 +17,9 @@ import net.i2p.data.Certificate;
import net.i2p.data.DataFormatException;
import net.i2p.data.DataHelper;
import net.i2p.data.Hash;
-import net.i2p.data.TunnelId;
import net.i2p.data.SessionKey;
import net.i2p.data.SessionTag;
+import net.i2p.data.TunnelId;
import net.i2p.util.Log;
/**
diff --git a/router/java/src/net/i2p/router/CommSystemFacade.java b/router/java/src/net/i2p/router/CommSystemFacade.java
index 6c062cd67a0f6f46ccf9b1262d154b8e1ce8deb5..32f6500e6baf0f402703b527315acad862d817d7 100644
--- a/router/java/src/net/i2p/router/CommSystemFacade.java
+++ b/router/java/src/net/i2p/router/CommSystemFacade.java
@@ -10,7 +10,6 @@ package net.i2p.router;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.HashSet;
import java.util.Set;
diff --git a/router/java/src/net/i2p/router/JobQueue.java b/router/java/src/net/i2p/router/JobQueue.java
index f11b6170a3a4d9a6c950fc7ab5f237e8e063a24f..61754fb48363cde0747fd3ee75f9e3690d8fd12b 100644
--- a/router/java/src/net/i2p/router/JobQueue.java
+++ b/router/java/src/net/i2p/router/JobQueue.java
@@ -10,7 +10,6 @@ package net.i2p.router;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
diff --git a/router/java/src/net/i2p/router/NetworkDatabaseFacade.java b/router/java/src/net/i2p/router/NetworkDatabaseFacade.java
index bc6621cd3ac057b34482beefd4840dd62e3b9b1f..6da53ec25f0652e3c830614cbd5c27ef5e6fbc46 100644
--- a/router/java/src/net/i2p/router/NetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/NetworkDatabaseFacade.java
@@ -10,7 +10,6 @@ package net.i2p.router;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
diff --git a/router/java/src/net/i2p/router/RouterContext.java b/router/java/src/net/i2p/router/RouterContext.java
index 62e739fffbef517de6b23aa902be331b9aa61d8d..bcce250bd8590ce7008abaab7f042a851487c80e 100644
--- a/router/java/src/net/i2p/router/RouterContext.java
+++ b/router/java/src/net/i2p/router/RouterContext.java
@@ -9,16 +9,16 @@ import net.i2p.data.Hash;
import net.i2p.router.client.ClientManagerFacadeImpl;
import net.i2p.router.networkdb.kademlia.KademliaNetworkDatabaseFacade;
import net.i2p.router.peermanager.Calculator;
+import net.i2p.router.peermanager.CapacityCalculator;
import net.i2p.router.peermanager.IntegrationCalculator;
import net.i2p.router.peermanager.IsFailingCalculator;
import net.i2p.router.peermanager.PeerManagerFacadeImpl;
import net.i2p.router.peermanager.ProfileManagerImpl;
import net.i2p.router.peermanager.ProfileOrganizer;
import net.i2p.router.peermanager.ReliabilityCalculator;
-import net.i2p.router.peermanager.CapacityCalculator;
import net.i2p.router.peermanager.SpeedCalculator;
-import net.i2p.router.transport.FIFOBandwidthLimiter;
import net.i2p.router.transport.CommSystemFacadeImpl;
+import net.i2p.router.transport.FIFOBandwidthLimiter;
import net.i2p.router.transport.OutboundMessageRegistry;
import net.i2p.router.transport.VMCommSystem;
import net.i2p.router.tunnelmanager.PoolingTunnelManagerFacade;
diff --git a/router/java/src/net/i2p/router/RouterThrottleImpl.java b/router/java/src/net/i2p/router/RouterThrottleImpl.java
index 2f8b092499dd65c57ca5a9b39d0c85082465e742..f5a8813a9d077f0003aeb5b3e49a77c62263578e 100644
--- a/router/java/src/net/i2p/router/RouterThrottleImpl.java
+++ b/router/java/src/net/i2p/router/RouterThrottleImpl.java
@@ -2,8 +2,8 @@ package net.i2p.router;
import net.i2p.data.Hash;
import net.i2p.data.i2np.TunnelCreateMessage;
-import net.i2p.stat.RateStat;
import net.i2p.stat.Rate;
+import net.i2p.stat.RateStat;
import net.i2p.util.Log;
/**
diff --git a/router/java/src/net/i2p/router/Shitlist.java b/router/java/src/net/i2p/router/Shitlist.java
index 43c86e34df0d61925aef4efc274b6a1f2d04a645..52af0504b4b13c5da95005badf677db358a1dddb 100644
--- a/router/java/src/net/i2p/router/Shitlist.java
+++ b/router/java/src/net/i2p/router/Shitlist.java
@@ -10,7 +10,6 @@ package net.i2p.router;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/router/java/src/net/i2p/router/StatisticsManager.java b/router/java/src/net/i2p/router/StatisticsManager.java
index 41956a3072caaa73b329d16580bdccb80cfe5cdb..ceccc526f2ff7d4917b6b05e05862c8fad7c6384 100644
--- a/router/java/src/net/i2p/router/StatisticsManager.java
+++ b/router/java/src/net/i2p/router/StatisticsManager.java
@@ -8,9 +8,7 @@ package net.i2p.router;
*
*/
-import java.io.IOException;
import java.io.OutputStream;
-
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.util.Locale;
diff --git a/router/java/src/net/i2p/router/admin/AdminManager.java b/router/java/src/net/i2p/router/admin/AdminManager.java
index 007c8b02e7f6a4c417bdf841d7094b4e4ad8e610..7734e322a647c14be74ce2b368e7f29e41c5e03c 100644
--- a/router/java/src/net/i2p/router/admin/AdminManager.java
+++ b/router/java/src/net/i2p/router/admin/AdminManager.java
@@ -1,6 +1,5 @@
package net.i2p.router.admin;
-import java.io.IOException;
import java.io.OutputStream;
import net.i2p.router.RouterContext;
diff --git a/router/java/src/net/i2p/router/admin/StatsGenerator.java b/router/java/src/net/i2p/router/admin/StatsGenerator.java
index cdd8fbbde558da1a6aa7de5fd0cf8d93662ad925..87a3ec2a81295cfc5ce30dd512b5b8063cbf39a5 100644
--- a/router/java/src/net/i2p/router/admin/StatsGenerator.java
+++ b/router/java/src/net/i2p/router/admin/StatsGenerator.java
@@ -1,9 +1,7 @@
package net.i2p.router.admin;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.PrintWriter;
import java.text.DecimalFormat;
import java.util.Arrays;
import java.util.Iterator;
diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java
index c323042f67196eeb175d71238895c74e31a6544c..18343967d4496f7f7411e4d623be619755e044b2 100644
--- a/router/java/src/net/i2p/router/client/ClientManager.java
+++ b/router/java/src/net/i2p/router/client/ClientManager.java
@@ -10,7 +10,6 @@ package net.i2p.router.client;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
diff --git a/router/java/src/net/i2p/router/client/ClientWriterRunner.java b/router/java/src/net/i2p/router/client/ClientWriterRunner.java
index 0803b28f0186b9821a553da00ea8e4fcca9955db..b8bd8c6e829b77adcc4fe00d60a3cae456cdeaf6 100644
--- a/router/java/src/net/i2p/router/client/ClientWriterRunner.java
+++ b/router/java/src/net/i2p/router/client/ClientWriterRunner.java
@@ -1,10 +1,11 @@
package net.i2p.router.client;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
+
+import net.i2p.data.i2cp.I2CPMessage;
import net.i2p.router.RouterContext;
import net.i2p.util.Log;
-import net.i2p.data.i2cp.I2CPMessage;
/**
* Async writer class so that if a client app hangs, they wont take down the
diff --git a/router/java/src/net/i2p/router/message/MessageHandler.java b/router/java/src/net/i2p/router/message/MessageHandler.java
index 6798119d3799b91d09c0f45e881f2ef6cf9d9091..4ba497c2fa11ad4d333409e2f434e9a2bf5d8d62 100644
--- a/router/java/src/net/i2p/router/message/MessageHandler.java
+++ b/router/java/src/net/i2p/router/message/MessageHandler.java
@@ -20,7 +20,6 @@ import net.i2p.data.i2np.I2NPMessage;
import net.i2p.data.i2np.TunnelMessage;
import net.i2p.router.ClientMessage;
import net.i2p.router.InNetMessage;
-import net.i2p.router.Job;
import net.i2p.router.MessageReceptionInfo;
import net.i2p.router.RouterContext;
import net.i2p.util.Log;
diff --git a/router/java/src/net/i2p/router/message/SendTunnelMessageJob.java b/router/java/src/net/i2p/router/message/SendTunnelMessageJob.java
index b88ee274b19c89c5658be13acd1c5f55d12e44aa..34d64ef9c2ee2573b521bc488095edba210af57a 100644
--- a/router/java/src/net/i2p/router/message/SendTunnelMessageJob.java
+++ b/router/java/src/net/i2p/router/message/SendTunnelMessageJob.java
@@ -32,7 +32,6 @@ import net.i2p.router.MessageReceptionInfo;
import net.i2p.router.MessageSelector;
import net.i2p.router.OutNetMessage;
import net.i2p.router.ReplyJob;
-import net.i2p.router.Router;
import net.i2p.router.RouterContext;
import net.i2p.router.TunnelInfo;
import net.i2p.util.Log;
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 0eff865d0fe0520b593c78b7830f3e38b9ab22b7..d60c7b5cb010c1bb4dbee56fefe5b5aee31c91ed 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
@@ -29,7 +29,6 @@ import net.i2p.data.LeaseSet;
import net.i2p.data.RouterAddress;
import net.i2p.data.RouterInfo;
import net.i2p.data.i2np.DatabaseLookupMessage;
-import net.i2p.data.i2np.DatabaseSearchReplyMessage;
import net.i2p.data.i2np.DatabaseStoreMessage;
import net.i2p.router.Job;
import net.i2p.router.NetworkDatabaseFacade;
diff --git a/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java b/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java
index 35844f1b456180d0bedb8d37298c7234766c5232..a6c3f7403029c9afde12a26f68feede616432bc9 100644
--- a/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java
+++ b/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java
@@ -1,8 +1,8 @@
package net.i2p.router.peermanager;
import net.i2p.router.RouterContext;
-import net.i2p.stat.RateStat;
import net.i2p.stat.Rate;
+import net.i2p.stat.RateStat;
import net.i2p.util.Log;
/**
diff --git a/router/java/src/net/i2p/router/peermanager/PeerManager.java b/router/java/src/net/i2p/router/peermanager/PeerManager.java
index fed203ffeb74560f0c586b0c5504b8af308e6dc3..5777848ac7d733467bfa2762b693e95d5aef1b3b 100644
--- a/router/java/src/net/i2p/router/peermanager/PeerManager.java
+++ b/router/java/src/net/i2p/router/peermanager/PeerManager.java
@@ -10,7 +10,6 @@ package net.i2p.router.peermanager;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
diff --git a/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java b/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java
index 15285f7f141d6f2cb3e52c7659b2958d171ad911..caf32dd90e736e43cbb95395007381cea6256027 100644
--- a/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java
+++ b/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java
@@ -10,7 +10,6 @@ package net.i2p.router.peermanager;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.ArrayList;
import java.util.List;
diff --git a/router/java/src/net/i2p/router/peermanager/PeerProfile.java b/router/java/src/net/i2p/router/peermanager/PeerProfile.java
index ab6de47775e570316b2409e40f38ff0d2e7ef5a1..134b5180190ba4eb97c7e75bb56393fdb7dd251c 100644
--- a/router/java/src/net/i2p/router/peermanager/PeerProfile.java
+++ b/router/java/src/net/i2p/router/peermanager/PeerProfile.java
@@ -1,7 +1,6 @@
package net.i2p.router.peermanager;
import java.io.File;
-
import java.text.DecimalFormat;
import net.i2p.data.Hash;
diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
index afb401d15158112ac044c79353c814250cf720f1..f2fecd974f48e17c18f066fda4498b0410521c7f 100644
--- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
+++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
@@ -10,7 +10,6 @@ package net.i2p.router.transport;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.HashSet;
import java.util.List;
import java.util.Properties;
diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java
index 05a9027f74ba0d9422382b1c4682cebb795c2f61..dc0f33406f1ecbc8a5d0e33674b83af421936f16 100644
--- a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java
+++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java
@@ -2,9 +2,8 @@ package net.i2p.router.transport;
import java.io.IOException;
import java.io.OutputStream;
-
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
import net.i2p.I2PAppContext;
import net.i2p.util.I2PThread;
diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java
index 6b7892b553fea6f8e0e2f6f8982f6b332235f122..2c648c572fdaecfbd826514b73fa17066aabbff9 100644
--- a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java
+++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java
@@ -1,7 +1,7 @@
package net.i2p.router.transport;
-import net.i2p.util.Log;
import net.i2p.I2PAppContext;
+import net.i2p.util.Log;
class FIFOBandwidthRefiller implements Runnable {
private Log _log;
diff --git a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
index fbf92fc5596bb8ef96143ccbc2736824dcb2e4f0..98802223ca0d82e179fa35e373049b7b57821777 100644
--- a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
+++ b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
@@ -10,7 +10,6 @@ package net.i2p.router.transport;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java
index bcf42d42d7e0eea3d2f1317369ef17f19629a07c..24f36821931248b7d61419c9b148b88cc0b84739 100644
--- a/router/java/src/net/i2p/router/transport/TransportImpl.java
+++ b/router/java/src/net/i2p/router/transport/TransportImpl.java
@@ -8,10 +8,10 @@ package net.i2p.router.transport;
*
*/
+import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.ArrayList;
import java.util.List;
import java.util.Set;
diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java
index c42b19a80ad366c3ce442665c9759e558808e374..9790495c803df86535fbb6e9bb5bb1bbe273f762 100644
--- a/router/java/src/net/i2p/router/transport/TransportManager.java
+++ b/router/java/src/net/i2p/router/transport/TransportManager.java
@@ -10,7 +10,6 @@ package net.i2p.router.transport;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
diff --git a/router/java/src/net/i2p/router/transport/VMCommSystem.java b/router/java/src/net/i2p/router/transport/VMCommSystem.java
index 543d3becb3546bb92243e2c47e99ff51d717f6e9..524eeeb7f129e063a9674e5ac7c899b6719a9221 100644
--- a/router/java/src/net/i2p/router/transport/VMCommSystem.java
+++ b/router/java/src/net/i2p/router/transport/VMCommSystem.java
@@ -1,7 +1,6 @@
package net.i2p.router.transport;
import java.io.ByteArrayInputStream;
-import java.io.IOException;
import java.io.OutputStream;
import java.util.Collections;
import java.util.HashMap;
diff --git a/router/java/src/net/i2p/router/transport/tcp/RestrictiveTCPConnection.java b/router/java/src/net/i2p/router/transport/tcp/RestrictiveTCPConnection.java
index ad482f5232633ec569bd41d46cc7e0e43d2913d0..14a0a111826724820eb32d7a5dca597b3cf022cf 100644
--- a/router/java/src/net/i2p/router/transport/tcp/RestrictiveTCPConnection.java
+++ b/router/java/src/net/i2p/router/transport/tcp/RestrictiveTCPConnection.java
@@ -8,10 +8,9 @@ package net.i2p.router.transport.tcp;
*
*/
+import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.BufferedOutputStream;
-import java.io.BufferedInputStream;
import java.io.IOException;
import java.math.BigInteger;
import java.net.Socket;
diff --git a/router/java/src/net/i2p/router/tunnelmanager/HandleTunnelCreateMessageJob.java b/router/java/src/net/i2p/router/tunnelmanager/HandleTunnelCreateMessageJob.java
index 01aacb3982dd85f04e8d43c271435c3b0fc6273f..347d6bb529e62aa1a3b23eda278fe751c5cec331 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/HandleTunnelCreateMessageJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/HandleTunnelCreateMessageJob.java
@@ -16,11 +16,10 @@ import net.i2p.data.Hash;
import net.i2p.data.RouterIdentity;
import net.i2p.data.RouterInfo;
import net.i2p.data.TunnelId;
-import net.i2p.data.i2np.TunnelCreateMessage;
import net.i2p.data.i2np.DeliveryInstructions;
-import net.i2p.data.i2np.GarlicClove;
import net.i2p.data.i2np.GarlicMessage;
import net.i2p.data.i2np.I2NPMessage;
+import net.i2p.data.i2np.TunnelCreateMessage;
import net.i2p.data.i2np.TunnelCreateStatusMessage;
import net.i2p.router.Job;
import net.i2p.router.JobImpl;
@@ -28,8 +27,8 @@ import net.i2p.router.MessageSelector;
import net.i2p.router.ReplyJob;
import net.i2p.router.RouterContext;
import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelSettings;
import net.i2p.router.TunnelSelectionCriteria;
+import net.i2p.router.TunnelSettings;
import net.i2p.router.message.BuildTestMessageJob;
import net.i2p.router.message.GarlicConfig;
import net.i2p.router.message.GarlicMessageBuilder;
diff --git a/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelManagerFacade.java b/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelManagerFacade.java
index 8eced3acfc25a2c9f8a1b6c3e9972580f13b9e7f..086ab95d011d3fd6e6a79dfe70efae2a92a19133 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelManagerFacade.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelManagerFacade.java
@@ -2,7 +2,6 @@ package net.i2p.router.tunnelmanager;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.Date;
import java.util.Iterator;
import java.util.List;
diff --git a/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelSelector.java b/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelSelector.java
index ecdac3683b49fee30139f98e22698a8edf814250..e5266f69e21e4e5cba3966e4e78f6cc1cb24eac7 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelSelector.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelSelector.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
-import java.util.ArrayList;
import java.util.List;
import java.util.Set;
diff --git a/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java b/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java
index 0f09fee55eea42f84e232d2b8ee8387c07ffad59..85e3dc0cc06b2708dd5235a7be064a137efb9fd4 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java
@@ -17,8 +17,6 @@ import java.util.List;
import java.util.Set;
import net.i2p.data.Certificate;
-import net.i2p.data.DataFormatException;
-import net.i2p.data.Hash;
import net.i2p.data.PublicKey;
import net.i2p.data.RouterInfo;
import net.i2p.data.SessionKey;
@@ -34,7 +32,6 @@ import net.i2p.router.Job;
import net.i2p.router.JobImpl;
import net.i2p.router.MessageHistory;
import net.i2p.router.MessageSelector;
-import net.i2p.router.PeerSelectionCriteria;
import net.i2p.router.ReplyJob;
import net.i2p.router.RouterContext;
import net.i2p.router.TunnelInfo;
diff --git a/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java b/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java
index 0a63ab04c5098c37d908e9be5c689a221f7e82a0..2b1971ba6b17343058972b1394fc150d900fb09e 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java
@@ -2,7 +2,6 @@ package net.i2p.router.tunnelmanager;
import java.io.IOException;
import java.io.OutputStream;
-
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;