diff --git a/apps/heartbeat/java/src/net/i2p/heartbeat/PeerData.java b/apps/heartbeat/java/src/net/i2p/heartbeat/PeerData.java
index e05a01e35..d36a41e84 100644
--- a/apps/heartbeat/java/src/net/i2p/heartbeat/PeerData.java
+++ b/apps/heartbeat/java/src/net/i2p/heartbeat/PeerData.java
@@ -2,11 +2,11 @@ package net.i2p.heartbeat;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
-import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 
 import net.i2p.stat.Rate;
diff --git a/apps/heartbeat/java/src/net/i2p/heartbeat/gui/PeerPlotConfig.java b/apps/heartbeat/java/src/net/i2p/heartbeat/gui/PeerPlotConfig.java
index 5c8fe5581..230e3a574 100644
--- a/apps/heartbeat/java/src/net/i2p/heartbeat/gui/PeerPlotConfig.java
+++ b/apps/heartbeat/java/src/net/i2p/heartbeat/gui/PeerPlotConfig.java
@@ -11,8 +11,8 @@ import java.util.Set;
 import java.util.TreeMap;
 
 import net.i2p.data.Destination;
-import net.i2p.util.Log;
 import net.i2p.heartbeat.ClientConfig;
+import net.i2p.util.Log;
 
 /**
  * Configure how we want to render a particular clientConfig in the GUI
diff --git a/apps/httptunnel/java/src/net/i2p/httptunnel/handler/EepHandler.java b/apps/httptunnel/java/src/net/i2p/httptunnel/handler/EepHandler.java
index 9e5d105f9..4e9ffb367 100644
--- a/apps/httptunnel/java/src/net/i2p/httptunnel/handler/EepHandler.java
+++ b/apps/httptunnel/java/src/net/i2p/httptunnel/handler/EepHandler.java
@@ -7,8 +7,8 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.SocketException;
 
+import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
-import net.i2p.client.naming.NamingService;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
 import net.i2p.client.streaming.I2PSocketOptions;
@@ -19,7 +19,6 @@ import net.i2p.httptunnel.SocketManagerProducer;
 import net.i2p.httptunnel.filter.Filter;
 import net.i2p.httptunnel.filter.NullFilter;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Handler for browsing Eepsites.
diff --git a/apps/httptunnel/java/src/net/i2p/httptunnel/handler/ProxyHandler.java b/apps/httptunnel/java/src/net/i2p/httptunnel/handler/ProxyHandler.java
index da0b856b7..24e349ea0 100644
--- a/apps/httptunnel/java/src/net/i2p/httptunnel/handler/ProxyHandler.java
+++ b/apps/httptunnel/java/src/net/i2p/httptunnel/handler/ProxyHandler.java
@@ -3,7 +3,7 @@ package net.i2p.httptunnel.handler;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import net.i2p.client.naming.NamingService;
+import net.i2p.I2PAppContext;
 import net.i2p.client.streaming.I2PSocketManager;
 import net.i2p.data.Destination;
 import net.i2p.httptunnel.HTTPListener;
@@ -12,7 +12,6 @@ import net.i2p.httptunnel.SocketManagerProducer;
 import net.i2p.httptunnel.filter.Filter;
 import net.i2p.httptunnel.filter.NullFilter;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Handler for proxying "normal" HTTP requests.
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java
index 67ceb01c7..3f7b2e12e 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java
@@ -5,7 +5,6 @@ package net.i2p.i2ptunnel;
 
 import java.net.Socket;
 
-import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
index 5d5833f1a..1985a9feb 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
@@ -10,9 +10,6 @@ import java.io.OutputStream;
 import java.net.Socket;
 import java.net.SocketException;
 import java.util.Date;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
 
 import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PSocket;
diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PServerSocketImpl.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PServerSocketImpl.java
index c42ea1eb1..436e4bb4c 100644
--- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PServerSocketImpl.java
+++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PServerSocketImpl.java
@@ -1,15 +1,14 @@
 package net.i2p.client.streaming;
 
 import java.net.ConnectException;
-
-import net.i2p.I2PException;
-import net.i2p.util.Log;
-import net.i2p.util.Clock;
-import net.i2p.I2PAppContext;
-
-import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
+
+import net.i2p.I2PAppContext;
+import net.i2p.I2PException;
+import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  * Server socket implementation, allowing multiple threads to accept I2PSockets 
diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java
index 7c1101265..f81d2abd1 100644
--- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java
+++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java
@@ -4,7 +4,6 @@
  */
 package net.i2p.client.streaming;
 
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -21,8 +20,8 @@ import net.i2p.client.I2PSession;
 import net.i2p.client.I2PSessionException;
 import net.i2p.client.I2PSessionListener;
 import net.i2p.data.Base64;
-import net.i2p.data.Destination;
 import net.i2p.data.DataFormatException;
+import net.i2p.data.Destination;
 import net.i2p.util.Log;
 
 /**
diff --git a/apps/netmonitor/java/src/net/i2p/netmonitor/DataHarvester.java b/apps/netmonitor/java/src/net/i2p/netmonitor/DataHarvester.java
index 5e5f0f148..0011708e0 100644
--- a/apps/netmonitor/java/src/net/i2p/netmonitor/DataHarvester.java
+++ b/apps/netmonitor/java/src/net/i2p/netmonitor/DataHarvester.java
@@ -1,17 +1,18 @@
 package net.i2p.netmonitor;
 
-import net.i2p.data.RouterInfo;
-import net.i2p.util.Log;
-import net.i2p.util.Clock;
-import java.util.Properties;
-import java.util.Iterator;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.Locale;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import net.i2p.data.RouterInfo;
+import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  * Pull out important data from the published routerInfo and stash it away
diff --git a/apps/netmonitor/java/src/net/i2p/netmonitor/NetMonitor.java b/apps/netmonitor/java/src/net/i2p/netmonitor/NetMonitor.java
index 6b9fc749a..31be7918f 100644
--- a/apps/netmonitor/java/src/net/i2p/netmonitor/NetMonitor.java
+++ b/apps/netmonitor/java/src/net/i2p/netmonitor/NetMonitor.java
@@ -1,18 +1,18 @@
 package net.i2p.netmonitor;
 
-import net.i2p.util.Log;
-import net.i2p.util.I2PThread;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Map;
-import java.util.HashMap;
-import java.io.IOException;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FilenameFilter;
-import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import net.i2p.util.I2PThread;
+import net.i2p.util.Log;
 
 /**
  * Main driver for the app that harvests data about the performance of the network,
diff --git a/apps/netmonitor/java/src/net/i2p/netmonitor/NetMonitorRunner.java b/apps/netmonitor/java/src/net/i2p/netmonitor/NetMonitorRunner.java
index e52451640..6b2b03e96 100644
--- a/apps/netmonitor/java/src/net/i2p/netmonitor/NetMonitorRunner.java
+++ b/apps/netmonitor/java/src/net/i2p/netmonitor/NetMonitorRunner.java
@@ -1,19 +1,17 @@
 package net.i2p.netmonitor;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import java.io.IOException;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.RouterInfo;
+import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /**
  * Active process that drives the monitoring by periodically rading the 
diff --git a/apps/netmonitor/java/src/net/i2p/netmonitor/PeerSummary.java b/apps/netmonitor/java/src/net/i2p/netmonitor/PeerSummary.java
index 8f3493cda..517da9d39 100644
--- a/apps/netmonitor/java/src/net/i2p/netmonitor/PeerSummary.java
+++ b/apps/netmonitor/java/src/net/i2p/netmonitor/PeerSummary.java
@@ -1,16 +1,16 @@
 package net.i2p.netmonitor;
 
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.TreeMap;
 import java.util.Set;
+import java.util.TreeMap;
+
+import net.i2p.util.Clock;
+import net.i2p.util.Log;
 
 /** 
  * coordinate the data points summarizing the performance of a particular peer 
diff --git a/apps/netmonitor/java/src/net/i2p/netmonitor/PeerSummaryReader.java b/apps/netmonitor/java/src/net/i2p/netmonitor/PeerSummaryReader.java
index 8bf62fd33..672393b74 100644
--- a/apps/netmonitor/java/src/net/i2p/netmonitor/PeerSummaryReader.java
+++ b/apps/netmonitor/java/src/net/i2p/netmonitor/PeerSummaryReader.java
@@ -1,20 +1,17 @@
 package net.i2p.netmonitor;
 
-import net.i2p.util.Log;
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.BufferedReader;
 import java.io.InputStreamReader;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.TreeSet;
-import java.util.Set;
-import java.util.Locale;
-import java.util.Date;
-import java.util.StringTokenizer;
-import java.text.SimpleDateFormat;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.StringTokenizer;
+
+import net.i2p.util.Log;
 
 /**
  * Load up the peer summary 
diff --git a/apps/netmonitor/java/src/net/i2p/netmonitor/PeerSummaryWriter.java b/apps/netmonitor/java/src/net/i2p/netmonitor/PeerSummaryWriter.java
index be9b9bbbe..ba848ed94 100644
--- a/apps/netmonitor/java/src/net/i2p/netmonitor/PeerSummaryWriter.java
+++ b/apps/netmonitor/java/src/net/i2p/netmonitor/PeerSummaryWriter.java
@@ -1,15 +1,15 @@
 package net.i2p.netmonitor;
 
-import net.i2p.util.Log;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
-import java.util.TreeSet;
-import java.util.Set;
 import java.util.Locale;
-import java.util.Date;
-import java.text.SimpleDateFormat;
+import java.util.TreeSet;
+
+import net.i2p.util.Log;
 
 /**
  * Dump various peer summaries to disk (so external apps (or good ol' vi) can
diff --git a/apps/netmonitor/java/src/net/i2p/netmonitor/StatGroupLoader.java b/apps/netmonitor/java/src/net/i2p/netmonitor/StatGroupLoader.java
index 4a4dfdb37..1b777f209 100644
--- a/apps/netmonitor/java/src/net/i2p/netmonitor/StatGroupLoader.java
+++ b/apps/netmonitor/java/src/net/i2p/netmonitor/StatGroupLoader.java
@@ -1,14 +1,15 @@
 package net.i2p.netmonitor;
 
 
-import net.i2p.util.Log;
-import java.io.IOException;
 import java.io.File;
 import java.io.FileInputStream;
-import java.util.List;
+import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 
+import net.i2p.util.Log;
+
 /**
  * Load up the StatGroups from the location specified to configure the data harvester.
  * The stat groups are formatted in a simple properties file style, e.g.: <pre>
diff --git a/apps/netmonitor/java/src/net/i2p/netmonitor/gui/JFreeChartAdapter.java b/apps/netmonitor/java/src/net/i2p/netmonitor/gui/JFreeChartAdapter.java
index a9fbebebb..95a26e4ce 100644
--- a/apps/netmonitor/java/src/net/i2p/netmonitor/gui/JFreeChartAdapter.java
+++ b/apps/netmonitor/java/src/net/i2p/netmonitor/gui/JFreeChartAdapter.java
@@ -1,28 +1,24 @@
 package net.i2p.netmonitor.gui;
 
-import net.i2p.netmonitor.PeerSummary;
-import net.i2p.netmonitor.PeerStat;
-import net.i2p.util.Log;
-
-import org.jfree.data.XYSeries;
-import org.jfree.data.XYSeriesCollection;
-import org.jfree.data.MovingAverage;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.ChartPanel;
-import org.jfree.chart.plot.Plot;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.axis.DateAxis;
-import org.jfree.chart.axis.NumberAxis;
-import org.jfree.chart.renderer.XYLineAndShapeRenderer;
-import org.jfree.chart.renderer.XYItemRenderer;
-import org.jfree.chart.renderer.XYDotRenderer;
+import java.awt.Color;
+import java.awt.Font;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import java.util.Iterator;
 
-import javax.swing.JPanel;
-import java.awt.Font;
-import java.awt.Color;
+import org.jfree.chart.ChartPanel;
+import org.jfree.chart.JFreeChart;
+import org.jfree.chart.axis.DateAxis;
+import org.jfree.chart.axis.NumberAxis;
+import org.jfree.chart.plot.Plot;
+import org.jfree.chart.plot.XYPlot;
+import org.jfree.chart.renderer.XYItemRenderer;
+import org.jfree.chart.renderer.XYLineAndShapeRenderer;
+import org.jfree.data.XYSeries;
+import org.jfree.data.XYSeriesCollection;
+
+import net.i2p.netmonitor.PeerStat;
+import net.i2p.util.Log;
 
 class JFreeChartAdapter {
     private final static Log _log = new Log(JFreeChartAdapter.class);
diff --git a/apps/netmonitor/java/src/net/i2p/netmonitor/gui/JFreeChartHeartbeatPlotPane.java b/apps/netmonitor/java/src/net/i2p/netmonitor/gui/JFreeChartHeartbeatPlotPane.java
index 21d1ea7c1..9d4a4e7f1 100644
--- a/apps/netmonitor/java/src/net/i2p/netmonitor/gui/JFreeChartHeartbeatPlotPane.java
+++ b/apps/netmonitor/java/src/net/i2p/netmonitor/gui/JFreeChartHeartbeatPlotPane.java
@@ -1,20 +1,15 @@
 package net.i2p.netmonitor.gui;
 
-import javax.swing.JPanel;
-import javax.swing.JTextArea;
-import javax.swing.JScrollPane;
-import javax.swing.JLabel;
 import java.awt.BorderLayout;
-import java.awt.Color;
 import java.awt.Dimension;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import net.i2p.util.Log;
+import javax.swing.JLabel;
+import javax.swing.JScrollPane;
 
 import org.jfree.chart.ChartPanel;
 
+import net.i2p.util.Log;
+
 /**
  * Render the graph and legend
  *
diff --git a/apps/netmonitor/java/src/net/i2p/netmonitor/gui/NetViewer.java b/apps/netmonitor/java/src/net/i2p/netmonitor/gui/NetViewer.java
index 1f90057fa..174860b3f 100644
--- a/apps/netmonitor/java/src/net/i2p/netmonitor/gui/NetViewer.java
+++ b/apps/netmonitor/java/src/net/i2p/netmonitor/gui/NetViewer.java
@@ -1,14 +1,13 @@
 package net.i2p.netmonitor.gui;
 
-import net.i2p.netmonitor.NetMonitor;
-import net.i2p.netmonitor.PeerSummary;
-import net.i2p.netmonitor.PeerStat;
-import net.i2p.util.Log;
-import net.i2p.util.I2PThread;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
+
+import net.i2p.netmonitor.NetMonitor;
+import net.i2p.util.I2PThread;
+import net.i2p.util.Log;
 
 /**
  * Coordinate the visualization of the network monitor. <p />
diff --git a/apps/netmonitor/java/src/net/i2p/netmonitor/gui/NetViewerControlPane.java b/apps/netmonitor/java/src/net/i2p/netmonitor/gui/NetViewerControlPane.java
index 286662031..22aca39d5 100644
--- a/apps/netmonitor/java/src/net/i2p/netmonitor/gui/NetViewerControlPane.java
+++ b/apps/netmonitor/java/src/net/i2p/netmonitor/gui/NetViewerControlPane.java
@@ -5,7 +5,6 @@ import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
 
-import java.awt.Dimension;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
diff --git a/apps/netmonitor/java/src/net/i2p/netmonitor/gui/NetViewerPlotPane.java b/apps/netmonitor/java/src/net/i2p/netmonitor/gui/NetViewerPlotPane.java
index fa52bf8f1..321698d0c 100644
--- a/apps/netmonitor/java/src/net/i2p/netmonitor/gui/NetViewerPlotPane.java
+++ b/apps/netmonitor/java/src/net/i2p/netmonitor/gui/NetViewerPlotPane.java
@@ -1,9 +1,5 @@
 package net.i2p.netmonitor.gui;
 
-import java.awt.Color;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
 import javax.swing.JPanel;
 import javax.swing.JTextArea;
 
diff --git a/apps/netmonitor/java/src/net/i2p/netmonitor/gui/PeerPlotConfig.java b/apps/netmonitor/java/src/net/i2p/netmonitor/gui/PeerPlotConfig.java
index a255ade3c..fafbd22b9 100644
--- a/apps/netmonitor/java/src/net/i2p/netmonitor/gui/PeerPlotConfig.java
+++ b/apps/netmonitor/java/src/net/i2p/netmonitor/gui/PeerPlotConfig.java
@@ -1,20 +1,15 @@
 package net.i2p.netmonitor.gui;
 
 import java.awt.Color;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeMap;
 import java.util.Map;
-import java.util.HashMap;
+import java.util.Set;
 
-import net.i2p.data.Destination;
-import net.i2p.util.Log;
 import net.i2p.netmonitor.PeerSummary;
+import net.i2p.util.Log;
 
 /**
  * Configure how we want to render a particular peerSummary in the GUI
diff --git a/apps/netmonitor/java/src/net/i2p/netmonitor/gui/PeerPlotConfigPane.java b/apps/netmonitor/java/src/net/i2p/netmonitor/gui/PeerPlotConfigPane.java
index e0430005d..864fd1be8 100644
--- a/apps/netmonitor/java/src/net/i2p/netmonitor/gui/PeerPlotConfigPane.java
+++ b/apps/netmonitor/java/src/net/i2p/netmonitor/gui/PeerPlotConfigPane.java
@@ -5,25 +5,21 @@ import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.TreeMap;
-import java.util.List;
 import java.util.ArrayList;
-import java.util.Set;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Random;
+import java.util.Set;
+import java.util.TreeMap;
 
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
-import javax.swing.JColorChooser;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
 import javax.swing.JTextField;
 
-import net.i2p.util.Log;
 import net.i2p.netmonitor.PeerStat;
-import net.i2p.netmonitor.PeerSummary;
+import net.i2p.util.Log;
 
 class PeerPlotConfigPane extends JPanel implements PeerPlotConfig.UpdateListener {
     private final static Log _log = new Log(PeerPlotConfigPane.class);
diff --git a/apps/sam/java/src/net/i2p/sam/SAMBridge.java b/apps/sam/java/src/net/i2p/sam/SAMBridge.java
index 3ead182f2..69f641637 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMBridge.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMBridge.java
@@ -8,29 +8,25 @@ package net.i2p.sam;
  *
  */
 
