diff --git a/modules/samples/connectedcup/component/controller/pom.xml b/modules/samples/connectedcup/component/controller/pom.xml
index 82102873..5a360f7b 100644
--- a/modules/samples/connectedcup/component/controller/pom.xml
+++ b/modules/samples/connectedcup/component/controller/pom.xml
@@ -210,12 +210,10 @@
             <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
             <artifactId>org.coffeeking.connectedcup.plugin</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.json.wso2</groupId>
             <artifactId>json</artifactId>
         </dependency>
-
     </dependencies>
 
 
diff --git a/modules/samples/connectedcup/pom.xml b/modules/samples/connectedcup/pom.xml
index bbf510b4..7590d09c 100644
--- a/modules/samples/connectedcup/pom.xml
+++ b/modules/samples/connectedcup/pom.xml
@@ -219,28 +219,6 @@
                 <checksumPolicy>ignore</checksumPolicy>
             </releases>
         </repository>
-        <repository>
-            <id>wso2.snapshots</id>
-            <name>WSO2 Snapshot Repository</name>
-            <url>http://maven.wso2.org/nexus/content/repositories/snapshots/</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-        <repository>
-            <id>wso2-staging</id>
-            <name>WSO2 internal Repository</name>
-            <url>http://maven.wso2.org/nexus/content/repositories/orgwso2carbonapimgt-174/</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </releases>
-        </repository>
     </repositories>
 
 
@@ -248,7 +226,6 @@
 		<carbon.kernel.version>4.4.2</carbon.kernel.version>
 		<carbon.device.mgt.version>0.9.2-SNAPSHOT</carbon.device.mgt.version>
 		<paho.mqtt.version>0.4.0</paho.mqtt.version>
-		<smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>
 		<commons-json.version>3.0.0.wso2v1</commons-json.version>
 		<eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
 		<carbon.iot.device.mgt.version>1.9.2-SNAPSHOT</carbon.iot.device.mgt.version>
diff --git a/modules/samples/installer/device-deployer.xml b/modules/samples/installer/device-deployer.xml
index 2063e453..ebec035a 100644
--- a/modules/samples/installer/device-deployer.xml
+++ b/modules/samples/installer/device-deployer.xml
@@ -30,9 +30,14 @@
     <packaging>pom</packaging>
     <name>Creating custom distribution</name>
     <url>http://wso2.org</url>
+
+    <modules>
+        <!-- maven module of your device-type -->
+        <module>samples/connectedcup</module>
+    </modules>
+
     <build>
         <plugins>
-
             <plugin>
                 <groupId>org.wso2.maven</groupId>
                 <artifactId>carbon-p2-plugin</artifactId>
@@ -53,7 +58,7 @@
 
                             <featureArtifacts>
                                 <featureArtifactDef>
-                                    <!-- STEP#1. ADD YOUR DEVICE TYPE FEATURE HERE  -->
+                                    <!-- STEP#1. ADD YOUR DEVICE TYPE FEATURE HERE  "< GROUP_ID:ARTIFACT_ID:VERSION >" -->
                                     org.wso2.carbon.devicemgt-plugins:org.coffeeking.connectedcup.feature:1.9.2-SNAPSHOT
                                 </featureArtifactDef>
                             </featureArtifacts>
@@ -62,8 +67,6 @@
                 </executions>
             </plugin>
 
-
-
             <plugin>
                 <groupId>org.wso2.maven</groupId>
                 <artifactId>carbon-p2-plugin</artifactId>
@@ -82,7 +85,7 @@
                             <destination>repository/components</destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
-                                <!-- STEP#2. ADD YOUR DEVICE TYPE FEATURE GROUP HERE  -->
+                                <!-- STEP#2. ADD YOUR DEVICE TYPE FEATURE GROUP HERE  "<ARTIFACT_ID>.group" -->
                                 <feature>
                                     <id>org.coffeeking.connectedcup.feature.group</id>
                                     <version>1.9.2-SNAPSHOT</version>
@@ -114,6 +117,7 @@
             </plugin>
         </plugins>
     </build>
+
     <repositories>
         <repository>
             <id>wso2-nexus</id>