diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java
index b6e201e3b..57415a359 100644
--- a/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java
+++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java
@@ -28,7 +28,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.springframework.amqp.AmqpConnectException;
-import org.springframework.amqp.UncategorizedAmqpException;
 import org.springframework.amqp.core.AnonymousQueue;
 import org.springframework.amqp.core.BindingBuilder;
 import org.springframework.amqp.core.DirectExchange;
@@ -490,15 +489,6 @@ public class RabbitMessageChannelBinder extends AbstractBinder<MessageChannel, E
 				logger.debug("Declaration of queue: " + queue.getName() + " deferred - connection not available");
 			}
 		}
-		catch (UncategorizedAmqpException e) {
-			if (e.getCause() instanceof NullPointerException) {
-				// Temporary fix for https://jira.spring.io/browse/AMQP-565
-				// TODO remove once Spring AMQP is upgraded beyond 1.5.4
-			}
-			else {
-				throw e;
-			}
-		}
 		addToAutoDeclareContext(beanName, queue);
 	}
 
diff --git a/spring-cloud-stream-rxjava/src/main/java/org/springframework/cloud/stream/annotation/rxjava/SubjectMessageHandler.java b/spring-cloud-stream-rxjava/src/main/java/org/springframework/cloud/stream/annotation/rxjava/SubjectMessageHandler.java
index ba6f1b09b..a2f6b65c1 100644
--- a/spring-cloud-stream-rxjava/src/main/java/org/springframework/cloud/stream/annotation/rxjava/SubjectMessageHandler.java
+++ b/spring-cloud-stream-rxjava/src/main/java/org/springframework/cloud/stream/annotation/rxjava/SubjectMessageHandler.java
@@ -141,7 +141,6 @@ public class SubjectMessageHandler extends AbstractMessageProducingHandler imple
 	}
 
 	@Override
-	//todo: support module input type
 	protected void handleMessageInternal(Message<?> message) throws Exception {
 		subject.onNext(message.getPayload());
 	}
diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/StreamListenerAnnotationBeanPostProcessor.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/StreamListenerAnnotationBeanPostProcessor.java
index c4498236f..7ab657620 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/StreamListenerAnnotationBeanPostProcessor.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/StreamListenerAnnotationBeanPostProcessor.java
@@ -97,7 +97,6 @@ public class StreamListenerAnnotationBeanPostProcessor implements BeanPostProces
 								" already existing for " + mappedBindings.get(streamListener.value()).getShortLogMessage());
 					}
 					mappedBindings.put(streamListener.value(), invocableHandlerMethod);
-					// TODO: support pollable channels https://github.com/spring-cloud/spring-cloud-stream/issues/436
 					SubscribableChannel channel = applicationContext.getBean(streamListener.value(),
 							SubscribableChannel.class);
 					final String defaultOutputChannel = extractDefaultOutput(method);