-import java.io.IOException;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.BufferedReader;
-import java.io.InputStreamReader;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
-import java.util.Properties;
-import java.util.Map;
-import java.util.HashMap;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
 
-import net.i2p.data.Destination;
 import net.i2p.data.DataFormatException;
-import net.i2p.data.PrivateKey;
-import net.i2p.data.SigningPrivateKey;
-
+import net.i2p.data.Destination;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * SAM bridge implementation.
diff --git a/apps/sam/java/src/net/i2p/sam/SAMDatagramSession.java b/apps/sam/java/src/net/i2p/sam/SAMDatagramSession.java
index 757f137f9..7fd926d86 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMDatagramSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMDatagramSession.java
@@ -8,16 +8,14 @@ package net.i2p.sam;
  *
  */
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Properties;
 
+import net.i2p.client.I2PSessionException;
 import net.i2p.client.datagram.I2PDatagramDissector;
 import net.i2p.client.datagram.I2PDatagramMaker;
 import net.i2p.client.datagram.I2PInvalidDatagramException;
-import net.i2p.client.I2PSessionException;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.util.Log;
diff --git a/apps/sam/java/src/net/i2p/sam/SAMHandler.java b/apps/sam/java/src/net/i2p/sam/SAMHandler.java
index bba48361a..16efe9279 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMHandler.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMHandler.java
@@ -12,7 +12,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
-
 import java.util.Properties;
 
 import net.i2p.util.I2PThread;
diff --git a/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java b/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java
index 8adb573fd..aa1e32d73 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java
@@ -9,8 +9,8 @@ package net.i2p.sam;
  */
 
 import java.io.BufferedReader;
-import java.io.InputStreamReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.Socket;
diff --git a/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java b/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java
index 15bd926c1..237381e1e 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java
@@ -9,9 +9,8 @@ package net.i2p.sam;
  */
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Properties;
 
 import net.i2p.client.I2PClient;
diff --git a/apps/sam/java/src/net/i2p/sam/SAMRawSession.java b/apps/sam/java/src/net/i2p/sam/SAMRawSession.java
index 33dbe3796..d00f6adc2 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMRawSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMRawSession.java
@@ -8,10 +8,8 @@ package net.i2p.sam;
  *
  */
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Properties;
 
 import net.i2p.client.I2PSessionException;
diff --git a/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java
index d3151a096..2fa2f330a 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java
@@ -9,29 +9,27 @@ package net.i2p.sam;
  */
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InterruptedIOException;
-import java.util.HashMap;
 import java.io.OutputStream;
 import java.net.ConnectException;
 import java.net.NoRouteToHostException;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Properties;
 import java.util.Set;
 
+import net.i2p.I2PException;
+import net.i2p.client.I2PClient;
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
 import net.i2p.client.streaming.I2PSocketManagerFactory;
 import net.i2p.client.streaming.I2PSocketOptions;
-import net.i2p.client.I2PClient;
 import net.i2p.data.Base64;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
-import net.i2p.I2PException;
-import net.i2p.util.HexDump;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
 
diff --git a/apps/sam/java/src/net/i2p/sam/SAMUtils.java b/apps/sam/java/src/net/i2p/sam/SAMUtils.java
index 96983f1f7..da464274f 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMUtils.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMUtils.java
@@ -8,22 +8,20 @@ package net.i2p.sam;
  *
  */
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Enumeration;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
+import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.client.I2PClient;
 import net.i2p.client.I2PClientFactory;
 import net.i2p.client.naming.NamingService;
-import net.i2p.data.Base64;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Miscellaneous utility methods used by SAM protocol handlers.
diff --git a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
index b0481d6a8..6a57c73ea 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
@@ -8,27 +8,24 @@ package net.i2p.sam;
  *
  */
 
-import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.EOFException;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InterruptedIOException;
-import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
-import java.net.Socket;
 import java.net.ConnectException;
 import java.net.NoRouteToHostException;
-import java.util.Enumeration;
+import java.net.Socket;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
+import net.i2p.I2PException;
 import net.i2p.client.I2PSessionException;
 import net.i2p.data.Base64;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
-import net.i2p.I2PException;
 import net.i2p.util.Log;
 
 /**
diff --git a/apps/time/java/src/net/i2p/time/NtpClient.java b/apps/time/java/src/net/i2p/time/NtpClient.java
index bf134a46f..aa50ead4d 100644
--- a/apps/time/java/src/net/i2p/time/NtpClient.java
+++ b/apps/time/java/src/net/i2p/time/NtpClient.java
@@ -5,7 +5,6 @@ import java.io.InterruptedIOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
-import java.text.DecimalFormat;
 
 
 /**
diff --git a/apps/time/java/src/net/i2p/time/Timestamper.java b/apps/time/java/src/net/i2p/time/Timestamper.java
index 0fceea483..07111038a 100644
--- a/apps/time/java/src/net/i2p/time/Timestamper.java
+++ b/apps/time/java/src/net/i2p/time/Timestamper.java
@@ -1,15 +1,14 @@
 package net.i2p.time;
 
-import net.i2p.util.Log;
-import net.i2p.util.I2PThread;
-
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.io.IOException;
+import net.i2p.util.I2PThread;
+import net.i2p.util.Log;
 
 /**
  * Periodically query a series of NTP servers and post the offset 
diff --git a/core/java/src/net/i2p/I2PAppContext.java b/core/java/src/net/i2p/I2PAppContext.java
index 026793e6e..803463022 100644
--- a/core/java/src/net/i2p/I2PAppContext.java
+++ b/core/java/src/net/i2p/I2PAppContext.java
@@ -1,26 +1,26 @@
 package net.i2p;
 
-import net.i2p.stat.StatManager;
-import net.i2p.crypto.SessionKeyManager;
-import net.i2p.crypto.PersistentSessionKeyManager;
-import net.i2p.crypto.ElGamalAESEngine;
-import net.i2p.crypto.ElGamalEngine;
-import net.i2p.crypto.DummyElGamalEngine;
-import net.i2p.crypto.SHA256Generator;
-import net.i2p.crypto.HMACSHA256Generator;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+
+import net.i2p.client.naming.NamingService;
 import net.i2p.crypto.AESEngine;
 import net.i2p.crypto.CryptixAESEngine;
 import net.i2p.crypto.DSAEngine;
-import net.i2p.client.naming.NamingService;
-import net.i2p.util.LogManager;
-import net.i2p.util.Clock;
-import net.i2p.util.RandomSource;
-import net.i2p.data.RoutingKeyGenerator;
+import net.i2p.crypto.DummyElGamalEngine;
+import net.i2p.crypto.ElGamalAESEngine;
+import net.i2p.crypto.ElGamalEngine;
+import net.i2p.crypto.HMACSHA256Generator;
 import net.i2p.crypto.KeyGenerator;
-
-import java.util.Properties;
-import java.util.HashSet;
-import java.util.Set;
+import net.i2p.crypto.PersistentSessionKeyManager;
+import net.i2p.crypto.SHA256Generator;
+import net.i2p.crypto.SessionKeyManager;
+import net.i2p.data.RoutingKeyGenerator;
+import net.i2p.stat.StatManager;
+import net.i2p.util.Clock;
+import net.i2p.util.LogManager;
+import net.i2p.util.RandomSource;
 
 /**
  * <p>Provide a base scope for accessing singletons that I2P exposes.  Rather than
diff --git a/core/java/src/net/i2p/client/ATalk.java b/core/java/src/net/i2p/client/ATalk.java
index a922c2b9f..303f94e7a 100644
--- a/core/java/src/net/i2p/client/ATalk.java
+++ b/core/java/src/net/i2p/client/ATalk.java
@@ -24,14 +24,13 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Properties;
 
+import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.util.LogManager;
-import net.i2p.I2PAppContext;
 
 /**
  * ATalk - anonymous talk, demonstrating a trivial I2P usage scenario.
diff --git a/core/java/src/net/i2p/client/DisconnectMessageHandler.java b/core/java/src/net/i2p/client/DisconnectMessageHandler.java
index 0c1e69d0f..dd3c6ea59 100644
--- a/core/java/src/net/i2p/client/DisconnectMessageHandler.java
+++ b/core/java/src/net/i2p/client/DisconnectMessageHandler.java
@@ -9,9 +9,9 @@ package net.i2p.client;
  *
  */
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.i2cp.DisconnectMessage;
 import net.i2p.data.i2cp.I2CPMessage;
-import net.i2p.I2PAppContext;
 
 /**
  * Handle I2CP disconnect messages from the router
diff --git a/core/java/src/net/i2p/client/HandlerImpl.java b/core/java/src/net/i2p/client/HandlerImpl.java
index bf9171284..d2951bc94 100644
--- a/core/java/src/net/i2p/client/HandlerImpl.java
+++ b/core/java/src/net/i2p/client/HandlerImpl.java
@@ -9,8 +9,8 @@ package net.i2p.client;
  *
  */
 
-import net.i2p.util.Log;
 import net.i2p.I2PAppContext;
+import net.i2p.util.Log;
 
 /**
  * Base class for handling I2CP messages
diff --git a/core/java/src/net/i2p/client/I2CPMessageProducer.java b/core/java/src/net/i2p/client/I2CPMessageProducer.java
index a664d3062..529351304 100644
--- a/core/java/src/net/i2p/client/I2CPMessageProducer.java
+++ b/core/java/src/net/i2p/client/I2CPMessageProducer.java
@@ -12,7 +12,7 @@ package net.i2p.client;
 import java.util.HashSet;
 import java.util.Set;
 
-import net.i2p.crypto.ElGamalAESEngine;
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.data.LeaseSet;
@@ -32,7 +32,6 @@ import net.i2p.data.i2cp.SendMessageMessage;
 import net.i2p.data.i2cp.SessionConfig;
 import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /**
  * Produce the various messages the session needs to send to the router.
diff --git a/core/java/src/net/i2p/client/I2PClientImpl.java b/core/java/src/net/i2p/client/I2PClientImpl.java
index 76dab5a7b..f65b26dcc 100644
--- a/core/java/src/net/i2p/client/I2PClientImpl.java
+++ b/core/java/src/net/i2p/client/I2PClientImpl.java
@@ -14,6 +14,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Properties;
 
+import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.crypto.KeyGenerator;
 import net.i2p.data.Certificate;
@@ -22,7 +23,6 @@ import net.i2p.data.PrivateKey;
 import net.i2p.data.PublicKey;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SigningPublicKey;
-import net.i2p.I2PAppContext;
 
 /**
  * Base client implementation
diff --git a/core/java/src/net/i2p/client/I2PClientMessageHandlerMap.java b/core/java/src/net/i2p/client/I2PClientMessageHandlerMap.java
index 0945999d8..9551698fc 100644
--- a/core/java/src/net/i2p/client/I2PClientMessageHandlerMap.java
+++ b/core/java/src/net/i2p/client/I2PClientMessageHandlerMap.java
@@ -12,6 +12,7 @@ package net.i2p.client;
 import java.util.HashMap;
 import java.util.Map;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.i2cp.DisconnectMessage;
 import net.i2p.data.i2cp.MessagePayloadMessage;
 import net.i2p.data.i2cp.MessageStatusMessage;
@@ -19,7 +20,6 @@ import net.i2p.data.i2cp.RequestLeaseSetMessage;
 import net.i2p.data.i2cp.SessionStatusMessage;
 import net.i2p.data.i2cp.SetDateMessage;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Contains a map of message handlers that a session will want to use
diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java
index 1e7476b6c..588ded97a 100644
--- a/core/java/src/net/i2p/client/I2PSessionImpl.java
+++ b/core/java/src/net/i2p/client/I2PSessionImpl.java
@@ -23,6 +23,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.data.LeaseSet;
@@ -36,10 +37,8 @@ import net.i2p.data.i2cp.I2CPMessageException;
 import net.i2p.data.i2cp.I2CPMessageReader;
 import net.i2p.data.i2cp.MessagePayloadMessage;
 import net.i2p.data.i2cp.SessionId;
-import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Implementation of an I2P session running over TCP.  This class is NOT thread safe -
diff --git a/core/java/src/net/i2p/client/I2PSessionImpl2.java b/core/java/src/net/i2p/client/I2PSessionImpl2.java
index d5d0297d1..7225a6dba 100644
--- a/core/java/src/net/i2p/client/I2PSessionImpl2.java
+++ b/core/java/src/net/i2p/client/I2PSessionImpl2.java
@@ -15,18 +15,14 @@ import java.util.Iterator;
 import java.util.Properties;
 import java.util.Set;
 
-import net.i2p.crypto.KeyGenerator;
-import net.i2p.crypto.SessionKeyManager;
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 import net.i2p.data.SessionKey;
 import net.i2p.data.SessionTag;
 import net.i2p.data.i2cp.MessageId;
 import net.i2p.data.i2cp.MessageStatusMessage;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /**
  * Thread safe implementation of an I2P session running over TCP.  
diff --git a/core/java/src/net/i2p/client/MessagePayloadMessageHandler.java b/core/java/src/net/i2p/client/MessagePayloadMessageHandler.java
index ac8cef572..b217b1816 100644
--- a/core/java/src/net/i2p/client/MessagePayloadMessageHandler.java
+++ b/core/java/src/net/i2p/client/MessagePayloadMessageHandler.java
@@ -9,14 +9,13 @@ package net.i2p.client;
  *
  */
 
-import net.i2p.crypto.ElGamalAESEngine;
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Payload;
 import net.i2p.data.i2cp.I2CPMessage;
 import net.i2p.data.i2cp.MessageId;
 import net.i2p.data.i2cp.MessagePayloadMessage;
 import net.i2p.data.i2cp.ReceiveMessageEndMessage;
-import net.i2p.I2PAppContext;
 
 /**
  * Handle I2CP MessagePayloadMessages from the router delivering the contents
diff --git a/core/java/src/net/i2p/client/MessageStatusMessageHandler.java b/core/java/src/net/i2p/client/MessageStatusMessageHandler.java
index 3413aff3a..e16bccc56 100644
--- a/core/java/src/net/i2p/client/MessageStatusMessageHandler.java
+++ b/core/java/src/net/i2p/client/MessageStatusMessageHandler.java
@@ -9,10 +9,10 @@ package net.i2p.client;
  *
  */
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.i2cp.I2CPMessage;
 import net.i2p.data.i2cp.MessageStatusMessage;
 import net.i2p.data.i2cp.ReceiveMessageBeginMessage;
-import net.i2p.I2PAppContext;
 
 /**
  * Handle I2CP MessageStatusMessages from the router.  This currently only takes
diff --git a/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java b/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java
index 06bb3e808..bc3f8d7f1 100644
--- a/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java
+++ b/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java
@@ -12,6 +12,7 @@ package net.i2p.client;
 import java.util.HashMap;
 import java.util.Map;
 
+import net.i2p.I2PAppContext;
 import net.i2p.crypto.KeyGenerator;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
@@ -25,7 +26,6 @@ import net.i2p.data.SigningPublicKey;
 import net.i2p.data.i2cp.I2CPMessage;
 import net.i2p.data.i2cp.RequestLeaseSetMessage;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Handle I2CP RequestLeaseSetMessage from the router by granting all leases
diff --git a/core/java/src/net/i2p/client/SessionStatusMessageHandler.java b/core/java/src/net/i2p/client/SessionStatusMessageHandler.java
index 6f0ad741f..abf7805c1 100644
--- a/core/java/src/net/i2p/client/SessionStatusMessageHandler.java
+++ b/core/java/src/net/i2p/client/SessionStatusMessageHandler.java
@@ -9,9 +9,9 @@ package net.i2p.client;
  *
  */
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.i2cp.I2CPMessage;
 import net.i2p.data.i2cp.SessionStatusMessage;
