diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index c24afad6..2e4ced59 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -744,49 +744,29 @@
             <fileMode>755</fileMode>
         </file>
         <!-- End of "portal" app specific modifications -->
-        <!--<file>-->
-            <!--<source>-->
-                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-android-agent.war-->
-            <!--</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps-->
-            <!--</outputDirectory>-->
-            <!--<fileMode>755</fileMode>-->
-        <!--</file>-->
-        <!--<file>-->
-            <!--<source>-->
-                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-windows-agent.war-->
-            <!--</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps-->
-            <!--</outputDirectory>-->
-            <!--<fileMode>755</fileMode>-->
-        <!--</file>-->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-admin.war
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-android-agent.war
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
             </outputDirectory>
-            <destName>devicemgt_admin.war</destName>
+            <fileMode>755</fileMode>
         </file>
         <file>
             <source>
-                ../tools/mdm-android-agent-archetype/target/mdm-android-agent-archetype-${mdm.android.agent.archetype.version}.jar
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-windows-agent.war
             </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/tools
-            </outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>../tools/mdm-android-agent-archetype/README.txt</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/tools
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
             </outputDirectory>
             <fileMode>755</fileMode>
         </file>
         <file>
-            <source>../tools/mdm-android-agent-archetype/android-agent.sh</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/tools
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-admin.war
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
             </outputDirectory>
-            <fileMode>755</fileMode>
+            <destName>devicemgt_admin.war</destName>
         </file>
         <!-- Copying synapse.properties file -->
         <file>
@@ -1111,6 +1091,24 @@
             <destName>AndroidSenseDM_DB.h2.db</destName>
             <fileMode>644</fileMode>
         </file>
+        <!-- Copying ANDROID SENSE H2 database -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/AndroidSenseDM_DB.h2.db
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
+            <destName>AndroidSenseDM_DB.h2.db</destName>
+            <fileMode>644</fileMode>
+        </file>
+        <!-- Copying MOBILE-WINDOWS H2 database -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileWindows_DB.h2.db
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
+            <destName>WSO2MobileWindows_DB.h2.db</destName>
+            <fileMode>644</fileMode>
+        </file>
         <!-- Copying ARDUINO H2 database -->
         <file>
             <source>
@@ -1157,23 +1155,23 @@
             <fileMode>644</fileMode>
         </file>
         <!-- Copying MOBILE-ANDROID H2 database -->
-        <!--<file>-->
-            <!--<source>-->
-                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileAndroid_DB.h2.db-->
-            <!--</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
-            <!--<destName>WSO2MobileAndroid_DB.h2.db</destName>-->
-            <!--<fileMode>644</fileMode>-->
-        <!--</file>-->
-        <!--&lt;!&ndash; Copying MOBILE-WINDOWS H2 database &ndash;&gt;-->
-        <!--<file>-->
-            <!--<source>-->
-                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileWindows_DB.h2.db-->
-            <!--</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
-            <!--<destName>WSO2MobileWindows_DB.h2.db</destName>-->
-            <!--<fileMode>644</fileMode>-->
-        <!--</file>-->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileAndroid_DB.h2.db
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
+            <destName>WSO2MobileAndroid_DB.h2.db</destName>
+            <fileMode>644</fileMode>
+        </file>
+        <!-- Copying MOBILE-WINDOWS H2 database -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileWindows_DB.h2.db
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
+            <destName>WSO2MobileWindows_DB.h2.db</destName>
+            <fileMode>644</fileMode>
+        </file>
         <file>
             <source>src/repository/conf/carbon.xml
             </source>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index c1ebf60f..3dba82a8 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -102,10 +102,6 @@
                             <publishArtifactRepository>true</publishArtifactRepository>
 
                             <featureArtifacts>
-                                <!--<featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.platform.version}
-                                </featureArtifactDef>-->
-
                                 <!-- Device Management Features -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.feature:${carbon.device.mgt.version}
@@ -149,12 +145,12 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
-                                <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:${carbon.device.mgt.plugin.version}-->
-                                <!--</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.mobile.android.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
                                 <!-- Mobile Device Management Features -->
 
                                 <!-- IoT Device Management Features -->
@@ -239,9 +235,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.event.server.feature:${carbon.commons.version}
                                 </featureArtifactDef>
-                                <!--<featureArtifactDef>-->
-                                <!--org.wso2.carbon.commons:org.wso2.carbon.user.mgt.feature:${carbon.commons.version}-->
-                                <!--</featureArtifactDef>-->
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.ntask.feature:${carbon.commons.version}
                                 </featureArtifactDef>
@@ -272,9 +265,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.mgt.core.feature:${carbon.multitenancy.version}
                                 </featureArtifactDef>
