diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/pom.xml b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/pom.xml
index f861513e29..e54526735e 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/pom.xml
@@ -51,64 +51,6 @@
                         <Bundle-Description>Application Management Core Bundle</Bundle-Description>
                         <Private-Package>org.wso2.carbon.device.application.mgt.core.internal</Private-Package>
                         <Import-Package>
-                            <!--com.dd.plist;version="[1.21,2)",com.google.gson;versio-->
-                            <!--n="[2.3,3)",com.google.gson.reflect;version="[2.3,3)",javax.annotatio-->
-                            <!--n;version="[1.3,2)",javax.naming,javax.sql,javax.ws.rs.core;version="-->
-                            <!--[2.0,3)",javax.xml.bind;version="[2.3,3)",javax.xml.bind.annotation;v-->
-                            <!--ersion="[2.3,3)",javax.xml.parsers,org.apache.commons.codec.binary;ve-->
-                            <!--rsion="[1.4,2)",org.apache.commons.codec.digest;version="[1.4,2)",org-->
-                            <!--.apache.commons.httpclient;version="[3.1,4)",org.apache.commons.httpc-->
-                            <!--lient.methods;version="[3.1,4)",org.apache.commons.io;version="[2.4,3-->
-                            <!--)",org.apache.commons.lang;version="[2.6,3)",org.apache.commons.loggi-->
-                            <!--ng;version="[1.2,2)",org.apache.commons.validator.routines;version="[-->
-                            <!--1.6,2)",org.apache.cxf.jaxrs.ext.multipart;version="[3.3,4)",org.boun-->
-                            <!--cycastle.cert,org.bouncycastle.cert.jcajce,org.bouncycastle.cms,org.b-->
-                            <!--ouncycastle.jce.provider;version="[1.60,2)",org.bouncycastle.util;ver-->
-                            <!--sion="[1.60,2)",org.json;version="[3.0,4)",org.osgi.framework;version-->
-                            <!--="[1.7,2)",org.osgi.service.component;version="[1.2,2)",org.quartz;ve-->
-                            <!--rsion="[2.1,3)",org.wso2.carbon.apimgt.application.extension;version=-->
-                            <!--"[4.1,5)",org.wso2.carbon.apimgt.application.extension.dto;version="[-->
-                            <!--4.1,5)",org.wso2.carbon.apimgt.application.extension.exception;versio-->
-                            <!--n="[4.1,5)",org.wso2.carbon.context;version="[4.6,5)",org.wso2.carbon-->
-                            <!--.device.application.mgt.common;version="[4.1,5)",org.wso2.carbon.devi-->
-                            <!--ce.application.mgt.common.config;version="[4.1,5)",org.wso2.carbon.de-->
-                            <!--vice.application.mgt.common.dto;version="[4.1,5)",org.wso2.carbon.dev-->
-                            <!--ice.application.mgt.common.exception;version="[4.1,5)",org.wso2.carbo-->
-                            <!--n.device.application.mgt.common.response;version="[4.1,5)",org.wso2.c-->
-                            <!--arbon.device.application.mgt.common.services;version="[4.1,5)",org.ws-->
-                            <!--o2.carbon.device.application.mgt.common.wrapper;version="[4.1,5)",org-->
-                            <!--.wso2.carbon.device.application.mgt.core.config,org.wso2.carbon.devic-->
-                            <!--e.application.mgt.core.dao,org.wso2.carbon.device.application.mgt.cor-->
-                            <!--e.dao.common,org.wso2.carbon.device.application.mgt.core.dao.impl,org-->
-                            <!--.wso2.carbon.device.application.mgt.core.dao.impl.application,org.wso-->
-                            <!--2.carbon.device.application.mgt.core.dao.impl.application.release,org-->
-                            <!--.wso2.carbon.device.application.mgt.core.dao.impl.lifecyclestate,org.-->
-                            <!--wso2.carbon.device.application.mgt.core.dao.impl.review,org.wso2.carb-->
-                            <!--on.device.application.mgt.core.dao.impl.subscription,org.wso2.carbon.-->
-                            <!--device.application.mgt.core.dao.impl.visibility,org.wso2.carbon.devic-->
-                            <!--e.application.mgt.core.exception,org.wso2.carbon.device.mgt.common;ve-->
-                            <!--rsion="[4.1,5)",org.wso2.carbon.device.mgt.common.app.mgt;version="[4-->
-                            <!--.1,5)",org.wso2.carbon.device.mgt.common.app.mgt.android;version="[4.-->
-                            <!--1,5)",org.wso2.carbon.device.mgt.common.exceptions;version="[4.1,5)",-->
-                            <!--org.wso2.carbon.device.mgt.common.group.mgt;version="[4.1,5)",org.wso-->
-                            <!--2.carbon.device.mgt.common.operation.mgt;version="[4.1,5)",org.wso2.c-->
-                            <!--arbon.device.mgt.common.permission.mgt;version="[4.1,5)",org.wso2.car-->
-                            <!--bon.device.mgt.core.dto;version="[4.1,5)",org.wso2.carbon.device.mgt.-->
-                            <!--core.operation.mgt;version="[4.1,5)",org.wso2.carbon.device.mgt.core.-->
-                            <!--permission.mgt;version="[4.1,5)",org.wso2.carbon.device.mgt.core.serv-->
-                            <!--ice;version="[4.1,5)",org.wso2.carbon.device.mgt.core.task.impl;versi-->
-                            <!--on="[4.1,5)",org.wso2.carbon.device.mgt.core.util;version="[4.1,5)",o-->
-                            <!--rg.wso2.carbon.identity.jwt.client.extension,org.wso2.carbon.identity-->
-                            <!--.jwt.client.extension.dto,org.wso2.carbon.identity.jwt.client.extensi-->
-                            <!--on.exception,org.wso2.carbon.identity.jwt.client.extension.service,or-->
-                            <!--g.wso2.carbon.ndatasource.core;version="[4.6,5)",org.wso2.carbon.ntas-->
-                            <!--k.common;version="[4.6,5)",org.wso2.carbon.ntask.core;version="[4.6,5-->
-                            <!--)",org.wso2.carbon.ntask.core.service;version="[4.6,5)",org.wso2.carb-->
-                            <!--on.user.api;version="[1.0,2)",org.wso2.carbon.user.core.service;versi-->
-                            <!--on="[4.6,5)",org.wso2.carbon.utils;version="[4.6,5)",org.wso2.carbon.-->
-                            <!--utils.dbcreator;version="[4.6,5)",org.xml.sax,org.xml.sax.helpers-->
-
-
                             org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
                             org.osgi.service.*;version="${imp.package.version.osgi.service}",
                             org.apache.commons.logging,
@@ -145,8 +87,6 @@
                             org.apache.commons.validator.routines
                         </Import-Package>
                         <Embed-Dependency>apk-parser;scope=compile|runtime;inline=false</Embed-Dependency>
-                        <!--<Embed-Transitive>true</Embed-Transitive>-->
-                        <!--<Embed-StripGroup>true</Embed-StripGroup>-->
                         <Export-Package>
                             !org.wso2.carbon.device.application.mgt.core.internal.*,
                             org.wso2.carbon.device.application.mgt.core.*
@@ -410,10 +350,6 @@
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId></groupId>-->
-            <!--<artifactId></artifactId>-->
-        <!--</dependency>-->
     </dependencies>
 </project>