diff --git a/spring-ldap-odm/src/main/java/org/springframework/ldap/odm/dao/LdapDaoImpl.java b/spring-ldap-odm/src/main/java/org/springframework/ldap/odm/dao/LdapDaoImpl.java
index 3d08f4f8..242ae746 100644
--- a/spring-ldap-odm/src/main/java/org/springframework/ldap/odm/dao/LdapDaoImpl.java
+++ b/spring-ldap-odm/src/main/java/org/springframework/ldap/odm/dao/LdapDaoImpl.java
@@ -5,6 +5,10 @@
  */
 package org.springframework.ldap.odm.dao;
 
+import java.util.List;
+
+import javax.naming.Name;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.ldap.core.DirContextAdapter;
@@ -13,10 +17,6 @@ import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.odm.mapping.MappingException;
 import org.springframework.ldap.odm.mapping.ObjectDirectoryMapper;
 import org.springframework.ldap.odm.mapping.ObjectDirectoryMapperFactory;
-import org.springframework.util.StringUtils;
-
-import javax.naming.Name;
-import java.util.List;
 
 /**
  * An implementation of the <code>LdapDao</code> interface. 
diff --git a/spring-ldap-odm/src/test/java/org/springframework/ldap/odm/typeconversion/ReferencedEntryEditorTest.java b/spring-ldap-odm/src/test/java/org/springframework/ldap/odm/typeconversion/ReferencedEntryEditorTest.java
index 88f8252e..149d93fe 100644
--- a/spring-ldap-odm/src/test/java/org/springframework/ldap/odm/typeconversion/ReferencedEntryEditorTest.java
+++ b/spring-ldap-odm/src/test/java/org/springframework/ldap/odm/typeconversion/ReferencedEntryEditorTest.java
@@ -7,15 +7,13 @@
 package org.springframework.ldap.odm.typeconversion;
 
 import junit.framework.TestCase;
+
 import org.easymock.classextension.EasyMock;
 import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.odm.mapping.MappingException;
 import org.springframework.ldap.odm.mapping.ObjectDirectoryMapper;
 
-import javax.naming.InvalidNameException;
-import javax.naming.ldap.LdapName;
-
 public class ReferencedEntryEditorTest extends TestCase
 {
     private LdapTemplate ldapTemplate;