-import net.i2p.I2PAppContext;
 
 /**
  * Handle I2CP SessionStatusMessagese from the router, updating the session as
diff --git a/core/java/src/net/i2p/client/SetDateMessageHandler.java b/core/java/src/net/i2p/client/SetDateMessageHandler.java
index 2cc52086e..a204660d6 100644
--- a/core/java/src/net/i2p/client/SetDateMessageHandler.java
+++ b/core/java/src/net/i2p/client/SetDateMessageHandler.java
@@ -9,10 +9,10 @@ package net.i2p.client;
  *
  */
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.i2cp.I2CPMessage;
 import net.i2p.data.i2cp.SetDateMessage;
 import net.i2p.util.Clock;
-import net.i2p.I2PAppContext;
 
 /**
  * Handle I2CP time messages from the router
diff --git a/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java b/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java
index ae5e31c1d..7d3c7d460 100644
--- a/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java
+++ b/core/java/src/net/i2p/client/datagram/I2PDatagramDissector.java
@@ -9,7 +9,6 @@ package net.i2p.client.datagram;
  */
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 import net.i2p.crypto.DSAEngine;
@@ -17,7 +16,6 @@ import net.i2p.crypto.SHA256Generator;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.data.Signature;
-import net.i2p.util.HexDump;
 import net.i2p.util.Log;
 
 /**
diff --git a/core/java/src/net/i2p/client/naming/DummyNamingService.java b/core/java/src/net/i2p/client/naming/DummyNamingService.java
index d826b0b06..e956dfc8d 100644
--- a/core/java/src/net/i2p/client/naming/DummyNamingService.java
+++ b/core/java/src/net/i2p/client/naming/DummyNamingService.java
@@ -7,8 +7,8 @@
  */
 package net.i2p.client.naming;
 
-import net.i2p.data.Destination;
 import net.i2p.I2PAppContext;
+import net.i2p.data.Destination;
 
 /**
  * A Dummy naming service that can only handle base64 destinations.
diff --git a/core/java/src/net/i2p/client/naming/HostsTxtNamingService.java b/core/java/src/net/i2p/client/naming/HostsTxtNamingService.java
index 2a956d338..f8cf4fdea 100644
--- a/core/java/src/net/i2p/client/naming/HostsTxtNamingService.java
+++ b/core/java/src/net/i2p/client/naming/HostsTxtNamingService.java
@@ -12,9 +12,9 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Properties;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.Destination;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * A naming service based on the "hosts.txt" file.
diff --git a/core/java/src/net/i2p/client/naming/NamingService.java b/core/java/src/net/i2p/client/naming/NamingService.java
index b6b6d64a5..f3ebfa79a 100644
--- a/core/java/src/net/i2p/client/naming/NamingService.java
+++ b/core/java/src/net/i2p/client/naming/NamingService.java
@@ -7,12 +7,12 @@
  */
 package net.i2p.client.naming;
 
+import java.lang.reflect.Constructor;
+
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
-
-import java.lang.reflect.Constructor;
 
 /**
  * Naming services create a subclass of this class.
diff --git a/core/java/src/net/i2p/crypto/AESEngine.java b/core/java/src/net/i2p/crypto/AESEngine.java
index c90453a37..4f703340b 100644
--- a/core/java/src/net/i2p/crypto/AESEngine.java
+++ b/core/java/src/net/i2p/crypto/AESEngine.java
@@ -13,13 +13,13 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.SessionKey;
 import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /** 
  * Dummy wrapper for AES cipher operation.
diff --git a/core/java/src/net/i2p/crypto/AESInputStream.java b/core/java/src/net/i2p/crypto/AESInputStream.java
index ad2cb4c01..164490773 100644
--- a/core/java/src/net/i2p/crypto/AESInputStream.java
+++ b/core/java/src/net/i2p/crypto/AESInputStream.java
@@ -17,6 +17,7 @@ import java.io.InputStream;
 import java.util.LinkedList;
 import java.util.List;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
@@ -24,7 +25,6 @@ import net.i2p.data.SessionKey;
 import net.i2p.util.Clock;
 import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /**
  * This reads an underlying stream as written by AESOutputStream - AES256 encrypted
diff --git a/core/java/src/net/i2p/crypto/AESOutputStream.java b/core/java/src/net/i2p/crypto/AESOutputStream.java
index c1413c7e2..df485ec6e 100644
--- a/core/java/src/net/i2p/crypto/AESOutputStream.java
+++ b/core/java/src/net/i2p/crypto/AESOutputStream.java
@@ -15,10 +15,10 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Arrays;
 
-import net.i2p.data.SessionKey;
-import net.i2p.data.DataHelper;
-import net.i2p.util.Log;
 import net.i2p.I2PAppContext;
+import net.i2p.data.DataHelper;
+import net.i2p.data.SessionKey;
+import net.i2p.util.Log;
 
 /**
  * This writes everything as CBC with PKCS#5 padding, but each block is padded
diff --git a/core/java/src/net/i2p/crypto/CryptixAESEngine.java b/core/java/src/net/i2p/crypto/CryptixAESEngine.java
index 397f67c32..51658f77b 100644
--- a/core/java/src/net/i2p/crypto/CryptixAESEngine.java
+++ b/core/java/src/net/i2p/crypto/CryptixAESEngine.java
@@ -11,9 +11,9 @@ package net.i2p.crypto;
 
 import java.security.InvalidKeyException;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.SessionKey;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /** 
  * Wrapper for AES cypher operation using Cryptix's Rijndael implementation.  Implements
diff --git a/core/java/src/net/i2p/crypto/DHSessionKeyBuilder.java b/core/java/src/net/i2p/crypto/DHSessionKeyBuilder.java
index 4187348aa..9fa029290 100644
--- a/core/java/src/net/i2p/crypto/DHSessionKeyBuilder.java
+++ b/core/java/src/net/i2p/crypto/DHSessionKeyBuilder.java
@@ -13,6 +13,7 @@ import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.ByteArray;
 import net.i2p.data.SessionKey;
 import net.i2p.util.Clock;
@@ -20,7 +21,6 @@ import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
 import net.i2p.util.NativeBigInteger;
 import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /**
  * Generate a new session key through a diffie hellman exchange.  This uses the
diff --git a/core/java/src/net/i2p/crypto/DSAEngine.java b/core/java/src/net/i2p/crypto/DSAEngine.java
index 331edefb4..0bf261834 100644
--- a/core/java/src/net/i2p/crypto/DSAEngine.java
+++ b/core/java/src/net/i2p/crypto/DSAEngine.java
@@ -31,15 +31,13 @@ package net.i2p.crypto;
 
 import java.math.BigInteger;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.Hash;
 import net.i2p.data.Signature;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SigningPublicKey;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 import net.i2p.util.NativeBigInteger;
-import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 public class DSAEngine {
     private Log _log;
diff --git a/core/java/src/net/i2p/crypto/DummyElGamalEngine.java b/core/java/src/net/i2p/crypto/DummyElGamalEngine.java
index 780288f3f..5aad5261c 100644
--- a/core/java/src/net/i2p/crypto/DummyElGamalEngine.java
+++ b/core/java/src/net/i2p/crypto/DummyElGamalEngine.java
@@ -12,12 +12,12 @@ package net.i2p.crypto;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.PrivateKey;
 import net.i2p.data.PublicKey;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /** 
  * Fake ElG E and D, useful for when performance isn't being tested
diff --git a/core/java/src/net/i2p/crypto/ElGamalAESEngine.java b/core/java/src/net/i2p/crypto/ElGamalAESEngine.java
index 08d455cc5..82bad112d 100644
--- a/core/java/src/net/i2p/crypto/ElGamalAESEngine.java
+++ b/core/java/src/net/i2p/crypto/ElGamalAESEngine.java
@@ -18,6 +18,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
@@ -25,11 +26,7 @@ import net.i2p.data.PrivateKey;
 import net.i2p.data.PublicKey;
 import net.i2p.data.SessionKey;
 import net.i2p.data.SessionTag;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /**
  * Handles the actual ElGamal+AES encryption and decryption scenarios using the
diff --git a/core/java/src/net/i2p/crypto/ElGamalEngine.java b/core/java/src/net/i2p/crypto/ElGamalEngine.java
index f90f9fedc..2847caa9a 100644
--- a/core/java/src/net/i2p/crypto/ElGamalEngine.java
+++ b/core/java/src/net/i2p/crypto/ElGamalEngine.java
@@ -33,17 +33,16 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.math.BigInteger;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.PrivateKey;
 import net.i2p.data.PublicKey;
-import net.i2p.stat.StatManager;
 import net.i2p.util.Clock;
 import net.i2p.util.Log;
 import net.i2p.util.NativeBigInteger;
 import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /** 
  * Wrapper for ElGamal encryption/signature schemes.
diff --git a/core/java/src/net/i2p/crypto/HMACSHA256Generator.java b/core/java/src/net/i2p/crypto/HMACSHA256Generator.java
index c6ff13cf5..d90fa17d7 100644
--- a/core/java/src/net/i2p/crypto/HMACSHA256Generator.java
+++ b/core/java/src/net/i2p/crypto/HMACSHA256Generator.java
@@ -1,9 +1,9 @@
 package net.i2p.crypto;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.SessionKey;
-import net.i2p.I2PAppContext;
 
 /**
  * Calculate the HMAC-SHA256 of a key+message.  Currently FAKE - returns a stupid
diff --git a/core/java/src/net/i2p/crypto/KeyGenerator.java b/core/java/src/net/i2p/crypto/KeyGenerator.java
index 9327242fe..2330fbe2d 100644
--- a/core/java/src/net/i2p/crypto/KeyGenerator.java
+++ b/core/java/src/net/i2p/crypto/KeyGenerator.java
@@ -11,6 +11,7 @@ package net.i2p.crypto;
 
 import java.math.BigInteger;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.data.PrivateKey;
 import net.i2p.data.PublicKey;
@@ -22,7 +23,6 @@ import net.i2p.util.Clock;
 import net.i2p.util.Log;
 import net.i2p.util.NativeBigInteger;
 import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /** Define a way of generating asymetrical key pairs as well as symetrical keys
  * @author jrandom
diff --git a/core/java/src/net/i2p/crypto/PersistentSessionKeyManager.java b/core/java/src/net/i2p/crypto/PersistentSessionKeyManager.java
index 15ad9f393..f323b9b74 100644
--- a/core/java/src/net/i2p/crypto/PersistentSessionKeyManager.java
+++ b/core/java/src/net/i2p/crypto/PersistentSessionKeyManager.java
@@ -21,13 +21,13 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.PublicKey;
 import net.i2p.data.SessionKey;
 import net.i2p.data.SessionTag;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Expose the functionality to allow people to write out and read in the 
diff --git a/core/java/src/net/i2p/crypto/SHA256Generator.java b/core/java/src/net/i2p/crypto/SHA256Generator.java
index 683c5d166..87ef918a8 100644
--- a/core/java/src/net/i2p/crypto/SHA256Generator.java
+++ b/core/java/src/net/i2p/crypto/SHA256Generator.java
@@ -29,8 +29,8 @@ package net.i2p.crypto;
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-import net.i2p.data.Hash;
 import net.i2p.I2PAppContext;
+import net.i2p.data.Hash;
 
 /** Defines a wrapper for SHA-256 operation
  *
diff --git a/core/java/src/net/i2p/crypto/SessionKeyManager.java b/core/java/src/net/i2p/crypto/SessionKeyManager.java
index ee3073041..07ab061cb 100644
--- a/core/java/src/net/i2p/crypto/SessionKeyManager.java
+++ b/core/java/src/net/i2p/crypto/SessionKeyManager.java
@@ -11,10 +11,10 @@ package net.i2p.crypto;
 
 import java.util.Set;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.PublicKey;
 import net.i2p.data.SessionKey;
 import net.i2p.data.SessionTag;
-import net.i2p.I2PAppContext;
 
 /**
  * Manage the session keys and session tags used for encryption and decryption.
diff --git a/core/java/src/net/i2p/crypto/YKGenerator.java b/core/java/src/net/i2p/crypto/YKGenerator.java
index d5be31834..682e0cc78 100644
--- a/core/java/src/net/i2p/crypto/YKGenerator.java
+++ b/core/java/src/net/i2p/crypto/YKGenerator.java
@@ -13,12 +13,12 @@ import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.i2p.I2PAppContext;
 import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
 import net.i2p.util.NativeBigInteger;
 import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /**
  * Precalculate the Y and K for ElGamal encryption operations.
diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
index ff0cb4168..9d725886d 100644
--- a/core/java/src/net/i2p/data/DataHelper.java
+++ b/core/java/src/net/i2p/data/DataHelper.java
@@ -26,7 +26,6 @@ import java.util.TreeMap;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
-import net.i2p.util.Log;
 import net.i2p.util.OrderedProperties;
 
 /**
diff --git a/core/java/src/net/i2p/data/RoutingKeyGenerator.java b/core/java/src/net/i2p/data/RoutingKeyGenerator.java
index b0f270c89..0f14495ca 100644
--- a/core/java/src/net/i2p/data/RoutingKeyGenerator.java
+++ b/core/java/src/net/i2p/data/RoutingKeyGenerator.java
@@ -15,11 +15,10 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
+import net.i2p.I2PAppContext;
 import net.i2p.crypto.SHA256Generator;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /**
  * Component to manage the munging of hashes into routing keys - given a hash, 
diff --git a/core/java/src/net/i2p/stat/SimpleStatDumper.java b/core/java/src/net/i2p/stat/SimpleStatDumper.java
index e53edcaec..2a7d4ae78 100644
--- a/core/java/src/net/i2p/stat/SimpleStatDumper.java
+++ b/core/java/src/net/i2p/stat/SimpleStatDumper.java
@@ -5,8 +5,8 @@ import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeSet;
 
-import net.i2p.util.Log;
 import net.i2p.I2PAppContext;
+import net.i2p.util.Log;
 
 public class SimpleStatDumper {
     private final static Log _log = new Log(SimpleStatDumper.class);
diff --git a/core/java/src/net/i2p/stat/StatManager.java b/core/java/src/net/i2p/stat/StatManager.java
index f768fdafc..91e8aa3ff 100644
--- a/core/java/src/net/i2p/stat/StatManager.java
+++ b/core/java/src/net/i2p/stat/StatManager.java
@@ -9,8 +9,8 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import net.i2p.util.Log;
 import net.i2p.I2PAppContext;
+import net.i2p.util.Log;
 
 /** 
  * Coordinate the management of various frequencies and rates within I2P components,
diff --git a/core/java/src/net/i2p/util/I2PThread.java b/core/java/src/net/i2p/util/I2PThread.java
index 804ab05d3..2b53915ca 100644
--- a/core/java/src/net/i2p/util/I2PThread.java
+++ b/core/java/src/net/i2p/util/I2PThread.java
@@ -10,9 +10,9 @@ package net.i2p.util;
  */
 
 
-import java.util.Set;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Set;
 
 /**
  * In case its useful later...
diff --git a/core/java/src/net/i2p/util/Log.java b/core/java/src/net/i2p/util/Log.java
index 151ccd478..85b0bb4ec 100644
--- a/core/java/src/net/i2p/util/Log.java
+++ b/core/java/src/net/i2p/util/Log.java
@@ -9,8 +9,8 @@ package net.i2p.util;
  *
  */
 
-import net.i2p.data.DataHelper;
 import net.i2p.I2PAppContext;
+import net.i2p.data.DataHelper;
 
 /**
  * Wrapper class for whatever logging system I2P uses.  This class should be 
diff --git a/core/java/src/net/i2p/util/LogConsoleBuffer.java b/core/java/src/net/i2p/util/LogConsoleBuffer.java
index 296034823..02d1b5039 100644
--- a/core/java/src/net/i2p/util/LogConsoleBuffer.java
+++ b/core/java/src/net/i2p/util/LogConsoleBuffer.java
@@ -2,6 +2,7 @@ package net.i2p.util;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import net.i2p.I2PAppContext;
 
 /**
diff --git a/core/java/src/net/i2p/util/LogManager.java b/core/java/src/net/i2p/util/LogManager.java
index d4b1238af..74e5c1899 100644
--- a/core/java/src/net/i2p/util/LogManager.java
+++ b/core/java/src/net/i2p/util/LogManager.java
@@ -14,13 +14,11 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Properties;
-import java.util.ArrayList;
 import java.util.Map;
-import java.util.HashMap;
+import java.util.Properties;
 
 import net.i2p.I2PAppContext;
 
diff --git a/core/java/src/net/i2p/util/RandomSource.java b/core/java/src/net/i2p/util/RandomSource.java
index 648d0a69f..9c0ec6800 100644
--- a/core/java/src/net/i2p/util/RandomSource.java
+++ b/core/java/src/net/i2p/util/RandomSource.java
@@ -10,6 +10,7 @@ package net.i2p.util;
  */
 
 import java.security.SecureRandom;
