diff --git a/src/main/java/org/springframework/data/ldap/config/LdapNamespaceHandler.java b/src/main/java/org/springframework/data/ldap/config/LdapNamespaceHandler.java
index 4601459..81fd1f8 100644
--- a/src/main/java/org/springframework/data/ldap/config/LdapNamespaceHandler.java
+++ b/src/main/java/org/springframework/data/ldap/config/LdapNamespaceHandler.java
@@ -26,10 +26,6 @@ import org.springframework.data.repository.config.RepositoryBeanDefinitionParser
  */
 public class LdapNamespaceHandler extends NamespaceHandlerSupport {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.NamespaceHandler#init()
-	 */
 	public void init() {
 
 		registerBeanDefinitionParser("repositories",
diff --git a/src/main/java/org/springframework/data/ldap/core/mapping/LdapMappingContext.java b/src/main/java/org/springframework/data/ldap/core/mapping/LdapMappingContext.java
index 3a08745..1df9a17 100644
--- a/src/main/java/org/springframework/data/ldap/core/mapping/LdapMappingContext.java
+++ b/src/main/java/org/springframework/data/ldap/core/mapping/LdapMappingContext.java
@@ -35,17 +35,11 @@ public class LdapMappingContext extends AbstractMappingContext<BasicLdapPersiste
 		setSimpleTypeHolder(LdapSimpleTypes.HOLDER);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mapping.context.AbstractMappingContext#createPersistentEntity(org.springframework.data.util.TypeInformation)
-	 */
 	@Override
 	protected <T> BasicLdapPersistentEntity<?> createPersistentEntity(TypeInformation<T> typeInformation) {
 		return new BasicLdapPersistentEntity<>(typeInformation);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mapping.context.AbstractMappingContext#createPersistentProperty(org.springframework.data.mapping.model.Property, org.springframework.data.mapping.model.MutablePersistentEntity, org.springframework.data.mapping.model.SimpleTypeHolder)
-	 */
 	@Override
 	protected LdapPersistentProperty createPersistentProperty(Property property, BasicLdapPersistentEntity<?> owner,
 			SimpleTypeHolder simpleTypeHolder) {
diff --git a/src/main/java/org/springframework/data/ldap/core/mapping/LdapPersistentProperty.java b/src/main/java/org/springframework/data/ldap/core/mapping/LdapPersistentProperty.java
index b718584..a11dd6b 100644
--- a/src/main/java/org/springframework/data/ldap/core/mapping/LdapPersistentProperty.java
+++ b/src/main/java/org/springframework/data/ldap/core/mapping/LdapPersistentProperty.java
@@ -46,17 +46,11 @@ public class LdapPersistentProperty extends AnnotationBasedPersistentProperty<Ld
 		super(property, owner, simpleTypeHolder);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mapping.model.AbstractPersistentProperty#createAssociation()
-	 */
 	@Override
 	protected Association<LdapPersistentProperty> createAssociation() {
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mapping.model.AnnotationBasedPersistentProperty#isIdProperty()
-	 */
 	@Override
 	public boolean isIdProperty() {
 		return isId.get();
diff --git a/src/main/java/org/springframework/data/ldap/repository/LdapRepository.java b/src/main/java/org/springframework/data/ldap/repository/LdapRepository.java
index b0ced61..306c0d4 100644
--- a/src/main/java/org/springframework/data/ldap/repository/LdapRepository.java
+++ b/src/main/java/org/springframework/data/ldap/repository/LdapRepository.java
@@ -31,24 +31,12 @@ import org.springframework.ldap.query.LdapQuery;
  */
 public interface LdapRepository<T> extends CrudRepository<T, Name> {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#saveAll(java.lang.Iterable)
-	 */
 	@Override
 	<S extends T> List<S> saveAll(Iterable<S> entities);
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#findAll()
-	 */
 	@Override
 	List<T> findAll();
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#findAllById()
-	 */
 	@Override
 	List<T> findAllById(Iterable<Name> names);
 
diff --git a/src/main/java/org/springframework/data/ldap/repository/cdi/LdapRepositoryBean.java b/src/main/java/org/springframework/data/ldap/repository/cdi/LdapRepositoryBean.java
index ff8220c..81806b7 100644
--- a/src/main/java/org/springframework/data/ldap/repository/cdi/LdapRepositoryBean.java
+++ b/src/main/java/org/springframework/data/ldap/repository/cdi/LdapRepositoryBean.java
@@ -58,10 +58,6 @@ public class LdapRepositoryBean<T> extends CdiRepositoryBean<T> {
 		this.operations = operations;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(jakarta.enterprise.context.spi.CreationalContext, java.lang.Class)
-	 */
 	@Override
 	protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType) {
 
@@ -70,10 +66,6 @@ public class LdapRepositoryBean<T> extends CdiRepositoryBean<T> {
 		return create(() -> new LdapRepositoryFactory(ldapOperations), repositoryType);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.cdi.CdiRepositoryBean#getScope()
-	 */
 	@Override
 	public Class<? extends Annotation> getScope() {
 		return operations.getScope();
diff --git a/src/main/java/org/springframework/data/ldap/repository/config/LdapRepositoriesRegistrar.java b/src/main/java/org/springframework/data/ldap/repository/config/LdapRepositoriesRegistrar.java
index 45d556a..b1ec8d9 100644
--- a/src/main/java/org/springframework/data/ldap/repository/config/LdapRepositoriesRegistrar.java
+++ b/src/main/java/org/springframework/data/ldap/repository/config/LdapRepositoriesRegistrar.java
@@ -27,17 +27,11 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
  */
 class LdapRepositoriesRegistrar extends RepositoryBeanDefinitionRegistrarSupport {
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getAnnotation()
-	 */
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
 		return EnableLdapRepositories.class;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getExtension()
-	 */
 	@Override
 	protected RepositoryConfigurationExtension getExtension() {
 		return new LdapRepositoryConfigurationExtension();
diff --git a/src/main/java/org/springframework/data/ldap/repository/config/LdapRepositoryConfigurationExtension.java b/src/main/java/org/springframework/data/ldap/repository/config/LdapRepositoryConfigurationExtension.java
index afa14e4..2f7fc60 100644
--- a/src/main/java/org/springframework/data/ldap/repository/config/LdapRepositoryConfigurationExtension.java
+++ b/src/main/java/org/springframework/data/ldap/repository/config/LdapRepositoryConfigurationExtension.java
@@ -48,53 +48,30 @@ public class LdapRepositoryConfigurationExtension extends RepositoryConfiguratio
 	private static final String ATT_LDAP_TEMPLATE_REF = "ldap-template-ref";
 	private static final String MAPPING_CONTEXT_BEAN_NAME = "ldapMappingContext";
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getModuleName()
-	 */
 	@Override
 	public String getModuleName() {
 		return "LDAP";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getModulePrefix()
-	 */
 	@Override
 	protected String getModulePrefix() {
 		return "ldap";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getRepositoryFactoryClassName()
-	 */
 	public String getRepositoryFactoryBeanClassName() {
 		return LdapRepositoryFactoryBean.class.getName();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getIdentifyingAnnotations()
-	 */
 	@Override
 	protected Collection<Class<? extends Annotation>> getIdentifyingAnnotations() {
 		return Collections.singleton(Entry.class);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getIdentifyingTypes()
-	 */
 	@Override
 	protected Collection<Class<?>> getIdentifyingTypes() {
 		return Collections.singleton(LdapRepository.class);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.XmlRepositoryConfigurationSource)
-	 */
 	@Override
 	public void postProcess(BeanDefinitionBuilder builder, XmlRepositoryConfigurationSource config) {
 
@@ -109,9 +86,6 @@ public class LdapRepositoryConfigurationExtension extends RepositoryConfiguratio
 		builder.addPropertyReference("mappingContext", MAPPING_CONTEXT_BEAN_NAME);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource)
-	 */
 	@Override
 	public void postProcess(BeanDefinitionBuilder builder, AnnotationRepositoryConfigurationSource config) {
 
@@ -134,10 +108,6 @@ public class LdapRepositoryConfigurationExtension extends RepositoryConfiguratio
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#useRepositoryConfiguration(org.springframework.data.repository.core.RepositoryMetadata)
-	 */
 	@Override
 	protected boolean useRepositoryConfiguration(RepositoryMetadata metadata) {
 		return !metadata.isReactiveRepository();
diff --git a/src/main/java/org/springframework/data/ldap/repository/query/AbstractLdapRepositoryQuery.java b/src/main/java/org/springframework/data/ldap/repository/query/AbstractLdapRepositoryQuery.java
index cf3ca63..23d46a3 100644
--- a/src/main/java/org/springframework/data/ldap/repository/query/AbstractLdapRepositoryQuery.java
+++ b/src/main/java/org/springframework/data/ldap/repository/query/AbstractLdapRepositoryQuery.java
@@ -69,9 +69,6 @@ public abstract class AbstractLdapRepositoryQuery implements RepositoryQuery {
 		this.instantiators = instantiators;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.query.RepositoryQuery#execute(java.lang.Object[])
-	 */
 	@Override
 	@SuppressWarnings("ConstantConditions")
 	public final Object execute(Object[] parameters) {
@@ -116,9 +113,6 @@ public abstract class AbstractLdapRepositoryQuery implements RepositoryQuery {
 		return entityType;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.query.RepositoryQuery#getQueryMethod()
-	 */
 	@Override
 	public final QueryMethod getQueryMethod() {
 		return queryMethod;
diff --git a/src/main/java/org/springframework/data/ldap/repository/query/AnnotatedLdapRepositoryQuery.java b/src/main/java/org/springframework/data/ldap/repository/query/AnnotatedLdapRepositoryQuery.java
index 831a283..c5bb97d 100644
--- a/src/main/java/org/springframework/data/ldap/repository/query/AnnotatedLdapRepositoryQuery.java
+++ b/src/main/java/org/springframework/data/ldap/repository/query/AnnotatedLdapRepositoryQuery.java
@@ -57,9 +57,6 @@ public class AnnotatedLdapRepositoryQuery extends AbstractLdapRepositoryQuery {
 		queryAnnotation = queryMethod.getRequiredQueryAnnotation();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.ldap.repository.query.AbstractLdapRepositoryQuery#createQuery(org.springframework.data.ldap.repository.query.LdapParameterAccessor)
-	 */
 	@Override
 	protected LdapQuery createQuery(LdapParameterAccessor parameters) {
 
diff --git a/src/main/java/org/springframework/data/ldap/repository/query/DtoInstantiatingConverter.java b/src/main/java/org/springframework/data/ldap/repository/query/DtoInstantiatingConverter.java
index 6b57511..cf4839e 100644
--- a/src/main/java/org/springframework/data/ldap/repository/query/DtoInstantiatingConverter.java
+++ b/src/main/java/org/springframework/data/ldap/repository/query/DtoInstantiatingConverter.java
@@ -59,10 +59,6 @@ public class DtoInstantiatingConverter implements Converter<Object, Object> {
 		this.instantiator = entityInstantiators.getInstantiatorFor(context.getRequiredPersistentEntity(dtoType));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-	 */
 	@Override
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public Object convert(Object source) {
diff --git a/src/main/java/org/springframework/data/ldap/repository/query/LdapQueryCreator.java b/src/main/java/org/springframework/data/ldap/repository/query/LdapQueryCreator.java
index f6a2339..ff08fca 100644
--- a/src/main/java/org/springframework/data/ldap/repository/query/LdapQueryCreator.java
+++ b/src/main/java/org/springframework/data/ldap/repository/query/LdapQueryCreator.java
@@ -68,9 +68,6 @@ class LdapQueryCreator extends AbstractQueryCreator<LdapQuery, ContainerCriteria
 		this.inputProperties = inputProperties;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#create(org.springframework.data.repository.query.parser.Part, java.util.Iterator)
-	 */
 	@Override
 	protected ContainerCriteria create(Part part, Iterator<Object> iterator) {
 
@@ -138,9 +135,6 @@ class LdapQueryCreator extends AbstractQueryCreator<LdapQuery, ContainerCriteria
 		return mapper.attributeFor(entityType, path.getSegment());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#and(org.springframework.data.repository.query.parser.Part, java.lang.Object, java.util.Iterator)
-	 */
 	@Override
 	protected ContainerCriteria and(Part part, ContainerCriteria base, Iterator<Object> iterator) {
 		ConditionCriteria criteria = base.and(getAttribute(part));
@@ -148,17 +142,11 @@ class LdapQueryCreator extends AbstractQueryCreator<LdapQuery, ContainerCriteria
 		return appendCondition(part, iterator, criteria);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#or(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	protected ContainerCriteria or(ContainerCriteria base, ContainerCriteria criteria) {
 		return base.or(criteria);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#complete(java.lang.Object, org.springframework.data.domain.Sort)
-	 */
 	@Override
 	protected LdapQuery complete(ContainerCriteria criteria, Sort sort) {
 		return criteria;
diff --git a/src/main/java/org/springframework/data/ldap/repository/query/LdapQueryExecution.java b/src/main/java/org/springframework/data/ldap/repository/query/LdapQueryExecution.java
index a39960c..50634e6 100644
--- a/src/main/java/org/springframework/data/ldap/repository/query/LdapQueryExecution.java
+++ b/src/main/java/org/springframework/data/ldap/repository/query/LdapQueryExecution.java
@@ -147,10 +147,6 @@ interface LdapQueryExecution {
 			this.instantiators = instantiators;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
 		public Object convert(Object source) {
 
diff --git a/src/main/java/org/springframework/data/ldap/repository/query/PartTreeLdapRepositoryQuery.java b/src/main/java/org/springframework/data/ldap/repository/query/PartTreeLdapRepositoryQuery.java
index 7dec2f9..e5f3606 100644
--- a/src/main/java/org/springframework/data/ldap/repository/query/PartTreeLdapRepositoryQuery.java
+++ b/src/main/java/org/springframework/data/ldap/repository/query/PartTreeLdapRepositoryQuery.java
@@ -62,9 +62,6 @@ public class PartTreeLdapRepositoryQuery extends AbstractLdapRepositoryQuery {
 		objectDirectoryMapper = ldapOperations.getObjectDirectoryMapper();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.ldap.repository.query.AbstractLdapRepositoryQuery#createQuery(org.springframework.data.ldap.repository.query.LdapParameterAccessor)
-	 */
 	@Override
 	protected LdapQuery createQuery(LdapParameterAccessor parameters) {
 
diff --git a/src/main/java/org/springframework/data/ldap/repository/support/DefaultLdapAnnotationProcessorConfiguration.java b/src/main/java/org/springframework/data/ldap/repository/support/DefaultLdapAnnotationProcessorConfiguration.java
index 92f2414..156e470 100644
--- a/src/main/java/org/springframework/data/ldap/repository/support/DefaultLdapAnnotationProcessorConfiguration.java
+++ b/src/main/java/org/springframework/data/ldap/repository/support/DefaultLdapAnnotationProcessorConfiguration.java
@@ -46,17 +46,11 @@ class DefaultLdapAnnotationProcessorConfiguration extends DefaultConfiguration {
 				skipAnn);
 	}
 
-	/* (non-Javadoc)
-	 * @see com.querydsl.apt.DefaultConfiguration#isBlockedField(javax.lang.model.element.VariableElement)
-	 */
 	@Override
 	public boolean isBlockedField(VariableElement field) {
 		return super.isBlockedField(field) || field.getAnnotation(Id.class) != null;
 	}
 
-	/* (non-Javadoc)
-	 * @see com.querydsl.apt.DefaultConfiguration#isValidField(javax.lang.model.element.VariableElement)
-	 */
 	@Override
 	public boolean isValidField(VariableElement field) {
 		return super.isValidField(field) && field.getAnnotation(Id.class) == null;
diff --git a/src/main/java/org/springframework/data/ldap/repository/support/LdapAnnotationProcessor.java b/src/main/java/org/springframework/data/ldap/repository/support/LdapAnnotationProcessor.java
index 4a7f53f..28db56c 100644
--- a/src/main/java/org/springframework/data/ldap/repository/support/LdapAnnotationProcessor.java
+++ b/src/main/java/org/springframework/data/ldap/repository/support/LdapAnnotationProcessor.java
@@ -42,9 +42,6 @@ import com.querydsl.core.annotations.QueryEntities;
 @SupportedSourceVersion(SourceVersion.RELEASE_6)
 public class LdapAnnotationProcessor extends AbstractQuerydslProcessor {
 
-	/* (non-Javadoc)
-	 * @see com.querydsl.apt.AbstractQuerydslProcessor#createConfiguration(javax.annotation.processing.RoundEnvironment)
-	 */
 	@Override
 	protected Configuration createConfiguration(RoundEnvironment roundEnv) {
 		processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "Running " + getClass().getSimpleName());
diff --git a/src/main/java/org/springframework/data/ldap/repository/support/LdapRepositoryFactory.java b/src/main/java/org/springframework/data/ldap/repository/support/LdapRepositoryFactory.java
index 9523ef2..dd0a49d 100644
--- a/src/main/java/org/springframework/data/ldap/repository/support/LdapRepositoryFactory.java
+++ b/src/main/java/org/springframework/data/ldap/repository/support/LdapRepositoryFactory.java
@@ -92,28 +92,17 @@ public class LdapRepositoryFactory extends RepositoryFactorySupport {
 		this.mappingContext = mappingContext;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class)
-	 */
 	@Override
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public <T, ID> EntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
 		return new LdapEntityInformation(domainClass, ldapOperations.getObjectDirectoryMapper());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryBaseClass(org.springframework.data.repository.core.RepositoryMetadata)
-	 */
 	@Override
 	protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
 		return SimpleLdapRepository.class;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryFragments(org.springframework.data.repository.core.RepositoryMetadata)
-	 */
 	@Override
 	protected RepositoryFragments getRepositoryFragments(RepositoryMetadata metadata) {
 		return getRepositoryFragments(metadata, this.ldapOperations);
@@ -149,10 +138,6 @@ public class LdapRepositoryFactory extends RepositoryFactorySupport {
 		return RepositoryFragments.empty();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getTargetRepository(org.springframework.data.repository.core.RepositoryInformation)
-	 */
 	@Override
 	protected Object getTargetRepository(RepositoryInformation information) {
 
@@ -168,10 +153,6 @@ public class LdapRepositoryFactory extends RepositoryFactorySupport {
 				information.getDomainType());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key, org.springframework.data.repository.query.EvaluationContextProvider)
-	 */
 	@Override
 	protected Optional<QueryLookupStrategy> getQueryLookupStrategy(@Nullable Key key,
 			QueryMethodEvaluationContextProvider evaluationContextProvider) {
diff --git a/src/main/java/org/springframework/data/ldap/repository/support/LdapRepositoryFactoryBean.java b/src/main/java/org/springframework/data/ldap/repository/support/LdapRepositoryFactoryBean.java
index b422b40..0031e1a 100644
--- a/src/main/java/org/springframework/data/ldap/repository/support/LdapRepositoryFactoryBean.java
+++ b/src/main/java/org/springframework/data/ldap/repository/support/LdapRepositoryFactoryBean.java
@@ -59,10 +59,6 @@ public class LdapRepositoryFactoryBean<T extends Repository<S, Name>, S>
 		this.ldapOperations = ldapOperations;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#setMappingContext(org.springframework.data.mapping.context.MappingContext)
-	 */
 	@Override
 	public void setMappingContext(MappingContext<?, ?> mappingContext) {
 
@@ -71,10 +67,6 @@ public class LdapRepositoryFactoryBean<T extends Repository<S, Name>, S>
 		this.mappingContextConfigured = true;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#createRepositoryFactory()
-	 */
 	@Override
 	protected RepositoryFactorySupport createRepositoryFactory() {
 
@@ -84,10 +76,6 @@ public class LdapRepositoryFactoryBean<T extends Repository<S, Name>, S>
 				: new LdapRepositoryFactory(ldapOperations);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#afterPropertiesSet()
-	 */
 	@Override
 	public void afterPropertiesSet() {
 
diff --git a/src/main/java/org/springframework/data/ldap/repository/support/LdapSerializer.java b/src/main/java/org/springframework/data/ldap/repository/support/LdapSerializer.java
index c5b780b..7707995 100644
--- a/src/main/java/org/springframework/data/ldap/repository/support/LdapSerializer.java
+++ b/src/main/java/org/springframework/data/ldap/repository/support/LdapSerializer.java
@@ -55,25 +55,16 @@ class LdapSerializer implements Visitor<Object, Void> {
 		return (Filter) expression.accept(this, null);
 	}
 
-	/* (non-Javadoc)
-	 * @see com.querydsl.core.types.Visitor#visit(com.querydsl.core.types.Constant, java.lang.Object)
-	 */
 	@Override
 	public Object visit(Constant<?> expr, Void context) {
 		return expr.getConstant().toString();
 	}
 
-	/* (non-Javadoc)
-	 * @see com.querydsl.core.types.Visitor#visit(com.querydsl.core.types.FactoryExpression, java.lang.Object)
-	 */
 	@Override
 	public Object visit(FactoryExpression<?> expr, Void context) {
 		throw new UnsupportedOperationException();
 	}
 
-	/* (non-Javadoc)
-	 * @see com.querydsl.core.types.Visitor#visit(com.querydsl.core.types.Operation, java.lang.Object)
-	 */
 	@Override
 	public Object visit(Operation<?> expr, Void context) {
 
@@ -116,33 +107,21 @@ class LdapSerializer implements Visitor<Object, Void> {
 		return odm.attributeFor(entityType, (String) expr.getArg(0).accept(this, null));
 	}
 
-	/* (non-Javadoc)
-	 * @see com.querydsl.core.types.Visitor#visit(com.querydsl.core.types.ParamExpression, java.lang.Object)
-	 */
 	@Override
 	public Object visit(ParamExpression<?> expr, Void context) {
 		throw new UnsupportedOperationException();
 	}
 
-	/* (non-Javadoc)
-	 * @see com.querydsl.core.types.Visitor#visit(com.querydsl.core.types.Path, java.lang.Object)
-	 */
 	@Override
 	public Object visit(Path<?> expr, Void context) {
 		return expr.getMetadata().getName();
 	}
 
-	/* (non-Javadoc)
-	 * @see com.querydsl.core.types.Visitor#visit(com.querydsl.core.types.SubQueryExpression, java.lang.Object)
-	 */
 	@Override
 	public Object visit(SubQueryExpression<?> expr, Void context) {
 		throw new UnsupportedOperationException();
 	}
 
-	/* (non-Javadoc)
-	 * @see com.querydsl.core.types.Visitor#visit(com.querydsl.core.types.TemplateExpression, java.lang.Object)
-	 */
 	@Override
 	public Object visit(TemplateExpression<?> expr, Void context) {
 		throw new UnsupportedOperationException();
diff --git a/src/main/java/org/springframework/data/ldap/repository/support/QuerydslLdapPredicateExecutor.java b/src/main/java/org/springframework/data/ldap/repository/support/QuerydslLdapPredicateExecutor.java
index 82e8bb5..48ae3a1 100644
--- a/src/main/java/org/springframework/data/ldap/repository/support/QuerydslLdapPredicateExecutor.java
+++ b/src/main/java/org/springframework/data/ldap/repository/support/QuerydslLdapPredicateExecutor.java
@@ -110,41 +110,25 @@ public class QuerydslLdapPredicateExecutor<T> implements QuerydslPredicateExecut
 		this.mappingContext = mappingContext;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findOne(com.querydsl.core.types.Predicate)
-	 */
 	@Override
 	public Optional<T> findOne(Predicate predicate) {
 		return findBy(predicate, Function.identity()).one();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.querydsl.core.types.Predicate)
-	 */
 	@Override
 	public List<T> findAll(Predicate predicate) {
 		return queryFor(predicate).list();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#count(com.querydsl.core.types.Predicate)
-	 */
 	@Override
 	public long count(Predicate predicate) {
 		return findBy(predicate, FluentQuery.FetchableFluentQuery::count);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#exists(com.querydsl.core.types.Predicate)
-	 */
 	public boolean exists(Predicate predicate) {
 		return findBy(predicate, FluentQuery.FetchableFluentQuery::exists);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, org.springframework.data.domain.Sort)
-	 */
 	public Iterable<T> findAll(Predicate predicate, Sort sort) {
 
 		Assert.notNull(sort, "Pageable must not be null!");
@@ -156,9 +140,6 @@ public class QuerydslLdapPredicateExecutor<T> implements QuerydslPredicateExecut
 		throw new UnsupportedOperationException("Sorting is not supported");
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.querydsl.core.types.OrderSpecifier[])
-	 */
 	public Iterable<T> findAll(OrderSpecifier<?>... orders) {
 
 		if (orders.length == 0) {
@@ -168,9 +149,6 @@ public class QuerydslLdapPredicateExecutor<T> implements QuerydslPredicateExecut
 		throw new UnsupportedOperationException("Sorting is not supported");
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, com.querydsl.core.types.OrderSpecifier[])
-	 */
 	@Override
 	public Iterable<T> findAll(Predicate predicate, OrderSpecifier<?>... orders) {
 
@@ -181,9 +159,6 @@ public class QuerydslLdapPredicateExecutor<T> implements QuerydslPredicateExecut
 		throw new UnsupportedOperationException("Sorting is not supported");
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, org.springframework.data.domain.Pageable)
-	 */
 	@Override
 	public Page<T> findAll(Predicate predicate, Pageable pageable) {
 
@@ -202,10 +177,6 @@ public class QuerydslLdapPredicateExecutor<T> implements QuerydslPredicateExecut
 		throw new UnsupportedOperationException("Pagination and Sorting is not supported");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findBy(com.querydsl.core.types.Predicate, java.util.function.Function)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <S extends T, R> R findBy(Predicate predicate,
@@ -254,19 +225,11 @@ public class QuerydslLdapPredicateExecutor<T> implements QuerydslPredicateExecut
 			this.projection = projection;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#sortBy(org.springframework.data.domain.Sort)
-		 */
 		@Override
 		public FetchableFluentQuery<R> sortBy(Sort sort) {
 			throw new UnsupportedOperationException();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#as(java.lang.Class)
-		 */
 		@Override
 		public <R1> FetchableFluentQuery<R1> as(Class<R1> resultType) {
 
@@ -275,10 +238,6 @@ public class QuerydslLdapPredicateExecutor<T> implements QuerydslPredicateExecut
 			return new FluentQuerydsl<>(predicate, sort, resultType, projection);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#project(java.util.Collection)
-		 */
 		@Override
 		public FetchableFluentQuery<R> project(Collection<String> properties) {
 
@@ -287,10 +246,6 @@ public class QuerydslLdapPredicateExecutor<T> implements QuerydslPredicateExecut
 			return new FluentQuerydsl<>(predicate, sort, resultType, new ArrayList<>(properties));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#oneValue()
-		 */
 		@Nullable
 		@Override
 		public R oneValue() {
@@ -309,10 +264,6 @@ public class QuerydslLdapPredicateExecutor<T> implements QuerydslPredicateExecut
 			return getConversionFunction().apply(one);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#firstValue()
-		 */
 		@Nullable
 		@Override
 		public R firstValue() {
@@ -327,19 +278,11 @@ public class QuerydslLdapPredicateExecutor<T> implements QuerydslPredicateExecut
 			return getConversionFunction().apply(one);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#all()
-		 */
 		@Override
 		public List<R> all() {
 			return stream().collect(Collectors.toList());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#page(org.springframework.data.domain.Pageable)
-		 */
 		@Override
 		public Page<R> page(Pageable pageable) {
 
@@ -361,10 +304,6 @@ public class QuerydslLdapPredicateExecutor<T> implements QuerydslPredicateExecut
 			throw new UnsupportedOperationException("Pagination and Sorting is not supported");
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#stream()
-		 */
 		@Override
 		public Stream<R> stream() {
 
@@ -373,19 +312,11 @@ public class QuerydslLdapPredicateExecutor<T> implements QuerydslPredicateExecut
 			return search(null, QuerydslLdapQuery::list).stream().map(conversionFunction);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#count()
-		 */
 		@Override
 		public long count() {
 			return search(null, q -> q.search(it -> true)).size();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#exists()
-		 */
 		@Override
 		public boolean exists() {
 			return !search(1, q -> q.search(it -> true)).isEmpty();
diff --git a/src/main/java/org/springframework/data/ldap/repository/support/QuerydslLdapQuery.java b/src/main/java/org/springframework/data/ldap/repository/support/QuerydslLdapQuery.java
index f4c1ab0..c355135 100644
--- a/src/main/java/org/springframework/data/ldap/repository/support/QuerydslLdapQuery.java
+++ b/src/main/java/org/springframework/data/ldap/repository/support/QuerydslLdapQuery.java
@@ -92,9 +92,6 @@ public class QuerydslLdapQuery<K> implements FilteredClause<QuerydslLdapQuery<K>
 		this.filterGenerator = new LdapSerializer(ldapOperations.getObjectDirectoryMapper(), this.entityType);
 	}
 
-	/* (non-Javadoc)
-	 * @see com.querydsl.core.FilteredClause#where(com.querydsl.core.types.Predicate[])
-	 */
 	@Override
 	public QuerydslLdapQuery<K> where(Predicate... o) {
 
diff --git a/src/main/java/org/springframework/data/ldap/repository/support/QuerydslLdapRepository.java b/src/main/java/org/springframework/data/ldap/repository/support/QuerydslLdapRepository.java
index 6a2a3ba..49c53c1 100644
--- a/src/main/java/org/springframework/data/ldap/repository/support/QuerydslLdapRepository.java
+++ b/src/main/java/org/springframework/data/ldap/repository/support/QuerydslLdapRepository.java
@@ -82,72 +82,43 @@ public class QuerydslLdapRepository<T> extends SimpleLdapRepository<T> implement
 				ldapOperations, new LdapMappingContext());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findOne(com.querydsl.core.types.Predicate)
-	 */
 	@Override
 	public Optional<T> findOne(Predicate predicate) {
 		return executor.findOne(predicate);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.querydsl.core.types.Predicate)
-	 */
 	@Override
 	public List<T> findAll(Predicate predicate) {
 		return executor.findAll(predicate);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#count(com.querydsl.core.types.Predicate)
-	 */
 	@Override
 	public long count(Predicate predicate) {
 		return executor.count(predicate);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#exists(com.querydsl.core.types.Predicate)
-	 */
 	public boolean exists(Predicate predicate) {
 		return executor.exists(predicate);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, org.springframework.data.domain.Sort)
-	 */
 	public Iterable<T> findAll(Predicate predicate, Sort sort) {
 		return executor.findAll(predicate, sort);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.querydsl.core.types.OrderSpecifier[])
-	 */
 	public Iterable<T> findAll(OrderSpecifier<?>... orders) {
 		return executor.findAll(orders);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, com.querydsl.core.types.OrderSpecifier[])
-	 */
 	@Override
 	public Iterable<T> findAll(Predicate predicate, OrderSpecifier<?>... orders) {
 		return executor.findAll(predicate, orders);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, org.springframework.data.domain.Pageable)
-	 */
 	@Override
 	public Page<T> findAll(Predicate predicate, Pageable pageable) {
 		return executor.findAll(predicate, pageable);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findBy(com.querydsl.core.types.Predicate, java.util.function.Function)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <S extends T, R> R findBy(Predicate predicate,
diff --git a/src/main/java/org/springframework/data/ldap/repository/support/SimpleLdapRepository.java b/src/main/java/org/springframework/data/ldap/repository/support/SimpleLdapRepository.java
index 5b0a1be..8cea1c0 100644
--- a/src/main/java/org/springframework/data/ldap/repository/support/SimpleLdapRepository.java
+++ b/src/main/java/org/springframework/data/ldap/repository/support/SimpleLdapRepository.java
@@ -98,10 +98,6 @@ public class SimpleLdapRepository<T> implements LdapRepository<T> {
 	// Methods from CrudRepository
 	// -------------------------------------------------------------------------
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#save(java.lang.Object)
-	 */
 	@Override
 	public <S extends T> S save(S entity) {
 
@@ -118,10 +114,6 @@ public class SimpleLdapRepository<T> implements LdapRepository<T> {
 		return entity;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#saveAll(java.lang.Iterable)
-	 */
 	@Override
 	public <S extends T> List<S> saveAll(Iterable<S> entities) {
 
@@ -130,10 +122,6 @@ public class SimpleLdapRepository<T> implements LdapRepository<T> {
 				.collect(Collectors.toList());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#findById(java.io.Serializable)
-	 */
 	@Override
 	public Optional<T> findById(Name name) {
 
@@ -146,10 +134,6 @@ public class SimpleLdapRepository<T> implements LdapRepository<T> {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#existsById(java.io.Serializable)
-	 */
 	@Override
 	public boolean existsById(Name name) {
 
@@ -158,19 +142,11 @@ public class SimpleLdapRepository<T> implements LdapRepository<T> {
 		return findById(name).isPresent();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#findAll()
-	 */
 	@Override
 	public List<T> findAll() {
 		return ldapOperations.findAll(entityType);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#findAllById(java.lang.Iterable)
-	 */
 	@Override
 	public List<T> findAllById(Iterable<Name> names) {
 
@@ -180,10 +156,6 @@ public class SimpleLdapRepository<T> implements LdapRepository<T> {
 				.collect(Collectors.toList());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#count()
-	 */
 	@Override
 	public long count() {
 
@@ -195,10 +167,6 @@ public class SimpleLdapRepository<T> implements LdapRepository<T> {
 		return callback.getNoOfRows();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#deleteById(java.io.Serializable)
-	 */
 	@Override
 	public void deleteById(Name name) {
 
@@ -207,10 +175,6 @@ public class SimpleLdapRepository<T> implements LdapRepository<T> {
 		ldapOperations.unbind(name);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#delete(java.lang.Object)
-	 */
 	@Override
 	public void delete(T entity) {
 
@@ -219,10 +183,6 @@ public class SimpleLdapRepository<T> implements LdapRepository<T> {
 		ldapOperations.delete(entity);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#deleteAllById(java.lang.Iterable)
-	 */
 	@Override
 	public void deleteAllById(Iterable<? extends Name> names) {
 
@@ -231,10 +191,6 @@ public class SimpleLdapRepository<T> implements LdapRepository<T> {
 		names.forEach(this::deleteById);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#deleteAll(java.lang.Iterable)
-	 */
 	@Override
 	public void deleteAll(Iterable<? extends T> entities) {
 
@@ -243,10 +199,6 @@ public class SimpleLdapRepository<T> implements LdapRepository<T> {
 		entities.forEach(this::delete);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#deleteAll()
-	 */
 	@Override
 	public void deleteAll() {
 		deleteAll(findAll());
@@ -256,10 +208,6 @@ public class SimpleLdapRepository<T> implements LdapRepository<T> {
 	// Methods from LdapRepository
 	// ------------------------------------------------------------------------
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.ldap.repository.LdapRepository#findOne(org.springframework.ldap.query.LdapQuery)
-	 */
 	@Override
 	public Optional<T> findOne(LdapQuery ldapQuery) {
 
@@ -272,10 +220,6 @@ public class SimpleLdapRepository<T> implements LdapRepository<T> {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.ldap.repository.LdapRepository#findAll(org.springframework.ldap.query.LdapQuery)
-	 */
 	@Override
 	public List<T> findAll(LdapQuery ldapQuery) {