-                                <!--<featureArtifactDef>-->
-                                <!--org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.mgt.server.feature:${carbon.multitenancy.version}-->
-                                <!--</featureArtifactDef>-->
                                 <!-- End of Carbon Multi-tenancy Features -->
 
                                 <!-- Identity Features -->
@@ -290,9 +280,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.feature:${carbon.identity.version}
                                 </featureArtifactDef>
-                                <!--<featureArtifactDef>-->
-                                <!--org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.common.feature:${carbon.identity.version}-->
-                                <!--</featureArtifactDef>-->
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.provider.server.feature:${carbon.identity.version}
                                 </featureArtifactDef>
@@ -325,15 +312,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.application.mgt.feature:${carbon.identity.version}
                                 </featureArtifactDef>
-                                <!--<featureArtifactDef>-->
-                                <!--org.wso2.carbon.identity:org.wso2.carbon.identity.mgt.feature:${carbon.identity.version}-->
-                                <!--</featureArtifactDef>-->
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.claim.mgt.server.feature:${carbon.identity.version}
                                 </featureArtifactDef>
-                                <!--featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.self.registration.server.feature:${carbon.identity.version}
-                                </featureArtifactDef-->
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.claim.mgt.feature:${carbon.identity.version}
                                 </featureArtifactDef>
@@ -355,15 +336,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.xacml.server.feature:${carbon.identity.version}
                                 </featureArtifactDef>
-                                <!--   <featureArtifactDef>
-                                       org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.iwa.ui.feature:${carbon.identity.version}
-                                   </featureArtifactDef>
-                                   <featureArtifactDef>
-                                       org.wso2.carbon.identity:org.wso2.carbon.identity.xacml.server.feature:${carbon.identity.version}
-                                   </featureArtifactDef>
-                                   <featureArtifactDef>
-                                       org.wso2.carbon.identity:org.wso2.carbon.identity.notification.mgt.server.feature:${carbon.identity.version}
-                                   </featureArtifactDef>-->
                                 <!-- End of Identity Features -->
 
                                 <!-- Registry Features -->
@@ -536,12 +508,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature:${carbon.identity.version}
                                 </featureArtifactDef>
-                                <!--<feaureArtifactDef>-->
-                                <!--org.wso2.carbon:org.wso2.stratos.identity.saml2.sso.mgt.feature:${carbon.identity.version}-->
-                                <!--</feaureArtifactDef>-->
-                                <!--<featureArtifactDef>-->
-                                <!--org.wso2.carbon:org.wso2.carbon.identity.user.profile.server.feature:${carbon.identity.version}-->
-                                <!--</featureArtifactDef>-->
                                 <!-- SSO Fix-->
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.application.mgt.server.feature:${carbon.identity.version}
@@ -557,9 +523,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.user.registration.server.feature:${carbon.identity.version}
                                 </featureArtifactDef>
-                                <!--<featureArtifactDef>-->
-                                <!--org.wso2.carbon.identity:org.wso2.carbon.identity.relying.party.server.feature:${carbon.identity.version}-->
-                                <!--</featureArtifactDef>-->
 
                                 <!-- Registry features -->
                                 <featureArtifactDef>
@@ -617,10 +580,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.deployment:org.wso2.carbon.module.mgt.server.feature:${carbon.deployment.version}
                                 </featureArtifactDef>
-                                <!--<featureArtifactDef>-->
-                                <!--org.wso2.carbon.deployment:org.wso2.carbon.webapp.mgt.server.feature:${carbon.deployment.version}-->
-                                <!--</featureArtifactDef>-->
-                                <!--+++++++++++++++++++++++++++++++++++++++++++++-->
                                 <!-- End of Carbon Deployment Features -->
 
                                 <!-- Registry Features -->
@@ -799,9 +758,9 @@
                                     org.wso2.carbon.metrics:org.wso2.carbon.metrics.feature:${carbon.metrics.version}
                                 </featureArtifactDef>
                                 <!--JWT grant type handler-->
-                                <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.oauth2.grant.jwt.feature:${identity.jwt.extension.version}
-                                </featureArtifactDef>
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.identity:org.wso2.carbon.identity.oauth2.grant.jwt.feature:${identity.jwt.extension.version}-->
+                                <!--</featureArtifactDef>-->
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -872,10 +831,6 @@
                                     <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.device.mgt.common.api.feature.group</id>-->
-                                    <!--<version>${carbon.device.mgt.version}</version>-->
-                                <!--</feature>-->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
@@ -886,14 +841,14 @@
                                     <id>org.wso2.carbon.device.mgt.mobile.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