+
 import net.i2p.I2PAppContext;
 
 /**
diff --git a/router/java/src/net/i2p/data/i2np/DataMessage.java b/router/java/src/net/i2p/data/i2np/DataMessage.java
index be18d3c7a..508d448ae 100644
--- a/router/java/src/net/i2p/data/i2np/DataMessage.java
+++ b/router/java/src/net/i2p/data/i2np/DataMessage.java
@@ -12,10 +12,10 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines a message containing arbitrary bytes of data
diff --git a/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java b/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java
index 7d7533fc1..b1a57e9da 100644
--- a/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java
+++ b/router/java/src/net/i2p/data/i2np/DatabaseLookupMessage.java
@@ -15,13 +15,13 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
+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;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message a router sends to another router to search for a
diff --git a/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java b/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java
index ea996c7a8..e1c2d6d45 100644
--- a/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java
+++ b/router/java/src/net/i2p/data/i2np/DatabaseSearchReplyMessage.java
@@ -16,12 +16,12 @@ 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;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message a router sends to another router in response to a
diff --git a/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java b/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java
index 986fdaf74..2a9d999bb 100644
--- a/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java
+++ b/router/java/src/net/i2p/data/i2np/DatabaseStoreMessage.java
@@ -13,13 +13,13 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.data.RouterInfo;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message a router sends to another router to test the network
diff --git a/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java b/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java
index 0d4569917..337ce1ea7 100644
--- a/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java
+++ b/router/java/src/net/i2p/data/i2np/DeliveryStatusMessage.java
@@ -13,10 +13,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Date;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message sent back in reply to a message when requested, containing
diff --git a/router/java/src/net/i2p/data/i2np/GarlicClove.java b/router/java/src/net/i2p/data/i2np/GarlicClove.java
index 6f3b0febd..36bc88ca2 100644
--- a/router/java/src/net/i2p/data/i2np/GarlicClove.java
+++ b/router/java/src/net/i2p/data/i2np/GarlicClove.java
@@ -17,8 +17,8 @@ import net.i2p.data.Certificate;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Contains one deliverable message encrypted to a router along with instructions
diff --git a/router/java/src/net/i2p/data/i2np/GarlicMessage.java b/router/java/src/net/i2p/data/i2np/GarlicMessage.java
index 21d802184..4e0842a90 100644
--- a/router/java/src/net/i2p/data/i2np/GarlicMessage.java
+++ b/router/java/src/net/i2p/data/i2np/GarlicMessage.java
@@ -12,10 +12,10 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the wrapped garlic message
diff --git a/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java b/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java
index aea8e2e99..12395382b 100644
--- a/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java
+++ b/router/java/src/net/i2p/data/i2np/I2NPMessageHandler.java
@@ -12,11 +12,10 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Handle messages from router to router
diff --git a/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java b/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java
index d78b2ee0c..01a474e41 100644
--- a/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java
+++ b/router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java
@@ -13,13 +13,11 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Date;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the base message implementation.
diff --git a/router/java/src/net/i2p/data/i2np/I2NPMessageReader.java b/router/java/src/net/i2p/data/i2np/I2NPMessageReader.java
index f34420c98..cfd9f2843 100644
--- a/router/java/src/net/i2p/data/i2np/I2NPMessageReader.java
+++ b/router/java/src/net/i2p/data/i2np/I2NPMessageReader.java
@@ -11,9 +11,9 @@ package net.i2p.data.i2np;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.router.RouterContext;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * The I2NPMessageReader reads an InputStream (using
diff --git a/router/java/src/net/i2p/data/i2np/SourceRouteBlock.java b/router/java/src/net/i2p/data/i2np/SourceRouteBlock.java
index 42eadfc06..2d8c61ca9 100644
--- a/router/java/src/net/i2p/data/i2np/SourceRouteBlock.java
+++ b/router/java/src/net/i2p/data/i2np/SourceRouteBlock.java
@@ -14,9 +14,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Date;
 
-import net.i2p.crypto.ElGamalAESEngine;
-import net.i2p.crypto.KeyGenerator;
-import net.i2p.crypto.SessionKeyManager;
+import net.i2p.I2PAppContext;
 import net.i2p.data.Certificate;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
@@ -26,7 +24,6 @@ import net.i2p.data.PublicKey;
 import net.i2p.data.SessionKey;
 import net.i2p.data.SessionTag;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 
 /**
diff --git a/router/java/src/net/i2p/data/i2np/SourceRouteReplyMessage.java b/router/java/src/net/i2p/data/i2np/SourceRouteReplyMessage.java
index 29c356469..ccc167da6 100644
--- a/router/java/src/net/i2p/data/i2np/SourceRouteReplyMessage.java
+++ b/router/java/src/net/i2p/data/i2np/SourceRouteReplyMessage.java
@@ -13,13 +13,12 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import net.i2p.crypto.ElGamalAESEngine;
+import net.i2p.I2PAppContext;
 import net.i2p.data.Certificate;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.PrivateKey;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines a message directed by a source route block to deliver a message to an
diff --git a/router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java b/router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java
index 857b0517f..b58e67cf9 100644
--- a/router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java
+++ b/router/java/src/net/i2p/data/i2np/TunnelCreateMessage.java
@@ -12,13 +12,13 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 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.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message sent to a router to request that it participate in a
diff --git a/router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java b/router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java
index d8b276898..91f121942 100644
--- a/router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java
+++ b/router/java/src/net/i2p/data/i2np/TunnelCreateStatusMessage.java
@@ -12,12 +12,12 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message a router sends to another router in reply to a
diff --git a/router/java/src/net/i2p/data/i2np/TunnelMessage.java b/router/java/src/net/i2p/data/i2np/TunnelMessage.java
index 5463a35c7..aad4134a5 100644
--- a/router/java/src/net/i2p/data/i2np/TunnelMessage.java
+++ b/router/java/src/net/i2p/data/i2np/TunnelMessage.java
@@ -12,11 +12,11 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.TunnelId;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the message sent between routers for tunnel delivery
diff --git a/router/java/src/net/i2p/data/i2np/TunnelVerificationStructure.java b/router/java/src/net/i2p/data/i2np/TunnelVerificationStructure.java
index 3fbcac128..2c076d0e2 100644
--- a/router/java/src/net/i2p/data/i2np/TunnelVerificationStructure.java
+++ b/router/java/src/net/i2p/data/i2np/TunnelVerificationStructure.java
@@ -12,7 +12,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import net.i2p.crypto.DSAEngine;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
@@ -20,7 +19,6 @@ import net.i2p.data.Hash;
 import net.i2p.data.Signature;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SigningPublicKey;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
 
 /**
diff --git a/router/java/src/net/i2p/router/ClientManagerFacade.java b/router/java/src/net/i2p/router/ClientManagerFacade.java
index e44fd97cb..323593346 100644
--- a/router/java/src/net/i2p/router/ClientManagerFacade.java
+++ b/router/java/src/net/i2p/router/ClientManagerFacade.java
@@ -13,7 +13,6 @@ import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.data.i2cp.MessageId;
 import net.i2p.data.i2cp.SessionConfig;
-import net.i2p.router.client.ClientManagerFacadeImpl;
 
 /**
  * Manage all interactions with clients 
diff --git a/router/java/src/net/i2p/router/ClientMessagePool.java b/router/java/src/net/i2p/router/ClientMessagePool.java
index 8abe694b3..f5b33d717 100644
--- a/router/java/src/net/i2p/router/ClientMessagePool.java
+++ b/router/java/src/net/i2p/router/ClientMessagePool.java
@@ -9,10 +9,6 @@ package net.i2p.router;
  */
 
 //import net.i2p.router.message.ProcessOutboundClientMessageJob;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
 import net.i2p.router.message.OutboundClientMessageJob;
 import net.i2p.util.Log;
 
diff --git a/router/java/src/net/i2p/router/InNetMessagePool.java b/router/java/src/net/i2p/router/InNetMessagePool.java
index 1889b0ae7..440af4d93 100644
--- a/router/java/src/net/i2p/router/InNetMessagePool.java
+++ b/router/java/src/net/i2p/router/InNetMessagePool.java
@@ -11,12 +11,9 @@ package net.i2p.router;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import net.i2p.router.transport.OutboundMessageRegistry;
-import net.i2p.stat.StatManager;
 import net.i2p.util.Log;
 
 /**
diff --git a/router/java/src/net/i2p/router/JobImpl.java b/router/java/src/net/i2p/router/JobImpl.java
index c08502fe6..a38f948d0 100644
--- a/router/java/src/net/i2p/router/JobImpl.java
+++ b/router/java/src/net/i2p/router/JobImpl.java
@@ -8,7 +8,6 @@ package net.i2p.router;
  *
  */
 
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 /**
  * Base implementation of a Job
diff --git a/router/java/src/net/i2p/router/JobQueue.java b/router/java/src/net/i2p/router/JobQueue.java
index 1fa56e297..ddf68025a 100644
--- a/router/java/src/net/i2p/router/JobQueue.java
+++ b/router/java/src/net/i2p/router/JobQueue.java
@@ -8,19 +8,18 @@ package net.i2p.router;
  *
  */
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.ArrayList;
-import java.util.TreeMap;
 import java.util.SortedMap;
-import java.util.Collections;
+import java.util.TreeMap;
 
 import net.i2p.router.message.HandleSourceRouteReplyMessageJob;
 import net.i2p.router.networkdb.HandleDatabaseLookupMessageJob;
 import net.i2p.router.tunnelmanager.HandleTunnelCreateMessageJob;
 import net.i2p.router.tunnelmanager.RequestTunnelJob;
-import net.i2p.stat.StatManager;
 import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
diff --git a/router/java/src/net/i2p/router/JobQueueRunner.java b/router/java/src/net/i2p/router/JobQueueRunner.java
index 134fc465b..e1c7d01b3 100644
--- a/router/java/src/net/i2p/router/JobQueueRunner.java
+++ b/router/java/src/net/i2p/router/JobQueueRunner.java
@@ -1,7 +1,5 @@
 package net.i2p.router;
 
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 
 /** a do run run run a do run run */
diff --git a/router/java/src/net/i2p/router/KeyManager.java b/router/java/src/net/i2p/router/KeyManager.java
index 69256382e..cab482a2e 100644
--- a/router/java/src/net/i2p/router/KeyManager.java
+++ b/router/java/src/net/i2p/router/KeyManager.java
@@ -24,7 +24,6 @@ import net.i2p.data.PrivateKey;
 import net.i2p.data.PublicKey;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SigningPublicKey;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 
 /**
diff --git a/router/java/src/net/i2p/router/MessageHistory.java b/router/java/src/net/i2p/router/MessageHistory.java
index 420e2b4bf..1bb7cd37d 100644
--- a/router/java/src/net/i2p/router/MessageHistory.java
+++ b/router/java/src/net/i2p/router/MessageHistory.java
@@ -3,16 +3,15 @@ package net.i2p.router;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.TimeZone;
 
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 
 /**
diff --git a/router/java/src/net/i2p/router/MessageValidator.java b/router/java/src/net/i2p/router/MessageValidator.java
index 4347e8f7a..28beffcf0 100644
--- a/router/java/src/net/i2p/router/MessageValidator.java
+++ b/router/java/src/net/i2p/router/MessageValidator.java
@@ -5,7 +5,6 @@ import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeMap;
 
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 
 /**
diff --git a/router/java/src/net/i2p/router/MultiRouter.java b/router/java/src/net/i2p/router/MultiRouter.java
index 5241b4906..4c36dfa33 100644
--- a/router/java/src/net/i2p/router/MultiRouter.java
+++ b/router/java/src/net/i2p/router/MultiRouter.java
@@ -1,9 +1,10 @@
 package net.i2p.router;
 
-import java.io.IOException;
 import java.io.FileInputStream;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Properties;
+
 import net.i2p.I2PAppContext;
 import net.i2p.util.Log;
 
diff --git a/router/java/src/net/i2p/router/MultiRouterBuilder.java b/router/java/src/net/i2p/router/MultiRouterBuilder.java
index da50393b1..a2bb89d1c 100644
--- a/router/java/src/net/i2p/router/MultiRouterBuilder.java
+++ b/router/java/src/net/i2p/router/MultiRouterBuilder.java
@@ -1,11 +1,8 @@
 package net.i2p.router;
 
-import java.io.IOException;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.InputStreamReader;
-import java.io.BufferedReader;
+import java.io.IOException;
 
 /**
  * Build a set of config files suitable for use by the multirouter as a 
diff --git a/router/java/src/net/i2p/router/NetworkDatabaseFacade.java b/router/java/src/net/i2p/router/NetworkDatabaseFacade.java
index c00208dd6..b93b18487 100644
--- a/router/java/src/net/i2p/router/NetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/NetworkDatabaseFacade.java
@@ -16,7 +16,6 @@ import java.util.Set;
 import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.data.RouterInfo;
-import net.i2p.router.networkdb.kademlia.KademliaNetworkDatabaseFacade;
 
 /**
  * Defines the mechanism for interacting with I2P's network database
diff --git a/router/java/src/net/i2p/router/OutNetMessage.java b/router/java/src/net/i2p/router/OutNetMessage.java
index 0df345b72..fda749518 100644
--- a/router/java/src/net/i2p/router/OutNetMessage.java
+++ b/router/java/src/net/i2p/router/OutNetMessage.java
@@ -23,7 +23,6 @@ import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 
 /**
diff --git a/router/java/src/net/i2p/router/OutNetMessagePool.java b/router/java/src/net/i2p/router/OutNetMessagePool.java
index 1b76f90ad..abca042d8 100644
--- a/router/java/src/net/i2p/router/OutNetMessagePool.java
+++ b/router/java/src/net/i2p/router/OutNetMessagePool.java
@@ -8,14 +8,8 @@ package net.i2p.router;
  *
  */
 
-import java.util.ArrayList;
 import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.TreeMap;
 
-import net.i2p.router.transport.OutboundMessageRegistry;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 
 /**
diff --git a/router/java/src/net/i2p/router/PeerManagerFacade.java b/router/java/src/net/i2p/router/PeerManagerFacade.java
index d75a73258..99a111897 100644
--- a/router/java/src/net/i2p/router/PeerManagerFacade.java
+++ b/router/java/src/net/i2p/router/PeerManagerFacade.java
@@ -10,8 +10,6 @@ package net.i2p.router;
 
 import java.util.List;
 
-import net.i2p.router.peermanager.PeerManagerFacadeImpl;
-
 /**
  * Manage peer references and keep them up to date so that when asked for peers,
  * it can provide appropriate peers according to the criteria provided.  This 
diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index 304434a29..a0ec51817 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -8,10 +8,8 @@ package net.i2p.router;
  *
  */
 
-import java.io.BufferedReader;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.text.DecimalFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -28,26 +26,17 @@ import net.i2p.crypto.DHSessionKeyBuilder;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.RouterInfo;
-import net.i2p.data.RoutingKeyGenerator;
 import net.i2p.data.i2np.GarlicMessage;
 import net.i2p.data.i2np.SourceRouteReplyMessage;
 import net.i2p.data.i2np.TunnelMessage;
-import net.i2p.router.admin.StatsGenerator;
 import net.i2p.router.message.GarlicMessageHandler;
 import net.i2p.router.message.SourceRouteReplyMessageHandler;
 import net.i2p.router.message.TunnelMessageHandler;
 import net.i2p.router.startup.StartupJob;
-import net.i2p.router.transport.BandwidthLimiter;
-import net.i2p.router.transport.OutboundMessageRegistry;
 import net.i2p.stat.Rate;
 import net.i2p.stat.RateStat;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.util.LogConsoleBuffer;
