diff --git a/java/src/org/apache/xml/resolver/Catalog.java b/java/src/org/apache/xml/resolver/Catalog.java
index c485f14..3565e30 100644
--- a/java/src/org/apache/xml/resolver/Catalog.java
+++ b/java/src/org/apache/xml/resolver/Catalog.java
@@ -59,12 +59,10 @@
 
 package org.apache.xml.resolver;
 
-import java.lang.Integer;
 import java.io.IOException;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
-import java.io.File;
 import java.io.DataInputStream;
 import java.util.Enumeration;
 import java.util.Hashtable;
diff --git a/java/src/org/apache/xml/resolver/CatalogManager.java b/java/src/org/apache/xml/resolver/CatalogManager.java
index 66972d8..511b124 100644
--- a/java/src/org/apache/xml/resolver/CatalogManager.java
+++ b/java/src/org/apache/xml/resolver/CatalogManager.java
@@ -59,11 +59,6 @@
 
 package org.apache.xml.resolver;
 
-import java.lang.ClassNotFoundException;
-import java.lang.IllegalAccessException;
-import java.lang.InstantiationException;
-import java.lang.SecurityException;
-import java.lang.ClassCastException;
 import java.net.URL;
 import java.net.MalformedURLException;
 
diff --git a/java/src/org/apache/xml/resolver/Resolver.java b/java/src/org/apache/xml/resolver/Resolver.java
index 305d8f3..7fc9ed9 100644
--- a/java/src/org/apache/xml/resolver/Resolver.java
+++ b/java/src/org/apache/xml/resolver/Resolver.java
@@ -59,32 +59,17 @@
 
 package org.apache.xml.resolver;
 
-import java.lang.Integer;
 import java.io.IOException;
-import java.io.File;
 import java.io.InputStream;
-import java.io.DataInputStream;
-import java.io.PrintWriter;
-import java.io.FileWriter;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
 import java.io.FileNotFoundException;
 import java.util.Enumeration;
-import java.util.Hashtable;
 import java.util.Vector;
 import java.net.URL;
 import java.net.URLConnection;
-import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
-import org.apache.xml.resolver.readers.CatalogReader;
 import org.apache.xml.resolver.readers.SAXCatalogReader;
 import org.apache.xml.resolver.readers.OASISXMLCatalogReader;
-import org.apache.xml.resolver.readers.ExtendedXMLCatalogReader;
 import org.apache.xml.resolver.readers.TR9401CatalogReader;
