diff --git a/modules/core/distribution/src/repository/conf/tomcat/context.xml b/modules/core/distribution/src/repository/conf/tomcat/context.xml
index 0c4bfa37..512337cd 100644
--- a/modules/core/distribution/src/repository/conf/tomcat/context.xml
+++ b/modules/core/distribution/src/repository/conf/tomcat/context.xml
@@ -47,9 +47,6 @@
      -->
     <Listener className="org.wso2.carbon.apimgt.webapp.publisher.lifecycle.listener.APIPublisherLifecycleListener"/>
 
-    <!-- Listener responsible for reading device features -->
-    <Listener className="org.wso2.carbon.device.mgt.extensions.feature.mgt.lifecycle.listener.FeatureManagementLifecycleListener"/>
-
     <!-- WebAppDeploymentLifecycleListener listens to webapp deployment events and adds the custom permissions defined in webapps'
         META-INF/permissions.xml to the permissions/admin section of registry. Given below is a sample of permissions.xml file.