-import net.i2p.util.LogManager;
-import net.i2p.util.RandomSource;
 
 /**
  * Main driver for the router.
diff --git a/router/java/src/net/i2p/router/RouterContext.java b/router/java/src/net/i2p/router/RouterContext.java
index 5e82b333c..52bfe2dd2 100644
--- a/router/java/src/net/i2p/router/RouterContext.java
+++ b/router/java/src/net/i2p/router/RouterContext.java
@@ -1,24 +1,25 @@
 package net.i2p.router;
 
+import java.util.Properties;
+
+import net.i2p.I2PAppContext;
 import net.i2p.data.Hash;
 import net.i2p.router.client.ClientManagerFacadeImpl;
-import net.i2p.router.transport.OutboundMessageRegistry;
 import net.i2p.router.networkdb.kademlia.KademliaNetworkDatabaseFacade;
-import net.i2p.router.transport.VMCommSystem;
-import net.i2p.router.transport.CommSystemFacadeImpl;
-import net.i2p.router.transport.BandwidthLimiter;
-import net.i2p.router.transport.TrivialBandwidthLimiter;
-import net.i2p.router.tunnelmanager.PoolingTunnelManagerFacade;
-import net.i2p.router.peermanager.ProfileOrganizer;
+import net.i2p.router.peermanager.Calculator;
+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.Calculator;
-import net.i2p.router.peermanager.IsFailingCalculator;
+import net.i2p.router.peermanager.ProfileOrganizer;
 import net.i2p.router.peermanager.ReliabilityCalculator;
 import net.i2p.router.peermanager.SpeedCalculator;
-import net.i2p.router.peermanager.IntegrationCalculator;
-import net.i2p.I2PAppContext;
-import java.util.Properties;
+import net.i2p.router.transport.BandwidthLimiter;
+import net.i2p.router.transport.CommSystemFacadeImpl;
+import net.i2p.router.transport.OutboundMessageRegistry;
+import net.i2p.router.transport.TrivialBandwidthLimiter;
+import net.i2p.router.transport.VMCommSystem;
+import net.i2p.router.tunnelmanager.PoolingTunnelManagerFacade;
 
 /**
  * Build off the core I2P context to provide a root for a router instance to
diff --git a/router/java/src/net/i2p/router/Shitlist.java b/router/java/src/net/i2p/router/Shitlist.java
index 747eb351b..ff093fcde 100644
--- a/router/java/src/net/i2p/router/Shitlist.java
+++ b/router/java/src/net/i2p/router/Shitlist.java
@@ -14,7 +14,6 @@ import java.util.Iterator;
 import java.util.Map;
 
 import net.i2p.data.Hash;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 
 /**
diff --git a/router/java/src/net/i2p/router/StatisticsManager.java b/router/java/src/net/i2p/router/StatisticsManager.java
index c18298e7e..df08c4daa 100644
--- a/router/java/src/net/i2p/router/StatisticsManager.java
+++ b/router/java/src/net/i2p/router/StatisticsManager.java
@@ -17,7 +17,6 @@ import net.i2p.CoreVersion;
 import net.i2p.data.DataHelper;
 import net.i2p.stat.Rate;
 import net.i2p.stat.RateStat;
-import net.i2p.stat.StatManager;
 import net.i2p.util.Log;
 
 /**
diff --git a/router/java/src/net/i2p/router/SubmitMessageHistoryJob.java b/router/java/src/net/i2p/router/SubmitMessageHistoryJob.java
index a6c67be2f..8ad99d565 100644
--- a/router/java/src/net/i2p/router/SubmitMessageHistoryJob.java
+++ b/router/java/src/net/i2p/router/SubmitMessageHistoryJob.java
@@ -4,12 +4,9 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 
-import net.i2p.router.transport.BandwidthLimiter;
-import net.i2p.util.Clock;
 import net.i2p.util.HTTPSendData;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Job that, if its allowed to, will submit the data gathered by the MessageHistory
diff --git a/router/java/src/net/i2p/router/TunnelInfo.java b/router/java/src/net/i2p/router/TunnelInfo.java
index f64656ebc..cf56f2781 100644
--- a/router/java/src/net/i2p/router/TunnelInfo.java
+++ b/router/java/src/net/i2p/router/TunnelInfo.java
@@ -16,6 +16,7 @@ import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
@@ -29,7 +30,6 @@ import net.i2p.data.i2np.TunnelConfigurationSessionKey;
 import net.i2p.data.i2np.TunnelSessionKey;
 import net.i2p.data.i2np.TunnelSigningPrivateKey;
 import net.i2p.data.i2np.TunnelSigningPublicKey;
-import net.i2p.I2PAppContext;
 
 /**
  * Defines the information associated with a tunnel
diff --git a/router/java/src/net/i2p/router/TunnelManagerFacade.java b/router/java/src/net/i2p/router/TunnelManagerFacade.java
index 50ec1e68e..0462951e5 100644
--- a/router/java/src/net/i2p/router/TunnelManagerFacade.java
+++ b/router/java/src/net/i2p/router/TunnelManagerFacade.java
@@ -13,7 +13,6 @@ import java.util.List;
 import net.i2p.data.Destination;
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
-import net.i2p.router.tunnelmanager.PoolingTunnelManagerFacade;
 
 /**
  * Build and maintain tunnels throughout the network.
diff --git a/router/java/src/net/i2p/router/TunnelSettings.java b/router/java/src/net/i2p/router/TunnelSettings.java
index cb4d5bc32..3ea8baa56 100644
--- a/router/java/src/net/i2p/router/TunnelSettings.java
+++ b/router/java/src/net/i2p/router/TunnelSettings.java
@@ -13,10 +13,10 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Date;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
-import net.i2p.I2PAppContext;
 
 /**
  * Wrap up the settings specified for a particular tunnel
diff --git a/router/java/src/net/i2p/router/admin/AdminListener.java b/router/java/src/net/i2p/router/admin/AdminListener.java
index 455533d60..77cc81876 100644
--- a/router/java/src/net/i2p/router/admin/AdminListener.java
+++ b/router/java/src/net/i2p/router/admin/AdminListener.java
@@ -12,9 +12,9 @@ import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
 
+import net.i2p.router.RouterContext;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Listen for connections on the specified port, and toss them onto the client manager's
diff --git a/router/java/src/net/i2p/router/admin/AdminManager.java b/router/java/src/net/i2p/router/admin/AdminManager.java
index 63ec69924..ca7a056a4 100644
--- a/router/java/src/net/i2p/router/admin/AdminManager.java
+++ b/router/java/src/net/i2p/router/admin/AdminManager.java
@@ -1,10 +1,9 @@
 package net.i2p.router.admin;
 
-import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
 import net.i2p.router.Service;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 public class AdminManager implements Service {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/admin/AdminRunner.java b/router/java/src/net/i2p/router/admin/AdminRunner.java
index f0db74914..c01b52bb3 100644
--- a/router/java/src/net/i2p/router/admin/AdminRunner.java
+++ b/router/java/src/net/i2p/router/admin/AdminRunner.java
@@ -6,17 +6,15 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.Socket;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.Locale;
-import java.text.SimpleDateFormat;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Set;
 
 import net.i2p.data.Hash;
-import net.i2p.router.Router;
-import net.i2p.router.peermanager.ProfileOrganizer;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 class AdminRunner implements Runnable {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/admin/StatsGenerator.java b/router/java/src/net/i2p/router/admin/StatsGenerator.java
index 55fb4d655..6c718ff15 100644
--- a/router/java/src/net/i2p/router/admin/StatsGenerator.java
+++ b/router/java/src/net/i2p/router/admin/StatsGenerator.java
@@ -11,14 +11,12 @@ import java.util.Map;
 import java.util.Set;
 
 import net.i2p.data.DataHelper;
-import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
 import net.i2p.stat.Frequency;
 import net.i2p.stat.FrequencyStat;
 import net.i2p.stat.Rate;
 import net.i2p.stat.RateStat;
-import net.i2p.stat.StatManager;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Dump the stats to the web admin interface
diff --git a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java
index af9c9b36d..f8b21a3f4 100644
--- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java
+++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java
@@ -32,10 +32,7 @@ import net.i2p.data.i2cp.SessionConfig;
 import net.i2p.data.i2cp.SessionId;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.NetworkDatabaseFacade;
 import net.i2p.router.RouterContext;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
 
diff --git a/router/java/src/net/i2p/router/client/ClientListenerRunner.java b/router/java/src/net/i2p/router/client/ClientListenerRunner.java
index a314ce810..36db7b6e9 100644
--- a/router/java/src/net/i2p/router/client/ClientListenerRunner.java
+++ b/router/java/src/net/i2p/router/client/ClientListenerRunner.java
@@ -13,8 +13,8 @@ import java.net.ServerSocket;
 import java.net.Socket;
 
 import net.i2p.client.I2PClient;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Listen for connections on the specified port, and toss them onto the client manager's
diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java
index 6c478cb0b..67f7be196 100644
--- a/router/java/src/net/i2p/router/client/ClientManager.java
+++ b/router/java/src/net/i2p/router/client/ClientManager.java
@@ -21,15 +21,11 @@ import net.i2p.data.Payload;
 import net.i2p.data.i2cp.MessageId;
 import net.i2p.data.i2cp.SessionConfig;
 import net.i2p.router.ClientMessage;
-import net.i2p.router.ClientMessagePool;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
+import net.i2p.router.RouterContext;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Coordinate connections and various tasks
diff --git a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java
index 6b303926d..59caca44d 100644
--- a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java
+++ b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java
@@ -16,7 +16,6 @@ import net.i2p.data.i2cp.SessionConfig;
 import net.i2p.router.ClientManagerFacade;
 import net.i2p.router.ClientMessage;
 import net.i2p.router.Job;
-import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
 
diff --git a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java
index 90605d246..d63c13843 100644
--- a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java
+++ b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java
@@ -26,13 +26,9 @@ import net.i2p.data.i2cp.SendMessageMessage;
 import net.i2p.data.i2cp.SessionId;
 import net.i2p.data.i2cp.SessionStatusMessage;
 import net.i2p.data.i2cp.SetDateMessage;
-import net.i2p.router.JobQueue;
-import net.i2p.router.KeyManager;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.util.Clock;
+import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
-import net.i2p.router.RouterContext;
 
 /**
  * Receive events from the client and handle them accordingly (updating the runner when
diff --git a/router/java/src/net/i2p/router/client/CreateSessionJob.java b/router/java/src/net/i2p/router/client/CreateSessionJob.java
index 33f80e9d0..83996b1c8 100644
--- a/router/java/src/net/i2p/router/client/CreateSessionJob.java
+++ b/router/java/src/net/i2p/router/client/CreateSessionJob.java
@@ -13,9 +13,8 @@ import java.util.Properties;
 import net.i2p.data.i2cp.SessionConfig;
 import net.i2p.router.ClientTunnelSettings;
 import net.i2p.router.JobImpl;
-import net.i2p.router.TunnelManagerFacade;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Given an established connection, walk through the process of establishing the
diff --git a/router/java/src/net/i2p/router/client/ReportAbuseJob.java b/router/java/src/net/i2p/router/client/ReportAbuseJob.java
index 06c259012..e3c280f8a 100644
--- a/router/java/src/net/i2p/router/client/ReportAbuseJob.java
+++ b/router/java/src/net/i2p/router/client/ReportAbuseJob.java
@@ -15,8 +15,8 @@ import net.i2p.data.i2cp.AbuseSeverity;
 import net.i2p.data.i2cp.I2CPMessageException;
 import net.i2p.data.i2cp.ReportAbuseMessage;
 import net.i2p.router.JobImpl;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Async job to send an abuse message to the client
diff --git a/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java b/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java
index 19e845c10..e75705453 100644
--- a/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java
+++ b/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java
@@ -16,10 +16,8 @@ import net.i2p.data.i2cp.I2CPMessageException;
 import net.i2p.data.i2cp.RequestLeaseSetMessage;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Async job to walk the client through generating a lease set.  First sends it
diff --git a/router/java/src/net/i2p/router/message/BuildTestMessageJob.java b/router/java/src/net/i2p/router/message/BuildTestMessageJob.java
index 40031b193..21fc67c01 100644
--- a/router/java/src/net/i2p/router/message/BuildTestMessageJob.java
+++ b/router/java/src/net/i2p/router/message/BuildTestMessageJob.java
@@ -12,7 +12,6 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import net.i2p.crypto.SessionKeyManager;
 import net.i2p.data.Certificate;
 import net.i2p.data.Hash;
 import net.i2p.data.PublicKey;
@@ -23,14 +22,11 @@ import net.i2p.data.i2np.DeliveryStatusMessage;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
 import net.i2p.router.MessageSelector;
 import net.i2p.router.ReplyJob;
 import net.i2p.router.Router;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Build a test message that will be sent to the target to make sure they're alive.
diff --git a/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java b/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java
index 885b265ee..e71bdf7a7 100644
--- a/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java
+++ b/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java
@@ -14,9 +14,6 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import net.i2p.crypto.ElGamalAESEngine;
-import net.i2p.crypto.KeyGenerator;
-import net.i2p.crypto.SessionKeyManager;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.PublicKey;
@@ -26,9 +23,8 @@ import net.i2p.data.i2np.GarlicClove;
 import net.i2p.data.i2np.GarlicMessage;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.SourceRouteBlock;
-import net.i2p.router.MessageHistory;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Build garlic messages based on a GarlicConfig
diff --git a/router/java/src/net/i2p/router/message/GarlicMessageParser.java b/router/java/src/net/i2p/router/message/GarlicMessageParser.java
index 019e9f806..d4badfaec 100644
--- a/router/java/src/net/i2p/router/message/GarlicMessageParser.java
+++ b/router/java/src/net/i2p/router/message/GarlicMessageParser.java
@@ -14,15 +14,14 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import net.i2p.crypto.ElGamalAESEngine;
 import net.i2p.data.Certificate;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.PrivateKey;
 import net.i2p.data.i2np.GarlicClove;
 import net.i2p.data.i2np.GarlicMessage;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Read a GarlicMessage, decrypt it, and return the resulting CloveSet
diff --git a/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java b/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java
index 718df9455..f236d3ba6 100644
--- a/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java
+++ b/router/java/src/net/i2p/router/message/HandleGarlicMessageJob.java
@@ -21,14 +21,10 @@ import net.i2p.data.RouterIdentity;
 import net.i2p.data.i2np.GarlicClove;
 import net.i2p.data.i2np.GarlicMessage;
 import net.i2p.router.JobImpl;
-import net.i2p.router.KeyManager;
 import net.i2p.router.LeaseSetKeys;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.Router;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Unencrypt a garlic message and handle each of the cloves - locally destined
diff --git a/router/java/src/net/i2p/router/message/HandleSourceRouteReplyMessageJob.java b/router/java/src/net/i2p/router/message/HandleSourceRouteReplyMessageJob.java
index 6bb2439c7..30b9f6c12 100644
--- a/router/java/src/net/i2p/router/message/HandleSourceRouteReplyMessageJob.java
+++ b/router/java/src/net/i2p/router/message/HandleSourceRouteReplyMessageJob.java
@@ -21,12 +21,9 @@ import net.i2p.data.RouterIdentity;
 import net.i2p.data.i2np.DeliveryInstructions;
 import net.i2p.data.i2np.SourceRouteReplyMessage;
 import net.i2p.router.JobImpl;
-import net.i2p.router.KeyManager;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.Router;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Handle a source route reply - decrypt the instructions and forward the message 
diff --git a/router/java/src/net/i2p/router/message/HandleTunnelMessageJob.java b/router/java/src/net/i2p/router/message/HandleTunnelMessageJob.java
index aea4d1ba4..c67cd71c3 100644
--- a/router/java/src/net/i2p/router/message/HandleTunnelMessageJob.java
+++ b/router/java/src/net/i2p/router/message/HandleTunnelMessageJob.java
@@ -12,8 +12,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import net.i2p.crypto.AESEngine;
-import net.i2p.crypto.SHA256Generator;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
@@ -29,23 +27,13 @@ import net.i2p.data.i2np.I2NPMessageException;
 import net.i2p.data.i2np.I2NPMessageHandler;
 import net.i2p.data.i2np.TunnelMessage;
 import net.i2p.data.i2np.TunnelVerificationStructure;
-import net.i2p.router.ClientManagerFacade;
 import net.i2p.router.ClientMessage;
-import net.i2p.router.ClientMessagePool;
 import net.i2p.router.InNetMessage;
-import net.i2p.router.InNetMessagePool;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.MessageReceptionInfo;
-import net.i2p.router.MessageValidator;
-import net.i2p.router.Router;
-import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelManagerFacade;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
+import net.i2p.util.Log;
 
 public class HandleTunnelMessageJob extends JobImpl {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/message/MessageHandler.java b/router/java/src/net/i2p/router/message/MessageHandler.java
index ea3b8ae8f..0307f2722 100644
--- a/router/java/src/net/i2p/router/message/MessageHandler.java
+++ b/router/java/src/net/i2p/router/message/MessageHandler.java
@@ -19,20 +19,12 @@ import net.i2p.data.i2np.DeliveryInstructions;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.SourceRouteBlock;
 import net.i2p.data.i2np.TunnelMessage;
-import net.i2p.router.ClientManagerFacade;
 import net.i2p.router.ClientMessage;
-import net.i2p.router.ClientMessagePool;
 import net.i2p.router.InNetMessage;
-import net.i2p.router.InNetMessagePool;
 import net.i2p.router.Job;
-import net.i2p.router.JobQueue;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.MessageReceptionInfo;
-import net.i2p.router.MessageValidator;
-import net.i2p.router.Router;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Implement the inbound message processing logic to forward based on delivery instructions and
diff --git a/router/java/src/net/i2p/router/message/OutboundClientMessageJob.java b/router/java/src/net/i2p/router/message/OutboundClientMessageJob.java
index 638d65d55..72ca30da4 100644
--- a/router/java/src/net/i2p/router/message/OutboundClientMessageJob.java
+++ b/router/java/src/net/i2p/router/message/OutboundClientMessageJob.java
@@ -5,11 +5,10 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Properties;
 import java.util.Set;
 import java.util.TreeMap;
-import java.util.Properties;
 
-import net.i2p.crypto.SessionKeyManager;
 import net.i2p.data.Certificate;
 import net.i2p.data.Destination;
 import net.i2p.data.Hash;
@@ -25,22 +24,14 @@ import net.i2p.data.i2np.DeliveryInstructions;
 import net.i2p.data.i2np.DeliveryStatusMessage;
 import net.i2p.data.i2np.GarlicMessage;
 import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.router.ClientManagerFacade;
 import net.i2p.router.ClientMessage;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.MessageSelector;
-import net.i2p.router.NetworkDatabaseFacade;
 import net.i2p.router.ReplyJob;
 import net.i2p.router.Router;
-import net.i2p.router.TunnelManagerFacade;
-import net.i2p.router.TunnelSelectionCriteria;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelSelectionCriteria;
+import net.i2p.util.Log;
 
 /**
  * Send a client message, taking into consideration the fact that there may be
diff --git a/router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java b/router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java
index 51043e6cc..77ebd4bd2 100644
--- a/router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java
+++ b/router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java
@@ -15,24 +15,21 @@ import java.util.Set;
 import net.i2p.data.Certificate;
 import net.i2p.data.Destination;
 import net.i2p.data.Hash;
+import net.i2p.data.LeaseSet;
 import net.i2p.data.Payload;
 import net.i2p.data.PublicKey;
 import net.i2p.data.SessionKey;
 import net.i2p.data.TunnelId;
-import net.i2p.data.LeaseSet;
 import net.i2p.data.i2np.DataMessage;
+import net.i2p.data.i2np.DatabaseStoreMessage;
 import net.i2p.data.i2np.DeliveryInstructions;
 import net.i2p.data.i2np.DeliveryStatusMessage;
-import net.i2p.data.i2np.DatabaseStoreMessage;
 import net.i2p.data.i2np.GarlicMessage;
 import net.i2p.router.Router;
-import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelManagerFacade;
-import net.i2p.router.TunnelSelectionCriteria;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
+import net.i2p.router.TunnelSelectionCriteria;
+import net.i2p.util.Log;
 
 /**
  * Handle a particular client message that is destined for a remote destination.
diff --git a/router/java/src/net/i2p/router/message/SendGarlicJob.java b/router/java/src/net/i2p/router/message/SendGarlicJob.java
index 6c186d6aa..5df8c4259 100644
--- a/router/java/src/net/i2p/router/message/SendGarlicJob.java
+++ b/router/java/src/net/i2p/router/message/SendGarlicJob.java
@@ -15,15 +15,12 @@ import net.i2p.data.SessionKey;
 import net.i2p.data.i2np.GarlicMessage;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
 import net.i2p.router.MessageSelector;
 import net.i2p.router.OutNetMessage;
-import net.i2p.router.OutNetMessagePool;
 import net.i2p.router.ReplyJob;
 import net.i2p.router.Router;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Build a garlic message from config, encrypt it, and enqueue it for delivery.
diff --git a/router/java/src/net/i2p/router/message/SendMessageAckJob.java b/router/java/src/net/i2p/router/message/SendMessageAckJob.java
index c102d6fee..0eca89e79 100644
--- a/router/java/src/net/i2p/router/message/SendMessageAckJob.java
+++ b/router/java/src/net/i2p/router/message/SendMessageAckJob.java
@@ -14,8 +14,6 @@ import net.i2p.data.i2np.DeliveryStatusMessage;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.SourceRouteBlock;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.util.Clock;
 import net.i2p.router.RouterContext;
 
 /**
diff --git a/router/java/src/net/i2p/router/message/SendMessageDirectJob.java b/router/java/src/net/i2p/router/message/SendMessageDirectJob.java
index 172e85815..8421b556f 100644
--- a/router/java/src/net/i2p/router/message/SendMessageDirectJob.java
+++ b/router/java/src/net/i2p/router/message/SendMessageDirectJob.java
@@ -14,20 +14,13 @@ import net.i2p.data.Hash;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.InNetMessage;
-import net.i2p.router.InNetMessagePool;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
 import net.i2p.router.MessageSelector;
-import net.i2p.router.NetworkDatabaseFacade;
 import net.i2p.router.OutNetMessage;
-import net.i2p.router.OutNetMessagePool;
 import net.i2p.router.ReplyJob;
-import net.i2p.router.Router;
-import net.i2p.router.transport.OutboundMessageRegistry;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 public class SendMessageDirectJob extends JobImpl {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/message/SendReplyMessageJob.java b/router/java/src/net/i2p/router/message/SendReplyMessageJob.java
index 0a560be71..748678819 100644
--- a/router/java/src/net/i2p/router/message/SendReplyMessageJob.java
+++ b/router/java/src/net/i2p/router/message/SendReplyMessageJob.java
@@ -12,9 +12,8 @@ import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.SourceRouteBlock;
 import net.i2p.data.i2np.SourceRouteReplyMessage;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Send a SourceRouteReplyMessage to the location specified in the source route block.
diff --git a/router/java/src/net/i2p/router/message/SendTunnelMessageJob.java b/router/java/src/net/i2p/router/message/SendTunnelMessageJob.java
index eb58fc234..0621206bc 100644
--- a/router/java/src/net/i2p/router/message/SendTunnelMessageJob.java
+++ b/router/java/src/net/i2p/router/message/SendTunnelMessageJob.java
@@ -12,9 +12,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Date;
 
-import net.i2p.crypto.AESEngine;
-import net.i2p.crypto.KeyGenerator;
-import net.i2p.crypto.SHA256Generator;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataStructure;
 import net.i2p.data.Hash;
@@ -28,25 +25,17 @@ import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.TunnelMessage;
 import net.i2p.data.i2np.TunnelVerificationStructure;
 import net.i2p.router.ClientMessage;
-import net.i2p.router.ClientMessagePool;
 import net.i2p.router.InNetMessage;
-import net.i2p.router.InNetMessagePool;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.MessageReceptionInfo;
 import net.i2p.router.MessageSelector;
-import net.i2p.router.MessageValidator;
 import net.i2p.router.OutNetMessage;
 import net.i2p.router.ReplyJob;
 import net.i2p.router.Router;
-import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelManagerFacade;
-import net.i2p.router.transport.OutboundMessageRegistry;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
+import net.i2p.util.Log;
 
 /**
  * Send a message down a tunnel that we are the gateway for
diff --git a/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java b/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java
index 20fbe43d0..747c6c6d6 100644
--- a/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java
+++ b/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java
@@ -27,17 +27,11 @@ import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.TunnelMessage;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.MessageHistory;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelManagerFacade;
 import net.i2p.router.message.SendMessageDirectJob;
 import net.i2p.router.message.SendTunnelMessageJob;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Handle a lookup for a key received from a remote peer.  Needs to be implemented
diff --git a/router/java/src/net/i2p/router/networkdb/HandleDatabaseSearchReplyMessageJob.java b/router/java/src/net/i2p/router/networkdb/HandleDatabaseSearchReplyMessageJob.java
index 4fc976c4e..ab97308c2 100644
--- a/router/java/src/net/i2p/router/networkdb/HandleDatabaseSearchReplyMessageJob.java
+++ b/router/java/src/net/i2p/router/networkdb/HandleDatabaseSearchReplyMessageJob.java
@@ -13,10 +13,8 @@ import net.i2p.data.RouterIdentity;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.i2np.DatabaseSearchReplyMessage;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Receive DatabaseSearchReplyMessage data and store it in the local net db
diff --git a/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java b/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java
index 61548a0f5..538299872 100644
--- a/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java
+++ b/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java
@@ -14,12 +14,8 @@ import net.i2p.data.Hash;
 import net.i2p.data.RouterIdentity;
 import net.i2p.data.i2np.DatabaseStoreMessage;
 import net.i2p.router.JobImpl;
-import net.i2p.router.MessageHistory;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.router.ProfileManager;
-import net.i2p.util.Log;
-import net.i2p.stat.StatManager;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Receive DatabaseStoreMessage data and store it in the local net db
diff --git a/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java b/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java
index 89abad881..b642960a7 100644
--- a/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java
+++ b/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java
@@ -13,16 +13,9 @@ import java.util.Properties;
 
 import net.i2p.data.DataFormatException;
 import net.i2p.data.RouterInfo;
-import net.i2p.router.CommSystemFacade;
 import net.i2p.router.JobImpl;
-import net.i2p.router.KeyManager;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.router.Router;
-import net.i2p.router.StatisticsManager;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Publish the local router's RouterInfo every 5 to 10 minutes
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/DataPublisherJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/DataPublisherJob.java
index 9f08aba68..901555e3d 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/DataPublisherJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/DataPublisherJob.java
@@ -16,11 +16,9 @@ import net.i2p.data.DataStructure;
 import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
 import net.i2p.router.Router;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 class DataPublisherJob extends JobImpl {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/DataRepublishingSelectorJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/DataRepublishingSelectorJob.java
index bed3455cd..4270e7cf7 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/DataRepublishingSelectorJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/DataRepublishingSelectorJob.java
@@ -18,10 +18,8 @@ import net.i2p.data.LeaseSet;
 import net.i2p.data.RouterInfo;
 import net.i2p.router.JobImpl;
 import net.i2p.router.Router;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 class DataRepublishingSelectorJob extends JobImpl {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/ExpireLeasesJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/ExpireLeasesJob.java
index 4d33a8055..af44fe638 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/ExpireLeasesJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/ExpireLeasesJob.java
@@ -16,8 +16,8 @@ import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.router.JobImpl;
 import net.i2p.router.Router;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Periodically search through all leases to find expired ones, failing those
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/ExpireRoutersJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/ExpireRoutersJob.java
index d7e94d2d3..5dbf58c46 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/ExpireRoutersJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/ExpireRoutersJob.java
@@ -16,10 +16,8 @@ import java.util.Set;
 import net.i2p.data.Hash;
 import net.i2p.data.RouterInfo;
 import net.i2p.router.JobImpl;
-import net.i2p.router.TunnelManagerFacade;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Go through the routing table pick routers that are performing poorly or
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java
index 6c7cd463d..2da05b465 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java
@@ -17,9 +17,8 @@ import net.i2p.data.Hash;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.DatabaseLookupMessage;
-import net.i2p.router.Router;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Search for a particular key iteratively until we either find a value, we run
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 bd713f5ef..0ecc123ff 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/ExploreKeySelectorJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/ExploreKeySelectorJob.java
@@ -14,8 +14,8 @@ import java.util.Set;
 
 import net.i2p.data.Hash;
 import net.i2p.router.JobImpl;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Go through the kbuckets and generate random keys for routers in buckets not
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java
index 5fb26ab70..a24ca48ff 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java
@@ -12,11 +12,11 @@ import java.math.BigInteger;
 import java.util.HashSet;
 import java.util.Set;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.util.Log;
 import net.i2p.util.RandomSource;
-import net.i2p.I2PAppContext;
 
 class KBucketImpl implements KBucket {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketSet.java b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketSet.java
index 33f2e0970..fdd082c14 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketSet.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketSet.java
@@ -12,10 +12,10 @@ import java.math.BigInteger;
 import java.util.HashSet;
 import java.util.Set;
 
+import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.util.Log;
-import net.i2p.I2PAppContext;
 
 /**
  * In memory storage of buckets sorted by the XOR metric from the local router's
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 97eee18a3..29f2b48b7 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
@@ -24,18 +24,15 @@ 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.InNetMessagePool;
 import net.i2p.router.Job;
-import net.i2p.router.JobQueue;
 import net.i2p.router.NetworkDatabaseFacade;
 import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
 import net.i2p.router.networkdb.DatabaseLookupMessageHandler;
 import net.i2p.router.networkdb.DatabaseSearchReplyMessageHandler;
 import net.i2p.router.networkdb.DatabaseStoreMessageHandler;
 import net.i2p.router.networkdb.PublishLocalRouterInfoJob;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Kademlia based version of the network database
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java b/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java
index 0ac1f883e..ff66c0981 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java
@@ -20,10 +20,8 @@ import java.util.TreeMap;
 
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
-import net.i2p.router.ProfileManager;
-import net.i2p.router.Router;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 class PeerSelector {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
index 881967b8e..c7f1e6816 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
@@ -21,10 +21,9 @@ import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.data.RouterInfo;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
 import net.i2p.router.Router;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Write out keys to disk when we get them and periodically read ones we don't know
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java
index 395376d97..a765eb3c6 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java
@@ -8,19 +8,12 @@ package net.i2p.router.networkdb.kademlia;
  *
  */
 
