diff --git a/dspace/src/edu/mit/dspace/MITSpecialGroup.java b/dspace/src/edu/mit/dspace/MITSpecialGroup.java
index 7c168cdafd..ef458d36f2 100755
--- a/dspace/src/edu/mit/dspace/MITSpecialGroup.java
+++ b/dspace/src/edu/mit/dspace/MITSpecialGroup.java
@@ -39,22 +39,17 @@
  */
 package edu.mit.dspace;
 
-import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.jstl.fmt.LocaleSupport;
-import java.util.ArrayList;
 
 import org.apache.log4j.Logger;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
+import org.dspace.eperson.AuthenticationMethod;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
-import org.dspace.eperson.AuthenticationMethod;
-import org.dspace.authorize.AuthorizeException;
 
 /**
  * Identify members of "MIT Community" and give them membership in
diff --git a/dspace/src/org/dspace/eperson/LDAPAuthentication.java b/dspace/src/org/dspace/eperson/LDAPAuthentication.java
index b2f69a0dbd..4febbaf3b8 100755
--- a/dspace/src/org/dspace/eperson/LDAPAuthentication.java
+++ b/dspace/src/org/dspace/eperson/LDAPAuthentication.java
@@ -39,30 +39,26 @@
  */
 package org.dspace.eperson;
 
-import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.jstl.fmt.LocaleSupport;
-import java.util.ArrayList;
 import java.util.Hashtable;
 
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
+import javax.naming.directory.SearchResult;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.log4j.Logger;
+import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
-import org.dspace.core.ConfigurationManager;
-import org.dspace.eperson.EPerson;
-import org.dspace.eperson.Group;
-import org.dspace.eperson.AuthenticationMethod;
-import org.dspace.eperson.AuthenticationManager;
-import org.dspace.authorize.AuthorizeException;
-
-import javax.naming.directory.*;
-import javax.naming.*;
 
 /**
  * This is UNTESTED, since I do not have LDAP servers available.
diff --git a/dspace/src/org/dspace/eperson/PasswordAuthentication.java b/dspace/src/org/dspace/eperson/PasswordAuthentication.java
index 5bb730e70a..73295e9e2f 100755
--- a/dspace/src/org/dspace/eperson/PasswordAuthentication.java
+++ b/dspace/src/org/dspace/eperson/PasswordAuthentication.java
@@ -39,21 +39,16 @@
  */
 package org.dspace.eperson;
 
-import javax.servlet.ServletException;
+import java.sql.SQLException;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.jstl.fmt.LocaleSupport;
-import java.sql.SQLException;
-import java.util.ArrayList;
 
 import org.apache.log4j.Logger;
+import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
-import org.dspace.eperson.EPerson;
-import org.dspace.eperson.AuthenticationMethod;
-import org.dspace.authorize.AuthorizeException;
 
 /**
  * A stackable authentication method
diff --git a/dspace/src/org/dspace/eperson/X509Authentication.java b/dspace/src/org/dspace/eperson/X509Authentication.java
index 061b33d0c2..92eebde66e 100755
--- a/dspace/src/org/dspace/eperson/X509Authentication.java
+++ b/dspace/src/org/dspace/eperson/X509Authentication.java
@@ -39,41 +39,30 @@
  */
 package org.dspace.eperson;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.jstl.fmt.LocaleSupport;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Enumeration;
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
 import java.security.Principal;
 import java.security.PublicKey;
 import java.security.cert.Certificate;
-import java.security.KeyStore;
-import java.security.SignatureException;
-import java.security.GeneralSecurityException;
 import java.security.cert.CertificateException;
-import java.security.cert.CertificateExpiredException;
 import java.security.cert.CertificateFactory;
-import java.security.cert.CertificateNotYetValidException;
 import java.security.cert.X509Certificate;
+import java.sql.SQLException;
+import java.util.Enumeration;
 import java.util.StringTokenizer;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.log4j.Logger;
-import org.dspace.core.LogManager;
+import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
-import org.dspace.eperson.EPerson;
-import org.dspace.eperson.AuthenticationMethod;
-import org.dspace.authorize.AuthorizeException;
+import org.dspace.core.LogManager;
 
 /**
  * Implicit authentication method that gets credentials from the X.509