diff --git a/src/main/java/org/springframework/data/keyvalue/annotation/KeySpace.java b/src/main/java/org/springframework/data/keyvalue/annotation/KeySpace.java
index a4078f0..e63a36b 100644
--- a/src/main/java/org/springframework/data/keyvalue/annotation/KeySpace.java
+++ b/src/main/java/org/springframework/data/keyvalue/annotation/KeySpace.java
@@ -54,7 +54,6 @@ import org.springframework.data.annotation.Persistent;
  * </pre>
  * 
  * @author Christoph Strobl
- * @since 1.10
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
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 748c31e..2a11a0a 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/AbstractKeyValueAdapter.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/AbstractKeyValueAdapter.java
@@ -25,7 +25,6 @@ import org.springframework.data.keyvalue.core.query.KeyValueQuery;
  * {@literal count} execution to.
  * 
  * @author Christoph Strobl
- * @since 1.10
  */
 public abstract class AbstractKeyValueAdapter implements KeyValueAdapter {
 
diff --git a/src/main/java/org/springframework/data/keyvalue/core/CriteriaAccessor.java b/src/main/java/org/springframework/data/keyvalue/core/CriteriaAccessor.java
index d1804ce..389d65b 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/CriteriaAccessor.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/CriteriaAccessor.java
@@ -21,7 +21,6 @@ import org.springframework.data.keyvalue.core.query.KeyValueQuery;
  * Resolves the criteria object from given {@link KeyValueQuery}.
  * 
  * @author Christoph Strobl
- * @since 1.10
  * @param <T>
  */
 public interface CriteriaAccessor<T> {
diff --git a/src/main/java/org/springframework/data/keyvalue/core/IdentifierGenerator.java b/src/main/java/org/springframework/data/keyvalue/core/IdentifierGenerator.java
index 25361d2..0fd2458 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/IdentifierGenerator.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/IdentifierGenerator.java
@@ -22,7 +22,6 @@ import org.springframework.data.util.TypeInformation;
  * 
  * @author Christoph Strobl
  * @author Oliver Gierke
- * @since 1.10
  */
 public interface IdentifierGenerator {
 
diff --git a/src/main/java/org/springframework/data/keyvalue/core/KeySpaceUtils.java b/src/main/java/org/springframework/data/keyvalue/core/KeySpaceUtils.java
index 640c2c6..c71944c 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/KeySpaceUtils.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/KeySpaceUtils.java
@@ -42,7 +42,6 @@ abstract class KeySpaceUtils {
 	 * Looks up {@link Persistent} when used as meta annotation to find the {@link KeySpace} attribute.
 	 * 
 	 * @return
-	 * @since 1.10
 	 */
 	public static Object getKeySpace(Class<?> type) {
 
diff --git a/src/main/java/org/springframework/data/keyvalue/core/KeyValueAdapter.java b/src/main/java/org/springframework/data/keyvalue/core/KeyValueAdapter.java
index 42be9c4..bfc019f 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/KeyValueAdapter.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/KeyValueAdapter.java
@@ -25,7 +25,6 @@ import org.springframework.data.keyvalue.core.query.KeyValueQuery;
  * {@link KeyValueAdapter} unifies access and shields the underlying key/value specific implementation.
  * 
  * @author Christoph Strobl
- * @since 1.10
  */
 public interface KeyValueAdapter extends DisposableBean {
 
diff --git a/src/main/java/org/springframework/data/keyvalue/core/KeyValueCallback.java b/src/main/java/org/springframework/data/keyvalue/core/KeyValueCallback.java
index b30f49d..93f85da 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/KeyValueCallback.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/KeyValueCallback.java
@@ -20,7 +20,6 @@ package org.springframework.data.keyvalue.core;
  * delegating code that needs to work closely on the underlying key/value store implementation.
  * 
  * @author Christoph Strobl
- * @since 1.10
  * @param <T>
  */
 public interface KeyValueCallback<T> {
diff --git a/src/main/java/org/springframework/data/keyvalue/core/KeyValueOperations.java b/src/main/java/org/springframework/data/keyvalue/core/KeyValueOperations.java
index 3495408..3851c81 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/KeyValueOperations.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/KeyValueOperations.java
@@ -28,7 +28,6 @@ import org.springframework.data.mapping.context.MappingContext;
  * Interface that specifies a basic set of key/value operations. Implemented by {@link KeyValueTemplate}.
  * 
  * @author Christoph Strobl
- * @since 1.10
  */
 public interface KeyValueOperations extends DisposableBean {
 
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 5a5ed66..21fb050 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/KeyValuePersistenceExceptionTranslator.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/KeyValuePersistenceExceptionTranslator.java
@@ -26,7 +26,6 @@ import org.springframework.dao.support.PersistenceExceptionTranslator;
  * exception to an appropriate exception from the {@code org.springframework.dao} hierarchy.
  * 
  * @author Christoph Strobl
- * @since 1.10
  */
 public class KeyValuePersistenceExceptionTranslator implements PersistenceExceptionTranslator {
 
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 820d18a..5d897c4 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/KeyValueTemplate.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/KeyValueTemplate.java
@@ -42,7 +42,6 @@ import org.springframework.util.StringUtils;
  * 
  * @author Christoph Strobl
  * @author Oliver Gierke
- * @since 1.10
  */
 public class KeyValueTemplate implements KeyValueOperations {
 
diff --git a/src/main/java/org/springframework/data/keyvalue/core/QueryEngine.java b/src/main/java/org/springframework/data/keyvalue/core/QueryEngine.java
index eea6679..16c26a8 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/QueryEngine.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/QueryEngine.java
@@ -24,7 +24,6 @@ import org.springframework.data.keyvalue.core.query.KeyValueQuery;
  * Base implementation for accessing and executing {@link KeyValueQuery} against a {@link KeyValueAdapter}.
  * 
  * @author Christoph Strobl
- * @since 1.10
  * @param <ADAPTER>
  * @param <CRITERIA>
  * @param <SORT>
diff --git a/src/main/java/org/springframework/data/keyvalue/core/SortAccessor.java b/src/main/java/org/springframework/data/keyvalue/core/SortAccessor.java
index 363dd4d..5bba685 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/SortAccessor.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/SortAccessor.java
@@ -23,7 +23,6 @@ import org.springframework.data.keyvalue.core.query.KeyValueQuery;
  * representation that can be used by the {@link QueryEngine} implementation.
  * 
  * @author Christoph Strobl
- * @since 1.10
  * @param <T>
  */
 public interface SortAccessor<T> {
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 9da2d71..06e2233 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/SpelCriteriaAccessor.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/SpelCriteriaAccessor.java
@@ -25,7 +25,6 @@ import org.springframework.util.Assert;
  * 
  * @author Christoph Strobl
  * @author Oliver Gierke
- * @since 1.10
  */
 class SpelCriteriaAccessor implements CriteriaAccessor<SpelExpression> {
 
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 b145860..646400b 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/SpelPropertyComparator.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/SpelPropertyComparator.java
@@ -25,7 +25,6 @@ import org.springframework.expression.spel.standard.SpelExpressionParser;
  *
  * @author Christoph Strobl
  * @author Oliver Gierke
- * @since 1.10
  * @param <T>
  */
 public class SpelPropertyComparator<T> implements Comparator<T> {
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 671c5d2..6b7977a 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/SpelQueryEngine.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/SpelQueryEngine.java
@@ -33,7 +33,6 @@ import org.springframework.expression.spel.standard.SpelExpressionParser;
  * 
  * @author Christoph Strobl
  * @author Oliver Gierke
- * @since 1.10
  * @param <T>
  */
 class SpelQueryEngine<T extends KeyValueAdapter> extends QueryEngine<KeyValueAdapter, SpelExpression, Comparator<?>> {
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 3f4a419..6d5c9d0 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/SpelSortAccessor.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/SpelSortAccessor.java
@@ -30,7 +30,6 @@ import org.springframework.util.comparator.CompoundComparator;
  * 
  * @author Christoph Strobl
  * @author Oliver Gierke
- * @since 1.10
  */
 class SpelSortAccessor implements SortAccessor<Comparator<?>> {
 
diff --git a/src/main/java/org/springframework/data/keyvalue/core/UncategorizedKeyValueException.java b/src/main/java/org/springframework/data/keyvalue/core/UncategorizedKeyValueException.java
index 47df713..07f371f 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/UncategorizedKeyValueException.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/UncategorizedKeyValueException.java
@@ -19,7 +19,6 @@ import org.springframework.dao.UncategorizedDataAccessException;
 
 /**
  * @author Christoph Strobl
- * @since 1.10
  */
 public class UncategorizedKeyValueException extends UncategorizedDataAccessException {
 
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 453b001..3fd4947 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
@@ -28,7 +28,6 @@ import org.springframework.data.mapping.model.SimpleTypeHolder;
  * Most trivial implementation of {@link PersistentProperty}.
  * 
  * @author Christoph Strobl
- * @since 1.10
  */
 public class KeyValuePersistentProperty extends AnnotationBasedPersistentProperty<KeyValuePersistentProperty> {
 
diff --git a/src/main/java/org/springframework/data/keyvalue/core/mapping/context/KeyValueMappingContext.java b/src/main/java/org/springframework/data/keyvalue/core/mapping/context/KeyValueMappingContext.java
index f3266fe..4f9ab84 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/mapping/context/KeyValueMappingContext.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/mapping/context/KeyValueMappingContext.java
@@ -26,7 +26,6 @@ import org.springframework.data.util.TypeInformation;
 
 /**
  * @author Christoph Strobl
- * @since 1.10
  */
 public class KeyValueMappingContext extends
 		AbstractMappingContext<BasicPersistentEntity<?, KeyValuePersistentProperty>, KeyValuePersistentProperty> {
diff --git a/src/main/java/org/springframework/data/keyvalue/core/query/KeyValueQuery.java b/src/main/java/org/springframework/data/keyvalue/core/query/KeyValueQuery.java
index 79d683e..b032a62 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/query/KeyValueQuery.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/query/KeyValueQuery.java
@@ -19,7 +19,6 @@ import org.springframework.data.domain.Sort;
 
 /**
  * @author Christoph Strobl
- * @since 1.10
  * @param <T> Criteria type
  */
 public class KeyValueQuery<T> {
diff --git a/src/main/java/org/springframework/data/keyvalue/repository/KeyValueRepository.java b/src/main/java/org/springframework/data/keyvalue/repository/KeyValueRepository.java
index 2a70394..50e3a11 100644
--- a/src/main/java/org/springframework/data/keyvalue/repository/KeyValueRepository.java
+++ b/src/main/java/org/springframework/data/keyvalue/repository/KeyValueRepository.java
@@ -21,7 +21,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 
 /**
  * @author Christoph Strobl
- * @since 1.10
  * @param <T>
  * @param <ID>
  */
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 f0c55af..764aceb 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
@@ -41,7 +41,6 @@ import org.springframework.util.CollectionUtils;
  * 
  * @author Christoph Strobl
  * @author Oliver Gierke
- * @since 1.10
  */
 public class KeyValuePartTreeQuery implements RepositoryQuery {
 
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 cf1e714..90108a8 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
@@ -34,7 +34,6 @@ import org.springframework.expression.spel.standard.SpelExpressionParser;
  * 
  * @author Christoph Strobl
  * @author Oliver Gierke
- * @since 1.10
  */
 public class SpelQueryCreator extends AbstractQueryCreator<KeyValueQuery<SpelExpression>, String> {
 
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 efddd7b..8e6a7b8 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
@@ -45,7 +45,6 @@ import org.springframework.util.ClassUtils;
  * {@link org.springframework.data.keyvalue.repository.KeyValueRepository}.
  * 
  * @author Christoph Strobl
- * @since 1.10
  */
 public class KeyValueRepositoryFactory extends RepositoryFactorySupport {
 
@@ -145,7 +144,6 @@ public class KeyValueRepositoryFactory extends RepositoryFactorySupport {
 	/**
 	 * @author Christoph Strobl
 	 * @author Oliver Gierke
-	 * @since 1.10
 	 */
 	private static class KeyValueQueryLookupStrategy implements QueryLookupStrategy {
 
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 5ead4a9..df08c7c 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
@@ -29,7 +29,6 @@ import org.springframework.data.repository.query.parser.AbstractQueryCreator;
  * {@link org.springframework.beans.factory.FactoryBean} to create {@link KeyValueRepository}.
  * 
  * @author Christoph Strobl
- * @since 1.10
  */
 public class KeyValueRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable> extends
 		RepositoryFactoryBeanSupport<T, S, ID> {
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 d62265c..15523ea 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
@@ -42,7 +42,6 @@ import com.mysema.query.types.path.PathBuilder;
  * {@link KeyValueRepository} implementation capable of executing {@link Predicate}s using {@link CollQuery}.
  * 
  * @author Christoph Strobl
- * @since 1.10
  * @param <T>
  * @param <ID>
  */
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 ac79a9f..5ab9d89 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
@@ -31,7 +31,6 @@ import org.springframework.util.Assert;
 /**
  * @author Christoph Strobl
  * @author Oliver Gierke
- * @since 1.10
  * @param <T>
  * @param <ID>
  */
diff --git a/src/main/java/org/springframework/data/map/MapKeyValueAdapter.java b/src/main/java/org/springframework/data/map/MapKeyValueAdapter.java
index 392a1c0..dbe9719 100644
--- a/src/main/java/org/springframework/data/map/MapKeyValueAdapter.java
+++ b/src/main/java/org/springframework/data/map/MapKeyValueAdapter.java
@@ -30,7 +30,6 @@ import org.springframework.util.ClassUtils;
  * {@link KeyValueAdapter} implementation for {@link Map}.
  * 
  * @author Christoph Strobl
- * @since 1.10
  */
 public class MapKeyValueAdapter extends AbstractKeyValueAdapter {