diff --git a/src/helma/objectmodel/dom/IDGenParser.java b/src/helma/objectmodel/dom/IDGenParser.java
index f6cfd3f8..72cbf586 100644
--- a/src/helma/objectmodel/dom/IDGenParser.java
+++ b/src/helma/objectmodel/dom/IDGenParser.java
@@ -18,7 +18,9 @@ package helma.objectmodel.dom;
 
 import helma.objectmodel.ObjectNotFoundException;
 import helma.objectmodel.db.IDGenerator;
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
 import java.io.*;
 import java.util.Date;
 
diff --git a/src/helma/objectmodel/dom/XmlConverter.java b/src/helma/objectmodel/dom/XmlConverter.java
index 95e1bed6..aa8a2c5c 100644
--- a/src/helma/objectmodel/dom/XmlConverter.java
+++ b/src/helma/objectmodel/dom/XmlConverter.java
@@ -16,14 +16,18 @@
 
 package helma.objectmodel.dom;
 
-import helma.objectmodel.*;
+import helma.objectmodel.INode;
+import helma.objectmodel.TransientNode;
 import helma.util.SystemProperties;
 import org.w3c.dom.*;
 import org.xml.sax.InputSource;
+
 import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.xml.parsers.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
 
 /**
  * 
diff --git a/src/helma/objectmodel/dom/XmlDatabaseReader.java b/src/helma/objectmodel/dom/XmlDatabaseReader.java
index 650b9a9f..43bb0b40 100644
--- a/src/helma/objectmodel/dom/XmlDatabaseReader.java
+++ b/src/helma/objectmodel/dom/XmlDatabaseReader.java
@@ -16,27 +16,21 @@
 
 package helma.objectmodel.dom;
 
-import helma.objectmodel.INode;
-import helma.objectmodel.db.DbKey;
-import helma.objectmodel.db.DbMapping;
-import helma.objectmodel.db.ExternalizableVector;
-import helma.objectmodel.db.Node;
-import helma.objectmodel.db.NodeHandle;
-import helma.objectmodel.db.NodeManager;
-import helma.objectmodel.db.Property;
-import org.xml.sax.*;
+import helma.objectmodel.db.*;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-
-// import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
-import javax.xml.parsers.*;
 
 /**
  * 
diff --git a/src/helma/objectmodel/dom/XmlReader.java b/src/helma/objectmodel/dom/XmlReader.java
index 10ffbb73..c6e2cffe 100644
--- a/src/helma/objectmodel/dom/XmlReader.java
+++ b/src/helma/objectmodel/dom/XmlReader.java
@@ -17,20 +17,20 @@
 package helma.objectmodel.dom;
 
 import helma.objectmodel.INode;
-import org.xml.sax.*;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import java.io.*;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Stack;
-import javax.xml.parsers.*;
 
 /**
  * 
diff --git a/src/helma/objectmodel/dom/XmlUtil.java b/src/helma/objectmodel/dom/XmlUtil.java
index 78c50b39..2ca7ed6d 100644
--- a/src/helma/objectmodel/dom/XmlUtil.java
+++ b/src/helma/objectmodel/dom/XmlUtil.java
@@ -16,20 +16,19 @@
 
 package helma.objectmodel.dom;
 
-import helma.objectmodel.INode;
-import helma.objectmodel.TransientNode;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.WeakHashMap;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.WeakHashMap;
 
 /**
  * 
diff --git a/src/helma/objectmodel/dom/XmlWriter.java b/src/helma/objectmodel/dom/XmlWriter.java
index 2c796f7e..82156e5b 100644
--- a/src/helma/objectmodel/dom/XmlWriter.java
+++ b/src/helma/objectmodel/dom/XmlWriter.java
@@ -17,23 +17,15 @@
 package helma.objectmodel.dom;
 
 
-// import java.util.Set;
-import helma.objectmodel.*;
 import helma.objectmodel.INode;
 import helma.objectmodel.IProperty;
 import helma.objectmodel.TransientNode;
 import helma.objectmodel.db.DbMapping;
 import helma.objectmodel.db.Node;
 import helma.util.HtmlEncoder;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
+
+import java.io.*;
 import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Vector;