-                                <!--<feature>-->
-                                    <!--<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.mobile.windows.feature.group</id>-->
-                                    <!--<version>${carbon.device.mgt.plugin.version}</version>-->
-                                <!--</feature>-->
+                                <feature>
+                                    <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.mobile.windows.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
 
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.iot.feature.group</id>
@@ -1033,10 +988,6 @@
                                     <id>org.wso2.carbon.tenant.common.feature.group</id>
                                     <version>${carbon.multitenancy.version}</version>
                                 </feature>
-                                <!--<feature>-->
-                                <!--<id>org.wso2.carbon.tenant.mgt.server.feature.group</id>-->
-                                <!--<version>${carbon.multitenancy.version}</version>-->
-                                <!--</feature>-->
                                 <feature>
                                     <id>org.wso2.carbon.tenant.mgt.core.feature.group</id>
                                     <version>${carbon.multitenancy.version}</version>
@@ -1060,10 +1011,6 @@
                                     <id>org.wso2.carbon.identity.oauth.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <!--<feature>-->
-                                <!--<id>org.wso2.carbon.identity.oauth.common.feature.group</id>-->
-                                <!--<version>${carbon.identity.version}</version>-->
-                                <!--</feature>-->
                                 <feature>
                                     <id>org.wso2.carbon.identity.provider.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
@@ -1123,18 +1070,10 @@
                                     <id>org.wso2.carbon.identity.application.mgt.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <!--<feature>-->
-                                <!--<id>org.wso2.carbon.identity.mgt.feature.group</id>-->
-                                <!--<version>${carbon.identity.version}</version>-->
-                                <!--</feature>-->
                                 <feature>
                                     <id>org.wso2.carbon.claim.mgt.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <!--feature>
-                                    <id>org.wso2.carbon.identity.self.registration.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
-                                </feature-->
                                 <feature>
                                     <id>org.wso2.carbon.claim.mgt.feature.group</id>
                                     <version>${carbon.identity.version}</version>
@@ -1152,19 +1091,6 @@
                                     <id>org.wso2.carbon.identity.xacml.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-
-                                <!--       <feature>
-                                           <id>org.wso2.carbon.identity.authenticator.iwa.ui.feature.group</id>
-                                           <version>${carbon.identity.version}</version>
-                                       </feature>
-                                       <feature>
-                                           <id>org.wso2.carbon.identity.xacml.server.feature.group</id>
-                                           <version>${carbon.identity.version}</version>
-                                       </feature>
-                                       <feature>
-                                           <id>org.wso2.carbon.identity.notification.mgt.server.feature.group</id>
-                                           <version>${carbon.identity.version}</version>
-                                       </feature>-->
                                 <feature>
                                     <id>org.wso2.carbon.identity.user.registration.feature.group
                                     </id>
@@ -1278,17 +1204,10 @@
                                     <version>${appmgt.feature.version}</version>
                                 </feature>
 
-                                <!--<feature>-->
-                                <!--<id>org.wso2.carbon.appmgt.core.feature.group</id>-->
-                                <!--<version>${appmgt.feature.version}</version>-->
-                                <!--</feature>-->
-
-
                                 <feature>
                                     <id>org.wso2.carbon.store.feature.group</id>
                                     <version>${carbon.store.version}</version>
                                 </feature>
-
                                 <feature>
                                     <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
                                     <version>${appmgt.feature.version}</version>
@@ -1370,22 +1289,16 @@
 
                                 <!-- Identity Features -->
                                 <feature>
-                                    <id>
-                                        org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group
-                                    </id>
+                                    <id>org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>
-                                        org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature.group
-                                    </id>
+                                    <id>org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
                                 <!-- SSO Fix-->
                                 <feature>
-                                    <id>
-                                        org.wso2.carbon.identity.application.mgt.server.feature.group
-                                    </id>
+                                    <id>org.wso2.carbon.identity.application.mgt.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
                                 <feature>
