diff --git a/core/src/main/java/org/springframework/security/ui/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java b/core/src/main/java/org/springframework/security/ui/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java
index ed2b2e43af..625cb8cdfd 100755
--- a/core/src/main/java/org/springframework/security/ui/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java
+++ b/core/src/main/java/org/springframework/security/ui/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java
@@ -1,15 +1,12 @@
 package org.springframework.security.ui.preauth;
 
-import java.util.Arrays;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.security.ui.WebAuthenticationDetails;
+import org.springframework.security.GrantedAuthoritiesContainerImpl;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.MutableGrantedAuthoritiesContainer;
 
-import org.springframework.util.Assert;
-
 /**
  * This WebAuthenticationDetails implementation allows for storing a list of
  * pre-authenticated Granted Authorities.
@@ -22,28 +19,24 @@ public class PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails extends
 		MutableGrantedAuthoritiesContainer {
 	public static final long serialVersionUID = 1L;
 
-	private GrantedAuthority[] preAuthenticatedGrantedAuthorities = null;
+	private MutableGrantedAuthoritiesContainer authoritiesContainer = new GrantedAuthoritiesContainerImpl();
 
 	public PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails(HttpServletRequest request) {
 		super(request);
 	}
 
 	public GrantedAuthority[] getGrantedAuthorities() {
-		Assert.notNull(preAuthenticatedGrantedAuthorities, "Pre-authenticated granted authorities have not been set");
-		GrantedAuthority[] result = new GrantedAuthority[preAuthenticatedGrantedAuthorities.length];
-		System.arraycopy(preAuthenticatedGrantedAuthorities, 0, result, 0, result.length);
-		return result;
+		return authoritiesContainer.getGrantedAuthorities();
 	}
 
 	public void setGrantedAuthorities(GrantedAuthority[] authorities) {
-		this.preAuthenticatedGrantedAuthorities = new GrantedAuthority[authorities.length];
-		System.arraycopy(authorities, 0, preAuthenticatedGrantedAuthorities, 0, preAuthenticatedGrantedAuthorities.length);
+		this.authoritiesContainer.setGrantedAuthorities(authorities);
 	}
 	
     public String toString() {
         StringBuffer sb = new StringBuffer();
         sb.append(super.toString() + "; ");
-        sb.append("preAuthenticatedGrantedAuthorities: " + Arrays.asList(preAuthenticatedGrantedAuthorities));
+        sb.append(authoritiesContainer);
         return sb.toString();
     }	
 }
diff --git a/core/src/main/java/org/springframework/security/userdetails/User.java b/core/src/main/java/org/springframework/security/userdetails/User.java
index 0bc00326bd..1942d751a5 100644
--- a/core/src/main/java/org/springframework/security/userdetails/User.java
+++ b/core/src/main/java/org/springframework/security/userdetails/User.java
@@ -15,7 +15,6 @@
 
 package org.springframework.security.userdetails;
 
-import java.util.Iterator;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
diff --git a/core/src/test/java/org/springframework/security/GrantedAuthorityImplTests.java b/core/src/test/java/org/springframework/security/GrantedAuthorityImplTests.java
index 5563168bc2..1ccd052c3c 100644
--- a/core/src/test/java/org/springframework/security/GrantedAuthorityImplTests.java
+++ b/core/src/test/java/org/springframework/security/GrantedAuthorityImplTests.java
@@ -87,10 +87,6 @@ public class GrantedAuthorityImplTests extends TestCase {
 			return this.role.compareTo(((GrantedAuthority)o).getAuthority());
 		}
 
-		private MockGrantedAuthorityImpl() {
-            super();
-        }
-
         public String getAuthority() {
             return this.role;
         }
diff --git a/core/src/test/java/org/springframework/security/config/DataSourcePopulator.java b/core/src/test/java/org/springframework/security/config/DataSourcePopulator.java
index 4f0a372c4b..ce24d73151 100644
--- a/core/src/test/java/org/springframework/security/config/DataSourcePopulator.java
+++ b/core/src/test/java/org/springframework/security/config/DataSourcePopulator.java
@@ -17,7 +17,6 @@ package org.springframework.security.config;
 import javax.sql.DataSource;
 
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.DisposableBean;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.util.Assert;
 
diff --git a/core/src/test/java/org/springframework/security/ui/rememberme/PersistentTokenBasedRememberMeServicesTests.java b/core/src/test/java/org/springframework/security/ui/rememberme/PersistentTokenBasedRememberMeServicesTests.java
index ea9c1df49c..6498850a3f 100644
--- a/core/src/test/java/org/springframework/security/ui/rememberme/PersistentTokenBasedRememberMeServicesTests.java
+++ b/core/src/test/java/org/springframework/security/ui/rememberme/PersistentTokenBasedRememberMeServicesTests.java
@@ -5,7 +5,6 @@ import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import org.junit.Before;
 import org.junit.Test;