diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/MessageProperties.java b/spring-amqp-core/src/main/java/org/springframework/amqp/core/MessageProperties.java
index e92629cc..b4c2147a 100644
--- a/spring-amqp-core/src/main/java/org/springframework/amqp/core/MessageProperties.java
+++ b/spring-amqp-core/src/main/java/org/springframework/amqp/core/MessageProperties.java
@@ -146,7 +146,7 @@ public class MessageProperties {
 		this.type = type;
 	}
 
-	//TODO what is this?  is it stuctureType - int in qpid
+	//NOTE stuctureType is int in qpid
 	public String getType() {
 		return this.type;
 	}
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/SimpleConnection.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/SimpleConnection.java
index d0e9953a..6dfc9996 100755
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/SimpleConnection.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/SimpleConnection.java
@@ -24,7 +24,6 @@ public class SimpleConnection implements Connection {
 		this.delegate = delegate;
 	}
 
-	// TODO: expose the transactional flag
 	public Channel createChannel(boolean transactional) {
 		try {
 			Channel channel = delegate.createChannel();
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
index 303de08f..2769b7b2 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
@@ -263,7 +263,6 @@ public class RabbitTemplate extends RabbitAccessor implements RabbitOperations {
 
 				Assert.isNull(message.getMessageProperties().getReplyTo(),
 						"Send-and-receive methods can only be used if the Message does not already have a replyTo property.");
-				// TODO: first check for a replyToAddress property on this template
 				DeclareOk queueDeclaration = channel.queueDeclare();
 				Address replyToAddress = new Address(ExchangeTypes.DIRECT, DEFAULT_EXCHANGE, queueDeclaration
 						.getQueue());
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java
index 9b04faac..ee95ff9c 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java
@@ -107,7 +107,6 @@ public abstract class AbstractMessageListenerContainer extends RabbitAccessor im
 	}
 
 	public void setQueues(Queue... queues) {
-		// TODO: Merge with string queue name values?
 		String[] queueNames = new String[queues.length];
 		for (int i = 0; i < queues.length; i++) {
 			Assert.notNull(queues[i], "Queue must not be null.");
diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/MessageListenerRecoveryCachingConnectionIntegrationTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/MessageListenerRecoveryCachingConnectionIntegrationTests.java
index d5d65afe..45a2cd95 100644
--- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/MessageListenerRecoveryCachingConnectionIntegrationTests.java
+++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/MessageListenerRecoveryCachingConnectionIntegrationTests.java
@@ -243,7 +243,6 @@ public class MessageListenerRecoveryCachingConnectionIntegrationTests {
 		boolean waited = latch.await(timeout, TimeUnit.SECONDS);
 		assertTrue("Timed out waiting for message", waited);
 
-		// TODO: is there a race condition here where the template gets a closed connection and this receive fails?
 		assertNull(template.receiveAndConvert(queue.getName()));
 
 	}