diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
index 919a901fa5a..494b03da1d9 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
@@ -603,6 +603,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
     @Override
     public License getLicense(String deviceType, String languageCode) throws DeviceManagementException {
         DeviceManager deviceManager = this.getDeviceManager(deviceType);
+        License license;
         if (deviceManager == null) {
             if (log.isDebugEnabled()) {
                 log.debug("Device Manager associated with the device type '" + deviceType + "' is null. " +
@@ -611,7 +612,13 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
             return null;
         }
         try {
-            return deviceManager.getLicense(languageCode);
+            license = deviceManager.getLicense(languageCode);
+            if (license == null) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Cannot find a license for '" + deviceType + "' device type");
+                }
+            }
+            return license;
         } catch (LicenseManagementException e) {
             throw new DeviceManagementException("Error occurred while retrieving license configured for " +
                     "device type '" + deviceType + "' and language code '" + languageCode + "'", e);
@@ -851,7 +858,6 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         }
     }
 
-
     public List<Device> getDevicesByStatus(EnrolmentInfo.Status status) throws DeviceManagementException {
         List<Device> devices = new ArrayList<>();
         List<Device> allDevices;
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/PolicyManagerServiceImpl.java b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/PolicyManagerServiceImpl.java
index e96e4ff6a03..1ad71fa0f93 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/PolicyManagerServiceImpl.java
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/PolicyManagerServiceImpl.java
@@ -119,43 +119,13 @@ public class PolicyManagerServiceImpl implements PolicyManagerService {
     public List<ProfileFeature> getEffectiveFeatures(DeviceIdentifier deviceIdentifier) throws
             FeatureManagementException {
         try {
-
-            List<ProfileFeature> effectiveFeatures = PolicyManagementDataHolder.getInstance()
-                    .getPolicyEvaluationPoint().
-                            getEffectiveFeatures(deviceIdentifier);
-
-            List<DeviceIdentifier> deviceIdentifiers = new ArrayList<DeviceIdentifier>();
-            deviceIdentifiers.add(deviceIdentifier);
-            List<ProfileOperation> profileOperationList = new ArrayList<ProfileOperation>();
-
-            if (!effectiveFeatures.isEmpty()) {
-                for (ProfileFeature feature : effectiveFeatures) {
-                    ProfileOperation operation = new ProfileOperation();
-
-                    operation.setCode(feature.getFeatureCode());
-                    operation.setPayLoad(feature.getContent());
-                    operation.setStatus(Operation.Status.PENDING);
-                    operation.setType(Operation.Type.PROFILE);
-                    operation.setEnabled(true);
-                    profileOperationList.add(operation);
-                    PolicyManagementDataHolder.getInstance().getDeviceManagementService().
-                            addOperation(operation, deviceIdentifiers);
-                }
-            } else {
-                return null;
-            }
-
-            return effectiveFeatures;
+            return PolicyManagementDataHolder.getInstance().
+                    getPolicyEvaluationPoint().getEffectiveFeatures(deviceIdentifier);
         } catch (PolicyEvaluationException e) {
             String msg = "Error occurred while getting the effective features from the PEP service " +
                     deviceIdentifier.getId() + " - " + deviceIdentifier.getType();
             log.error(msg, e);
             throw new FeatureManagementException(msg, e);
-        } catch (OperationManagementException e) {
-            String msg = "Error occurred while adding the effective feature to database." +
-                    deviceIdentifier.getId() + " - " + deviceIdentifier.getType();
-            log.error(msg, e);
-            throw new FeatureManagementException(msg, e);
         }
     }