diff --git a/config/alfresco/authentication-services-context.xml b/config/alfresco/authentication-services-context.xml
index a1c7e395d9..94d289be04 100644
--- a/config/alfresco/authentication-services-context.xml
+++ b/config/alfresco/authentication-services-context.xml
@@ -92,15 +92,15 @@
               <property name="namespaceService">
                   <ref bean="namespaceService" />
               </property>
-              <property name="passwordEncoder">
-                  <ref bean="passwordEncoder" />
-              </property>
               <property name="searchService">
                   <ref bean="searchService" />
               </property>
               <property name="userNamesAreCaseSensitive">
                  <value>${user.name.caseSensitive}</value>
               </property>
+              <property name="passwordEncoder">
+                  <ref bean="passwordEncoder" />
+              </property>
            </bean>
         </property>
         <property name="transactionAttributes">
@@ -120,6 +120,19 @@
 
     <bean id="passwordEncoder" class="org.alfresco.repo.security.authentication.MD4PasswordEncoderImpl"></bean>
 
+<!--
+    <bean id="userType" class="org.alfresco.repo.security.authentication.UserType" init-method="init">
+        <property name="policyComponent">
+            <ref bean="policyComponent" />
+        </property>
+        <property name="nodeService">
+            <ref bean="nodeService" />
+        </property>
+        <property name="passwordEncoder">
+            <ref bean="passwordEncoder" />
+        </property>
+    </bean>
+-->
 
     <!-- A transactional wrapper around the implementation.                 -->
     <!-- TODO: This should be removed.                                      -->              
@@ -295,38 +308,4 @@
         </property>
     </bean>
     
-    <!-- Authentication bootstrap -->
-    
-    <!-- Work in progress -->
-    <!--
-    <bean id="authenticationBootstrap" class="org.alfresco.repo.security.authentication.AuthenticationBootstrap" init-method="bootstrap">
-        <property name="config">
-            <ref bean="authenticationBoostrapConfig"/>
-        </property>
-        <property name="authenticationComponent">
-            <ref bean="authenticationComponentImpl"/>
-        </property>
-        <property name="authenticationService">
-            <ref bean="authenticationService"/>
-        </property>
-        <property name="authenticationDao">
-            <ref bean="alfDaoImpl" />
-        </property>
-    </bean>
-    
-    <bean id="authenticationBoostrapConfigSource" class="org.alfresco.config.source.ClassPathConfigSource">
-      <constructor-arg>
-         <list>
-            <value>alfresco/authentication-bootstrap-config.xml</value>
-         </list>
-      </constructor-arg>
-   </bean>
-   
-   <bean id="authenticationBoostrapConfig" class="org.alfresco.config.xml.XMLConfigService" init-method="init">
-      <constructor-arg>
-         <ref bean="authenticationBoostrapConfigSource"/>
-      </constructor-arg>
-   </bean>
-   -->
-    
 </beans>
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/security/authentication/AbstractAuthenticationComponent.java b/source/java/org/alfresco/repo/security/authentication/AbstractAuthenticationComponent.java
index 63b0e0c4b1..d0edb8d940 100644
--- a/source/java/org/alfresco/repo/security/authentication/AbstractAuthenticationComponent.java
+++ b/source/java/org/alfresco/repo/security/authentication/AbstractAuthenticationComponent.java
@@ -16,9 +16,6 @@
  */
 package org.alfresco.repo.security.authentication;
 
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.service.cmr.security.PermissionService;
-
 import net.sf.acegisecurity.Authentication;
 import net.sf.acegisecurity.GrantedAuthority;
 import net.sf.acegisecurity.GrantedAuthorityImpl;
@@ -30,6 +27,9 @@ import net.sf.acegisecurity.context.security.SecureContextImpl;
 import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken;
 import net.sf.acegisecurity.providers.dao.User;
 
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.service.cmr.security.PermissionService;
+
 /**
  * This class abstract the support required to set up and query the Acegi context for security enforcement.
  * 
diff --git a/source/java/org/alfresco/repo/security/authentication/MutableAuthenticationDao.java b/source/java/org/alfresco/repo/security/authentication/MutableAuthenticationDao.java
index b8fdb3f046..cee31c0a31 100644
--- a/source/java/org/alfresco/repo/security/authentication/MutableAuthenticationDao.java
+++ b/source/java/org/alfresco/repo/security/authentication/MutableAuthenticationDao.java
@@ -21,7 +21,6 @@ import java.util.Date;
 import net.sf.acegisecurity.providers.dao.AuthenticationDao;
 import net.sf.acegisecurity.providers.dao.SaltSource;
 
-import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
 
 /**
diff --git a/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java b/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
index ba5ca14671..8d13d93c23 100644
--- a/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
+++ b/source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
@@ -31,7 +31,6 @@ import net.sf.acegisecurity.providers.encoding.PasswordEncoder;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.search.QueryParameterDefImpl;
-import org.alfresco.repo.security.permissions.PermissionServiceSPI;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
diff --git a/source/java/org/alfresco/repo/security/authentication/SimpleAcceptOrRejectAllAuthenticationComponentImpl.java b/source/java/org/alfresco/repo/security/authentication/SimpleAcceptOrRejectAllAuthenticationComponentImpl.java
index d7058dd288..a246c7cbd2 100644
--- a/source/java/org/alfresco/repo/security/authentication/SimpleAcceptOrRejectAllAuthenticationComponentImpl.java
+++ b/source/java/org/alfresco/repo/security/authentication/SimpleAcceptOrRejectAllAuthenticationComponentImpl.java
@@ -16,7 +16,6 @@
  */
 package org.alfresco.repo.security.authentication;
 
-import net.sf.acegisecurity.Authentication;
 
 /**
  * This implementation of an AuthenticationComponent can be configured to accept or reject all attempts to login.
diff --git a/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java b/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java
index f298a494a6..f686cd9943 100644
--- a/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java
+++ b/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java
@@ -17,12 +17,8 @@
 package org.alfresco.repo.security.permissions.impl;
 
 import java.io.Serializable;
-import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import net.sf.acegisecurity.Authentication;