-import org.apache.xml.resolver.readers.TextCatalogReader;
-import org.apache.xml.resolver.helpers.Debug;
-import org.xml.sax.SAXException;
-import org.xml.sax.EntityResolver;
 import javax.xml.parsers.SAXParserFactory;
 
 /**
diff --git a/java/src/org/apache/xml/resolver/apps/XParseError.java b/java/src/org/apache/xml/resolver/apps/XParseError.java
index 7a18839..880c590 100644
--- a/java/src/org/apache/xml/resolver/apps/XParseError.java
+++ b/java/src/org/apache/xml/resolver/apps/XParseError.java
@@ -59,7 +59,6 @@
 
 package org.apache.xml.resolver.apps;
 
-import java.io.IOException;
 import java.net.URL;
 import java.net.MalformedURLException;
 
diff --git a/java/src/org/apache/xml/resolver/apps/resolver.java b/java/src/org/apache/xml/resolver/apps/resolver.java
index 5be7526..e2f7efc 100644
--- a/java/src/org/apache/xml/resolver/apps/resolver.java
+++ b/java/src/org/apache/xml/resolver/apps/resolver.java
@@ -64,15 +64,12 @@ import java.io.IOException;
 import java.net.URL;
 import java.net.MalformedURLException;
 import java.util.Vector;
-import java.util.Date;
-import java.util.GregorianCalendar;
 
 import org.xml.sax.*;
 import org.xml.sax.helpers.*;
 
 import javax.xml.parsers.*;
 import javax.xml.transform.*;
-import javax.xml.transform.sax.SAXSource;
 
 import org.apache.xml.resolver.Catalog;
 import org.apache.xml.resolver.CatalogManager;
diff --git a/java/src/org/apache/xml/resolver/apps/xparse.java b/java/src/org/apache/xml/resolver/apps/xparse.java
index 16afcd7..a3d68bd 100644
--- a/java/src/org/apache/xml/resolver/apps/xparse.java
+++ b/java/src/org/apache/xml/resolver/apps/xparse.java
@@ -63,7 +63,6 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Vector;
 import java.util.Date;
-import java.util.GregorianCalendar;
 
 import org.xml.sax.*;
 import org.xml.sax.helpers.*;
diff --git a/java/src/org/apache/xml/resolver/apps/xread.java b/java/src/org/apache/xml/resolver/apps/xread.java
index 42b4326..8c8cf89 100644
--- a/java/src/org/apache/xml/resolver/apps/xread.java
+++ b/java/src/org/apache/xml/resolver/apps/xread.java
@@ -63,7 +63,6 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Vector;
 import java.util.Date;
-import java.util.GregorianCalendar;
 
 import org.xml.sax.*;
 import org.xml.sax.helpers.*;
diff --git a/java/src/org/apache/xml/resolver/readers/DOMCatalogReader.java b/java/src/org/apache/xml/resolver/readers/DOMCatalogReader.java
index 6e05cd8..955c0fd 100644
--- a/java/src/org/apache/xml/resolver/readers/DOMCatalogReader.java
+++ b/java/src/org/apache/xml/resolver/readers/DOMCatalogReader.java
@@ -59,10 +59,7 @@
 
 package org.apache.xml.resolver.readers;
 
-import java.lang.Integer;
-import java.util.Vector;
 import java.util.Hashtable;
-import java.util.Enumeration;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -74,11 +71,8 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.xml.resolver.Catalog;
-import org.apache.xml.resolver.CatalogEntry;
 import org.apache.xml.resolver.CatalogException;
 import org.apache.xml.resolver.readers.CatalogReader;
-import org.apache.xml.resolver.helpers.Debug;
-import org.apache.xml.resolver.helpers.PublicId;
 import org.apache.xml.resolver.helpers.Namespaces;
 
 import org.xml.sax.SAXException;
diff --git a/java/src/org/apache/xml/resolver/readers/ExtendedXMLCatalogReader.java b/java/src/org/apache/xml/resolver/readers/ExtendedXMLCatalogReader.java
index 28c66f3..adb4ff4 100644
--- a/java/src/org/apache/xml/resolver/readers/ExtendedXMLCatalogReader.java
+++ b/java/src/org/apache/xml/resolver/readers/ExtendedXMLCatalogReader.java
@@ -59,22 +59,11 @@
 
 package org.apache.xml.resolver.readers;
 
-import java.lang.Integer;
-import java.util.Stack;
 import java.util.Vector;
-import java.util.Enumeration;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.MalformedURLException;
 import org.apache.xml.resolver.Catalog;
 import org.apache.xml.resolver.Resolver;
 import org.apache.xml.resolver.CatalogEntry;
 import org.apache.xml.resolver.CatalogException;
-import org.apache.xml.resolver.readers.CatalogReader;
-import org.apache.xml.resolver.helpers.PublicId;
-import org.apache.xml.resolver.helpers.Debug;
 
 import org.xml.sax.*;
 import org.w3c.dom.*;
diff --git a/java/src/org/apache/xml/resolver/readers/OASISXMLCatalogReader.java b/java/src/org/apache/xml/resolver/readers/OASISXMLCatalogReader.java
index 88c3433..1a4d929 100644
--- a/java/src/org/apache/xml/resolver/readers/OASISXMLCatalogReader.java
+++ b/java/src/org/apache/xml/resolver/readers/OASISXMLCatalogReader.java
@@ -59,21 +59,13 @@
 
 package org.apache.xml.resolver.readers;
 
-import java.lang.Integer;
 import java.util.Stack;
 import java.util.Vector;
 import java.util.Enumeration;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.MalformedURLException;
 import org.apache.xml.resolver.Catalog;
 import org.apache.xml.resolver.CatalogEntry;
 import org.apache.xml.resolver.CatalogException;
-import org.apache.xml.resolver.readers.CatalogReader;
 import org.apache.xml.resolver.helpers.PublicId;
-import org.apache.xml.resolver.helpers.Debug;
 
 import org.xml.sax.*;
 import org.w3c.dom.*;
diff --git a/java/src/org/apache/xml/resolver/readers/SAXCatalogReader.java b/java/src/org/apache/xml/resolver/readers/SAXCatalogReader.java
index 3985040..e638fe9 100644
--- a/java/src/org/apache/xml/resolver/readers/SAXCatalogReader.java
+++ b/java/src/org/apache/xml/resolver/readers/SAXCatalogReader.java
@@ -59,10 +59,7 @@
 
 package org.apache.xml.resolver.readers;
 
-import java.lang.Integer;
-import java.util.Vector;
 import java.util.Hashtable;
-import java.util.Enumeration;
 import java.io.IOException;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
@@ -72,12 +69,9 @@ import java.net.MalformedURLException;
 import java.net.UnknownHostException;
 import org.apache.xml.resolver.Catalog;
 import org.apache.xml.resolver.CatalogManager;
-import org.apache.xml.resolver.CatalogEntry;
 import org.apache.xml.resolver.CatalogException;
 import org.apache.xml.resolver.readers.CatalogReader;
 import org.apache.xml.resolver.helpers.Debug;
-import org.apache.xml.resolver.helpers.PublicId;
-import org.apache.xml.resolver.helpers.Namespaces;
 
 import org.xml.sax.*;
 
diff --git a/java/src/org/apache/xml/resolver/readers/TR9401CatalogReader.java b/java/src/org/apache/xml/resolver/readers/TR9401CatalogReader.java
index 6651b7e..1497771 100644
--- a/java/src/org/apache/xml/resolver/readers/TR9401CatalogReader.java
+++ b/java/src/org/apache/xml/resolver/readers/TR9401CatalogReader.java
@@ -59,22 +59,13 @@
 
 package org.apache.xml.resolver.readers;
 
-import java.lang.Integer;
-import java.io.DataInputStream;
 import java.io.InputStream;
 import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.net.URL;
-import java.net.URLConnection;
 import java.net.MalformedURLException;
 import java.util.Vector;
-import java.util.Stack;
 import org.apache.xml.resolver.Catalog;
 import org.apache.xml.resolver.CatalogEntry;
 import org.apache.xml.resolver.CatalogException;
-import org.apache.xml.resolver.readers.CatalogReader;
-import org.apache.xml.resolver.helpers.Debug;
-import org.apache.xml.resolver.helpers.PublicId;
 
 /**
  * <p>Parses OASIS Open Catalog files.</p>
diff --git a/java/src/org/apache/xml/resolver/readers/TextCatalogReader.java b/java/src/org/apache/xml/resolver/readers/TextCatalogReader.java
index 51deb1d..ad75d3a 100644
--- a/java/src/org/apache/xml/resolver/readers/TextCatalogReader.java
+++ b/java/src/org/apache/xml/resolver/readers/TextCatalogReader.java
@@ -59,8 +59,6 @@
 
 package org.apache.xml.resolver.readers;
 
-import java.lang.Integer;
-import java.io.DataInputStream;
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.FileNotFoundException;
@@ -73,8 +71,6 @@ import org.apache.xml.resolver.Catalog;
 import org.apache.xml.resolver.CatalogEntry;
 import org.apache.xml.resolver.CatalogException;
 import org.apache.xml.resolver.readers.CatalogReader;
-import org.apache.xml.resolver.helpers.Debug;
-import org.apache.xml.resolver.helpers.PublicId;
 
 /**
  * <p>Parses plain text Catalog files.</p>
diff --git a/java/src/org/apache/xml/resolver/readers/XCatalogReader.java b/java/src/org/apache/xml/resolver/readers/XCatalogReader.java
index 43e3c23..5b038d3 100644
--- a/java/src/org/apache/xml/resolver/readers/XCatalogReader.java
+++ b/java/src/org/apache/xml/resolver/readers/XCatalogReader.java
@@ -59,20 +59,11 @@
 
 package org.apache.xml.resolver.readers;
 
-import java.lang.Integer;
 import java.util.Vector;
-import java.util.Enumeration;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.MalformedURLException;
 import org.apache.xml.resolver.Catalog;
 import org.apache.xml.resolver.CatalogEntry;
 import org.apache.xml.resolver.CatalogException;
-import org.apache.xml.resolver.readers.CatalogReader;
 import org.apache.xml.resolver.helpers.PublicId;
-import org.apache.xml.resolver.helpers.Debug;
 
 import org.xml.sax.*;
 
diff --git a/java/src/org/apache/xml/resolver/tools/CatalogResolver.java b/java/src/org/apache/xml/resolver/tools/CatalogResolver.java
index 71adc26..e2c5ef8 100644
--- a/java/src/org/apache/xml/resolver/tools/CatalogResolver.java
+++ b/java/src/org/apache/xml/resolver/tools/CatalogResolver.java
@@ -59,8 +59,6 @@
 
 package org.apache.xml.resolver.tools;
 
-import java.lang.ClassNotFoundException;
-import java.lang.ClassCastException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -75,7 +73,6 @@ import javax.xml.transform.sax.SAXSource;
 
 import org.apache.xml.resolver.Catalog;
 import org.apache.xml.resolver.CatalogManager;
-import org.apache.xml.resolver.helpers.Debug;
 
 /**
  * <p>A SAX EntityResolver/JAXP URIResolver that uses catalogs.</p>
diff --git a/java/src/org/apache/xml/resolver/tools/ResolvingParser.java b/java/src/org/apache/xml/resolver/tools/ResolvingParser.java
index 1b760e8..b41271c 100644
--- a/java/src/org/apache/xml/resolver/tools/ResolvingParser.java
+++ b/java/src/org/apache/xml/resolver/tools/ResolvingParser.java
@@ -71,7 +71,6 @@ import javax.xml.parsers.*;
 
 import org.apache.xml.resolver.Catalog;
 import org.apache.xml.resolver.CatalogManager;
-import org.apache.xml.resolver.helpers.Debug;
 
 /**
  * <p>A SAX Parser that performs catalog-based entity resolution.</p>
diff --git a/java/src/org/apache/xml/resolver/tools/ResolvingXMLFilter.java b/java/src/org/apache/xml/resolver/tools/ResolvingXMLFilter.java
index 3fbad1e..4865ab0 100644
--- a/java/src/org/apache/xml/resolver/tools/ResolvingXMLFilter.java
+++ b/java/src/org/apache/xml/resolver/tools/ResolvingXMLFilter.java
@@ -71,7 +71,6 @@ import javax.xml.parsers.*;
 
 import org.apache.xml.resolver.Catalog;
 import org.apache.xml.resolver.CatalogManager;
-import org.apache.xml.resolver.helpers.Debug;
 
 /**
  * <p>A SAX XMLFilter that performs catalog-based entity resolution.</p>
diff --git a/java/src/org/apache/xml/resolver/tools/ResolvingXMLReader.java b/java/src/org/apache/xml/resolver/tools/ResolvingXMLReader.java
index b87bfd3..474cfec 100644
--- a/java/src/org/apache/xml/resolver/tools/ResolvingXMLReader.java
+++ b/java/src/org/apache/xml/resolver/tools/ResolvingXMLReader.java
@@ -59,11 +59,7 @@
 
 package org.apache.xml.resolver.tools;
 
-import java.io.IOException;
-import java.net.URL;
-
 import org.xml.sax.*;
-import org.xml.sax.helpers.XMLFilterImpl;
 
 import javax.xml.parsers.*;