diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/OutboundChannelAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/OutboundChannelAdapter.java
deleted file mode 100644
index 1e5b25c43b..0000000000
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/OutboundChannelAdapter.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- * 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.integration.endpoint;
-
-import org.springframework.integration.channel.MessageChannel;
-import org.springframework.integration.message.Message;
-import org.springframework.integration.message.MessageConsumer;
-import org.springframework.util.Assert;
-
-/**
- * A Channel Adapter implementation for connecting a {@link MessageChannel}
- * to a {@link org.springframework.integration.message.MessageConsumer}.
- * 
- * @author Mark Fisher
- */
-public class OutboundChannelAdapter extends AbstractMessageConsumer {
-
-	private final MessageConsumer consumer;
-
-
-	public OutboundChannelAdapter(MessageConsumer consumer) {
-		Assert.notNull(consumer, "consumer must not be null");
-		this.consumer = consumer;
-	}
-
-
-	@Override
-	protected void onMessageInternal(Message<?> message) {
-		this.consumer.onMessage(message);
-	}
-
-}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/ReplyMessageCorrelator.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/ReplyMessageCorrelator.java
deleted file mode 100644
index cf2992c798..0000000000
--- a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/ReplyMessageCorrelator.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- * 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.integration.gateway;
-
-import org.springframework.integration.endpoint.AbstractMessageHandlingEndpoint;
-import org.springframework.integration.message.Message;
-
-/**
- * A handler for receiving messages from a "reply channel".
- * 
- * @author Mark Fisher
- */
-public class ReplyMessageCorrelator extends AbstractMessageHandlingEndpoint {
-
-	@Override
-	public Message<?> handle(Message<?> message) {
-		return message;
-	}
-
-}
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/ReplyMessageCorrelatorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/ReplyMessageCorrelatorTests.java
deleted file mode 100644
index cc7d349e4d..0000000000
--- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/ReplyMessageCorrelatorTests.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.
- * 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.integration.gateway;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import org.springframework.integration.channel.QueueChannel;
-import org.springframework.integration.gateway.ReplyMessageCorrelator;
-import org.springframework.integration.message.Message;
-import org.springframework.integration.message.MessageBuilder;
-
-/**
- * @author Mark Fisher
- */
-public class ReplyMessageCorrelatorTests {
-
-	@Test
-	public void testReceiversPrecedeReply() throws InterruptedException {
-		final ReplyMessageCorrelator correlator = new ReplyMessageCorrelator();
-		QueueChannel replyChannel = new QueueChannel();
-		Message<String> message = MessageBuilder.withPayload("test")
-				.setCorrelationId("123").setReturnAddress(replyChannel).build();
-		correlator.onMessage(message);
-		Message<?> reply = replyChannel.receive(0);
-		assertEquals("test", reply.getPayload());
-	}
-
-}