diff --git a/src/helma/objectmodel/db/DbKey.java b/src/helma/objectmodel/db/DbKey.java
index b8d7ddd1..b644b077 100644
--- a/src/helma/objectmodel/db/DbKey.java
+++ b/src/helma/objectmodel/db/DbKey.java
@@ -16,10 +16,10 @@
 
 package helma.objectmodel.db;
 
-import java.io.Serializable;
+import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.IOException;
+import java.io.Serializable;
 
 
 /**
diff --git a/src/helma/objectmodel/db/DbSource.java b/src/helma/objectmodel/db/DbSource.java
index b5a2a627..4c92948f 100644
--- a/src/helma/objectmodel/db/DbSource.java
+++ b/src/helma/objectmodel/db/DbSource.java
@@ -17,8 +17,10 @@
 package helma.objectmodel.db;
 
 import helma.util.SystemProperties;
-import java.sql.*;
-import java.util.Hashtable;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
 
 /**
  *  This class describes a releational data source (URL, driver, user and password).
diff --git a/src/helma/objectmodel/db/ExternalizableVector.java b/src/helma/objectmodel/db/ExternalizableVector.java
index 04e1bbe9..80025f29 100644
--- a/src/helma/objectmodel/db/ExternalizableVector.java
+++ b/src/helma/objectmodel/db/ExternalizableVector.java
@@ -16,7 +16,10 @@
 
 package helma.objectmodel.db;
 
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 import java.util.ArrayList;
 
 /**
diff --git a/src/helma/objectmodel/db/IReplicationListener.java b/src/helma/objectmodel/db/IReplicationListener.java
index 55e0ee58..6bf3e191 100644
--- a/src/helma/objectmodel/db/IReplicationListener.java
+++ b/src/helma/objectmodel/db/IReplicationListener.java
@@ -16,7 +16,8 @@
 
 package helma.objectmodel.db;
 
-import java.rmi.*;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 import java.util.Vector;
 
 /**
diff --git a/src/helma/objectmodel/db/MultiKey.java b/src/helma/objectmodel/db/MultiKey.java
index aece2c58..1a20f6dc 100644
--- a/src/helma/objectmodel/db/MultiKey.java
+++ b/src/helma/objectmodel/db/MultiKey.java
@@ -16,10 +16,10 @@
 
 package helma.objectmodel.db;
 
-import java.io.Serializable;
+import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.IOException;
+import java.io.Serializable;
 import java.util.Map;
 
 /**
diff --git a/src/helma/objectmodel/db/NodeHandle.java b/src/helma/objectmodel/db/NodeHandle.java
index 35610fa2..4883c59b 100644
--- a/src/helma/objectmodel/db/NodeHandle.java
+++ b/src/helma/objectmodel/db/NodeHandle.java
@@ -16,7 +16,8 @@
 
 package helma.objectmodel.db;
 
-import helma.objectmodel.*;
+import helma.objectmodel.INodeState;
+
 import java.io.Serializable;
 
 /**
diff --git a/src/helma/objectmodel/db/Property.java b/src/helma/objectmodel/db/Property.java
index 8e949122..e768b41b 100644
--- a/src/helma/objectmodel/db/Property.java
+++ b/src/helma/objectmodel/db/Property.java
@@ -16,12 +16,16 @@
 
 package helma.objectmodel.db;
 
-import helma.objectmodel.*;
-import helma.util.*;
-import java.io.*;
+import helma.objectmodel.INode;
+import helma.objectmodel.IProperty;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 import java.sql.Timestamp;
-import java.text.*;
-import java.util.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 /**
  * A property implementation for Nodes stored inside a database. Basically
@@ -104,7 +108,7 @@ public final class Property implements IProperty, Serializable, Cloneable {
                     break;
 
                 case NODE:
-                    value = (NodeHandle) in.readObject();
+                    value = in.readObject();
 
                     break;
 
@@ -381,8 +385,8 @@ public final class Property implements IProperty, Serializable, Cloneable {
         nvalue.checkWriteLock();
 
         // check if the property node is also a subnode
-        // BUG: this doesn't work because properties for subnode/properties are never stored and therefore
-        // never reused.
+        // BUG: this doesn't work because properties for subnode/properties are never stored 
+        // and therefore never reused.
         if ((nvrel != null) && nvrel.hasAccessName()) {
             node.removeNode(nvalue);
         }
diff --git a/src/helma/objectmodel/db/Replicator.java b/src/helma/objectmodel/db/Replicator.java
index a4286ed2..6d851082 100644
--- a/src/helma/objectmodel/db/Replicator.java
+++ b/src/helma/objectmodel/db/Replicator.java
@@ -16,8 +16,8 @@
 
 package helma.objectmodel.db;
 
-import java.rmi.*;
-import java.util.*;
+import java.rmi.Naming;
+import java.util.Vector;
 
 /**
  * This class replicates the updates of transactions to other applications via RMI
diff --git a/src/helma/objectmodel/db/Transactor.java b/src/helma/objectmodel/db/Transactor.java
index 4767f90d..f0789944 100644
--- a/src/helma/objectmodel/db/Transactor.java
+++ b/src/helma/objectmodel/db/Transactor.java
@@ -16,11 +16,13 @@
 
 package helma.objectmodel.db;
 
-import helma.framework.TimeoutException;
-import helma.objectmodel.*;
-import java.io.*;
-import java.sql.*;
-import java.util.*;
+import helma.objectmodel.DatabaseException;
+import helma.objectmodel.ITransaction;
+
+import java.sql.Connection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
 
 /**
  * A subclass of thread that keeps track of changed nodes and triggers
@@ -147,7 +149,6 @@ public class Transactor extends Thread {
     /**
      *
      *
-     * @param key ...
      * @param node ...
      */
     public void visitParentNode(Node node) {
@@ -188,10 +189,9 @@ public class Transactor extends Thread {
     /**
      *
      *
-     * @param tnm ...
+     * @param name ...
      *
      * @throws Exception ...
-     * @throws DatabaseException ...
      */
     public synchronized void begin(String name) throws Exception {
         if (killed) {
diff --git a/src/helma/objectmodel/db/WrappedNodeManager.java b/src/helma/objectmodel/db/WrappedNodeManager.java
index 4c57eb6a..53bd573c 100644
--- a/src/helma/objectmodel/db/WrappedNodeManager.java
+++ b/src/helma/objectmodel/db/WrappedNodeManager.java
@@ -16,7 +16,8 @@
 
 package helma.objectmodel.db;
 
-import helma.objectmodel.*;
+import helma.objectmodel.ObjectNotFoundException;
+
 import java.util.List;
 import java.util.Vector;
 
diff --git a/src/helma/objectmodel/db/XmlDatabase.java b/src/helma/objectmodel/db/XmlDatabase.java
index c4a6ddc5..c7297cb7 100644
--- a/src/helma/objectmodel/db/XmlDatabase.java
+++ b/src/helma/objectmodel/db/XmlDatabase.java
@@ -17,11 +17,15 @@
 package helma.objectmodel.db;
 
 import helma.objectmodel.*;
-import helma.objectmodel.dom.*;
-import java.io.*;
-import javax.xml.parsers.ParserConfigurationException;
+import helma.objectmodel.dom.IDGenParser;
+import helma.objectmodel.dom.XmlDatabaseReader;
+import helma.objectmodel.dom.XmlWriter;
 import org.xml.sax.SAXException;
 
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.File;
+import java.io.IOException;
+
 /**
  * A simple XML-database
  */