@@ -1397,9 +1310,7 @@
                                     <version>${carbon.identity.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>
-                                        org.wso2.carbon.identity.user.registration.server.feature.group
-                                    </id>
+                                    <id>org.wso2.carbon.identity.user.registration.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
                                 <feature>
@@ -1410,34 +1321,26 @@
 
                                 <!-- Registry Features -->
                                 <feature>
-                                    <id>
-                                        org.wso2.carbon.registry.community.features.server.feature.group
-                                    </id>
+                                    <id>org.wso2.carbon.registry.community.features.server.feature.group</id>
                                     <version>${carbon.registry.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>
-                                        org.wso2.carbon.registry.community.features.ui.feature.group
-                                    </id>
+                                    <id>org.wso2.carbon.registry.community.features.ui.feature.group</id>
                                     <version>${carbon.registry.version}</version>
                                 </feature>
                                 <!-- End of Registry Features -->
 
                                 <!-- Governance features -->
                                 <feature>
-                                    <id>org.wso2.carbon.registry.extensions.server.feature.group
-                                    </id>
+                                    <id>org.wso2.carbon.registry.extensions.server.feature.group</id>
                                     <version>${carbon.governance.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>
-                                        org.wso2.carbon.governance.lifecycle.management.server.feature.group
-                                    </id>
+                                    <id>org.wso2.carbon.governance.lifecycle.management.server.feature.group</id>
                                     <version>${carbon.governance.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.governance.metadata.server.feature.group
-                                    </id>
+                                    <id>org.wso2.carbon.governance.metadata.server.feature.group</id>
                                     <version>${carbon.governance.version}</version>
                                 </feature>
                                 <!-- End of Governance Features -->
@@ -1534,12 +1437,6 @@
                                     <version>${carbon.analytics.common.version}</version>
                                 </feature>
                                 <!-- END - Analytics features -->
-                                <!--<feature>-->
-                                <!--<id>-->
-                                <!--org.wso2.carbon.datasource.reader.hadoop.server.feature.group-->
-                                <!--</id>-->
-                                    <!--<version>${carbon.data.version}</version>-->
-                                <!--</feature>-->
 
                                 <feature>
                                     <id>org.wso2.carbon.analytics.messageconsole.feature.group</id>
@@ -1566,13 +1463,6 @@
                                     <version>${carbon.analytics.version}</version>
                                 </feature>
 
-                                <!-- ************** START - Capp Management ********* -->
-                                <!--<feature>-->
-                                <!--<id>org.wso2.carbon.application.mgt.feature.group</id>-->
-                                <!--<version>${carbon.commons.version}</version>-->
-                                <!--</feature>-->
-                                <!-- ************** END - Capp Management ********* -->
-
                                 <!-- ************** START - Data Bridge ************ -->
                                 <feature>
                                     <id>org.wso2.carbon.databridge.core.server.feature.group</id>
@@ -1693,10 +1583,10 @@
                                     <version>${carbon.metrics.version}</version>
                                 </feature>
                                 <!--jwt grant type handler-->
-                                <feature>
-                                    <id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>
-                                    <version>${identity.jwt.extension.version}</version>
-                                </feature>
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>-->
+                                    <!--<version>${identity.jwt.extension.version}</version>-->
+                                <!--</feature>-->
                             </features>
                         </configuration>
                     </execution>
diff --git a/pom.xml b/pom.xml
index 536c7163..f79a3997 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1012,12 +1012,8 @@
         <eclipse.osgi.version>3.9.1.v20130814-1242</eclipse.osgi.version>
 
         <!--Orbit versions-->
-
         <orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version>
 
-        <!-- MDM android Agent -->
-        <mdm.android.agent.archetype.version>1.0.0-SNAPSHOT</mdm.android.agent.archetype.version>
-
         <!--CXF properties-->
         <cxf.version>2.7.16</cxf.version>
         <cxf.bindings.version>2.5.11</cxf.bindings.version>
@@ -1050,7 +1046,6 @@
 
         <!-- Carbon Device Management Plugins-->
         <carbon.device.mgt.plugin.version>2.1.0-SNAPSHOT</carbon.device.mgt.plugin.version>
-        <mdm.version>2.0.0-SNAPSHOT</mdm.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>5.0.3</carbon.api.mgt.version>
@@ -1059,7 +1054,7 @@
         <carbon.mediation.version>4.5.1</carbon.mediation.version>
 
         <!-- Carbon Analytics Common (DAS) -->
-        <carbon.analytics.common.version>5.0.12-SNAPSHOT</carbon.analytics.common.version>
+        <carbon.analytics.common.version>5.0.11</carbon.analytics.common.version>
 
         <!-- Tomcat -->
         <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
@@ -1074,7 +1069,7 @@
         <axis2-transports.wso2.version>1.1.0-wso2v17</axis2-transports.wso2.version>
 
         <!--DAS-->
-        <carbon.analytics.version>1.0.6-SNAPSHOT</carbon.analytics.version>
+        <carbon.analytics.version>1.0.5</carbon.analytics.version>
         <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
         <carbon.dashboard.version>1.0.13</carbon.dashboard.version>
         <shindig.version>1.0.0</shindig.version>
@@ -1116,8 +1111,6 @@
         <!-- Release plugin ID for github-->
         <project.scm.id>github-scm</project.scm.id>
 
-        <uuf.version>1.0.0-SNAPSHOT</uuf.version>
-
         <!-- MB Features -->
         <carbon.messaging.version>3.1.0</carbon.messaging.version>
         <product.mb.version>3.1.0</product.mb.version>