diff --git a/core/src/main/java/org/acegisecurity/captcha/CaptchaServiceProxy.java b/core/src/main/java/org/acegisecurity/captcha/CaptchaServiceProxy.java
index 3cbdc9a833..5d450a44b9 100644
--- a/core/src/main/java/org/acegisecurity/captcha/CaptchaServiceProxy.java
+++ b/core/src/main/java/org/acegisecurity/captcha/CaptchaServiceProxy.java
@@ -15,7 +15,6 @@
 
 package net.sf.acegisecurity.captcha;
 
-import javax.servlet.ServletRequest;
 
 
 /**
diff --git a/core/src/main/java/org/acegisecurity/concurrent/ConcurrentSessionControllerImpl.java b/core/src/main/java/org/acegisecurity/concurrent/ConcurrentSessionControllerImpl.java
index d598e1cac6..5ea1864143 100644
--- a/core/src/main/java/org/acegisecurity/concurrent/ConcurrentSessionControllerImpl.java
+++ b/core/src/main/java/org/acegisecurity/concurrent/ConcurrentSessionControllerImpl.java
@@ -15,8 +15,6 @@
 
 package net.sf.acegisecurity.concurrent;
 
-import java.util.Date;
-
 import net.sf.acegisecurity.Authentication;
 import net.sf.acegisecurity.AuthenticationException;
 
diff --git a/core/src/main/java/org/acegisecurity/providers/jaas/JaasAuthenticationToken.java b/core/src/main/java/org/acegisecurity/providers/jaas/JaasAuthenticationToken.java
index 86df5543ef..fb993da6a8 100644
--- a/core/src/main/java/org/acegisecurity/providers/jaas/JaasAuthenticationToken.java
+++ b/core/src/main/java/org/acegisecurity/providers/jaas/JaasAuthenticationToken.java
@@ -1,12 +1,10 @@
 package net.sf.acegisecurity.providers.jaas;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
-import net.sf.acegisecurity.GrantedAuthority;
-
 import javax.security.auth.login.LoginContext;
 
+import net.sf.acegisecurity.GrantedAuthority;
+import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
+
 /**
  * UsernamePasswordAuthenticationToken extension to carry the Jaas LoginContext that the user was logged into
  * @author Ray Krueger
diff --git a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/LdapPasswordAuthenticationDao.java b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/LdapPasswordAuthenticationDao.java
index 739f7a5b24..bd4ef4ffe3 100644
--- a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/LdapPasswordAuthenticationDao.java
+++ b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/LdapPasswordAuthenticationDao.java
@@ -2,23 +2,14 @@ package net.sf.acegisecurity.providers.dao.ldap;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
-import java.util.Collection;
 
 import javax.naming.AuthenticationException;
-import javax.naming.Name;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
-import javax.naming.directory.SearchResult;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.DataAccessResourceFailureException;
 
 import net.sf.acegisecurity.BadCredentialsException;
 import net.sf.acegisecurity.GrantedAuthority;
@@ -26,6 +17,11 @@ import net.sf.acegisecurity.GrantedAuthorityImpl;
 import net.sf.acegisecurity.UserDetails;
 import net.sf.acegisecurity.providers.dao.User;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.dao.DataAccessException;
+import org.springframework.dao.DataAccessResourceFailureException;
+
 /** 
  * A much simplified (vs the 1.6 revision) LdapPasswordAuthenticationDao, 
  * which should meet all 'basic' needs, leaving advanced options such as 
diff --git a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/LdapPassword2AuthenticationDao.java b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/LdapPassword2AuthenticationDao.java
index e9f0930bd2..766d919e33 100644
--- a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/LdapPassword2AuthenticationDao.java
+++ b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/LdapPassword2AuthenticationDao.java
@@ -7,7 +7,6 @@ import java.util.ArrayList;
 import java.util.Hashtable;
 
 import javax.naming.Context;
-import javax.naming.Name;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
@@ -16,16 +15,17 @@ import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
 import javax.naming.directory.SearchResult;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.dao.DataAccessException;
-import net.sf.acegisecurity.providers.dao.User;
 import net.sf.acegisecurity.BadCredentialsException;
 import net.sf.acegisecurity.GrantedAuthority;
 import net.sf.acegisecurity.GrantedAuthorityImpl;
 import net.sf.acegisecurity.UserDetails;
+import net.sf.acegisecurity.providers.dao.User;
 import net.sf.acegisecurity.providers.dao.ldap.PasswordAuthenticationDao;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.dao.DataAccessException;
+
 /**
  * Re-written version of the ACEGI LDAP code, 
  *  designed to be cleaner; it is partially based on 
diff --git a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/UserSearchResults.java b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/UserSearchResults.java
index 041c8ccd1a..5555165e96 100644
--- a/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/UserSearchResults.java
+++ b/sandbox/src/main/java/org/acegisecurity/providers/dao/ldap/revised/UserSearchResults.java
@@ -3,9 +3,6 @@
  */
 package net.sf.acegisecurity.providers.dao.ldap.revised;
 
-import java.util.Hashtable;
-
-import javax.naming.Context;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.SearchResult;
 
diff --git a/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/EmbeddedLdapServerController.java b/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/EmbeddedLdapServerController.java
index 5699a957b6..c452632894 100644
--- a/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/EmbeddedLdapServerController.java
+++ b/sandbox/src/test/java/org/acegisecurity/providers/dao/ldap/support/EmbeddedLdapServerController.java
@@ -18,9 +18,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
 import java.util.Hashtable;
 
 import javax.naming.Context;