diff --git a/src/helma/framework/core/Application.java b/src/helma/framework/core/Application.java
index 73820313..0f019ccb 100644
--- a/src/helma/framework/core/Application.java
+++ b/src/helma/framework/core/Application.java
@@ -3,7 +3,6 @@
 
 package helma.framework.core;
 
-import java.util.*;
 import java.io.*;
 import java.lang.reflect.*;
 import java.rmi.*;
@@ -17,7 +16,12 @@ import helma.util.*;
 import FESI.Data.*;
 import FESI.Interpreter.*;
 import com.sleepycat.db.DbException;
-
+import java.util.Hashtable;
+import java.util.Vector;
+import java.util.Enumeration;
+import java.util.Stack;
+import java.util.EmptyStackException;
+import java.util.StringTokenizer;
 
 /**
  * The central class of a HOP application. This class keeps a pool of so-called
diff --git a/src/helma/framework/core/ESRequestData.java b/src/helma/framework/core/ESRequestData.java
index eec2048a..2bf2d58b 100644
--- a/src/helma/framework/core/ESRequestData.java
+++ b/src/helma/framework/core/ESRequestData.java
@@ -7,7 +7,8 @@ package helma.framework.core;
 import FESI.Data.*;
 import FESI.Exceptions.*;
 import FESI.Interpreter.Evaluator;
-import java.util.*;
+import java.util.Hashtable;
+import java.util.Enumeration;
 import helma.objectmodel.INode;