diff --git a/src/helma/scripting/rhino/GlobalObject.java b/src/helma/scripting/rhino/GlobalObject.java
index 7b60af0c..4d17d598 100644
--- a/src/helma/scripting/rhino/GlobalObject.java
+++ b/src/helma/scripting/rhino/GlobalObject.java
@@ -17,16 +17,13 @@
 package helma.scripting.rhino;
 
 import helma.scripting.rhino.extensions.*;
-import helma.framework.*;
 import helma.framework.core.*;
-import helma.objectmodel.*;
 import helma.objectmodel.db.*;
 import helma.util.HtmlEncoder;
 import helma.util.MimePart;
 import helma.util.XmlUtils;
 import org.mozilla.javascript.*;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Date;
 import java.util.Locale;
@@ -87,8 +84,8 @@ public class GlobalObject extends ScriptableObject {
     /**
      *
      *
-     * @param skin ...
-     * @param param ...
+     * @param skinobj ...
+     * @param paramobj ...
      *
      * @return ...
      */
@@ -116,8 +113,8 @@ public class GlobalObject extends ScriptableObject {
     /**
      *
      *
-     * @param skin ...
-     * @param param ...
+     * @param skinobj ...
+     * @param paramobj ...
      *
      * @return ...
      */
@@ -187,7 +184,7 @@ public class GlobalObject extends ScriptableObject {
     /**
      * Get a Helma DB connection specified in db.properties
      *
-     * @param str the db source name
+     * @param dbsource the db source name
      *
      * @return a DatabaseObject for the specified DbConnection
      */
@@ -331,7 +328,7 @@ public class GlobalObject extends ScriptableObject {
     /**
      *
      *
-     * @param str ...
+     * @param obj ...
      *
      * @return ...
      */
@@ -342,7 +339,7 @@ public class GlobalObject extends ScriptableObject {
     /**
      *
      *
-     * @param str ...
+     * @param obj ...
      *
      * @return ...
      */
@@ -353,7 +350,7 @@ public class GlobalObject extends ScriptableObject {
     /**
      *
      *
-     * @param str ...
+     * @param obj ...
      *
      * @return ...
      */
@@ -364,7 +361,7 @@ public class GlobalObject extends ScriptableObject {
     /**
      *
      *
-     * @param str ...
+     * @param obj ...
      *
      * @return ...
      */
@@ -375,7 +372,7 @@ public class GlobalObject extends ScriptableObject {
     /**
      *
      *
-     * @param str ...
+     * @param obj ...
      *
      * @return ...
      */
@@ -404,8 +401,6 @@ public class GlobalObject extends ScriptableObject {
      *
      *
      * @param str ...
-     *
-     * @return ...
      */
     public void write(String str) {
         System.out.print(str);
@@ -415,8 +410,6 @@ public class GlobalObject extends ScriptableObject {
      *
      *
      * @param str ...
-     *
-     * @return ...
      */
     public void writeln(String str) {
         System.out.println(str);
diff --git a/src/helma/scripting/rhino/JavaObject.java b/src/helma/scripting/rhino/JavaObject.java
index a3bf0ba7..7b2a166b 100644
--- a/src/helma/scripting/rhino/JavaObject.java
+++ b/src/helma/scripting/rhino/JavaObject.java
@@ -16,15 +16,9 @@
 
 package helma.scripting.rhino;
 
-import helma.framework.*;
 import helma.framework.core.*;
-import helma.objectmodel.*;
-import helma.objectmodel.db.*;
 import org.mozilla.javascript.*;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -69,8 +63,8 @@ public class JavaObject extends NativeJavaObject {
     /**
      *
      *
-     * @param skin ...
-     * @param param ...
+     * @param skinobj ...
+     * @param paramobj ...
      *
      * @return ...
      */
@@ -98,8 +92,8 @@ public class JavaObject extends NativeJavaObject {
     /**
      *
      *
-     * @param skin ...
-     * @param param ...
+     * @param skinobj ...
+     * @param paramobj ...
      *
      * @return ...
      */
diff --git a/src/helma/scripting/rhino/MapWrapper.java b/src/helma/scripting/rhino/MapWrapper.java
index 2f6a6bcf..415be346 100644
--- a/src/helma/scripting/rhino/MapWrapper.java
+++ b/src/helma/scripting/rhino/MapWrapper.java
@@ -118,7 +118,7 @@ public class MapWrapper extends ScriptableObject {
     /**
      *
      *
-     * @param name ...
+     * @param idx ...
      * @param start ...
      * @param value ...
      */
@@ -136,7 +136,7 @@ public class MapWrapper extends ScriptableObject {
     /**
      *
      *
-     * @param name ...
+     * @param idx ...
      * @param start ...
      *
      * @return ...
@@ -158,7 +158,7 @@ public class MapWrapper extends ScriptableObject {
     /**
      *
      *
-     * @param name ...
+     * @param idx ...
      * @param start ...
      *
      * @return ...
@@ -170,7 +170,7 @@ public class MapWrapper extends ScriptableObject {
     /**
      *
      *
-     * @param name ...
+     * @param idx ...
      */
     public void delete(int idx) {
         if (map != null) {
diff --git a/src/helma/scripting/rhino/PathWrapper.java b/src/helma/scripting/rhino/PathWrapper.java
index cb1dcf9f..b6a9bf11 100644
--- a/src/helma/scripting/rhino/PathWrapper.java
+++ b/src/helma/scripting/rhino/PathWrapper.java
@@ -18,7 +18,6 @@ package helma.scripting.rhino;
 
 import helma.framework.core.RequestPath;
 import org.mozilla.javascript.*;
-import java.lang.reflect.*;
 
 /**
  * This class wraps around instances of helma.framework.core.RequestPath and
diff --git a/src/helma/scripting/rhino/RhinoActionAdapter.java b/src/helma/scripting/rhino/RhinoActionAdapter.java
index 71ae1218..442ee72b 100644
--- a/src/helma/scripting/rhino/RhinoActionAdapter.java
+++ b/src/helma/scripting/rhino/RhinoActionAdapter.java
@@ -18,14 +18,6 @@ package helma.scripting.rhino;
 
 import helma.scripting.*;
 
-// import java.util.Vector;
-// import java.util.Iterator;
-import java.io.*;
-
-// import helma.framework.*;
-// import helma.framework.core.*;
-// import helma.util.Updatable;
-
 /**
  *  An class that updates fesi interpreters with actionfiles and templates.
  */
diff --git a/src/helma/scripting/rhino/RhinoEngine.java b/src/helma/scripting/rhino/RhinoEngine.java
index fcf3c885..4222edbf 100644
--- a/src/helma/scripting/rhino/RhinoEngine.java
+++ b/src/helma/scripting/rhino/RhinoEngine.java
@@ -27,11 +27,8 @@ import helma.objectmodel.db.DbMapping;
 import helma.objectmodel.db.Relation;
 import helma.scripting.*;
 import helma.scripting.rhino.debug.Tracer;
-import helma.util.CacheMap;
-import helma.util.Updatable;
 import org.mozilla.javascript.*;
 
-import java.io.*;
 import java.util.*;
 
 /**
diff --git a/src/helma/scripting/rhino/SkinKey.java b/src/helma/scripting/rhino/SkinKey.java
index ceed5f0e..58893e1f 100644
--- a/src/helma/scripting/rhino/SkinKey.java
+++ b/src/helma/scripting/rhino/SkinKey.java
@@ -16,8 +16,6 @@
 
 package helma.scripting.rhino;
 
-import java.io.Serializable;
-
 /**
  *  A helper class to serve as Map key for two strings
  */