diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml
index b722228a..74beb972 100644
--- a/modules/p2-profile/analytics-profile/pom.xml
+++ b/modules/p2-profile/analytics-profile/pom.xml
@@ -393,21 +393,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics.shared:org.wso2.carbon.analytics.shared.spark.common.udf.feature:${analytics.shared.version}
                                 </featureArtifactDef>
-                                <!-- Siddhi extension feature -->
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.execution.json.feature:${carbon.device.mgt.plugin.version}
-                                </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.device.feature:${carbon.device.mgt.plugin.version}
-                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.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}
-                                </featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -851,21 +839,6 @@
                                     <version>${carbon.analytics.common.version}</version>
                                 </feature>
                                 <!-- End of IoT Analytics Features -->
-
-                                <!-- Siddhi extension Feature -->
-                                <feature>
-                                    <id>org.wso2.extension.siddhi.execution.json.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.extension.siddhi.device.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>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
                             </features>
                         </configuration>
                     </execution>
diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index 5b32a874..55aad795 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -184,9 +184,6 @@
 								<featureArtifactDef>
 									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.notification.listener.feature:${carbon.device.mgt.plugin.version}
 								</featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:io.entgra.health.check.api.feature:${carbon.device.mgt.plugin.version}
-                                </featureArtifactDef>
                                 <!-- End of Device Management Plugin Features -->
 
                                 <!-- IoT Device Management Features -->
@@ -730,12 +727,6 @@
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.analytics.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
 
-                                <!-- Realtime Operations Feature -->
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.remote.session.feature:${carbon.device.mgt.plugin.version}
-                                </featureArtifactDef>
-                                <!-- End of Realtime Operations Feature -->
-
                                 <!--MQTT Dashboard-->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.andes.extensions.device.mgt.api.feature:${carbon.device.mgt.plugin.version}
@@ -981,10 +972,6 @@
                                     <id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>io.entgra.health.check.api.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
                                 <!-- End of Device Management Features -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
@@ -1590,12 +1577,6 @@
                                     <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>
@@ -1982,10 +1963,6 @@
 									<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
 									<version>${carbon.device.mgt.plugin.version}</version>
 								</feature>
-                                <feature>
-                                    <id>io.entgra.health.check.api.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
                                 <!-- End of Device Management Features -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
@@ -2452,12 +2429,6 @@
                                     <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>
@@ -2597,10 +2568,6 @@
 									<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
 									<version>${carbon.device.mgt.plugin.version}</version>
 								</feature>
-                                <feature>
-                                    <id>io.entgra.health.check.api.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
                                 <!-- End of Device Management Features -->
 
                                 <feature>
@@ -3056,12 +3023,6 @@
                                     <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>
diff --git a/pom.xml b/pom.xml
index 2f763906..f0da4276 100644
--- a/pom.xml
+++ b/pom.xml
@@ -898,63 +898,6 @@
                 <version>1.9.0</version>
             </dependency>
 
-
-            <!-- App Management feature dependencies-->
-            <dependency>
-                <groupId>org.wso2.carbon.appmgt</groupId>
-                <artifactId>org.wso2.carbon.appmgt.core.feature</artifactId>
-                <version>${appmgt.feature.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.wso2.carbon.appmgt</groupId>
-                <artifactId>org.wso2.carbon.appmgt.feature</artifactId>
-                <version>${appmgt.feature.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.wso2.carbon.appmgt</groupId>
-                <artifactId>org.wso2.carbon.appmgt.mdm.wso2emm.feature</artifactId>
-                <version>${appmgt.feature.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.wso2.carbon.appmgt</groupId>
-                <artifactId>org.wso2.carbon.appmgt.mdm.wso2mdm.feature</artifactId>
-                <version>${appmgt.feature.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.wso2.carbon.appmgt</groupId>
-                <artifactId>org.wso2.carbon.appmgt.mobile.feature</artifactId>
-                <version>${appmgt.feature.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.wso2.carbon.appmgt</groupId>
-                <artifactId>org.wso2.carbon.appmgt.publisher.feature</artifactId>
-                <version>${appmgt.feature.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.wso2.carbon.appmgt</groupId>
-                <artifactId>org.wso2.carbon.appmgt.services.api.feature</artifactId>
-                <version>${appmgt.feature.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.wso2.carbon.appmgt</groupId>
-                <artifactId>org.wso2.carbon.appmgt.store.feature</artifactId>
-                <version>${appmgt.feature.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.appmgt</groupId>
-                <artifactId>org.wso2.carbon.appmgt.mobile</artifactId>
-                <version>${carbon.appmgt.version}</version>
-            </dependency>
-
-            <!-- End of app management features-->
-
             <!-- Carbon store -->
 
             <dependency>
@@ -1538,6 +1481,9 @@
         <!-- Carbon Device Management Plugins-->
         <carbon.device.mgt.plugin.version>5.0.7-SNAPSHOT</carbon.device.mgt.plugin.version>
 
+        <!-- Carbon Device Management Proprietary Plugins-->
+        <io.entgra.proprietary.plugin.version>1.0.0-SNAPSHOT</io.entgra.proprietary.plugin.version>
+
         <!-- API Management -->
         <carbon.api.mgt.version>6.2.201</carbon.api.mgt.version>
         <carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>