diff --git a/core/src/main/java/org/acegisecurity/ldap/AttributesMapper.java b/core/src/main/java/org/acegisecurity/ldap/AttributesMapper.java
deleted file mode 100644
index 83bd2097cd..0000000000
--- a/core/src/main/java/org/acegisecurity/ldap/AttributesMapper.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2004, 2005 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.ldap;
-
-import javax.naming.directory.Attributes;
-import javax.naming.NamingException;
-
-/**
- * A mapper for use with {@link LdapTemplate}. Creates a customized object from
- * a set of attributes retrieved from a directory entry.
- *
- * @author Luke Taylor
- * @version $Id$
- */
-public interface AttributesMapper {
-
- public Object mapAttributes(Attributes attributes) throws NamingException;
-}
diff --git a/core/src/main/java/org/acegisecurity/ldap/LdapUserInfo.java b/core/src/main/java/org/acegisecurity/ldap/LdapUserInfo.java
deleted file mode 100644
index bd1f03c345..0000000000
--- a/core/src/main/java/org/acegisecurity/ldap/LdapUserInfo.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright 2004, 2005 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.ldap;
-
-import javax.naming.directory.Attributes;
-import javax.naming.directory.DirContext;
-import javax.naming.NamingException;
-
-/**
- * A user representation which is used internally by the Ldap provider.
- *
- *
- * @deprecated in favour of {@link org.acegisecurity.userdetails.ldap.LdapUserDetails}
- *
- *
- * @author Luke Taylor
- * @version $Id$
- */
-public class LdapUserInfo {
-
- //~ Instance fields ========================================================
-
- private String dn;
- private Attributes attributes;
-
- //~ Constructors ===========================================================
-
- /**
- *
- * @param dn the full DN of the user
- * @param attributes any attributes loaded from the user's directory entry.
- */
- public LdapUserInfo(String dn, Attributes attributes) {
- this.dn = dn;
- this.attributes = attributes;
- }
-
- //~ Methods ================================================================
-
- public String getDn() {
- return dn;
- }
-
- public String getRelativeName(DirContext ctx) throws NamingException {
- return LdapUtils.getRelativeName(dn, ctx);
- }
-
- public Attributes getAttributes() {
- return (Attributes)attributes.clone();
- }
-}
diff --git a/core/src/main/java/org/acegisecurity/providers/ldap/LdapUserInfo.java b/core/src/main/java/org/acegisecurity/providers/ldap/LdapUserInfo.java
deleted file mode 100644
index 8dae67e05d..0000000000
--- a/core/src/main/java/org/acegisecurity/providers/ldap/LdapUserInfo.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2004, 2005 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.acegisecurity.providers.ldap;
-
-import javax.naming.directory.Attributes;
-import javax.naming.directory.DirContext;
-import javax.naming.NamingException;
-
-/**
- * A user representation which is used internally by the Ldap provider.
- *
- * It contains the user's distinguished name and a set of attributes that
- * have been retrieved from the Ldap server.
- *
- * An instance may be created as the result of a search, or when user information
- * is retrieved during authentication.
- *
- *
- * An instance of this class will be used by the LdapAuthenticationProvider
- * to construct the final user details object that it returns.
- *
- *
- * @author Luke Taylor
- * @version $Id$
- */
-public class LdapUserInfo {
-
- //~ Instance fields ========================================================
-
- private String dn;
- private Attributes attributes;
-
- //~ Constructors ===========================================================
-
- /**
- *
- * @param dn the full DN of the user
- * @param attributes any attributes loaded from the user's directory entry.
- */
- public LdapUserInfo(String dn, Attributes attributes) {
- this.dn = dn;
- this.attributes = attributes;
- }
-
- //~ Methods ================================================================
-
- public String getDn() {
- return dn;
- }
-
- public String getRelativeName(DirContext ctx) throws NamingException {
- return LdapUtils.getRelativeName(dn, ctx);
- }
-
- public Attributes getAttributes() {
- return (Attributes)attributes.clone();
- }
-}