4 files changed, 2 insertions, 12 deletions
diff --git a/tools/gnu/classpath/tools/keytool/Command.java b/tools/gnu/classpath/tools/keytool/Command.java
index bc5cff2aa..af91e4a71 100644
--- a/tools/gnu/classpath/tools/keytool/Command.java
+++ b/tools/gnu/classpath/tools/keytool/Command.java
@@ -56,7 +56,6 @@ import gnu.java.security.hash.MD5;
 import gnu.java.security.hash.Sha160;
 import gnu.java.security.util.Util;
 import gnu.java.security.x509.X500DistinguishedName;
-import gnu.javax.security.auth.callback.ConsoleCallbackHandler;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -1203,7 +1202,8 @@ abstract class Command
    * <p>
    * If no installed providers were found, this method falls back on the GNU
    * provider, by-passing the Security search mechanism. The default console
-   * callback handler implementation is {@link ConsoleCallbackHandler}.
+   * callback handler implementation is
+   * {@link gnu.javax.security.auth.callback.ConsoleCallbackHandler}.
    * 
    * @return a console-based {@link CallbackHandler}.
    */
diff --git a/tools/gnu/classpath/tools/keytool/GenKeyCmd.java b/tools/gnu/classpath/tools/keytool/GenKeyCmd.java
index 03a1555a8..e2048b223 100644
--- a/tools/gnu/classpath/tools/keytool/GenKeyCmd.java
+++ b/tools/gnu/classpath/tools/keytool/GenKeyCmd.java
@@ -217,7 +217,6 @@ class GenKeyCmd extends Command
   protected String _providerClassName;
   private int keySize;
   private X500DistinguishedName distinguishedName;
-  private Parser cmdOptionsParser;
 
   // default 0-arguments constructor
 
diff --git a/tools/gnu/classpath/tools/keytool/ImportCmd.java b/tools/gnu/classpath/tools/keytool/ImportCmd.java
index 3a6ed872b..1eaf6b337 100644
--- a/tools/gnu/classpath/tools/keytool/ImportCmd.java
+++ b/tools/gnu/classpath/tools/keytool/ImportCmd.java
@@ -207,7 +207,6 @@ class ImportCmd extends Command
   protected String _ksPassword;
   protected String _providerClassName;
   private CertificateFactory x509Factory;
-  private boolean imported;
   /**
    * Pathname to a GKR-type cacerts file to use when trustCACerts is true. This
    * is usually a file named "cacerts.gkr" located in lib/security in the folder
diff --git a/tools/gnu/classpath/tools/keytool/Main.java b/tools/gnu/classpath/tools/keytool/Main.java
index 08d55556e..7c3ebd053 100644
--- a/tools/gnu/classpath/tools/keytool/Main.java
+++ b/tools/gnu/classpath/tools/keytool/Main.java
@@ -296,14 +296,6 @@ public class Main
       log.exiting(this.getClass().getName(), "teardown"); //$NON-NLS-1$
   }
 
-  private void printHelp()
-  {
-    if (helpPrinted)
-      return;
-
-    helpPrinted = true;
-  }
-
   // Inner class(es)
   // ==========================================================================