diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java
index 5e63430d41c..ebd264b36ad 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java
@@ -59,21 +59,11 @@ public final class DeviceManagementConstants {
         public final static String LANGUAGE_CODE_ENGLISH_UK = "en-uk";
     }
 
-    public static final class DefaultLicences {
-
-        private DefaultLicences() {
-            throw new AssertionError();
-        }
-
-        public static final String DEFAULT_LICENSE_CONFIG_XML_NAME = "DefaultLicense.xml";
-    }
-
     public static final class LicenseProperties {
 
         private LicenseProperties() {
             throw new AssertionError();
         }
-
         public static final String OVERVIEW_PROVIDER = "overview_provider";
         public static final String OVERVIEW_NAME = "overview_name";
         public static final String OVERVIEW_LANGUAGE = "overview_language";
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/LicenseManagerImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/LicenseManagerImpl.java
index 413e1fe12b2..3252e2e98df 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/LicenseManagerImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/LicenseManagerImpl.java
@@ -68,7 +68,8 @@ public class LicenseManagerImpl implements LicenseManager {
 
         try {
             GovernanceUtils.loadGovernanceArtifacts((UserRegistry) registry);
-            GenericArtifactManager artifactManager = new GenericArtifactManager(registry, "license");
+            GenericArtifactManager artifactManager = new GenericArtifactManager(registry,
+                    DeviceManagementConstants.LicenseProperties.LICENSE_REGISTRY_KEY);
 
             filteredArtifacts = artifactManager.findGenericArtifacts(
                     new GenericArtifactFilter() {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/LicenseManagementServiceComponent.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/LicenseManagementServiceComponent.java
index 3fd0ad6acc1..67d2b6a835a 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/LicenseManagementServiceComponent.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/LicenseManagementServiceComponent.java
@@ -68,7 +68,7 @@ public class LicenseManagementServiceComponent {
             LicenseManager licenseManager = new LicenseManagerImpl();
             LicenseManagementDataHolder.getInstance().setLicenseManager(licenseManager);
 
-                        /* If -Dsetup option enabled then create creates default license management */
+            /* If -Dsetup option enabled then create creates default license management */
             String setupOption = System.getProperty(
                     org.wso2.carbon.device.mgt.core.DeviceManagementConstants.Common.PROPERTY_SETUP);
 
@@ -81,7 +81,6 @@ public class LicenseManagementServiceComponent {
                         .getLicenseMgtConfig();
                 addDefaultLicenses(licenseManagementConfig);
             }
-
             if (log.isDebugEnabled()) {
                 log.debug("Registering OSGi service LicenseManagementService");
             }