diff --git a/src/contrib/src/org/apache/poi/contrib/poibrowser/Codec.java b/src/contrib/src/org/apache/poi/contrib/poibrowser/Codec.java
index 325b0fe07..7f5c2508e 100644
--- a/src/contrib/src/org/apache/poi/contrib/poibrowser/Codec.java
+++ b/src/contrib/src/org/apache/poi/contrib/poibrowser/Codec.java
@@ -58,8 +58,10 @@
 
 package org.apache.poi.contrib.poibrowser;
 
-import java.io.*;
-import java.util.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
 import org.apache.poi.hpsf.ClassID;
 
 
diff --git a/src/contrib/src/org/apache/poi/contrib/poibrowser/TreeReaderListener.java b/src/contrib/src/org/apache/poi/contrib/poibrowser/TreeReaderListener.java
index bcb237ea9..0467872fa 100644
--- a/src/contrib/src/org/apache/poi/contrib/poibrowser/TreeReaderListener.java
+++ b/src/contrib/src/org/apache/poi/contrib/poibrowser/TreeReaderListener.java
@@ -265,13 +265,4 @@ public class TreeReaderListener implements POIFSReaderListener
         }
     }
 
-
-    private String s(final Object o)
-    {
-        if (o == null)
-            return "null";
-        else
-            return o.getClass().getName() + '@' + o.hashCode();
-    }
-
 }
diff --git a/src/testcases/org/apache/poi/hpsf/basic/Util.java b/src/testcases/org/apache/poi/hpsf/basic/Util.java
index 7afd37194..75e7aa72e 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/Util.java
+++ b/src/testcases/org/apache/poi/hpsf/basic/Util.java
@@ -90,7 +90,10 @@ public class Util
      * output stream until end of file is encountered.</p>
      *
      * @param in the input stream to read from
+     * 
      * @param out the output stream to write to
+     * 
+     * @exception IOException if an I/O exception occurs
      */
     public static void copy(final InputStream in, final OutputStream out)
         throws IOException
@@ -129,6 +132,11 @@ public class Util
      *
      * @return The POI files. The elements are ordered in the same way
      * as the files in the POI filesystem.
+     * 
+     * @exception FileNotFoundException if the file containing the POI 
+     * filesystem does not exist
+     * 
+     * @exception IOException if an I/O exception occurs
      */
     public static POIFile[] readPOIFiles(final File poiFs)
         throws FileNotFoundException, IOException
@@ -151,6 +159,11 @@ public class Util
      *
      * @return The POI files. The elements are ordered in the same way
      * as the files in the POI filesystem.
+     * 
+     * @exception FileNotFoundException if the file containing the POI 
+     * filesystem does not exist
+     * 
+     * @exception IOException if an I/O exception occurs
      */
     public static POIFile[] readPOIFiles(final File poiFs,
                                          final String[] poiFiles)