diff --git a/src/main/java/org/springframework/data/keyvalue/core/AbstractKeyValueAdapter.java b/src/main/java/org/springframework/data/keyvalue/core/AbstractKeyValueAdapter.java
index 4ca0ec9..c8a243c 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/AbstractKeyValueAdapter.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/AbstractKeyValueAdapter.java
@@ -58,48 +58,28 @@ public abstract class AbstractKeyValueAdapter implements KeyValueAdapter {
 		return engine;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#get(java.lang.Object, java.lang.String, java.lang.Class)
-	 */
 	@Nullable
 	@Override
 	public <T> T get(Object id, String keyspace, Class<T> type) {
 		return type.cast(get(id, keyspace));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#delete(java.lang.Object, java.lang.String, java.lang.Class)
-	 */
 	@Nullable
 	@Override
 	public <T> T delete(Object id, String keyspace, Class<T> type) {
 		return type.cast(delete(id, keyspace));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#find(org.springframework.data.keyvalue.core.query.KeyValueQuery, java.lang.String, java.lang.Class)
-	 */
 	@Override
 	public <T> Iterable<T> find(KeyValueQuery<?> query, String keyspace, Class<T> type) {
 		return engine.execute(query, keyspace, type);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#find(org.springframework.data.keyvalue.core.query.KeyValueQuery, java.lang.String)
-	 */
 	@Override
 	public Collection<?> find(KeyValueQuery<?> query, String keyspace) {
 		return engine.execute(query, keyspace);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#count(org.springframework.data.keyvalue.core.query.KeyValueQuery, java.lang.String)
-	 */
 	@Override
 	public long count(KeyValueQuery<?> query, String keyspace) {
 		return engine.count(query, keyspace);
diff --git a/src/main/java/org/springframework/data/keyvalue/core/DefaultIdentifierGenerator.java b/src/main/java/org/springframework/data/keyvalue/core/DefaultIdentifierGenerator.java
index 8b97786..911788a 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/DefaultIdentifierGenerator.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/DefaultIdentifierGenerator.java
@@ -39,10 +39,6 @@ enum DefaultIdentifierGenerator implements IdentifierGenerator {
 
 	private final AtomicReference<SecureRandom> secureRandom = new AtomicReference<>(null);
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.IdentifierGenerator#newIdForType(org.springframework.data.util.TypeInformation)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T generateIdentifierOfType(TypeInformation<T> identifierType) {
diff --git a/src/main/java/org/springframework/data/keyvalue/core/ForwardingCloseableIterator.java b/src/main/java/org/springframework/data/keyvalue/core/ForwardingCloseableIterator.java
index bb617e2..ebe4b9f 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/ForwardingCloseableIterator.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/ForwardingCloseableIterator.java
@@ -58,28 +58,16 @@ public class ForwardingCloseableIterator<T> implements CloseableIterator<T> {
 		this.closeHandler = closeHandler;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Iterator#hasNext()
-	 */
 	@Override
 	public boolean hasNext() {
 		return delegate.hasNext();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Iterator#next()
-	 */
 	@Override
 	public T next() {
 		return delegate.next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.util.CloseableIterator#close()
-	 */
 	@Override
 	public void close() {
 		if (closeHandler != null) {
diff --git a/src/main/java/org/springframework/data/keyvalue/core/GeneratingIdAccessor.java b/src/main/java/org/springframework/data/keyvalue/core/GeneratingIdAccessor.java
index abfb654..15c440c 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/GeneratingIdAccessor.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/GeneratingIdAccessor.java
@@ -54,10 +54,6 @@ class GeneratingIdAccessor implements IdentifierAccessor {
 		this.generator = generator;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.IdentifierAccessor#getIdentifier()
-	 */
 	@Override
 	public Object getIdentifier() {
 		return accessor.getProperty(identifierProperty);
diff --git a/src/main/java/org/springframework/data/keyvalue/core/KeyValuePersistenceExceptionTranslator.java b/src/main/java/org/springframework/data/keyvalue/core/KeyValuePersistenceExceptionTranslator.java
index 3a5a38d..d5f8ead 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/KeyValuePersistenceExceptionTranslator.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/KeyValuePersistenceExceptionTranslator.java
@@ -32,10 +32,6 @@ import org.springframework.util.Assert;
  */
 public class KeyValuePersistenceExceptionTranslator implements PersistenceExceptionTranslator {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.dao.support.PersistenceExceptionTranslator#translateExceptionIfPossible(java.lang.RuntimeException)
-	 */
 	@Nullable
 	@Override
 	public DataAccessException translateExceptionIfPossible(RuntimeException exception) {
diff --git a/src/main/java/org/springframework/data/keyvalue/core/KeyValueTemplate.java b/src/main/java/org/springframework/data/keyvalue/core/KeyValueTemplate.java
index 5eccab4..da718f0 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/KeyValueTemplate.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/KeyValueTemplate.java
@@ -132,19 +132,11 @@ public class KeyValueTemplate implements KeyValueOperations, ApplicationEventPub
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.ApplicationEventPublisherAware#setApplicationEventPublisher(org.springframework.context.ApplicationEventPublisher)
-	 */
 	@Override
 	public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
 		this.eventPublisher = applicationEventPublisher;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueOperations#insert(java.lang.Object)
-	 */
 	@Override
 	public <T> T insert(T objectToInsert) {
 
@@ -157,10 +149,6 @@ public class KeyValueTemplate implements KeyValueOperations, ApplicationEventPub
 		return insert(id, objectToInsert);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueOperations#insert(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public <T> T insert(Object id, T objectToInsert) {
 
@@ -187,10 +175,6 @@ public class KeyValueTemplate implements KeyValueOperations, ApplicationEventPub
 		return objectToInsert;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueOperations#update(java.lang.Object)
-	 */
 	@Override
 	public <T> T update(T objectToUpdate) {
 
@@ -204,10 +188,6 @@ public class KeyValueTemplate implements KeyValueOperations, ApplicationEventPub
 		return update(entity.getIdentifierAccessor(objectToUpdate).getRequiredIdentifier(), objectToUpdate);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueOperations#update(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public <T> T update(Object id, T objectToUpdate) {
 
@@ -226,10 +206,6 @@ public class KeyValueTemplate implements KeyValueOperations, ApplicationEventPub
 		return objectToUpdate;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueOperations#findAllOf(java.lang.Class)
-	 */
 	@Override
 	public <T> Iterable<T> findAll(Class<T> type) {
 
@@ -250,10 +226,6 @@ public class KeyValueTemplate implements KeyValueOperations, ApplicationEventPub
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueOperations#findById(java.lang.Object, java.lang.Class)
-	 */
 	@Override
 	public <T> Optional<T> findById(Object id, Class<T> type) {
 
@@ -280,10 +252,6 @@ public class KeyValueTemplate implements KeyValueOperations, ApplicationEventPub
 		return Optional.ofNullable(result);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueOperations#delete(java.lang.Class)
-	 */
 	@Override
 	public void delete(Class<?> type) {
 
@@ -302,10 +270,6 @@ public class KeyValueTemplate implements KeyValueOperations, ApplicationEventPub
 		potentiallyPublishEvent(KeyValueEvent.afterDropKeySpace(keyspace, type));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueOperations#delete(java.lang.Object)
-	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T> T delete(T objectToDelete) {
@@ -316,10 +280,6 @@ public class KeyValueTemplate implements KeyValueOperations, ApplicationEventPub
 		return delete(entity.getIdentifierAccessor(objectToDelete).getIdentifier(), type);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueOperations#delete(java.lang.Object, java.lang.Class)
-	 */
 	@Override
 	public <T> T delete(Object id, Class<T> type) {
 
@@ -337,10 +297,6 @@ public class KeyValueTemplate implements KeyValueOperations, ApplicationEventPub
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueOperations#count(java.lang.Class)
-	 */
 	@Override
 	public long count(Class<?> type) {
 
@@ -348,10 +304,6 @@ public class KeyValueTemplate implements KeyValueOperations, ApplicationEventPub
 		return adapter.count(resolveKeySpace(type));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueOperations#execute(org.springframework.data.keyvalue.core.KeyValueCallback)
-	 */
 	@Nullable
 	@Override
 	public <T> T execute(KeyValueCallback<T> action) {
@@ -383,10 +335,6 @@ public class KeyValueTemplate implements KeyValueOperations, ApplicationEventPub
 		throw new IllegalStateException(String.format("KeyValueCallback %s returned null value!", action));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueOperations#find(org.springframework.data.keyvalue.core.query.KeyValueQuery, java.lang.Class)
-	 */
 	@Override
 	public <T> Iterable<T> find(KeyValueQuery<?> query, Class<T> type) {
 
@@ -406,67 +354,39 @@ public class KeyValueTemplate implements KeyValueOperations, ApplicationEventPub
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueOperations#findAllOf(org.springframework.data.domain.Sort, java.lang.Class)
-	 */
 	@SuppressWarnings("rawtypes")
 	@Override
 	public <T> Iterable<T> findAll(Sort sort, Class<T> type) {
 		return find(new KeyValueQuery(sort), type);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueOperations#findInRange(long, int, java.lang.Class)
-	 */
 	@SuppressWarnings("rawtypes")
 	@Override
 	public <T> Iterable<T> findInRange(long offset, int rows, Class<T> type) {
 		return find(new KeyValueQuery().skip(offset).limit(rows), type);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueOperations#findInRange(long, int, org.springframework.data.domain.Sort, java.lang.Class)
-	 */
 	@SuppressWarnings("rawtypes")
 	@Override
 	public <T> Iterable<T> findInRange(long offset, int rows, Sort sort, Class<T> type) {
 		return find(new KeyValueQuery(sort).skip(offset).limit(rows), type);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueOperations#count(org.springframework.data.keyvalue.core.query.KeyValueQuery, java.lang.Class)
-	 */
 	@Override
 	public long count(KeyValueQuery<?> query, Class<?> type) {
 		return executeRequired(adapter -> adapter.count(query, resolveKeySpace(type)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueOperations#count(org.springframework.data.keyvalue.core.query.KeyValueQuery, java.lang.Class)
-	 */
 	@Override
 	public boolean exists(KeyValueQuery<?> query, Class<?> type) {
 		return executeRequired(adapter -> adapter.exists(query, resolveKeySpace(type)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueOperations#getMappingContext()
-	 */
 	@Override
 	public MappingContext<?, ?> getMappingContext() {
 		return this.mappingContext;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.DisposableBean#destroy()
-	 */
 	@Override
 	public void destroy() throws Exception {
 		this.adapter.clear();
diff --git a/src/main/java/org/springframework/data/keyvalue/core/SpelCriteriaAccessor.java b/src/main/java/org/springframework/data/keyvalue/core/SpelCriteriaAccessor.java
index 9e335e8..eeb7a0c 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/SpelCriteriaAccessor.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/SpelCriteriaAccessor.java
@@ -42,10 +42,6 @@ class SpelCriteriaAccessor implements CriteriaAccessor<SpelCriteria> {
 		this.parser = parser;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.CriteriaAccessor#resolve(org.springframework.data.keyvalue.core.query.KeyValueQuery)
-	 */
 	@Override
 	public SpelCriteria resolve(KeyValueQuery<?> query) {
 
diff --git a/src/main/java/org/springframework/data/keyvalue/core/SpelPropertyComparator.java b/src/main/java/org/springframework/data/keyvalue/core/SpelPropertyComparator.java
index 2afcd09..fc885b6 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/SpelPropertyComparator.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/SpelPropertyComparator.java
@@ -122,10 +122,6 @@ public class SpelPropertyComparator<T> implements Comparator<T> {
 		return rawExpression;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public int compare(T arg1, T arg2) {
 
diff --git a/src/main/java/org/springframework/data/keyvalue/core/SpelQueryEngine.java b/src/main/java/org/springframework/data/keyvalue/core/SpelQueryEngine.java
index 2c71126..3f3e30a 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/SpelQueryEngine.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/SpelQueryEngine.java
@@ -47,20 +47,12 @@ class SpelQueryEngine extends QueryEngine<KeyValueAdapter, SpelCriteria, Compara
 		super(new SpelCriteriaAccessor(PARSER), new SpelSortAccessor(PARSER));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.QueryEngine#execute(java.lang.Object, java.lang.Object, int, int, java.lang.String)
-	 */
 	@Override
 	public Collection<?> execute(@Nullable SpelCriteria criteria, @Nullable Comparator<?> sort, long offset, int rows,
 			String keyspace) {
 		return sortAndFilterMatchingRange(getRequiredAdapter().getAllOf(keyspace), criteria, sort, offset, rows);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.QueryEngine#count(java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public long count(@Nullable SpelCriteria criteria, String keyspace) {
 		return filterMatchingRange(IterableConverter.toList(getRequiredAdapter().getAllOf(keyspace)), criteria, -1, -1)
diff --git a/src/main/java/org/springframework/data/keyvalue/core/SpelSortAccessor.java b/src/main/java/org/springframework/data/keyvalue/core/SpelSortAccessor.java
index 262880f..a6c08f4 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/SpelSortAccessor.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/SpelSortAccessor.java
@@ -47,10 +47,6 @@ public class SpelSortAccessor implements SortAccessor<Comparator<?>> {
 		this.parser = parser;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.SortAccessor#resolve(org.springframework.data.keyvalue.core.query.KeyValueQuery)
-	 */
 	@Override
 	public Comparator<?> resolve(KeyValueQuery<?> query) {
 
diff --git a/src/main/java/org/springframework/data/keyvalue/core/event/KeyValueEvent.java b/src/main/java/org/springframework/data/keyvalue/core/event/KeyValueEvent.java
index c59f3b9..16855d9 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/event/KeyValueEvent.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/event/KeyValueEvent.java
@@ -201,10 +201,6 @@ public class KeyValueEvent<T> extends ApplicationEvent {
 			return key;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.util.EventObject#getSource()
-		 */
 		@Override
 		public Object getSource() {
 			return getKey();
diff --git a/src/main/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolver.java b/src/main/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolver.java
index b9ce5cf..fd0fc15 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolver.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolver.java
@@ -35,10 +35,6 @@ enum AnnotationBasedKeySpaceResolver implements KeySpaceResolver {
 
 	INSTANCE;
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeySpaceResolver#resolveKeySpace(java.lang.Class)
-	 */
 	@Override
 	@Nullable
 	public String resolveKeySpace(Class<?> type) {
diff --git a/src/main/java/org/springframework/data/keyvalue/core/mapping/BasicKeyValuePersistentEntity.java b/src/main/java/org/springframework/data/keyvalue/core/mapping/BasicKeyValuePersistentEntity.java
index 6e1d563..c66d94b 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/mapping/BasicKeyValuePersistentEntity.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/mapping/BasicKeyValuePersistentEntity.java
@@ -85,10 +85,6 @@ public class BasicKeyValuePersistentEntity<T, P extends KeyValuePersistentProper
 				.resolveKeySpace(type);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.mapping.KeyValuePersistentEntity#getKeySpace()
-	 */
 	@Override
 	public String getKeySpace() {
 		return keyspaceExpression == null //
diff --git a/src/main/java/org/springframework/data/keyvalue/core/mapping/ClassNameKeySpaceResolver.java b/src/main/java/org/springframework/data/keyvalue/core/mapping/ClassNameKeySpaceResolver.java
index fbeb835..ae73c77 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/mapping/ClassNameKeySpaceResolver.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/mapping/ClassNameKeySpaceResolver.java
@@ -28,10 +28,6 @@ enum ClassNameKeySpaceResolver implements KeySpaceResolver {
 
 	INSTANCE;
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeySpaceResolver#resolveKeySpace(java.lang.Class)
-	 */
 	@Override
 	public String resolveKeySpace(Class<?> type) {
 
diff --git a/src/main/java/org/springframework/data/keyvalue/core/mapping/KeyValuePersistentProperty.java b/src/main/java/org/springframework/data/keyvalue/core/mapping/KeyValuePersistentProperty.java
index 97851a3..489aebe 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/mapping/KeyValuePersistentProperty.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/mapping/KeyValuePersistentProperty.java
@@ -36,10 +36,6 @@ public class KeyValuePersistentProperty<P extends KeyValuePersistentProperty<P>>
 		super(property, owner, simpleTypeHolder);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.model.AbstractPersistentProperty#createAssociation()
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	protected Association<P> createAssociation() {
diff --git a/src/main/java/org/springframework/data/keyvalue/repository/config/KeyValueRepositoryConfigurationExtension.java b/src/main/java/org/springframework/data/keyvalue/repository/config/KeyValueRepositoryConfigurationExtension.java
index ee4a3e6..3d45e28 100644
--- a/src/main/java/org/springframework/data/keyvalue/repository/config/KeyValueRepositoryConfigurationExtension.java
+++ b/src/main/java/org/springframework/data/keyvalue/repository/config/KeyValueRepositoryConfigurationExtension.java
@@ -50,46 +50,26 @@ public abstract class KeyValueRepositoryConfigurationExtension extends Repositor
 	protected static final String MAPPING_CONTEXT_BEAN_NAME = "keyValueMappingContext";
 	protected static final String KEY_VALUE_TEMPLATE_BEAN_REF_ATTRIBUTE = "keyValueTemplateRef";
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getRepositoryFactoryClassName()
-	 */
 	@Override
 	public String getRepositoryFactoryBeanClassName() {
 		return KeyValueRepositoryFactoryBean.class.getName();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getModuleName()
-	 */
 	@Override
 	public String getModuleName() {
 		return "KeyValue";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getModulePrefix()
-	 */
 	@Override
 	protected String getModulePrefix() {
 		return "keyvalue";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getIdentifyingTypes()
-	 */
 	@Override
 	protected Collection<Class<?>> getIdentifyingTypes() {
 		return Collections.singleton(KeyValueRepository.class);
 	}
 
-	/*
-	 * (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) {
 
@@ -145,10 +125,6 @@ public abstract class KeyValueRepositoryConfigurationExtension extends Repositor
 		return queryCreatorAttributes.getClass("repositoryQueryType");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#registerBeansForRoot(org.springframework.beans.factory.support.BeanDefinitionRegistry, org.springframework.data.repository.config.RepositoryConfigurationSource)
-	 */
 	@Override
 	public void registerBeansForRoot(BeanDefinitionRegistry registry, RepositoryConfigurationSource configurationSource) {
 
diff --git a/src/main/java/org/springframework/data/keyvalue/repository/query/CachingKeyValuePartTreeQuery.java b/src/main/java/org/springframework/data/keyvalue/repository/query/CachingKeyValuePartTreeQuery.java
index 6148fc9..a2f6cf1 100644
--- a/src/main/java/org/springframework/data/keyvalue/repository/query/CachingKeyValuePartTreeQuery.java
+++ b/src/main/java/org/springframework/data/keyvalue/repository/query/CachingKeyValuePartTreeQuery.java
@@ -41,10 +41,6 @@ public class CachingKeyValuePartTreeQuery extends KeyValuePartTreeQuery {
 		super(queryMethod, evaluationContextProvider, keyValueOperations, queryCreator);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.repository.query.KeyValuePartTreeQuery#prepareQuery(java.lang.Object[])
-	 */
 	protected KeyValueQuery<?> prepareQuery(Object[] parameters) {
 
 		if (cachedQuery == null) {
diff --git a/src/main/java/org/springframework/data/keyvalue/repository/query/KeyValuePartTreeQuery.java b/src/main/java/org/springframework/data/keyvalue/repository/query/KeyValuePartTreeQuery.java
index bc8ba92..d1d9932 100644
--- a/src/main/java/org/springframework/data/keyvalue/repository/query/KeyValuePartTreeQuery.java
+++ b/src/main/java/org/springframework/data/keyvalue/repository/query/KeyValuePartTreeQuery.java
@@ -101,10 +101,6 @@ public class KeyValuePartTreeQuery implements RepositoryQuery {
 		this.queryCreatorFactory = queryCreatorFactory;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.RepositoryQuery#execute(java.lang.Object[])
-	 */
 	@Override
 	public Object execute(Object[] parameters) {
 
@@ -221,10 +217,6 @@ public class KeyValuePartTreeQuery implements RepositoryQuery {
 		return query;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.RepositoryQuery#getQueryMethod()
-	 */
 	@Override
 	public QueryMethod getQueryMethod() {
 		return queryMethod;
diff --git a/src/main/java/org/springframework/data/keyvalue/repository/query/SpelQueryCreator.java b/src/main/java/org/springframework/data/keyvalue/repository/query/SpelQueryCreator.java
index 840a436..9ee96ac 100644
--- a/src/main/java/org/springframework/data/keyvalue/repository/query/SpelQueryCreator.java
+++ b/src/main/java/org/springframework/data/keyvalue/repository/query/SpelQueryCreator.java
@@ -57,28 +57,16 @@ public class SpelQueryCreator extends AbstractQueryCreator<KeyValueQuery<SpelExp
 		this.expression = toPredicateExpression(tree);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#create(org.springframework.data.repository.query.parser.Part, java.util.Iterator)
-	 */
 	@Override
 	protected String create(Part part, Iterator<Object> iterator) {
 		return "";
 	}
 
-	/*
-	 * (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 String and(Part part, String base, Iterator<Object> iterator) {
 		return "";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#or(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	protected String or(String base, String criteria) {
 		return "";
diff --git a/src/main/java/org/springframework/data/keyvalue/repository/support/DtoInstantiatingConverter.java b/src/main/java/org/springframework/data/keyvalue/repository/support/DtoInstantiatingConverter.java
index d100ab8..0b21596 100644
--- a/src/main/java/org/springframework/data/keyvalue/repository/support/DtoInstantiatingConverter.java
+++ b/src/main/java/org/springframework/data/keyvalue/repository/support/DtoInstantiatingConverter.java
@@ -60,10 +60,6 @@ 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/keyvalue/repository/support/KeyValueRepositoryFactory.java b/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueRepositoryFactory.java
index 25e356c..72b8bb7 100644
--- a/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueRepositoryFactory.java
+++ b/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueRepositoryFactory.java
@@ -109,10 +109,6 @@ public class KeyValueRepositoryFactory extends RepositoryFactorySupport {
 		this.repositoryQueryType = repositoryQueryType;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T, ID> EntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
@@ -122,10 +118,6 @@ public class KeyValueRepositoryFactory extends RepositoryFactorySupport {
 		return new PersistentEntityInformation<>(entity);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getTargetRepository(org.springframework.data.repository.core.RepositoryMetadata)
-	 */
 	@Override
 	protected Object getTargetRepository(RepositoryInformation repositoryInformation) {
 
@@ -133,19 +125,11 @@ public class KeyValueRepositoryFactory extends RepositoryFactorySupport {
 		return super.getTargetRepositoryViaReflection(repositoryInformation, entityInformation, keyValueOperations);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryBaseClass(org.springframework.data.repository.core.RepositoryMetadata)
-	 */
 	@Override
 	protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
 		return SimpleKeyValueRepository.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, keyValueOperations);
@@ -189,10 +173,6 @@ public class KeyValueRepositoryFactory extends RepositoryFactorySupport {
 		return QUERY_DSL_PRESENT && QuerydslPredicateExecutor.class.isAssignableFrom(repositoryInterface);
 	}
 
-	/*
-	 * (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) {
@@ -235,10 +215,6 @@ public class KeyValueRepositoryFactory extends RepositoryFactorySupport {
 			this.repositoryQueryType = repositoryQueryType;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.QueryLookupStrategy#resolveQuery(java.lang.reflect.Method, org.springframework.data.repository.core.RepositoryMetadata, org.springframework.data.projection.ProjectionFactory, org.springframework.data.repository.core.NamedQueries)
-		 */
 		@Override
 		@SuppressWarnings("unchecked")
 		public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory,
diff --git a/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueRepositoryFactoryBean.java b/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueRepositoryFactoryBean.java
index 3a3d663..4f39a82 100644
--- a/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueRepositoryFactoryBean.java
+++ b/src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueRepositoryFactoryBean.java
@@ -62,10 +62,6 @@ public class KeyValueRepositoryFactoryBean<T extends Repository<S, ID>, S, ID>
 		this.operations = operations;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#setMappingContext(org.springframework.data.mapping.context.MappingContext)
-	 */
 	@Override
 	public void setMappingContext(MappingContext<?, ?> mappingContext) {
 		super.setMappingContext(mappingContext);
@@ -97,10 +93,6 @@ public class KeyValueRepositoryFactoryBean<T extends Repository<S, ID>, S, ID>
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#createRepositoryFactory()
-	 */
 	@Override
 	protected final RepositoryFactorySupport createRepositoryFactory() {
 		return createRepositoryFactory(operations, queryCreator, repositoryQueryType);
@@ -121,10 +113,6 @@ public class KeyValueRepositoryFactoryBean<T extends Repository<S, ID>, S, ID>
 		return new KeyValueRepositoryFactory(operations, queryCreator, repositoryQueryType);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#afterPropertiesSet()
-	 */
 	@Override
 	public void afterPropertiesSet() {
 
diff --git a/src/main/java/org/springframework/data/keyvalue/repository/support/QuerydslKeyValuePredicateExecutor.java b/src/main/java/org/springframework/data/keyvalue/repository/support/QuerydslKeyValuePredicateExecutor.java
index 585e51c..e51656a 100644
--- a/src/main/java/org/springframework/data/keyvalue/repository/support/QuerydslKeyValuePredicateExecutor.java
+++ b/src/main/java/org/springframework/data/keyvalue/repository/support/QuerydslKeyValuePredicateExecutor.java
@@ -108,10 +108,6 @@ public class QuerydslKeyValuePredicateExecutor<T> implements QuerydslPredicateEx
 		findAll = () -> operations.findAll(entityInformation.getJavaType());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findOne(com.querydsl.core.types.Predicate)
-	 */
 	@Override
 	public Optional<T> findOne(Predicate predicate) {
 
@@ -124,10 +120,6 @@ public class QuerydslKeyValuePredicateExecutor<T> implements QuerydslPredicateEx
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.querydsl.core.types.Predicate)
-	 */
 	@Override
 	public Iterable<T> findAll(Predicate predicate) {
 
@@ -136,10 +128,6 @@ public class QuerydslKeyValuePredicateExecutor<T> implements QuerydslPredicateEx
 		return prepareQuery(predicate).fetchResults().getResults();
 	}
 
-	/*
-	 * (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) {
 
@@ -152,10 +140,6 @@ public class QuerydslKeyValuePredicateExecutor<T> implements QuerydslPredicateEx
 		return query.fetchResults().getResults();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, org.springframework.data.domain.Sort)
-	 */
 	@Override
 	public Iterable<T> findAll(Predicate predicate, Sort sort) {
 
@@ -165,10 +149,6 @@ public class QuerydslKeyValuePredicateExecutor<T> implements QuerydslPredicateEx
 		return findAll(predicate, toOrderSpecifier(sort, builder));
 	}
 
-	/*
-	 * (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) {
 
@@ -190,10 +170,6 @@ public class QuerydslKeyValuePredicateExecutor<T> implements QuerydslPredicateEx
 		return new PageImpl<>(query.fetchResults().getResults(), pageable, count(predicate));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findAll(com.querydsl.core.types.OrderSpecifier[])
-	 */
 	@Override
 	public Iterable<T> findAll(OrderSpecifier<?>... orders) {
 
@@ -209,10 +185,6 @@ public class QuerydslKeyValuePredicateExecutor<T> implements QuerydslPredicateEx
 		return query.fetchResults().getResults();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#count(com.querydsl.core.types.Predicate)
-	 */
 	@Override
 	public long count(Predicate predicate) {
 
@@ -221,10 +193,6 @@ public class QuerydslKeyValuePredicateExecutor<T> implements QuerydslPredicateEx
 		return prepareQuery(predicate).fetchCount();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#exists(com.querydsl.core.types.Predicate)
-	 */
 	@Override
 	public boolean exists(Predicate predicate) {
 
@@ -233,10 +201,6 @@ public class QuerydslKeyValuePredicateExecutor<T> implements QuerydslPredicateEx
 		return count(predicate) > 0;
 	}
 
-	/*
-	 * (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,
@@ -290,10 +254,6 @@ public class QuerydslKeyValuePredicateExecutor<T> implements QuerydslPredicateEx
 			this.fieldsToInclude = fieldsToInclude;
 		}
 
-		/*
-		* (non-Javadoc)
-		* @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#sortBy(org.springframework.data.domain.Sort)
-		*/
 		@Override
 		public FluentQuery.FetchableFluentQuery<R> sortBy(Sort sort) {
 
@@ -302,10 +262,6 @@ public class QuerydslKeyValuePredicateExecutor<T> implements QuerydslPredicateEx
 			return new FluentQuerydsl<>(predicate, sort, entityType, resultType, fieldsToInclude);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#as(java.lang.Class)
-		 */
 		@Override
 		public <NR> FluentQuery.FetchableFluentQuery<NR> as(Class<NR> projection) {
 
@@ -314,10 +270,6 @@ public class QuerydslKeyValuePredicateExecutor<T> implements QuerydslPredicateEx
 			return new FluentQuerydsl<>(predicate, sort, entityType, projection, fieldsToInclude);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#project(java.util.Collection)
-		 */
 		public FluentQuery.FetchableFluentQuery<R> project(Collection<String> properties) {
 
 			Assert.notNull(properties, "Projection properties must not be null!");
@@ -325,10 +277,6 @@ public class QuerydslKeyValuePredicateExecutor<T> implements QuerydslPredicateEx
 			return new FluentQuerydsl<>(predicate, sort, entityType, resultType, new ArrayList<>(properties));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#oneValue()
-		 */
 		@Override
 		public R oneValue() {
 
@@ -347,10 +295,6 @@ public class QuerydslKeyValuePredicateExecutor<T> implements QuerydslPredicateEx
 
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#firstValue()
-		 */
 		@Override
 		public R firstValue() {
 
@@ -364,10 +308,6 @@ public class QuerydslKeyValuePredicateExecutor<T> implements QuerydslPredicateEx
 			return getConversionFunction().apply(one);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#all()
-		 */
 		@Override
 		public List<R> all() {
 
@@ -376,10 +316,6 @@ public class QuerydslKeyValuePredicateExecutor<T> implements QuerydslPredicateEx
 			return mapResults(results);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#page(org.springframework.data.domain.Pageable)
-		 */
 		@Override
 		public Page<R> page(Pageable pageable) {
 
@@ -401,28 +337,16 @@ public class QuerydslKeyValuePredicateExecutor<T> implements QuerydslPredicateEx
 			return new PageImpl<>(mapResults(results.getResults()), pageable, results.getTotal());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#stream()
-		 */
 		@Override
 		public Stream<R> stream() {
 			return createQuery().stream().map(getConversionFunction());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#count()
-		 */
 		@Override
 		public long count() {
 			return createQuery().fetchCount();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#exists()
-		 */
 		@Override
 		public boolean exists() {
 			return count() > 0;
diff --git a/src/main/java/org/springframework/data/keyvalue/repository/support/QuerydslKeyValueRepository.java b/src/main/java/org/springframework/data/keyvalue/repository/support/QuerydslKeyValueRepository.java
index 54d9146..e9d9f38 100644
--- a/src/main/java/org/springframework/data/keyvalue/repository/support/QuerydslKeyValueRepository.java
+++ b/src/main/java/org/springframework/data/keyvalue/repository/support/QuerydslKeyValueRepository.java
@@ -82,82 +82,46 @@ public class QuerydslKeyValueRepository<T, ID> extends SimpleKeyValueRepository<
 				operations, resolver);
 	}
 
-	/*
-	 * (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 Iterable<T> findAll(Predicate predicate) {
 		return executor.findAll(predicate);
 	}
 
-	/*
-	 * (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.Sort)
-	 */
 	@Override
 	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.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#findAll(com.querydsl.core.types.OrderSpecifier[])
-	 */
 	@Override
 	public Iterable<T> findAll(OrderSpecifier<?>... orders) {
 		return executor.findAll(orders);
 	}
 
-	/*
-	 * (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)
-	 */
 	@Override
 	public boolean exists(Predicate predicate) {
 		return executor.exists(predicate);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findBy(com.querydsl.core.types.Predicate, java.util.function.Function)
-	 */
 	@Override
 	public <S extends T, R> R findBy(Predicate predicate,
 			Function<FluentQuery.FetchableFluentQuery<S>, R> queryFunction) {
diff --git a/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java b/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java
index 5a8291e..b9eb182 100644
--- a/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java
+++ b/src/main/java/org/springframework/data/keyvalue/repository/support/SimpleKeyValueRepository.java
@@ -64,10 +64,6 @@ public class SimpleKeyValueRepository<T, ID> implements KeyValueRepository<T, ID
 	// Methods from CrudRepository
 	// -------------------------------------------------------------------------
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#save(java.lang.Object)
-	 */
 	@Override
 	public <S extends T> S save(S entity) {
 
@@ -80,10 +76,6 @@ public class SimpleKeyValueRepository<T, ID> implements KeyValueRepository<T, ID
 		return operations.update(entityInformation.getRequiredId(entity), entity);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#save(java.lang.Iterable)
-	 */
 	@Override
 	public <S extends T> Iterable<S> saveAll(Iterable<S> entities) {
 
@@ -98,10 +90,6 @@ public class SimpleKeyValueRepository<T, ID> implements KeyValueRepository<T, ID
 		return saved;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#findOne(java.lang.Object)
-	 */
 	@Override
 	public Optional<T> findById(ID id) {
 
@@ -110,28 +98,16 @@ public class SimpleKeyValueRepository<T, ID> implements KeyValueRepository<T, ID
 		return operations.findById(id, entityInformation.getJavaType());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#exists(java.lang.Object)
-	 */
 	@Override
 	public boolean existsById(ID id) {
 		return findById(id).isPresent();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#findAll()
-	 */
 	@Override
 	public List<T> findAll() {
 		return IterableConverter.toList(operations.findAll(entityInformation.getJavaType()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#findAll(java.lang.Iterable)
-	 */
 	@Override
 	public Iterable<T> findAllById(Iterable<ID> ids) {
 
@@ -144,19 +120,11 @@ public class SimpleKeyValueRepository<T, ID> implements KeyValueRepository<T, ID
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#count()
-	 */
 	@Override
 	public long count() {
 		return operations.count(entityInformation.getJavaType());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#delete(java.lang.Object)
-	 */
 	@Override
 	public void deleteById(ID id) {
 
@@ -165,10 +133,6 @@ public class SimpleKeyValueRepository<T, ID> implements KeyValueRepository<T, ID
 		operations.delete(id, entityInformation.getJavaType());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#delete(java.lang.Object)
-	 */
 	@Override
 	public void delete(T entity) {
 
@@ -177,10 +141,6 @@ public class SimpleKeyValueRepository<T, ID> implements KeyValueRepository<T, ID
 		deleteById(entityInformation.getRequiredId(entity));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#deleteAllById(java.lang.Iterable)
-	 */
 	@Override
 	public void deleteAllById(Iterable<? extends ID> ids) {
 
@@ -189,10 +149,6 @@ public class SimpleKeyValueRepository<T, ID> implements KeyValueRepository<T, ID
 		ids.forEach(this::deleteById);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#delete(java.lang.Iterable)
-	 */
 	@Override
 	public void deleteAll(Iterable<? extends T> entities) {
 
@@ -201,10 +157,6 @@ public class SimpleKeyValueRepository<T, ID> implements KeyValueRepository<T, ID
 		entities.forEach(this::delete);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#deleteAll()
-	 */
 	@Override
 	public void deleteAll() {
 		operations.delete(entityInformation.getJavaType());
@@ -214,10 +166,6 @@ public class SimpleKeyValueRepository<T, ID> implements KeyValueRepository<T, ID
 	// Methods from PagingAndSortingRepository
 	// -------------------------------------------------------------------------
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Sort)
-	 */
 	@Override
 	public Iterable<T> findAll(Sort sort) {
 
@@ -226,10 +174,6 @@ public class SimpleKeyValueRepository<T, ID> implements KeyValueRepository<T, ID
 		return operations.findAll(sort, entityInformation.getJavaType());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Pageable)
-	 */
 	@Override
 	public Page<T> findAll(Pageable pageable) {
 
diff --git a/src/main/java/org/springframework/data/map/MapKeyValueAdapter.java b/src/main/java/org/springframework/data/map/MapKeyValueAdapter.java
index e8ae73d..3739a11 100644
--- a/src/main/java/org/springframework/data/map/MapKeyValueAdapter.java
+++ b/src/main/java/org/springframework/data/map/MapKeyValueAdapter.java
@@ -123,10 +123,6 @@ public class MapKeyValueAdapter extends AbstractKeyValueAdapter {
 		this.keySpaceMapType = keySpaceMapType;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#put(java.lang.Object, java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public Object put(Object id, Object item, String keyspace) {
 
@@ -136,27 +132,16 @@ public class MapKeyValueAdapter extends AbstractKeyValueAdapter {
 		return getKeySpaceMap(keyspace).put(id, item);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#contains(java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public boolean contains(Object id, String keyspace) {
 		return get(id, keyspace) != null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#count(java.lang.String)
-	 */
 	@Override
 	public long count(String keyspace) {
 		return getKeySpaceMap(keyspace).size();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#get(java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public Object get(Object id, String keyspace) {
 
@@ -164,10 +149,6 @@ public class MapKeyValueAdapter extends AbstractKeyValueAdapter {
 		return getKeySpaceMap(keyspace).get(id);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#delete(java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public Object delete(Object id, String keyspace) {
 
@@ -175,46 +156,26 @@ public class MapKeyValueAdapter extends AbstractKeyValueAdapter {
 		return getKeySpaceMap(keyspace).remove(id);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#getAllOf(java.lang.String)
-	 */
 	@Override
 	public Collection<?> getAllOf(String keyspace) {
 		return getKeySpaceMap(keyspace).values();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#entries(java.lang.String)
-	 */
 	@Override
 	public CloseableIterator<Entry<Object, Object>> entries(String keyspace) {
 		return new ForwardingCloseableIterator<>(getKeySpaceMap(keyspace).entrySet().iterator());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#deleteAllOf(java.lang.String)
-	 */
 	@Override
 	public void deleteAllOf(String keyspace) {
 		getKeySpaceMap(keyspace).clear();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.core.KeyValueAdapter#clear()
-	 */
 	@Override
 	public void clear() {
 		store.clear();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.DisposableBean#destroy()
-	 */
 	@Override
 	public void destroy() throws Exception {
 		clear();
diff --git a/src/main/java/org/springframework/data/map/repository/config/MapRepositoriesRegistrar.java b/src/main/java/org/springframework/data/map/repository/config/MapRepositoriesRegistrar.java
index 69ec739..1a768e4 100644
--- a/src/main/java/org/springframework/data/map/repository/config/MapRepositoriesRegistrar.java
+++ b/src/main/java/org/springframework/data/map/repository/config/MapRepositoriesRegistrar.java
@@ -27,19 +27,11 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
  */
 public class MapRepositoriesRegistrar extends RepositoryBeanDefinitionRegistrarSupport {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getAnnotation()
-	 */
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
 		return EnableMapRepositories.class;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getExtension()
-	 */
 	@Override
 	protected RepositoryConfigurationExtension getExtension() {
 		return new MapRepositoryConfigurationExtension();
diff --git a/src/main/java/org/springframework/data/map/repository/config/MapRepositoryConfigurationExtension.java b/src/main/java/org/springframework/data/map/repository/config/MapRepositoryConfigurationExtension.java
index 2c1be2a..1c5e99b 100644
--- a/src/main/java/org/springframework/data/map/repository/config/MapRepositoryConfigurationExtension.java
+++ b/src/main/java/org/springframework/data/map/repository/config/MapRepositoryConfigurationExtension.java
@@ -32,37 +32,21 @@ import org.springframework.data.repository.config.RepositoryConfigurationSource;
  */
 public class MapRepositoryConfigurationExtension extends KeyValueRepositoryConfigurationExtension {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.repository.config.KeyValueRepositoryConfigurationExtension#getModuleName()
-	 */
 	@Override
 	public String getModuleName() {
 		return "Map";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.repository.config.KeyValueRepositoryConfigurationExtension#getModulePrefix()
-	 */
 	@Override
 	protected String getModulePrefix() {
 		return "map";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.repository.config.KeyValueRepositoryConfigurationExtension#getDefaultKeyValueTemplateRef()
-	 */
 	@Override
 	protected String getDefaultKeyValueTemplateRef() {
 		return "mapKeyValueTemplate";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.keyvalue.repository.config.KeyValueRepositoryConfigurationExtension#getDefaultKeyValueTemplateBeanDefinition()
-	 */
 	@Override
 	protected AbstractBeanDefinition getDefaultKeyValueTemplateBeanDefinition(
 			RepositoryConfigurationSource configurationSource) {
diff --git a/src/test/java/org/springframework/data/map/QuerydslKeyValuePredicateExecutorUnitTests.java b/src/test/java/org/springframework/data/map/QuerydslKeyValuePredicateExecutorUnitTests.java
index 4d2e2cc..907ba8d 100644
--- a/src/test/java/org/springframework/data/map/QuerydslKeyValuePredicateExecutorUnitTests.java
+++ b/src/test/java/org/springframework/data/map/QuerydslKeyValuePredicateExecutorUnitTests.java
@@ -296,10 +296,6 @@ class QuerydslKeyValuePredicateExecutorUnitTests extends AbstractRepositoryUnitT
 		String firstname;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.map.SimpleKeyValueRepositoryUnitTests#getRepository(org.springframework.data.keyvalue.repository.support.KeyValueRepositoryFactory)
-	 */
 	@Override
 	protected QPersonRepository getRepository(KeyValueRepositoryFactory factory) {
 		return factory.getRepository(QPersonRepository.class);