diff --git a/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml b/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
index 4cd18ad4..39967e5e 100644
--- a/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
+++ b/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
@@ -134,6 +134,36 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.1</version>
+                <executions>
+                    <execution>
+                        <id>default-feature-install</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <tasks>
+                                <replace token="false" value="true"
+                                         dir="../wso2/components/default/configuration/org.eclipse.equinox.simpleconfigurator">
+                                    <include name="**/bundles.info"/>
+                                </replace>
+                                <replace token="false" value="true"
+                                         dir="../wso2/components/device-manager/configuration/org.eclipse.equinox.simpleconfigurator">
+                                    <include name="**/bundles.info"/>
+                                </replace>
+                                <replace token="false" value="true"
+                                         dir="../wso2/components/device-backend/configuration/org.eclipse.equinox.simpleconfigurator">
+                                    <include name="**/bundles.info"/>
+                                </replace>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/configs/connectedcup.xml b/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/configs/connectedcup.xml
deleted file mode 100644
index 8d70e4d0..00000000
--- a/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/configs/connectedcup.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you 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.
-  -->
-
-<DeviceTypeConfigurations>
-  <DeviceTypeConfig type="connectedcup">
-    <DatasourceName>jdbc/ConnectedCupDM_DB</DatasourceName>
-    <!--ApiApplicationName>firealarm</ApiApplicationName-->
-  </DeviceTypeConfig>
-</DeviceTypeConfigurations>
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/p2.inf b/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/p2.inf
index d23ed547..d92054fb 100644
--- a/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/p2.inf
+++ b/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/p2.inf
@@ -1,6 +1,4 @@
 instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../conf/device-types/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.backend_${feature.version}/configs/,target:${installFolder}/../../../conf/device-types/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/webapps/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.backend_${feature.version}/webapps/,target:${installFolder}/../../../repository/deployment/server/webapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.backend_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/connectedcup,overwrite:true);\
@@ -9,7 +7,6 @@ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../r
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.backend_${feature.version}/database/,target:${installFolder}/../../../repository/database/,overwrite:true);\
 
 instructions.unconfigure = \
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../conf/device-types/connectedcup.xml);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connectedcup.war);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connected-cup-agent.war);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connectedcup);\
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/configs/connectedcup.xml b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/configs/connectedcup.xml
deleted file mode 100644
index 8d70e4d0..00000000
--- a/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/configs/connectedcup.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you 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.
-  -->
-
-<DeviceTypeConfigurations>
-  <DeviceTypeConfig type="connectedcup">
-    <DatasourceName>jdbc/ConnectedCupDM_DB</DatasourceName>
-    <!--ApiApplicationName>firealarm</ApiApplicationName-->
-  </DeviceTypeConfig>
-</DeviceTypeConfigurations>
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/datasources/connectedcup-datasources.xml b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/datasources/connectedcup-datasources.xml
deleted file mode 100644
index 893a91c0..00000000
--- a/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/datasources/connectedcup-datasources.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you 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.
-  -->
-
-<datasources-configuration xmlns:svns="http://org.wso2.securevault/configuration">
-    <providers>
-        <provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider>
-    </providers>
-    <datasources>
-        <datasource>
-            <name>ConnectedCupDM_DB</name>
-            <description>The datasource used for the Connected Cup database</description>
-            <jndiConfig>
-                <name>jdbc/ConnectedCupDM_DB</name>
-            </jndiConfig>
-            <definition type="RDBMS">
-                <configuration>
-                    <url>jdbc:h2:repository/database/ConnectedCupDM_DB;DB_CLOSE_ON_EXIT=FALSE
-                    </url>
-                    <username>wso2carbon</username>
-                    <password>wso2carbon</password>
-                    <driverClassName>org.h2.Driver</driverClassName>
-                    <maxActive>50</maxActive>
-                    <maxWait>60000</maxWait>
-                    <testOnBorrow>true</testOnBorrow>
-                    <validationQuery>SELECT 1</validationQuery>
-                    <validationInterval>30000</validationInterval>
-                </configuration>
-            </definition>
-        </datasource>
-    </datasources>
-</datasources-configuration>
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/dbscripts/h2.sql b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/dbscripts/h2.sql
deleted file mode 100644
index afa2ad8a..00000000
--- a/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/dbscripts/h2.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-
--- -----------------------------------------------------
--- Table `CONNECTED_CUP_DEVICE`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `CONNECTED_CUP_DEVICE` (
-  `CONNECTED_CUP_DEVICE_ID` VARCHAR(45) NOT NULL ,
-  `DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
-  PRIMARY KEY (`CONNECTED_CUP_DEVICE_ID`) );
-
-
-
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/dbscripts/mysql.sql b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/dbscripts/mysql.sql
deleted file mode 100644
index 64560fc3..00000000
--- a/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/dbscripts/mysql.sql
+++ /dev/null
@@ -1,12 +0,0 @@
--- -----------------------------------------------------
--- Table `CONNECTED_CUP_DEVICE`
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS `CONNECTED_CUP_DEVICE` (
-  `CONNECTED_CUP_DEVICE_ID` VARCHAR(45) NOT NULL ,
-  `DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
-  PRIMARY KEY (`CONNECTED_CUP_DEVICE_ID`) )
-ENGINE = InnoDB;
-
-
-
-
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/p2.inf b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/p2.inf
index 27366c97..073aa7f9 100644
--- a/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/p2.inf
+++ b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/p2.inf
@@ -1,19 +1,9 @@
 instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../conf/device-types/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.ui_${feature.version}/configs/,target:${installFolder}/../../../conf/device-types/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.ui_${feature.version}/jaggeryapps/,target:${installFolder}/../../../repository/deployment/server/jaggeryapps/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.ui_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/connectedcup,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.ui_${feature.version}/datasources/,target:${installFolder}/../../../conf/datasources/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/database/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.ui_${feature.version}/database/,target:${installFolder}/../../../repository/database/,overwrite:true);\
 
 
 instructions.unconfigure = \
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../conf/device-types/connectedcup.xml);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../dbscripts/cdm/plugins/connectedcup);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../conf/datasources/connectedcup-datasources.xml);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/database/ConnectedCupDM_DB.h2.db);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view);\