diff --git a/spring-session/src/main/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepository.java b/spring-session/src/main/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepository.java
index b465a9e..d291450 100644
--- a/spring-session/src/main/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepository.java
+++ b/spring-session/src/main/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepository.java
@@ -55,6 +55,7 @@ import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.session.ExpiringSession;
 import org.springframework.session.FindByIndexNameSessionRepository;
 import org.springframework.session.Session;
+import org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession;
 import org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration;
 import org.springframework.session.events.SessionCreatedEvent;
 import org.springframework.session.events.SessionDeletedEvent;
@@ -70,18 +71,7 @@ import org.springframework.util.StringUtils;
  *
  * @author John Blum
  * @since 1.1.0
- * @see org.springframework.beans.factory.InitializingBean
- * @see org.springframework.context.ApplicationEventPublisher
- * @see org.springframework.context.ApplicationEventPublisherAware
- * @see org.springframework.data.gemfire.GemfireAccessor
- * @see org.springframework.data.gemfire.GemfireOperations
- * @see org.springframework.session.ExpiringSession
- * @see org.springframework.session.FindByIndexNameSessionRepository
- * @see org.springframework.session.Session
- * @see org.springframework.session.data.gemfire.config.annotation.web.http.
- * GemFireHttpSessionConfiguration
- * @see com.gemstone.gemfire.cache.Region
- * @see com.gemstone.gemfire.cache.util.CacheListenerAdapter
+ * @see EnableGemFireHttpSession
  */
 public abstract class AbstractGemFireOperationsSessionRepository
 		extends CacheListenerAdapter<Object, ExpiringSession>
@@ -350,14 +340,6 @@ public abstract class AbstractGemFireOperationsSessionRepository
 	 * GemFire. This class implements GemFire's {@link DataSerializable} interface to
 	 * better handle replication of Session information across the GemFire cluster.
 	 *
-	 * @see java.lang.Comparable
-	 * @see org.springframework.session.ExpiringSession
-	 * @see org.springframework.session.data.gemfire.
-	 * AbstractGemFireOperationsSessionRepository.GemFireSessionAttributes
-	 * @see com.gemstone.gemfire.DataSerializable
-	 * @see com.gemstone.gemfire.DataSerializer
-	 * @see com.gemstone.gemfire.Delta
-	 * @see com.gemstone.gemfire.Instantiator
 	 */
 	@SuppressWarnings("serial")
 	public static class GemFireSession implements Comparable<ExpiringSession>,
diff --git a/spring-session/src/main/java/org/springframework/session/data/gemfire/GemFireOperationsSessionRepository.java b/spring-session/src/main/java/org/springframework/session/data/gemfire/GemFireOperationsSessionRepository.java
index 1df3c36..313869d 100644
--- a/spring-session/src/main/java/org/springframework/session/data/gemfire/GemFireOperationsSessionRepository.java
+++ b/spring-session/src/main/java/org/springframework/session/data/gemfire/GemFireOperationsSessionRepository.java
@@ -30,11 +30,7 @@ import org.springframework.session.ExpiringSession;
  *
  * @author John Blum
  * @since 1.1.0
