diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java
index 1a990ae3..a4df72e7 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/SubscriptionAttributesFactoryBean.java
@@ -40,28 +40,16 @@ public class SubscriptionAttributesFactoryBean implements FactoryBean<Subscripti
 
 	private SubscriptionAttributes subscriptionAttributes;
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-	 */
 	@Override
 	public void afterPropertiesSet() throws Exception {
 		this.subscriptionAttributes = new SubscriptionAttributes(getInterestPolicy());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.FactoryBean#getObject()
-	 */
 	@Override
 	public SubscriptionAttributes getObject() throws Exception {
 		return this.subscriptionAttributes;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
-	 */
 	@Override
 	public Class<?> getObjectType() {
 
@@ -70,10 +58,6 @@ public class SubscriptionAttributesFactoryBean implements FactoryBean<Subscripti
 			: SubscriptionAttributes.class;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.FactoryBean#isSingleton()
-	 */
 	@Override
 	public boolean isSingleton() {
 		return true;
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunction.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunction.java
index 45a0f3c1..17706646 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunction.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/client/function/ListRegionsOnServerFunction.java
@@ -40,10 +40,6 @@ public class ListRegionsOnServerFunction implements Function {
 
 	public static final String ID = ListRegionsOnServerFunction.class.getName();
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.apache.geode.cache.execute.Function#execute(org.apache.geode.cache.execute.FunctionContext)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public void execute(FunctionContext functionContext) {
@@ -61,37 +57,21 @@ public class ListRegionsOnServerFunction implements Function {
 		return CacheFactory.getAnyInstance();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.apache.geode.cache.execute.Function#getId()
-	 */
 	@Override
 	public String getId() {
 		return this.getClass().getName();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.apache.geode.cache.execute.Function#hasResult()
-	 */
 	@Override
 	public boolean hasResult() {
 		return true;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.apache.geode.cache.execute.Function#isHA()
-	 */
 	@Override
 	public boolean isHA() {
 		return false;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.apache.geode.cache.execute.Function#optimizeForWrite()
-	 */
 	@Override
 	public boolean optimizeForWrite() {
 		return false;
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/DefaultFunctionArgumentResolver.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/DefaultFunctionArgumentResolver.java
index 3418bb4b..26be4f06 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/DefaultFunctionArgumentResolver.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/DefaultFunctionArgumentResolver.java
@@ -25,19 +25,11 @@ class DefaultFunctionArgumentResolver implements FunctionArgumentResolver {
 
 	private static final Object[] EMPTY_ARRAY = new Object[0];
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.reflect.Method
-	 */
 	@Override
 	public Method getFunctionAnnotatedMethod() {
 		throw new UnsupportedOperationException("Not Implemented!");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.gemfire.function.FunctionArgumentResolver#resolveFunctionArguments(org.apache.geode.cache.execute.FunctionContext)
-	 */
 	@Override
 	public Object[] resolveFunctionArguments(final FunctionContext functionContext) {
 
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolver.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolver.java
index 3c8db89c..8a388d62 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolver.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/PdxFunctionArgumentResolver.java
@@ -38,10 +38,6 @@ import org.springframework.util.ClassUtils;
 @SuppressWarnings("unused")
 class PdxFunctionArgumentResolver extends DefaultFunctionArgumentResolver {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.apache.geode.cache.execute.FunctionContext
-	 */
 	@Override
 	public Object[] resolveFunctionArguments(final FunctionContext functionContext) {
 
@@ -68,20 +64,11 @@ class PdxFunctionArgumentResolver extends DefaultFunctionArgumentResolver {
 		return functionArguments;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.reflect.Method
-	 */
 	@Override
 	public Method getFunctionAnnotatedMethod() {
 		throw new UnsupportedOperationException("Not Implemented!");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.apache.geode.cache.Cache#getPdxSerializer()
-	 * @see org.apache.geode.cache.CacheFactory#getAnyInstance()
-	 */
 	boolean isPdxSerializerConfigured() {
 		try {
 			return (CacheFactory.getAnyInstance().getPdxSerializer() != null);
@@ -100,21 +87,10 @@ class PdxFunctionArgumentResolver extends DefaultFunctionArgumentResolver {
 		return (isOnClasspath(className) && functionAnnotatedMethodHasParameterOfType(className));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Thread#currentThread()
-	 * @see java.lang.Thread#getContextClassLoader()
-	 * @see org.springframework.util.ClassUtils#isPresent(String, ClassLoader)
-	 */
 	boolean isOnClasspath(final String className) {
 		return ClassUtils.isPresent(className, Thread.currentThread().getContextClassLoader());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see #getFunctionAnnotatedMethod()
-	 * @see java.lang.reflect.Method#getParameterTypes()
-	 */
 	boolean functionAnnotatedMethodHasParameterOfType(final String className) {
 		for (Class<?> parameterType : getFunctionAnnotatedMethod().getParameterTypes()) {
 			if (parameterType.getName().equals(className)) {
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/AnnotationFunctionExecutionConfigurationSource.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/AnnotationFunctionExecutionConfigurationSource.java
index 7c10d738..34010d04 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/AnnotationFunctionExecutionConfigurationSource.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/AnnotationFunctionExecutionConfigurationSource.java
@@ -67,17 +67,11 @@ public class AnnotationFunctionExecutionConfigurationSource extends AbstractFunc
 		this.metadata = metadata;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.gemfire.function.config.FunctionExecutionConfigurationSource#getSource()
-	 */
 	@Override
 	public Object getSource() {
 		return this.metadata;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.gemfire.function.config.FunctionExecutionConfigurationSource#getBasePackages()
-	 */
 	@Override
 	public Iterable<String> getBasePackages() {
 
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionParser.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionParser.java
index bd6ee391..1e6f8629 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionParser.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionParser.java
@@ -34,10 +34,6 @@ import org.springframework.beans.factory.xml.ParserContext;
  */
 public class FunctionExecutionBeanDefinitionParser implements BeanDefinitionParser {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.BeanDefinitionParser#parse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
-	 */
 	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		new FunctionExecutionBeanDefinitionRegistrar().registerBeanDefinitions(element, parserContext);
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionRegistrar.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionRegistrar.java
index 94d33291..1a7c73c5 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionRegistrar.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionBeanDefinitionRegistrar.java
@@ -51,11 +51,6 @@ import org.w3c.dom.Element;
  */
 public class FunctionExecutionBeanDefinitionRegistrar implements ImportBeanDefinitionRegistrar {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.annotation.ImportBeanDefinitionRegistrar
-	 * 	#registerBeanDefinitions(org.springframework.core.type.AnnotationMetadata, org.springframework.beans.factory.support.BeanDefinitionRegistry)
-	 */
 	@Override
 	public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanDefinitionRegistry registry) {
 
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionComponentProvider.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionComponentProvider.java
index bae09aa7..23700fe3 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionComponentProvider.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/FunctionExecutionComponentProvider.java
@@ -95,10 +95,6 @@ class FunctionExecutionComponentProvider extends ClassPathScanningCandidateCompo
 		super.addIncludeFilter(new AllTypeFilter(filterPlusAnnotation));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider#isCandidateComponent(org.springframework.beans.factory.annotation.AnnotatedBeanDefinition)
-	 */
 	@Override
 	protected boolean isCandidateComponent(AnnotatedBeanDefinition beanDefinition) {
 
@@ -213,10 +209,6 @@ class FunctionExecutionComponentProvider extends ClassPathScanningCandidateCompo
 			this.delegates = delegates;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.type.filter.TypeFilter#match(org.springframework.core.type.classreading.MetadataReader, org.springframework.core.type.classreading.MetadataReaderFactory)
-		 */
 		public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) throws IOException {
 
 			for (TypeFilter filter : this.delegates) {
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessor.java
index 3310ef9b..c0e55d47 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessor.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessor.java
@@ -44,10 +44,6 @@ import org.springframework.util.ReflectionUtils;
  */
 public class GemfireFunctionBeanPostProcessor implements BeanPostProcessor {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessAfterInitialization(java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessorRegistrar.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessorRegistrar.java
index 133d4dd7..c027751d 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessorRegistrar.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/GemfireFunctionBeanPostProcessorRegistrar.java
@@ -25,9 +25,6 @@ import org.springframework.core.type.AnnotationMetadata;
  */
 public class GemfireFunctionBeanPostProcessorRegistrar implements ImportBeanDefinitionRegistrar {
 
-	/* (non-Javadoc)
-	 * @see org.springframework.context.annotation.ImportBeanDefinitionRegistrar#registerBeanDefinitions(org.springframework.core.type.AnnotationMetadata, org.springframework.beans.factory.support.BeanDefinitionRegistry)
-	 */
 	@Override
 	public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
 
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/MemberBasedFunctionExecutionBeanDefinitionBuilder.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/MemberBasedFunctionExecutionBeanDefinitionBuilder.java
index 9ead53bc..3eed883d 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/MemberBasedFunctionExecutionBeanDefinitionBuilder.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/MemberBasedFunctionExecutionBeanDefinitionBuilder.java
@@ -37,10 +37,6 @@ abstract class MemberBasedFunctionExecutionBeanDefinitionBuilder
 		super(configuration);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.gemfire.function.config.AbstractFunctionExecutionBeanDefinitionBuilder#getGemfireFunctionOperationsBeanDefinitionBuilder(org.springframework.beans.factory.support.BeanDefinitionRegistry)
-	 */
 	@Override
 	protected BeanDefinitionBuilder getGemfireFunctionOperationsBeanDefinitionBuilder(BeanDefinitionRegistry registry) {
 
@@ -58,9 +54,6 @@ abstract class MemberBasedFunctionExecutionBeanDefinitionBuilder
 	}
 
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.gemfire.function.config.AbstractFunctionExecutionBeanDefinitionBuilder#getFunctionProxyFactoryBeanClass()
-	 */
 	@Override
 	protected Class<?> getFunctionProxyFactoryBeanClass() {
 		return GemfireFunctionProxyFactoryBean.class;
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnMembersFunctionExecutionBeanDefinitionBuilder.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnMembersFunctionExecutionBeanDefinitionBuilder.java
index f8f88cdc..cda36568 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnMembersFunctionExecutionBeanDefinitionBuilder.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnMembersFunctionExecutionBeanDefinitionBuilder.java
@@ -25,10 +25,6 @@ class OnMembersFunctionExecutionBeanDefinitionBuilder extends MemberBasedFunctio
 		super(configuration);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.gemfire.function.config.MemberBasedFunctionExecutionBeanDefinitionBuilder#getGemfireFunctionOperationsClass()
-	 */
 	@Override
 	protected Class<?> getGemfireOperationsClass() {
 		return GemfireOnMembersFunctionTemplate.class;
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnRegionFunctionExecutionBeanDefinitionBuilder.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnRegionFunctionExecutionBeanDefinitionBuilder.java
index 0bd6d560..da011ec0 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnRegionFunctionExecutionBeanDefinitionBuilder.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnRegionFunctionExecutionBeanDefinitionBuilder.java
@@ -32,11 +32,6 @@ class OnRegionFunctionExecutionBeanDefinitionBuilder extends AbstractFunctionExe
 		super(configuration);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.gemfire.function.config.AbstractFunctionExecutionBeanDefinitionBuilder
-	 * 	#getGemfireFunctionOperationsBeanDefinitionBuilder(org.springframework.beans.factory.support.BeanDefinitionRegistry)
-	 */
 	@Override
 	protected BeanDefinitionBuilder getGemfireFunctionOperationsBeanDefinitionBuilder(BeanDefinitionRegistry registry) {
 
@@ -51,11 +46,6 @@ class OnRegionFunctionExecutionBeanDefinitionBuilder extends AbstractFunctionExe
 	}
 
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.gemfire.function.config.AbstractFunctionExecutionBeanDefinitionBuilder
-	 * 	#getFunctionProxyFactoryBeanClass()
-	 */
 	@Override
 	protected Class<?> getFunctionProxyFactoryBeanClass() {
 		return OnRegionFunctionProxyFactoryBean.class;
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnServerFunctionExecutionBeanDefinitionBuilder.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnServerFunctionExecutionBeanDefinitionBuilder.java
index 604866e6..82d71b42 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnServerFunctionExecutionBeanDefinitionBuilder.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnServerFunctionExecutionBeanDefinitionBuilder.java
@@ -25,11 +25,6 @@ class OnServerFunctionExecutionBeanDefinitionBuilder extends ServerBasedFunction
 		super(configuration);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.gemfire.function.config.ServerBasedFunctionExecutionBeanDefinitionBuilder
-	 * 	#getGemfireFunctionOperationsClass()
-	 */
 	@Override
 	protected Class<?> getGemfireFunctionOperationsClass() {
 		 return GemfireOnServerFunctionTemplate.class;
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnServersFunctionExecutionBeanDefinitionBuilder.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnServersFunctionExecutionBeanDefinitionBuilder.java
index 124bbef6..eb924891 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnServersFunctionExecutionBeanDefinitionBuilder.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/OnServersFunctionExecutionBeanDefinitionBuilder.java
@@ -25,11 +25,6 @@ class OnServersFunctionExecutionBeanDefinitionBuilder extends ServerBasedFunctio
 		super(configuration);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.gemfire.function.config.ServerBasedFunctionExecutionBeanDefinitionBuilder
-	 * 	#getGemfireFunctionOperationsClass()
-	 */
 	@Override
 	protected Class<?> getGemfireFunctionOperationsClass() {
 		return GemfireOnServersFunctionTemplate.class;
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilder.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilder.java
index ea45284d..bb91fbff 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilder.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/ServerBasedFunctionExecutionBeanDefinitionBuilder.java
@@ -41,11 +41,6 @@ abstract class ServerBasedFunctionExecutionBeanDefinitionBuilder
 		super(configuration);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.gemfire.function.config.AbstractFunctionExecutionBeanDefinitionBuilder
-	 * 	#getGemfireFunctionOperationsBeanDefinitionBuilder(org.springframework.beans.factory.support.BeanDefinitionRegistry)
-	 */
 	@Override
 	protected BeanDefinitionBuilder getGemfireFunctionOperationsBeanDefinitionBuilder(BeanDefinitionRegistry registry) {
 
@@ -71,11 +66,6 @@ abstract class ServerBasedFunctionExecutionBeanDefinitionBuilder
 		return functionTemplateBuilder;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.gemfire.function.config.AbstractFunctionExecutionBeanDefinitionBuilder
-	 * 	#getFunctionProxyFactoryBeanClass()
-	 */
 	@Override
 	protected Class<?> getFunctionProxyFactoryBeanClass() {
 		return GemfireFunctionProxyFactoryBean.class;
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/XmlFunctionExecutionConfigurationSource.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/XmlFunctionExecutionConfigurationSource.java
index d9df86e1..7a2db447 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/XmlFunctionExecutionConfigurationSource.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/function/config/XmlFunctionExecutionConfigurationSource.java
@@ -55,17 +55,11 @@ public class XmlFunctionExecutionConfigurationSource extends AbstractFunctionExe
 		this.excludeFilters = parser.parseTypeFilters(element, Type.EXCLUDE);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.gemfire.function.config.FunctionExecutionConfigurationSource#getSource()
-	 */
 	@Override
 	public Object getSource() {
 		return this.parserContext.extractSource(this.element);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.gemfire.function.config.FunctionExecutionConfigurationSource#getBasePackages()
-	 */
 	@Override
 	public Iterable<String> getBasePackages() {
 
@@ -75,17 +69,11 @@ public class XmlFunctionExecutionConfigurationSource extends AbstractFunctionExe
 	}
 
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.gemfire.function.config.FunctionExecutionConfigurationSource#getIncludeFilters()
-	 */
 	@Override
 	public Iterable<TypeFilter> getIncludeFilters() {
 		return this.includeFilters;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.gemfire.function.config.FunctionExecutionConfigurationSource#getExcludeFilters()
-	 */
 	@Override
 	public Iterable<TypeFilter> getExcludeFilters() {
 		return this.excludeFilters;
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/GemfirePropertyValueProvider.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/GemfirePropertyValueProvider.java
index df6f25eb..cc038f80 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/GemfirePropertyValueProvider.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/GemfirePropertyValueProvider.java
@@ -42,10 +42,6 @@ class GemfirePropertyValueProvider implements PropertyValueProvider<GemfirePersi
 		this.reader = reader;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.convert.PropertyValueProvider#getPropertyValue(org.springframework.data.mapping.PersistentProperty)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T getPropertyValue(GemfirePersistentProperty property) {
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessor.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessor.java
index e86110ff..5cc74daf 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessor.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/PdxReaderPropertyAccessor.java
@@ -30,28 +30,16 @@ enum PdxReaderPropertyAccessor implements PropertyAccessor {
 
 	INSTANCE;
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.expression.PropertyAccessor#getSpecificTargetClasses()
-	 */
 	@Override
 	public Class<?>[] getSpecificTargetClasses() {
 		return new Class<?>[] { PdxReader.class };
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.expression.PropertyAccessor#canRead(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public boolean canRead(EvaluationContext evaluationContext, Object target, String name) {
 		return ((PdxReader) target).hasField(name);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.expression.PropertyAccessor#read(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public TypedValue read(EvaluationContext evaluationContext, Object target, String name) {
 
@@ -60,19 +48,11 @@ enum PdxReaderPropertyAccessor implements PropertyAccessor {
 		return object != null ? new TypedValue(object) : TypedValue.NULL;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.expression.PropertyAccessor#canWrite(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public boolean canWrite(EvaluationContext evaluationContext, Object target, String name) {
 		return false;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.expression.PropertyAccessor#write(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String, java.lang.Object)
-	 */
 	@Override
 	public void write(EvaluationContext evaluationContext, Object target, String name, Object newValue) {
 		throw new UnsupportedOperationException();
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/Regions.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/Regions.java
index 9eff86f8..2c57fdc3 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/Regions.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/mapping/Regions.java
@@ -100,11 +100,6 @@ public class Regions implements Iterable<Region<?, ?>> {
 		return (Region<S, T>) this.regions.get(namePath);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see java.lang.Iterable#iterator()
-	 */
 	@Override
 	public Iterator<Region<?, ?>> iterator() {
 		return this.regions.values().iterator();
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformation.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformation.java
index 07dd4815..2e6db290 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformation.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/DefaultGemfireEntityInformation.java
@@ -45,10 +45,6 @@ public class DefaultGemfireEntityInformation<T, ID> extends PersistentEntityInfo
 		this.entity = entity;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.gemfire.repository.query.GemfireEntityInformation#getRegionName()
-	 */
 	@Override
 	public String getRegionName() {
 		return entity.getRegionName();
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/Predicates.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/Predicates.java
index bb98521e..30895dc0 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/Predicates.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/query/Predicates.java
@@ -79,10 +79,6 @@ class Predicates implements Predicate {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.gemfire.repository.query.Predicate#toString(java.lang.String)
-	 */
 	@Override
 	public String toString(String alias) {
 		return current.toString(alias);
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java
index 7453e532..0d0a47b7 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java
@@ -119,29 +119,16 @@ public class GemfireRepositoryFactory extends RepositoryFactorySupport {
 		return this.regions;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class)
-	 */
 	@Override
 	public <T, ID> GemfireEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
 		return new DefaultGemfireEntityInformation<>(resolvePersistentEntity(domainClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport
-	 * 	#getRepositoryBaseClass(org.springframework.data.repository.core.RepositoryMetadata)
-	 */
 	@Override
 	protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
 		return SimpleGemfireRepository.class;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getTargetRepository(org.springframework.data.repository.core.RepositoryInformation)
-	 */
 	@Override
 	protected Object getTargetRepository(RepositoryInformation repositoryInformation) {
 
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java
index 98cc4672..fd1ed12c 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java
@@ -292,10 +292,6 @@ public class CacheServerFactoryBean extends AbstractFactoryBeanSupport<CacheServ
 		this.cache = cache;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * For testing purposes only!
-	 */
 	void setCacheServer(CacheServer cacheServer) {
 		this.cacheServer = cacheServer;
 	}
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/util/PropertiesBuilder.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/util/PropertiesBuilder.java
index f411af5f..7c9caf64 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/util/PropertiesBuilder.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/util/PropertiesBuilder.java
@@ -160,28 +160,16 @@ public class PropertiesBuilder implements FactoryBean<Properties> {
 		this(builder.build());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.FactoryBean#getObject()
-	 */
 	@Override
 	public Properties getObject() throws Exception {
 		return build();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
-	 */
 	@Override
 	public Class<?> getObjectType() {
 		return this.properties != null ? this.properties.getClass() : Properties.class;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.FactoryBean#isSingleton()
-	 */
 	@Override
 	public boolean isSingleton() {
 		return true;