diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dto/operation/mgt/ConfigOperation.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dto/operation/mgt/ConfigOperation.java
index e6681e0e00..4bc28b19fa 100644
--- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dto/operation/mgt/ConfigOperation.java
+++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dto/operation/mgt/ConfigOperation.java
@@ -22,21 +22,10 @@ import java.util.List;
 
 public class ConfigOperation extends Operation {
 
-    private final List<Property> properties;
-
     public ConfigOperation() {
-        properties = new ArrayList<>();
         setControl(Control.REPEAT);
     }
 
-    public List<Property> getConfigProperties() {
-        return properties;
-    }
-
-    public void addConfigProperty(String name, Object value, Class<?> type) {
-        properties.add(new Property(name, value, type));
-    }
-
     public Type getType() {
         return Type.CONFIG;
     }
diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/MDMAndroidOperationUtil.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/MDMAndroidOperationUtil.java
index 6b5d9660f7..bdc4a4eb36 100644
--- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/MDMAndroidOperationUtil.java
+++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/util/MDMAndroidOperationUtil.java
@@ -68,9 +68,7 @@ public class MDMAndroidOperationUtil {
 				WebApplication webApplication = new WebApplication();
 				webApplication.setUrl(application.getLocation());
 				webApplication.setName(application.getName());
-//				webApplication.setType(application.getType().toString());
-//				Hard-corded "type" to "webapp". Some agent versions accept only "webapp" as the type.
-				webApplication.setType("webapp");
+				webApplication.setType(application.getType().toString());
 				webApplication.setProperties(application.getProperties());
 				operation.setPayLoad(webApplication.toJSON());
 				break;