diff --git a/core/src/main/java/org/springframework/security/access/vote/InterfaceBasedLabelParameterStrategy.java b/core/src/main/java/org/springframework/security/access/vote/InterfaceBasedLabelParameterStrategy.java
index 6dca070554..9a05649c50 100644
--- a/core/src/main/java/org/springframework/security/access/vote/InterfaceBasedLabelParameterStrategy.java
+++ b/core/src/main/java/org/springframework/security/access/vote/InterfaceBasedLabelParameterStrategy.java
@@ -36,11 +36,6 @@ public class InterfaceBasedLabelParameterStrategy implements LabelParameterStrat
      * Test if the argument is labeled, and if so, downcast to LabeledData and retrieve the domain object's
      * labeled value. Otherwise, return an empty string. NOTE: The default for no label is an empty string. If somehow
      * the user wants to make that a label itself, he or she must inject an alternate value to the noLabel property.
-     *
-     * @param method DOCUMENT ME!
-     * @param arg DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
      */
     public String getLabel(Method method, Object arg) {
         if (isLabeled(method, arg)) {
@@ -57,11 +52,6 @@ public class InterfaceBasedLabelParameterStrategy implements LabelParameterStrat
     /**
      * Test if the argument implemented the LabeledData interface. NOTE: The invoking method has no bearing for
      * this strategy, only the argument itself.
-     *
-     * @param method DOCUMENT ME!
-     * @param arg DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
      */
     public boolean isLabeled(Method method, Object arg) {
         return (arg instanceof LabeledData);
diff --git a/core/src/main/java/org/springframework/security/authentication/AuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationProvider.java
index 2186903af9..243d45809a 100644
--- a/core/src/main/java/org/springframework/security/authentication/AuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationProvider.java
@@ -57,7 +57,7 @@ public interface AuthenticationProvider {
      * <p>Selection of an <code>AuthenticationProvider</code> capable of performing authentication is
      * conducted at runtime the <code>ProviderManager</code>.</p>
      *
-     * @param authentication DOCUMENT ME!
+     * @param authentication
      *
      * @return <code>true</code> if the implementation can more closely evaluate the <code>Authentication</code> class
      *         presented
diff --git a/core/src/main/java/org/springframework/security/authentication/encoding/PasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/PasswordEncoder.java
index 54f1069d9b..6df2892db9 100644
--- a/core/src/main/java/org/springframework/security/authentication/encoding/PasswordEncoder.java
+++ b/core/src/main/java/org/springframework/security/authentication/encoding/PasswordEncoder.java
@@ -48,8 +48,6 @@ public interface PasswordEncoder {
      *        <code>null</code> value is legal.
      *
      * @return encoded password
-     *
-     * @throws DataAccessException DOCUMENT ME!
      */
     String encodePassword(String rawPass, Object salt)
         throws DataAccessException;
@@ -67,8 +65,6 @@ public interface PasswordEncoder {
      *        <code>null</code> value is legal.
      *
      * @return true if the password is valid , false otherwise
-     *
-     * @throws DataAccessException DOCUMENT ME!
      */
     boolean isPasswordValid(String encPass, String rawPass, Object salt)
         throws DataAccessException;
diff --git a/core/src/test/java/org/springframework/security/TargetObject.java b/core/src/test/java/org/springframework/security/TargetObject.java
index 9a7f045c0f..4cbad8904d 100644
--- a/core/src/test/java/org/springframework/security/TargetObject.java
+++ b/core/src/test/java/org/springframework/security/TargetObject.java
@@ -73,8 +73,6 @@ public class TargetObject implements ITargetObject {
      * Delegates through to the {@link #makeLowerCase(String)} method.
      *
      * @param input the message to be made lower-case
-     *
-     * @return DOCUMENT ME!
      */
     public String publicMakeLowerCase(String input) {
         return this.makeLowerCase(input);
diff --git a/core/src/test/java/org/springframework/security/access/annotation/test/OrganisationService.java b/core/src/test/java/org/springframework/security/access/annotation/test/OrganisationService.java
index 86ec72b6be..ab9d292cd3 100644
--- a/core/src/test/java/org/springframework/security/access/annotation/test/OrganisationService.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/test/OrganisationService.java
@@ -15,10 +15,6 @@
 
 package org.springframework.security.access.annotation.test;
 
-/**
- * DOCUMENT ME!
- *
-  */
 public interface OrganisationService extends Service<Organisation> {
     //~ Methods ========================================================================================================
 
diff --git a/core/src/test/java/org/springframework/security/access/annotation/test/PersonServiceImpl.java b/core/src/test/java/org/springframework/security/access/annotation/test/PersonServiceImpl.java
index 65d3649d42..2cf44f4317 100644
--- a/core/src/test/java/org/springframework/security/access/annotation/test/PersonServiceImpl.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/test/PersonServiceImpl.java
@@ -15,10 +15,6 @@
 
 package org.springframework.security.access.annotation.test;
 
-/**
- * DOCUMENT ME!
- *
-  */
 public class PersonServiceImpl extends ServiceImpl<Person> implements PersonService {
     //~ Methods ========================================================================================================
 
diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTest.java b/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTest.java
index 9889d1c2e9..b34895a36a 100644
--- a/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTest.java
+++ b/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAttributeTest.java
@@ -27,9 +27,6 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import javax.servlet.jsp.JspException;
 
 
-/**
- * DOCUMENT ME!
- */
 public class AuthzImplAttributeTest extends TestCase {
     //~ Instance fields ================================================================================================
 
diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTest.java b/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTest.java
index 0122ea5809..0992a2a873 100644
--- a/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTest.java
+++ b/taglibs/src/test/java/org/springframework/security/taglibs/velocity/AuthzImplAuthorizeTagTest.java
@@ -25,9 +25,6 @@ import org.springframework.security.core.context.SecurityContextHolder;
 
 
 
-/**
- * DOCUMENT ME!
- */
 public class AuthzImplAuthorizeTagTest extends TestCase {
     //~ Instance fields ================================================================================================