diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 35216133..fd89ecd7 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -1734,14 +1734,6 @@
                 ${pom.artifactId}-${pom.version}/repository/resources/lifecycles
             </outputDirectory>
         </file>
-        <!-- Adding Geo Dashboard CApp -->
-        <file>
-            <source>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/carbonapps/org_wso2_carbon_iot_geo_dashboard-1.0.0.car
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/devicetypes/analytics/</outputDirectory>
-            <fileMode>644</fileMode>
-        </file>
         <file>
             <source>src/core/samples/connectedcup-samples-deployer.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/samples/</outputDirectory>
diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml
index 6faa5718..38cec19a 100644
--- a/modules/p2-profile/analytics-profile/pom.xml
+++ b/modules/p2-profile/analytics-profile/pom.xml
@@ -393,10 +393,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.identity.jwt.client.extension.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
-                                <!-- Geo Dashboard feature -->
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version}
-                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics.shared:org.wso2.carbon.analytics.shared.spark.common.udf.feature:${analytics.shared.version}
                                 </featureArtifactDef>
@@ -410,9 +406,7 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.analytics.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
-                                </featureArtifactDef>
+
                                 <!-- GPL Siddhi Extension Script for Geo Fencing -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.gpl.siddhi.extension.geo.script.feature:${carbon.device.mgt.plugin.version}
@@ -863,16 +857,8 @@
                                     <id>org.wso2.carbon.analytics.gadget.template.feature.group</id>
                                     <version>${carbon.analytics.common.version}</version>
                                 </feature>
-
                                 <!-- End of IoT Analytics Features -->
 
-                                <!-- Geo Dashboard Feature -->
-                                <feature>
-                                    <id>org.wso2.carbon.iot.geo.dashboard.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
-                                <!-- End of Geo Dashboard Feature -->
-
                                 <!-- Siddhi extension Feature -->
                                 <feature>
                                     <id>org.wso2.extension.siddhi.execution.json.feature.group</id>
@@ -882,16 +868,6 @@
                                     <id>org.wso2.extension.siddhi.device.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.iot.analytics.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
-
-								<!--android sense analytics feature-->
-								<feature>
-									<id>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group</id>
-									<version>${carbon.device.mgt.plugin.version}</version>
-								</feature>
                                 <!-- GPL Siddhi Extension Script for Geo Fencing -->
                                 <feature>
                                     <id>org.wso2.gpl.siddhi.extension.geo.script.feature.group</id>
diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index 5ad52e1d..6a4e0293 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -180,12 +180,6 @@
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version}
-                                </featureArtifactDef>
-								<featureArtifactDef>
-									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.ui.feature:${carbon.device.mgt.plugin.version}
-								</featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.backend.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
 								<featureArtifactDef>
 									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.notification.listener.feature:${carbon.device.mgt.plugin.version}
@@ -777,7 +771,10 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
-                                <!-- End of Geo Dashboard feature -->
+                                <!-- IoT Analytics feature -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.analytics.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
 
                                 <!-- Realtime Operations Feature -->
                                 <featureArtifactDef>
@@ -1060,14 +1057,6 @@
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
-								<feature>
-									<id>org.wso2.carbon.device.mgt.iot.androidsense.ui.feature.group</id>
-									<version>${carbon.device.mgt.plugin.version}</version>
-								</feature>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
 								<feature>
 									<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
@@ -1721,7 +1710,11 @@
                                     <id>org.wso2.carbon.iot.geo.dashboard.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
-                                <!-- End of Geo Dashboard Feature -->
+                                <!-- IoT Analytics Feature -->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.analytics.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                                 <!-- Realtime Operations Feature -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.remote.session.feature.group</id>
@@ -2147,10 +2140,6 @@
                                     <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
-								<feature>
-									<id>org.wso2.carbon.device.mgt.iot.androidsense.ui.feature.group</id>
-									<version>${carbon.device.mgt.plugin.version}</version>
-								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
@@ -2624,7 +2613,11 @@
                                     <id>org.wso2.carbon.iot.geo.dashboard.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
-                                <!-- End of Geo Dashboard Feature -->
+                                <!-- IoT Analytics Feature -->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.analytics.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                                 <!-- Realtime Operations Feature -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.remote.session.feature.group</id>
@@ -2632,11 +2625,11 @@
                                 </feature>
                                 <!-- End of Realtime Operations Feature -->
 
-                            <!--MQTT Dashboard Feature-->
-                            <feature>
-                                <id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id>
-                                <version>${carbon.device.mgt.plugin.version}</version>
-                            </feature>
+                                <!--MQTT Dashboard Feature-->
+                                <feature>
+                                    <id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                             </features>
                         </configuration>
                     </execution>
@@ -2792,10 +2785,6 @@
                                     <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
-								<feature>
-									<id>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group</id>
-									<version>${carbon.device.mgt.plugin.version}</version>
-								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
@@ -3254,18 +3243,22 @@
                                     <id>org.wso2.carbon.iot.geo.dashboard.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
-                                <!-- End of Geo Dashboard Feature -->
+                                <!-- IoT Analytics Feature -->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.analytics.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                                 <!-- Realtime Operations Feature -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.remote.session.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Realtime Operations Feature -->
-                            <!--MQTT Dashboard Feature-->
-                            <feature>
-                                <id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id>
-                                <version>${carbon.device.mgt.plugin.version}</version>
-                            </feature>
+                                <!--MQTT Dashboard Feature-->
+                                <feature>
+                                    <id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                             </features>
                         </configuration>
                     </execution>