- * @see org.springframework.data.gemfire.GemfireOperations
- * @see org.springframework.session.ExpiringSession
- * @see org.springframework.session.Session
- * @see org.springframework.session.data.gemfire.
- * AbstractGemFireOperationsSessionRepository
+ * @see AbstractGemFireOperationsSessionRepository
  */
 public class GemFireOperationsSessionRepository
 		extends AbstractGemFireOperationsSessionRepository {
@@ -107,7 +103,7 @@ public class GemFireOperationsSessionRepository
 	 * Constructs a new {@link ExpiringSession} instance backed by GemFire.
 	 *
 	 * @return an instance of {@link ExpiringSession} backed by GemFire.
-	 * @see GemFireSession#create(int)
+	 * @see AbstractGemFireOperationsSessionRepository.GemFireSession#create(int)
 	 * @see org.springframework.session.ExpiringSession
 	 * @see #getMaxInactiveIntervalInSeconds()
 	 */
@@ -121,7 +117,7 @@ public class GemFireOperationsSessionRepository
 	 *
 	 * @param sessionId a String indicating the ID of the Session to get.
 	 * @return an existing {@link ExpiringSession} by ID or null if not Session exists.
-	 * @see org.springframework.session.data.gemfire.GemFireOperationsSessionRepository.GemFireSession#from(ExpiringSession)
+	 * @see AbstractGemFireOperationsSessionRepository.GemFireSession#from(ExpiringSession)
 	 * @see org.springframework.session.ExpiringSession
 	 * @see #delete(String)
 	 */
diff --git a/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/EnableGemFireHttpSession.java b/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/EnableGemFireHttpSession.java
index 744add6..bc7872d 100644
--- a/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/EnableGemFireHttpSession.java
+++ b/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/EnableGemFireHttpSession.java
@@ -27,6 +27,7 @@ import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.session.config.annotation.web.http.EnableSpringHttpSession;
 
 /**
  * Add this annotation to an {@code @Configuration} class to expose the
@@ -97,11 +98,8 @@ import org.springframework.context.annotation.Import;
  * instead.
  *
  * @author John Blum
- * @see org.springframework.context.annotation.Configuration
- * @see org.springframework.context.annotation.Import
- * @see org.springframework.session.data.gemfire.config.annotation.web.http.
- * GemFireHttpSessionConfiguration
- * @see org.springframework.session.config.annotation.web.http.EnableSpringHttpSession
+ * @see GemFireHttpSessionConfiguration
+ * @see EnableSpringHttpSession
  * @since 1.1.0
  */
 @Documented
diff --git a/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfiguration.java b/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfiguration.java
index ca328f8..72552ef 100644
--- a/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfiguration.java
+++ b/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfiguration.java
@@ -55,26 +55,7 @@ import org.springframework.util.StringUtils;
  *
  * @author John Blum
  * @since 1.1.0
- * @see org.springframework.beans.factory.BeanClassLoaderAware
- * @see org.springframework.context.annotation.Bean
- * @see org.springframework.context.annotation.Configuration
- * @see org.springframework.context.annotation.ImportAware
- * @see org.springframework.data.gemfire.GemfireOperations
- * @see org.springframework.data.gemfire.GemfireTemplate
- * @see org.springframework.data.gemfire.IndexFactoryBean
- * @see org.springframework.data.gemfire.RegionAttributesFactoryBean
- * @see org.springframework.session.ExpiringSession
- * @see org.springframework.session.config.annotation.web.http.
- * SpringHttpSessionConfiguration
- * @see org.springframework.session.data.gemfire.GemFireOperationsSessionRepository
- * @see org.springframework.session.data.gemfire.config.annotation.web.http.support.
- * GemFireCacheTypeAwareRegionFactoryBean
- * @see com.gemstone.gemfire.cache.ExpirationAttributes
- * @see com.gemstone.gemfire.cache.GemFireCache
- * @see com.gemstone.gemfire.cache.Region
- * @see com.gemstone.gemfire.cache.RegionAttributes
- * @see com.gemstone.gemfire.cache.RegionShortcut
- * @see com.gemstone.gemfire.cache.client.ClientRegionShortcut
+ * @see EnableGemFireHttpSession
  */
 @Configuration
 public class GemFireHttpSessionConfiguration extends SpringHttpSessionConfiguration
@@ -298,9 +279,6 @@ public class GemFireHttpSessionConfiguration extends SpringHttpSessionConfigurat
 	 *
 	 * @param importMetadata the AnnotationMetadata of the class importing
 	 * this @Configuration class.
-	 * @see org.springframework.session.data.gemfire.config.annotation.web.http.
-	 * EnableGemFireHttpSession
-	 * @see org.springframework.core.type.AnnotationMetadata
 	 */
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		AnnotationAttributes enableGemFireHttpSessionAnnotationAttributes = AnnotationAttributes
@@ -333,8 +311,6 @@ public class GemFireHttpSessionConfiguration extends SpringHttpSessionConfigurat
 	 * Spring Sessions in GemFire.
 	 * @return a GemFireOperationsSessionRepository for managing (clustering/replicating)
 	 * Sessions using GemFire.
-	 * @see org.springframework.session.data.gemfire.GemFireOperationsSessionRepository
-	 * @see org.springframework.data.gemfire.GemfireOperations
 	 */
 	@Bean
 	public GemFireOperationsSessionRepository sessionRepository(
@@ -378,10 +354,6 @@ public class GemFireHttpSessionConfiguration extends SpringHttpSessionConfigurat
 	 * configure the {@link Region}.
 	 * @return a {@link GemFireCacheTypeAwareRegionFactoryBean} used to configure and
 	 * initialize a GemFire Cache {@link Region} for storing and managing Sessions.
-	 * @see org.springframework.session.data.gemfire.config.annotation.web.http.support.
-	 * GemFireCacheTypeAwareRegionFactoryBean
-	 * @see com.gemstone.gemfire.cache.GemFireCache
-	 * @see com.gemstone.gemfire.cache.RegionAttributes
 	 * @see #getClientRegionShortcut()
 	 * @see #getSpringSessionGemFireRegionName()
 	 * @see #getServerRegionShortcut()
diff --git a/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/GemFireCacheTypeAwareRegionFactoryBean.java b/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/GemFireCacheTypeAwareRegionFactoryBean.java
index 55fc60f..211340c 100644
--- a/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/GemFireCacheTypeAwareRegionFactoryBean.java
+++ b/spring-session/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/GemFireCacheTypeAwareRegionFactoryBean.java
@@ -42,18 +42,7 @@ import org.springframework.util.StringUtils;
  * @param <V> the type of values
  * @author John Blum
  * @since 1.1.0
- * @see org.springframework.beans.factory.FactoryBean
- * @see org.springframework.beans.factory.InitializingBean
  * @see org.springframework.data.gemfire.GenericRegionFactoryBean
- * @see org.springframework.data.gemfire.client.ClientRegionFactoryBean
- * @see org.springframework.session.data.gemfire.config.annotation.web.http.
- * GemFireHttpSessionConfiguration
- * @see com.gemstone.gemfire.cache.GemFireCache
- * @see com.gemstone.gemfire.cache.InterestResultPolicy
- * @see com.gemstone.gemfire.cache.Region
- * @see com.gemstone.gemfire.cache.RegionAttributes
- * @see com.gemstone.gemfire.cache.RegionShortcut
- * @see com.gemstone.gemfire.cache.client.ClientRegionShortcut
  */
 public class GemFireCacheTypeAwareRegionFactoryBean<K, V>
 		implements FactoryBean<Region<K, V>>, InitializingBean {