diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/HTTPDeviceTypeManagerService.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/HTTPDeviceTypeManagerService.java
index c05da78f3ce..56dc171db7a 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/HTTPDeviceTypeManagerService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/HTTPDeviceTypeManagerService.java
@@ -99,13 +99,14 @@ public class HTTPDeviceTypeManagerService extends DeviceTypeManagerService imple
             }
 
             deviceTypeConfiguration.setName(deviceTypeName);
-            if (deviceTypeMetaDefinition.getLicense() != null) {
-                License license = new License();
-                license.setLanguage(deviceTypeMetaDefinition.getLicense().getLanguage());
-                license.setText(deviceTypeMetaDefinition.getLicense().getText());
-                license.setVersion(deviceTypeMetaDefinition.getLicense().getVersion());
-                deviceTypeConfiguration.setLicense(license);
-            }
+            //TODO: Add it to the license management service.
+//            if (deviceTypeMetaDefinition.getLicense() != null) {
+//                License license = new License();
+//                license.setLanguage(deviceTypeMetaDefinition.getLicense().getLanguage());
+//                license.setText(deviceTypeMetaDefinition.getLicense().getText());
+//                license.setVersion(deviceTypeMetaDefinition.getLicense().getVersion());
+//                deviceTypeConfiguration.setLicense(license);
+//            }
             PolicyMonitoring policyMonitoring = new PolicyMonitoring();
             policyMonitoring.setEnabled(deviceTypeMetaDefinition.isPolicyMonitoringEnabled());
             deviceTypeConfiguration.setPolicyMonitoring(policyMonitoring);
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.operation-bar/operation-bar.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.operation-bar/operation-bar.hbs
index 04030eb5e89..0dd0c6a1741 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.operation-bar/operation-bar.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.operation-bar/operation-bar.hbs
@@ -59,7 +59,7 @@
                             </h4>
 
                             <form id="form-{{operation}}" style="padding-bottom: 20px;"-->
-                                <select id="operation-type" class="form-control" onChange="operationTypeChage(this)">
+                                <select id="operation-type" class="form-control" onChange="operationTypeChage(this)" style="display:none">
                                     <option value="CONFIG">Config</option>
                                     <option value="COMMAND">Command</option>
                                 </select>
diff --git a/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml b/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml
index b686fbc64fd..86715239b94 100644
--- a/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml
+++ b/features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml
@@ -80,9 +80,6 @@
                                 <bundleDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.oauth.extensions:${carbon.device.mgt.version}
                                 </bundleDef>
-                                <bundleDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.identity.authenticator.backend.oauth:${carbon.device.mgt.version}
-                                </bundleDef>
                             </bundles>
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}