diff --git a/core/src/test/java/org/springframework/security/MockAfterInvocationManager.java b/core/src/test/java/org/springframework/security/MockAfterInvocationManager.java
deleted file mode 100644
index c361fc65b9..0000000000
--- a/core/src/test/java/org/springframework/security/MockAfterInvocationManager.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security;
-
-import java.util.Iterator;
-import java.util.List;
-
-
-/**
- * If there is a configuration attribute of "AFTER_INVOCATION_MOCK", modifies the return value to null.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class MockAfterInvocationManager implements AfterInvocationManager {
-    //~ Methods ========================================================================================================
-
-    public Object decide(Authentication authentication, Object object, List<ConfigAttribute> config,
-        Object returnedObject) throws AccessDeniedException {
-        Iterator iter = config.iterator();
-
-        while (iter.hasNext()) {
-            ConfigAttribute attr = (ConfigAttribute) iter.next();
-
-            if (this.supports(attr)) {
-                return null;
-            }
-        }
-
-        // this "after invocation" hasn't got a config attribute asking
-        // for this mock to modify the returned object
-        return returnedObject;
-    }
-
-    public boolean supports(ConfigAttribute attribute) {
-        if (attribute.getAttribute().equals("AFTER_INVOCATION_MOCK")) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public boolean supports(Class<?> clazz) {
-        return true;
-    }
-}
diff --git a/core/src/test/java/org/springframework/security/MockFilterConfig.java b/core/src/test/java/org/springframework/security/MockFilterConfig.java
index 70181e31da..9f7cf6f3c3 100644
--- a/core/src/test/java/org/springframework/security/MockFilterConfig.java
+++ b/core/src/test/java/org/springframework/security/MockFilterConfig.java
@@ -24,7 +24,6 @@ import javax.servlet.ServletContext;
 
 
 /**
- * DOCUMENT ME!
  *
  * @author Ben Alex
  * @version $Id$
diff --git a/core/src/test/java/org/springframework/security/MockRunAsAuthenticationToken.java b/core/src/test/java/org/springframework/security/MockRunAsAuthenticationToken.java
deleted file mode 100644
index 0bd42c3657..0000000000
--- a/core/src/test/java/org/springframework/security/MockRunAsAuthenticationToken.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security;
-
-import org.springframework.security.providers.AbstractAuthenticationToken;
-
-
-/**
- * Simple holder that indicates the {@link MockRunAsManager} returned a different <Code>Authentication</code>
- * object.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class MockRunAsAuthenticationToken extends AbstractAuthenticationToken {
-    //~ Constructors ===================================================================================================
-
-    public MockRunAsAuthenticationToken() {
-        super(null);
-    }
-
-    //~ Methods ========================================================================================================
-
-    public Object getCredentials() {
-        return null;
-    }
-
-    public Object getPrincipal() {
-        return null;
-    }
-}
diff --git a/core/src/test/java/org/springframework/security/MockRunAsManager.java b/core/src/test/java/org/springframework/security/MockRunAsManager.java
deleted file mode 100644
index 7847794163..0000000000
--- a/core/src/test/java/org/springframework/security/MockRunAsManager.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security;
-
-import java.util.Iterator;
-import java.util.List;
-
-
-/**
- * Returns a new run-as identity if configuration attribute RUN_AS is found. The new identity is simply an empty
- * {@link MockRunAsAuthenticationToken}.
- *
- * @author Ben Alex
- * @version $Id$
- */
-public class MockRunAsManager implements RunAsManager {
-    //~ Methods ========================================================================================================
-
-    public Authentication buildRunAs(Authentication authentication, Object object, List<ConfigAttribute> config) {
-        Iterator iter = config.iterator();
-
-        while (iter.hasNext()) {
-            ConfigAttribute attr = (ConfigAttribute) iter.next();
-
-            if (this.supports(attr)) {
-                Authentication response = new MockRunAsAuthenticationToken();
-                response.setAuthenticated(true);
-
-                return response;
-            }
-        }
-
-        return null;
-    }
-
-    public boolean supports(ConfigAttribute attribute) {
-        if (attribute.getAttribute().startsWith("RUN_AS")) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public boolean supports(Class<?> clazz) {
-        return true;
-    }
-}