-import java.util.HashSet;
-import java.util.Set;
-
 import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
-import net.i2p.router.ClientManagerFacade;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
 import net.i2p.router.Router;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
-import net.i2p.I2PException;
+import net.i2p.util.Log;
 
 /**
  * Run periodically for each locally created leaseSet to cause it to be republished
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java
index cfddf3a6a..c6df06151 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java
@@ -16,25 +16,17 @@ import java.util.Set;
 import net.i2p.data.DataStructure;
 import net.i2p.data.Hash;
 import net.i2p.data.RouterInfo;
-import net.i2p.data.RoutingKeyGenerator;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.DatabaseLookupMessage;
 import net.i2p.data.i2np.DatabaseSearchReplyMessage;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.router.ProfileManager;
-import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelManagerFacade;
 import net.i2p.router.TunnelSelectionCriteria;
 import net.i2p.router.message.SendMessageDirectJob;
 import net.i2p.router.message.SendTunnelMessageJob;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Search for a particular key iteratively until we either find a value or we 
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/SearchState.java b/router/java/src/net/i2p/router/networkdb/kademlia/SearchState.java
index cf28d09a0..45b103bba 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/SearchState.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/SearchState.java
@@ -8,7 +8,6 @@ import java.util.Iterator;
 import java.util.Set;
 
 import net.i2p.data.Hash;
-import net.i2p.util.Clock;
 import net.i2p.router.RouterContext;
 
 /**
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/SearchUpdateReplyFoundJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/SearchUpdateReplyFoundJob.java
index bfa2a718a..1f0aa4aa8 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/SearchUpdateReplyFoundJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/SearchUpdateReplyFoundJob.java
@@ -8,10 +8,9 @@ import net.i2p.data.i2np.DatabaseSearchReplyMessage;
 import net.i2p.data.i2np.DatabaseStoreMessage;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.JobImpl;
-import net.i2p.router.ProfileManager;
 import net.i2p.router.ReplyJob;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Called after a match to a db search is found
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StartExplorersJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/StartExplorersJob.java
index aae74dcb0..d15e504ee 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/StartExplorersJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/StartExplorersJob.java
@@ -14,9 +14,8 @@ import java.util.Set;
 
 import net.i2p.data.Hash;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Fire off search jobs for random keys from the explore pool, up to MAX_PER_RUN
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java
index d41b8e24d..5f040634f 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java
@@ -16,40 +16,22 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import net.i2p.crypto.SessionKeyManager;
-import net.i2p.data.Certificate;
 import net.i2p.data.DataStructure;
 import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
-import net.i2p.data.PublicKey;
 import net.i2p.data.RouterInfo;
-import net.i2p.data.RoutingKeyGenerator;
-import net.i2p.data.SessionKey;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.DatabaseStoreMessage;
-import net.i2p.data.i2np.DeliveryInstructions;
 import net.i2p.data.i2np.DeliveryStatusMessage;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
 import net.i2p.router.MessageSelector;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.router.ProfileManager;
-import net.i2p.router.ReplyJob;
-import net.i2p.router.Router;
-import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelManagerFacade;
-import net.i2p.router.TunnelSelectionCriteria;
-import net.i2p.router.message.GarlicConfig;
-import net.i2p.router.message.PayloadGarlicConfig;
-import net.i2p.router.message.SendGarlicJob;
-import net.i2p.router.message.SendTunnelMessageJob;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
-import net.i2p.stat.StatManager;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
+import net.i2p.router.TunnelSelectionCriteria;
+import net.i2p.router.message.SendTunnelMessageJob;
+import net.i2p.util.Log;
 
 class StoreJob extends JobImpl {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/TransientDataStore.java b/router/java/src/net/i2p/router/networkdb/kademlia/TransientDataStore.java
index af7250a26..c8081e94d 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/TransientDataStore.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/TransientDataStore.java
@@ -20,10 +20,8 @@ import net.i2p.data.DataStructure;
 import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.data.RouterInfo;
-import net.i2p.router.ProfileManager;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 class TransientDataStore implements DataStore {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/peermanager/DBHistory.java b/router/java/src/net/i2p/router/peermanager/DBHistory.java
index d3d1cbda5..3ff6d2525 100644
--- a/router/java/src/net/i2p/router/peermanager/DBHistory.java
+++ b/router/java/src/net/i2p/router/peermanager/DBHistory.java
@@ -4,8 +4,8 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Properties;
 
-import net.i2p.stat.RateStat;
 import net.i2p.router.RouterContext;
+import net.i2p.stat.RateStat;
 import net.i2p.util.Log;
 
 /**
diff --git a/router/java/src/net/i2p/router/peermanager/EvaluateProfilesJob.java b/router/java/src/net/i2p/router/peermanager/EvaluateProfilesJob.java
index c9df93012..b8af8ca68 100644
--- a/router/java/src/net/i2p/router/peermanager/EvaluateProfilesJob.java
+++ b/router/java/src/net/i2p/router/peermanager/EvaluateProfilesJob.java
@@ -6,9 +6,8 @@ import java.util.Set;
 
 import net.i2p.data.Hash;
 import net.i2p.router.JobImpl;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Run across all of the profiles, coallescing the stats and reorganizing them
diff --git a/router/java/src/net/i2p/router/peermanager/IntegrationCalculator.java b/router/java/src/net/i2p/router/peermanager/IntegrationCalculator.java
index 0c6f6b8bc..78708e1db 100644
--- a/router/java/src/net/i2p/router/peermanager/IntegrationCalculator.java
+++ b/router/java/src/net/i2p/router/peermanager/IntegrationCalculator.java
@@ -1,7 +1,7 @@
 package net.i2p.router.peermanager;
 
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Determine how well integrated the peer is - how likely they will be useful
diff --git a/router/java/src/net/i2p/router/peermanager/IsFailingCalculator.java b/router/java/src/net/i2p/router/peermanager/IsFailingCalculator.java
index 3a39f77b8..993b493d0 100644
--- a/router/java/src/net/i2p/router/peermanager/IsFailingCalculator.java
+++ b/router/java/src/net/i2p/router/peermanager/IsFailingCalculator.java
@@ -1,8 +1,7 @@
 package net.i2p.router.peermanager;
 
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Simple boolean calculation to determine whether the given profile is "failing" -
diff --git a/router/java/src/net/i2p/router/peermanager/PeerManager.java b/router/java/src/net/i2p/router/peermanager/PeerManager.java
index 09f70b393..7ad1807da 100644
--- a/router/java/src/net/i2p/router/peermanager/PeerManager.java
+++ b/router/java/src/net/i2p/router/peermanager/PeerManager.java
@@ -13,12 +13,9 @@ import java.util.Iterator;
 import java.util.Set;
 
 import net.i2p.data.Hash;
-import net.i2p.router.JobQueue;
-import net.i2p.router.NetworkDatabaseFacade;
 import net.i2p.router.PeerSelectionCriteria;
-import net.i2p.router.Router;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Manage the current state of the statistics
diff --git a/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java b/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java
index 800f9035a..db4b436e0 100644
--- a/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java
+++ b/router/java/src/net/i2p/router/peermanager/PeerManagerFacadeImpl.java
@@ -13,9 +13,8 @@ import java.util.List;
 
 import net.i2p.router.PeerManagerFacade;
 import net.i2p.router.PeerSelectionCriteria;
-import net.i2p.router.Router;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Base implementation that has simple algorithms and periodically saves state
diff --git a/router/java/src/net/i2p/router/peermanager/PeerProfile.java b/router/java/src/net/i2p/router/peermanager/PeerProfile.java
index 4e1a3b08b..19af251e9 100644
--- a/router/java/src/net/i2p/router/peermanager/PeerProfile.java
+++ b/router/java/src/net/i2p/router/peermanager/PeerProfile.java
@@ -1,10 +1,11 @@
 package net.i2p.router.peermanager;
 
+import java.io.File;
+
 import net.i2p.data.Hash;
+import net.i2p.router.RouterContext;
 import net.i2p.stat.RateStat;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
-import java.io.File;
 
 public class PeerProfile {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/peermanager/PersistProfilesJob.java b/router/java/src/net/i2p/router/peermanager/PersistProfilesJob.java
index f04d449e3..96ba5d7a7 100644
--- a/router/java/src/net/i2p/router/peermanager/PersistProfilesJob.java
+++ b/router/java/src/net/i2p/router/peermanager/PersistProfilesJob.java
@@ -5,8 +5,6 @@ import java.util.Set;
 
 import net.i2p.data.Hash;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.util.Clock;
 import net.i2p.router.RouterContext;
 
 class PersistProfilesJob extends JobImpl {
diff --git a/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java b/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java
index aaef0da7d..ca957f9c2 100644
--- a/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java
+++ b/router/java/src/net/i2p/router/peermanager/ProfileManagerImpl.java
@@ -18,9 +18,8 @@ import java.util.Set;
 
 import net.i2p.data.Hash;
 import net.i2p.router.ProfileManager;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 public class ProfileManagerImpl implements ProfileManager {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
index 5cdbb49d5..597926019 100644
--- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
+++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
@@ -20,9 +20,8 @@ import java.util.TreeSet;
 
 import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Keep the peer profiles organized according to the tiered model.  This does not
diff --git a/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java b/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java
index 43b42d8ad..d4ed3423a 100644
--- a/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java
+++ b/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java
@@ -16,10 +16,8 @@ import java.util.Set;
 
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Hash;
-import net.i2p.router.Router;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 class ProfilePersistenceHelper {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/peermanager/ReliabilityCalculator.java b/router/java/src/net/i2p/router/peermanager/ReliabilityCalculator.java
index a1ae58725..b65241570 100644
--- a/router/java/src/net/i2p/router/peermanager/ReliabilityCalculator.java
+++ b/router/java/src/net/i2p/router/peermanager/ReliabilityCalculator.java
@@ -1,8 +1,7 @@
 package net.i2p.router.peermanager;
 
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Determine how reliable the peer is - how likely they'll be able to respond or
diff --git a/router/java/src/net/i2p/router/peermanager/SpeedCalculator.java b/router/java/src/net/i2p/router/peermanager/SpeedCalculator.java
index 52015b444..084b7c4ae 100644
--- a/router/java/src/net/i2p/router/peermanager/SpeedCalculator.java
+++ b/router/java/src/net/i2p/router/peermanager/SpeedCalculator.java
@@ -1,9 +1,9 @@
 package net.i2p.router.peermanager;
 
+import net.i2p.router.RouterContext;
 import net.i2p.stat.Rate;
 import net.i2p.stat.RateStat;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Quantify how fast the peer is - how fast they respond to our requests, how fast
diff --git a/router/java/src/net/i2p/router/startup/BootCommSystemJob.java b/router/java/src/net/i2p/router/startup/BootCommSystemJob.java
index 69700549a..9de470668 100644
--- a/router/java/src/net/i2p/router/startup/BootCommSystemJob.java
+++ b/router/java/src/net/i2p/router/startup/BootCommSystemJob.java
@@ -8,15 +8,10 @@ package net.i2p.router.startup;
  *
  */
 
