diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubMessageConverter.java b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubMessageConverter.java
index ca38ebdf51..8f9e1ee850 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubMessageConverter.java
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.integration.jms;
 
 import javax.jms.JMSException;
@@ -22,15 +23,16 @@ import javax.jms.Session;
 import org.springframework.jms.support.converter.MessageConversionException;
 import org.springframework.jms.support.converter.MessageConverter;
 
+/**
+ * @author Mark Fisher
+ */
 public class StubMessageConverter implements MessageConverter {
 
 	public Object fromMessage(Message message) throws JMSException, MessageConversionException {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
 	public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubQueue.java b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubQueue.java
index 13c958438b..cf36d70c90 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubQueue.java
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/StubQueue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2008 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.integration.jms;
 
 import javax.jms.JMSException;
 import javax.jms.Queue;
 
-public class StubQueue implements Queue{
+/**
+ * @author Mark Fisher
+ */
+public class StubQueue implements Queue {
 
 	public String getQueueName() throws JMSException {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/StubDocumentBuilderFactory.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/StubDocumentBuilderFactory.java
index 6e2ba5f6ff..d290ff97c1 100644
--- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/StubDocumentBuilderFactory.java
+++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/StubDocumentBuilderFactory.java
@@ -13,42 +13,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.integration.xml.config;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+/**
+ * @author Jonas Partner
+ */
 public class StubDocumentBuilderFactory extends DocumentBuilderFactory{
 
 	@Override
 	public Object getAttribute(String name) throws IllegalArgumentException {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
 	public boolean getFeature(String name) throws ParserConfigurationException {
-		// TODO Auto-generated method stub
 		return false;
 	}
 
 	@Override
 	public DocumentBuilder newDocumentBuilder() throws ParserConfigurationException {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
 	public void setAttribute(String name, Object value) throws IllegalArgumentException {
-		// TODO Auto-generated method stub
-		
 	}
 
 	@Override
 	public void setFeature(String name, boolean value) throws ParserConfigurationException {
-		// TODO Auto-generated method stub
-		
 	}
 
 }
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageMappingMethodInvoker.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageMappingMethodInvoker.java
index 1d08756f45..a28d749a87 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageMappingMethodInvoker.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/MessageMappingMethodInvoker.java
@@ -130,7 +130,6 @@ public class MessageMappingMethodInvoker {
 			try {
 				if (message != null) {
 					result = invoker.invokeMethod(message);
-					// TODO: set this on the invoker
 					this.methodsExpectingMessage.add(method);
 				}
 			}