diff --git a/org.springframework.integration.osgi/src/main/java/org/springframework/intergration/osgi/ControlBusAware.java b/org.springframework.integration.osgi/src/main/java/org/springframework/intergration/osgi/ControlBusAware.java
deleted file mode 100644
index b00e82b7fb..0000000000
--- a/org.springframework.integration.osgi/src/main/java/org/springframework/intergration/osgi/ControlBusAware.java
+++ /dev/null
@@ -1,25 +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.intergration.osgi;
-
-/**
- * TODO - insert COMMENT
- * @author Oleg Zhurakousky
- * @since 2.0
- */
-public interface ControlBusAware {
-
-}
diff --git a/org.springframework.integration.osgi/src/main/java/org/springframework/intergration/osgi/ControlBusAwarePostProcessor.java b/org.springframework.integration.osgi/src/main/java/org/springframework/intergration/osgi/ControlBusAwarePostProcessor.java
deleted file mode 100644
index a3f3b877a5..0000000000
--- a/org.springframework.integration.osgi/src/main/java/org/springframework/intergration/osgi/ControlBusAwarePostProcessor.java
+++ /dev/null
@@ -1,40 +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.intergration.osgi;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-
-/**
- * TODO - insert COMMENT
- * @author Oleg Zhurakousky
- * @since 2.0
- */
-public class ControlBusAwarePostProcessor implements BeanPostProcessor {
-
-	
-	public Object postProcessAfterInitialization(Object bean, String beanName)
-			throws BeansException {
-		return bean;
-	}
-
-	
-	public Object postProcessBeforeInitialization(Object bean, String beanName)
-			throws BeansException {
-		return bean;
-	}
-
-}
diff --git a/org.springframework.integration.osgi/src/main/java/org/springframework/intergration/osgi/IntegrationOSGiConstants.java b/org.springframework.integration.osgi/src/main/java/org/springframework/intergration/osgi/IntegrationOSGiConstants.java
deleted file mode 100644
index 8175f146d9..0000000000
--- a/org.springframework.integration.osgi/src/main/java/org/springframework/intergration/osgi/IntegrationOSGiConstants.java
+++ /dev/null
@@ -1,27 +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.intergration.osgi;
-
-/**
- * TODO - insert COMMENT
- * @author Oleg Zhurakousky
- * @since 2.0
- */
-public interface IntegrationOSGiConstants {
-	//(&(org.springframework.osgi.bean.name=controlBus-DEFAULT_CONTROL_GROUP))
-	public final String DEFAULT_BUS_GROUP_NAME = "DEFAULT_CONTROL_GROUP";
-	public final String OSGI_BEAN_NAME = "org.springframework.osgi.bean.name";
-}
diff --git a/org.springframework.integration.osgi/src/main/java/org/springframework/intergration/osgi/OSGiIntegrationControlBus.java b/org.springframework.integration.osgi/src/main/java/org/springframework/intergration/osgi/OSGiIntegrationControlBus.java
deleted file mode 100644
index 5ffd6af7a2..0000000000
--- a/org.springframework.integration.osgi/src/main/java/org/springframework/intergration/osgi/OSGiIntegrationControlBus.java
+++ /dev/null
@@ -1,67 +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.intergration.osgi;
-
-import org.springframework.integration.channel.SubscribableChannel;
-import org.springframework.integration.controlbus.ControlBus;
-import org.springframework.integration.core.Message;
-import org.springframework.integration.message.MessageHandler;
-
-/**
- * Implementation of the {@link ControlBus} interface. 
- * Control Bus itself wrapper over {@link SubscribableChannel}, 
- * which represents the entry point to Control Bus infrastructure.
- * 
- * @author Oleg Zhurakousky
- * @since 2.0
- */
-public class OSGiIntegrationControlBus implements ControlBus {
-	private SubscribableChannel channel;
-	private String busName;
-	
-	public OSGiIntegrationControlBus(SubscribableChannel channel, String busName){
-		this.channel = channel;
-		this.busName = busName;
-	}
-
-	public boolean subscribe(MessageHandler handler) {
-		return channel.subscribe(handler);
-	}
-
-	
-	public boolean unsubscribe(MessageHandler handler) {
-		return channel.unsubscribe(handler);
-	}
-
-	public String getName() {
-		return channel.getName();
-	}
-
-	
-	public boolean send(Message<?> message) {
-		return channel.send(message);
-	}
-
-	
-	public boolean send(Message<?> message, long timeout) {
-		return channel.send(message, timeout);
-	}
-
-	//
-	public String getBusName() {
-		return busName;
-	}
-}