-import net.i2p.router.CommSystemFacade;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.PeerManagerFacade;
-import net.i2p.router.Router;
-import net.i2p.router.TunnelManagerFacade;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 public class BootCommSystemJob extends JobImpl {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/startup/BootNetworkDbJob.java b/router/java/src/net/i2p/router/startup/BootNetworkDbJob.java
index a15163235..7415b1c47 100644
--- a/router/java/src/net/i2p/router/startup/BootNetworkDbJob.java
+++ b/router/java/src/net/i2p/router/startup/BootNetworkDbJob.java
@@ -9,10 +9,8 @@ package net.i2p.router.startup;
  */
 
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 public class BootNetworkDbJob extends JobImpl {
     private static Log _log = new Log(BootNetworkDbJob.class);
diff --git a/router/java/src/net/i2p/router/startup/BuildTrustedLinksJob.java b/router/java/src/net/i2p/router/startup/BuildTrustedLinksJob.java
index 35298d69a..3b7285c8f 100644
--- a/router/java/src/net/i2p/router/startup/BuildTrustedLinksJob.java
+++ b/router/java/src/net/i2p/router/startup/BuildTrustedLinksJob.java
@@ -10,9 +10,8 @@ package net.i2p.router.startup;
 
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 public class BuildTrustedLinksJob extends JobImpl {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java b/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java
index 0c2821a53..02860f10f 100644
--- a/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java
+++ b/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java
@@ -12,7 +12,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.HashSet;
 
-import net.i2p.crypto.KeyGenerator;
 import net.i2p.data.Certificate;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.PrivateKey;
@@ -21,16 +20,11 @@ import net.i2p.data.RouterIdentity;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SigningPublicKey;
-import net.i2p.router.CommSystemFacade;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.KeyManager;
 import net.i2p.router.Router;
-import net.i2p.router.StatisticsManager;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 public class CreateRouterInfoJob extends JobImpl {
     private static Log _log = new Log(CreateRouterInfoJob.class);
diff --git a/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java b/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
index d48d89c15..37adbfd16 100644
--- a/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
+++ b/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
@@ -1,13 +1,13 @@
 package net.i2p.router.startup;
 
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
 import net.i2p.router.JobImpl;
 import net.i2p.router.RouterContext;
-
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.ArrayList;
+import net.i2p.util.I2PThread;
+import net.i2p.util.Log;
 
 /**
  * Run any client applications specified in the router.config.  If any clientApp
diff --git a/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java b/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java
index 2e3e78330..83a781164 100644
--- a/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java
+++ b/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java
@@ -19,12 +19,9 @@ import net.i2p.data.RouterInfo;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SigningPublicKey;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.KeyManager;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.Router;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 public class LoadRouterInfoJob extends JobImpl {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/startup/ReadConfigJob.java b/router/java/src/net/i2p/router/startup/ReadConfigJob.java
index b92cd67d6..860cf8440 100644
--- a/router/java/src/net/i2p/router/startup/ReadConfigJob.java
+++ b/router/java/src/net/i2p/router/startup/ReadConfigJob.java
@@ -15,11 +15,9 @@ import java.util.Iterator;
 import java.util.Properties;
 
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
 import net.i2p.router.Router;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Simply read the router config
diff --git a/router/java/src/net/i2p/router/startup/RebuildRouterInfoJob.java b/router/java/src/net/i2p/router/startup/RebuildRouterInfoJob.java
index c6fc935c3..04ed10b50 100644
--- a/router/java/src/net/i2p/router/startup/RebuildRouterInfoJob.java
+++ b/router/java/src/net/i2p/router/startup/RebuildRouterInfoJob.java
@@ -21,15 +21,10 @@ import net.i2p.data.RouterIdentity;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SigningPublicKey;
-import net.i2p.router.CommSystemFacade;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.KeyManager;
 import net.i2p.router.Router;
-import net.i2p.router.StatisticsManager;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * If the file router.info.rebuild exists, rebuild the router info and republish.
diff --git a/router/java/src/net/i2p/router/startup/StartAcceptingClientsJob.java b/router/java/src/net/i2p/router/startup/StartAcceptingClientsJob.java
index 2e9e86811..59ec1f3c2 100644
--- a/router/java/src/net/i2p/router/startup/StartAcceptingClientsJob.java
+++ b/router/java/src/net/i2p/router/startup/StartAcceptingClientsJob.java
@@ -8,18 +8,9 @@ package net.i2p.router.startup;
  *
  */
 
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import net.i2p.router.ClientManagerFacade;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.Router;
-import net.i2p.util.Clock;
-import net.i2p.util.I2PThread;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 public class StartAcceptingClientsJob extends JobImpl {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/startup/StartupJob.java b/router/java/src/net/i2p/router/startup/StartupJob.java
index 34b0cdc8c..9ac017d51 100644
--- a/router/java/src/net/i2p/router/startup/StartupJob.java
+++ b/router/java/src/net/i2p/router/startup/StartupJob.java
@@ -10,11 +10,8 @@ package net.i2p.router.startup;
 
 
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.StatisticsManager;
-import net.i2p.router.admin.AdminManager;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.router.admin.AdminManager;
 
 /**
  * The StartupJob should be run once on router startup to initialize the system
diff --git a/router/java/src/net/i2p/router/transport/BandwidthLimiter.java b/router/java/src/net/i2p/router/transport/BandwidthLimiter.java
index d7325ad39..fa068c4f4 100644
--- a/router/java/src/net/i2p/router/transport/BandwidthLimiter.java
+++ b/router/java/src/net/i2p/router/transport/BandwidthLimiter.java
@@ -9,8 +9,8 @@ package net.i2p.router.transport;
  */
 
 import net.i2p.data.RouterIdentity;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Coordinate the bandwidth limiting across all classes of peers.  Currently
diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
index b1c9dbd7c..a28ab89f1 100644
--- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
+++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
@@ -15,14 +15,11 @@ import java.util.Set;
 
 import net.i2p.data.RouterAddress;
 import net.i2p.router.CommSystemFacade;
-import net.i2p.router.JobQueue;
-import net.i2p.router.KeyManager;
 import net.i2p.router.OutNetMessage;
-import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
 import net.i2p.router.transport.phttp.PHTTPTransport;
 import net.i2p.router.transport.tcp.TCPTransport;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 public class CommSystemFacadeImpl extends CommSystemFacade {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/transport/GetBidsJob.java b/router/java/src/net/i2p/router/transport/GetBidsJob.java
index df543d4da..210954c12 100644
--- a/router/java/src/net/i2p/router/transport/GetBidsJob.java
+++ b/router/java/src/net/i2p/router/transport/GetBidsJob.java
@@ -12,14 +12,10 @@ import java.util.List;
 
 import net.i2p.data.Hash;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
 import net.i2p.router.MessageSelector;
 import net.i2p.router.OutNetMessage;
-import net.i2p.router.ProfileManager;
-import net.i2p.router.Router;
-import net.i2p.router.Shitlist;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Retrieve a set of bids for a particular outbound message, and if any are found
diff --git a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
index 1a0f9282a..8905f6b3c 100644
--- a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
+++ b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
@@ -19,13 +19,10 @@ import java.util.TreeMap;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.MessageSelector;
 import net.i2p.router.OutNetMessage;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 public class OutboundMessageRegistry {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java
index c5742ece7..d8257b0b3 100644
--- a/router/java/src/net/i2p/router/transport/TransportImpl.java
+++ b/router/java/src/net/i2p/router/transport/TransportImpl.java
@@ -21,16 +21,10 @@ import net.i2p.data.RouterIdentity;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.router.Job;
-import net.i2p.router.JobQueue;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.MessageSelector;
 import net.i2p.router.OutNetMessage;
-import net.i2p.router.OutNetMessagePool;
-import net.i2p.router.ProfileManager;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Defines a way to send a message to another peer and start listening for messages
diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java
index 7dedabb21..bab5f92a7 100644
--- a/router/java/src/net/i2p/router/transport/TransportManager.java
+++ b/router/java/src/net/i2p/router/transport/TransportManager.java
@@ -20,21 +20,16 @@ import net.i2p.data.Hash;
 import net.i2p.data.RouterAddress;
 import net.i2p.data.RouterIdentity;
 import net.i2p.data.RouterInfo;
-import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.i2np.DatabaseLookupMessage;
 import net.i2p.data.i2np.DatabaseSearchReplyMessage;
 import net.i2p.data.i2np.DatabaseStoreMessage;
 import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.router.CommSystemFacade;
 import net.i2p.router.InNetMessage;
-import net.i2p.router.InNetMessagePool;
 import net.i2p.router.OutNetMessage;
-import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
 import net.i2p.router.transport.phttp.PHTTPTransport;
 import net.i2p.router.transport.tcp.TCPTransport;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 public class TransportManager implements TransportEventListener {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/transport/TrivialBandwidthLimiter.java b/router/java/src/net/i2p/router/transport/TrivialBandwidthLimiter.java
index a30f7c4dd..df016e89d 100644
--- a/router/java/src/net/i2p/router/transport/TrivialBandwidthLimiter.java
+++ b/router/java/src/net/i2p/router/transport/TrivialBandwidthLimiter.java
@@ -10,11 +10,8 @@ package net.i2p.router.transport;
 
 import net.i2p.data.RouterIdentity;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.Router;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.util.Log;
 
 /**
  * Coordinate the bandwidth limiting across all classes of peers.  Currently
diff --git a/router/java/src/net/i2p/router/transport/VMCommSystem.java b/router/java/src/net/i2p/router/transport/VMCommSystem.java
index 9622247aa..0fa060fd4 100644
--- a/router/java/src/net/i2p/router/transport/VMCommSystem.java
+++ b/router/java/src/net/i2p/router/transport/VMCommSystem.java
@@ -1,22 +1,20 @@
 package net.i2p.router.transport;
 
+import java.io.ByteArrayInputStream;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 import net.i2p.data.Hash;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.I2NPMessageHandler;
-import net.i2p.router.RouterContext;
 import net.i2p.router.CommSystemFacade;
-import net.i2p.router.OutNetMessage;
 import net.i2p.router.InNetMessage;
-import net.i2p.router.InNetMessagePool;
 import net.i2p.router.JobImpl;
+import net.i2p.router.OutNetMessage;
+import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
 
-import java.io.ByteArrayInputStream;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Collections;
-
 /**
  * Hacked up in-VM comm system for talking between contexts.  It doesn't even
  * generate any routerAddresses, but instead tracks the peers through a singleton.
diff --git a/router/java/src/net/i2p/router/transport/phttp/PHTTPPoller.java b/router/java/src/net/i2p/router/transport/phttp/PHTTPPoller.java
index 8ef9dcf73..8118b86be 100644
--- a/router/java/src/net/i2p/router/transport/phttp/PHTTPPoller.java
+++ b/router/java/src/net/i2p/router/transport/phttp/PHTTPPoller.java
@@ -17,20 +17,15 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Date;
 
-import net.i2p.crypto.DSAEngine;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Signature;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.I2NPMessageException;
 import net.i2p.data.i2np.I2NPMessageHandler;
-import net.i2p.router.Router;
-import net.i2p.router.transport.BandwidthLimiter;
-import net.i2p.util.Clock;
+import net.i2p.router.RouterContext;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
-import net.i2p.router.RouterContext;
 
 class PHTTPPoller {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/transport/phttp/PHTTPSender.java b/router/java/src/net/i2p/router/transport/phttp/PHTTPSender.java
index b32626eba..eba8e160c 100644
--- a/router/java/src/net/i2p/router/transport/phttp/PHTTPSender.java
+++ b/router/java/src/net/i2p/router/transport/phttp/PHTTPSender.java
@@ -21,11 +21,9 @@ import java.util.Iterator;
 
 import net.i2p.data.RouterAddress;
 import net.i2p.router.OutNetMessage;
-import net.i2p.router.transport.BandwidthLimiter;
-import net.i2p.util.Clock;
+import net.i2p.router.RouterContext;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 class PHTTPSender {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/transport/phttp/PHTTPTransport.java b/router/java/src/net/i2p/router/transport/phttp/PHTTPTransport.java
index e09e298d5..33065f536 100644
--- a/router/java/src/net/i2p/router/transport/phttp/PHTTPTransport.java
+++ b/router/java/src/net/i2p/router/transport/phttp/PHTTPTransport.java
@@ -22,15 +22,11 @@ import net.i2p.data.RouterIdentity;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
 import net.i2p.router.OutNetMessage;
-import net.i2p.router.Router;
-import net.i2p.router.transport.BandwidthLimiter;
+import net.i2p.router.RouterContext;
 import net.i2p.router.transport.TransportBid;
 import net.i2p.router.transport.TransportImpl;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  *
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 c4fce3dfd..65305b82a 100644
--- a/router/java/src/net/i2p/router/transport/tcp/RestrictiveTCPConnection.java
+++ b/router/java/src/net/i2p/router/transport/tcp/RestrictiveTCPConnection.java
@@ -15,23 +15,17 @@ import java.math.BigInteger;
 import java.net.Socket;
 import java.util.Date;
 
-import net.i2p.crypto.AESEngine;
 import net.i2p.crypto.AESInputStream;
 import net.i2p.crypto.AESOutputStream;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.RouterIdentity;
-import net.i2p.data.SigningPrivateKey;
-import net.i2p.router.NetworkDatabaseFacade;
 import net.i2p.router.Router;
-import net.i2p.router.Shitlist;
+import net.i2p.router.RouterContext;
 import net.i2p.router.transport.BandwidthLimitedInputStream;
 import net.i2p.router.transport.BandwidthLimitedOutputStream;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * TCPConnection that validates the time and protocol version, dropping connection if
diff --git a/router/java/src/net/i2p/router/transport/tcp/TCPConnection.java b/router/java/src/net/i2p/router/transport/tcp/TCPConnection.java
index c522c3c84..7cf428bd7 100644
--- a/router/java/src/net/i2p/router/transport/tcp/TCPConnection.java
+++ b/router/java/src/net/i2p/router/transport/tcp/TCPConnection.java
@@ -20,12 +20,9 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import net.i2p.crypto.AESEngine;
 import net.i2p.crypto.AESInputStream;
 import net.i2p.crypto.AESOutputStream;
 import net.i2p.crypto.DHSessionKeyBuilder;
-import net.i2p.crypto.DSAEngine;
-import net.i2p.crypto.SHA256Generator;
 import net.i2p.data.ByteArray;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
@@ -33,18 +30,14 @@ import net.i2p.data.Hash;
 import net.i2p.data.RouterIdentity;
 import net.i2p.data.SessionKey;
 import net.i2p.data.Signature;
-import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.i2np.I2NPMessage;
 import net.i2p.data.i2np.I2NPMessageReader;
 import net.i2p.router.OutNetMessage;
-import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
 import net.i2p.router.transport.BandwidthLimitedInputStream;
 import net.i2p.router.transport.BandwidthLimitedOutputStream;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Wraps a connection - this contains a reader thread (via I2NPMessageReader) and
diff --git a/router/java/src/net/i2p/router/transport/tcp/TCPListener.java b/router/java/src/net/i2p/router/transport/tcp/TCPListener.java
index e7b40b1b5..0d5d349e9 100644
--- a/router/java/src/net/i2p/router/transport/tcp/TCPListener.java
+++ b/router/java/src/net/i2p/router/transport/tcp/TCPListener.java
@@ -15,9 +15,9 @@ import java.net.Socket;
 import java.net.SocketException;
 import java.net.UnknownHostException;
 
+import net.i2p.router.RouterContext;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Listen for TCP connections with a listener thread
diff --git a/router/java/src/net/i2p/router/transport/tcp/TCPTransport.java b/router/java/src/net/i2p/router/transport/tcp/TCPTransport.java
index e92a81236..5ccbecdda 100644
--- a/router/java/src/net/i2p/router/transport/tcp/TCPTransport.java
+++ b/router/java/src/net/i2p/router/transport/tcp/TCPTransport.java
@@ -27,19 +27,12 @@ import net.i2p.data.RouterIdentity;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.SigningPrivateKey;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.NetworkDatabaseFacade;
 import net.i2p.router.OutNetMessage;
-import net.i2p.router.ProfileManager;
-import net.i2p.router.Router;
-import net.i2p.router.Shitlist;
+import net.i2p.router.RouterContext;
 import net.i2p.router.transport.TransportBid;
 import net.i2p.router.transport.TransportImpl;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Defines a way to send a message to another peer and start listening for messages
diff --git a/router/java/src/net/i2p/router/tunnelmanager/ClientLeaseSetManagerJob.java b/router/java/src/net/i2p/router/tunnelmanager/ClientLeaseSetManagerJob.java
index 15bd8b81f..1905e29a9 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/ClientLeaseSetManagerJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/ClientLeaseSetManagerJob.java
@@ -10,13 +10,10 @@ import net.i2p.data.Lease;
 import net.i2p.data.LeaseSet;
 import net.i2p.data.RouterInfo;
 import net.i2p.data.TunnelId;
-import net.i2p.router.ClientManagerFacade;
 import net.i2p.router.JobImpl;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.router.TunnelInfo;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
+import net.i2p.util.Log;
 
 /**
  * Manage the process of requesting a lease set as necessary for a client based
diff --git a/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPool.java b/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPool.java
index ead99700d..358596ec7 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPool.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPool.java
@@ -9,13 +9,10 @@ import java.util.Set;
 import net.i2p.data.Destination;
 import net.i2p.data.TunnelId;
 import net.i2p.router.ClientTunnelSettings;
-import net.i2p.router.JobQueue;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.Router;
-import net.i2p.router.TunnelInfo;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
+import net.i2p.util.Log;
 
 class ClientTunnelPool {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolExpirationJob.java b/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolExpirationJob.java
index 01b8ed5bf..be70e1344 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolExpirationJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolExpirationJob.java
@@ -6,10 +6,9 @@ import java.util.Iterator;
 import net.i2p.data.TunnelId;
 import net.i2p.router.JobImpl;
 import net.i2p.router.Router;
-import net.i2p.router.TunnelInfo;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
+import net.i2p.util.Log;
 
 /**
  * Periodically go through all of the tunnels assigned to this client and mark 
diff --git a/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolManagerJob.java b/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolManagerJob.java
index 54a86f322..3bbe9cc9f 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolManagerJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/ClientTunnelPoolManagerJob.java
@@ -1,18 +1,15 @@
 package net.i2p.router.tunnelmanager;
 
-import java.util.Iterator;
-import java.util.TreeMap;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.TreeMap;
 
 import net.i2p.data.TunnelId;
-import net.i2p.router.ClientManagerFacade;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.TunnelInfo;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
+import net.i2p.util.Log;
 
 /**
  * refill the client tunnel pool as necessary, either from the TunnelPool's free
diff --git a/router/java/src/net/i2p/router/tunnelmanager/HandleTunnelCreateMessageJob.java b/router/java/src/net/i2p/router/tunnelmanager/HandleTunnelCreateMessageJob.java
index e5b767d7b..b199c0b31 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/HandleTunnelCreateMessageJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/HandleTunnelCreateMessageJob.java
@@ -18,18 +18,12 @@ import net.i2p.data.i2np.SourceRouteBlock;
 import net.i2p.data.i2np.TunnelCreateMessage;
 import net.i2p.data.i2np.TunnelCreateStatusMessage;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.MessageHistory;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelManagerFacade;
 import net.i2p.router.TunnelSettings;
 import net.i2p.router.message.BuildTestMessageJob;
 import net.i2p.router.message.SendReplyMessageJob;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 public class HandleTunnelCreateMessageJob extends JobImpl {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelManagerFacade.java b/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelManagerFacade.java
index feecdd73e..bb4d8646d 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelManagerFacade.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelManagerFacade.java
@@ -10,14 +10,11 @@ import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.TunnelCreateMessage;
 import net.i2p.router.ClientTunnelSettings;
-import net.i2p.router.InNetMessagePool;
+import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelInfo;
 import net.i2p.router.TunnelManagerFacade;
 import net.i2p.router.TunnelSelectionCriteria;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Main interface to the pool
diff --git a/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelSelector.java b/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelSelector.java
index 1434386df..3b8876c01 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelSelector.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/PoolingTunnelSelector.java
@@ -9,12 +9,10 @@ import java.util.List;
 import java.util.Set;
 
 import net.i2p.data.TunnelId;
+import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelInfo;
 import net.i2p.router.TunnelSelectionCriteria;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
-import net.i2p.router.RouterContext;
 
 /**
  * Implement the tunnel selection algorithms
diff --git a/router/java/src/net/i2p/router/tunnelmanager/RequestInboundTunnelJob.java b/router/java/src/net/i2p/router/tunnelmanager/RequestInboundTunnelJob.java
index 3f4c9c9c8..6ff8cd4bf 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/RequestInboundTunnelJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/RequestInboundTunnelJob.java
@@ -1,10 +1,9 @@
 package net.i2p.router.tunnelmanager;
 
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
+import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelInfo;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 class RequestInboundTunnelJob extends JobImpl {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/tunnelmanager/RequestOutboundTunnelJob.java b/router/java/src/net/i2p/router/tunnelmanager/RequestOutboundTunnelJob.java
index c1e05dff5..48359256f 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/RequestOutboundTunnelJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/RequestOutboundTunnelJob.java
@@ -1,9 +1,8 @@
 package net.i2p.router.tunnelmanager;
 
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.TunnelInfo;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
 
 class RequestOutboundTunnelJob extends JobImpl {
     private TunnelPool _pool;
diff --git a/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java b/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java
index 86d048a8f..75a07e5ad 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java
@@ -16,8 +16,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import net.i2p.crypto.KeyGenerator;
-import net.i2p.crypto.SessionKeyManager;
 import net.i2p.data.Certificate;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Hash;
@@ -35,27 +33,17 @@ import net.i2p.data.i2np.TunnelCreateMessage;
 import net.i2p.data.i2np.TunnelCreateStatusMessage;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.MessageSelector;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.router.PeerManagerFacade;
 import net.i2p.router.PeerSelectionCriteria;
-import net.i2p.router.ProfileManager;
 import net.i2p.router.ReplyJob;
-import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelManagerFacade;
 import net.i2p.router.TunnelSelectionCriteria;
 import net.i2p.router.message.GarlicConfig;
 import net.i2p.router.message.GarlicMessageBuilder;
 import net.i2p.router.message.PayloadGarlicConfig;
 import net.i2p.router.message.SendTunnelMessageJob;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
-import net.i2p.router.RouterContext;
 
 /**
  * Request the creation of a new tunnel
diff --git a/router/java/src/net/i2p/router/tunnelmanager/TestTunnelJob.java b/router/java/src/net/i2p/router/tunnelmanager/TestTunnelJob.java
index 6917c5484..9ecac821d 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TestTunnelJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TestTunnelJob.java
@@ -8,32 +8,21 @@ package net.i2p.router.tunnelmanager;
  *
  */
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 
-import net.i2p.data.DataFormatException;
 import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.data.i2np.DeliveryStatusMessage;
 import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.data.i2np.TunnelMessage;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.MessageHistory;
 import net.i2p.router.MessageSelector;
 import net.i2p.router.ReplyJob;
-import net.i2p.router.Router;
-import net.i2p.router.TunnelInfo;
-import net.i2p.router.TunnelManagerFacade;
-import net.i2p.router.TunnelSelectionCriteria;
-import net.i2p.router.message.SendMessageDirectJob;
-import net.i2p.router.message.SendTunnelMessageJob;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
+import net.i2p.router.TunnelSelectionCriteria;
+import net.i2p.router.message.SendTunnelMessageJob;
+import net.i2p.util.Log;
 
 class TestTunnelJob extends JobImpl {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/tunnelmanager/TunnelBuilder.java b/router/java/src/net/i2p/router/tunnelmanager/TunnelBuilder.java
index 80055448b..73793bc6c 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TunnelBuilder.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TunnelBuilder.java
@@ -14,7 +14,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import net.i2p.crypto.KeyGenerator;
 import net.i2p.data.Destination;
 import net.i2p.data.Hash;
 import net.i2p.data.SessionKey;
@@ -22,16 +21,11 @@ import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SigningPublicKey;
 import net.i2p.data.TunnelId;
 import net.i2p.router.ClientTunnelSettings;
-import net.i2p.router.NetworkDatabaseFacade;
-import net.i2p.router.PeerManagerFacade;
 import net.i2p.router.PeerSelectionCriteria;
-import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelInfo;
 import net.i2p.router.TunnelSettings;
-import net.i2p.util.Clock;
 import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
-import net.i2p.router.RouterContext;
 
 class TunnelBuilder {
     private Log _log;
diff --git a/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java b/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java
index 819e8c280..d8d9fa7cb 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java
@@ -12,15 +12,9 @@ import net.i2p.data.Hash;
 import net.i2p.data.TunnelId;
 import net.i2p.router.ClientTunnelSettings;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.MessageHistory;
-import net.i2p.router.ProfileManager;
-import net.i2p.router.Router;
-import net.i2p.router.TunnelInfo;
-import net.i2p.stat.StatManager;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
+import net.i2p.util.Log;
 
 /**
  * Store the data for free inbound, outbound, and client pooled tunnels, and serve
diff --git a/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolExpirationJob.java b/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolExpirationJob.java
index beed09a1f..3a8712e41 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolExpirationJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolExpirationJob.java
@@ -6,10 +6,9 @@ import java.util.Iterator;
 import net.i2p.data.TunnelId;
 import net.i2p.router.JobImpl;
 import net.i2p.router.Router;
-import net.i2p.router.TunnelInfo;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
+import net.i2p.util.Log;
 
 /**
  * Periodically go through all of the tunnels not assigned to a client and mark
diff --git a/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolManagerJob.java b/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolManagerJob.java
index 7b4fe0fb9..89692c472 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolManagerJob.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolManagerJob.java
@@ -5,11 +5,9 @@ import java.util.Set;
 
 import net.i2p.data.TunnelId;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.TunnelInfo;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
+import net.i2p.util.Log;
 
 /**
  * Request new tunnels to be created if insufficient free inbound tunnels or
diff --git a/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolPersistenceHelper.java b/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolPersistenceHelper.java
index 2a5925bcf..f11222a38 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolPersistenceHelper.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TunnelPoolPersistenceHelper.java
@@ -13,10 +13,9 @@ import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 import net.i2p.data.TunnelId;
 import net.i2p.router.ClientTunnelSettings;
-import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelInfo;
 import net.i2p.util.Log;
-import net.i2p.router.RouterContext;
 
 /**
  * Handle all of the load / store of the tunnel pool (including any contained 
diff --git a/router/java/src/net/i2p/router/tunnelmanager/TunnelTestManager.java b/router/java/src/net/i2p/router/tunnelmanager/TunnelTestManager.java
index 8ba2865f0..bd4df87f4 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TunnelTestManager.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TunnelTestManager.java
@@ -15,12 +15,9 @@ import java.util.Set;
 
 import net.i2p.data.TunnelId;
 import net.i2p.router.JobImpl;
-import net.i2p.router.JobQueue;
-import net.i2p.router.TunnelInfo;
-import net.i2p.util.Clock;
-import net.i2p.util.Log;
-import net.i2p.util.RandomSource;
 import net.i2p.router.RouterContext;
+import net.i2p.router.TunnelInfo;
+import net.i2p.util.Log;
 
 /**
  * Manage the testing for free, outbound, and active inbound client tunnels