diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java
index 7f9913b01..b6376fbe9 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java
@@ -53,23 +53,9 @@ public class AndroidDeviceManagementService implements DeviceManagementService {
         return AndroidDeviceManagementService.DEVICE_TYPE_ANDROID;
     }
 
-//    This method is not in use
     @Override
     public List<TaskOperation> getTasksForPlatform() {
-//            List<String> operationsForPlatform = new ArrayList<>();
-//            TaskConfiguration taskConfiguration =
-//                    MobileDeviceConfigurationManager.getInstance().getMobileDeviceManagementConfig()
-//                            .getTaskConfiguration();
-//
-//            List<TaskConfiguration.Operation> ops = taskConfiguration.getOperations();
-//            List<TaskOperation> taskOperations = new ArrayList<>();
-//            for (TaskConfiguration.Operation op : ops) {
-//                TaskOperation taskOperation = new TaskOperation();
-//                taskOperation.setTaskName(op.getOperationName());
-//                taskOperation.setRecurrentTimes(op.getRecurrency());
-//                taskOperations.add(taskOperation);
-//            }
-            return null;
+        return null;
     }
 
     @Override
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceManagementConfig.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceManagementConfig.java
index dd873b444..2c65375c7 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceManagementConfig.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceManagementConfig.java
@@ -18,8 +18,6 @@
 
 package org.wso2.carbon.device.mgt.mobile.android.impl.config;
 
-
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
@@ -30,7 +28,6 @@ import javax.xml.bind.annotation.XmlRootElement;
 public final class MobileDeviceManagementConfig {
 
     private MobileDeviceManagementRepository mobileDeviceMgtRepository;
-//    private TaskConfiguration taskConfiguration;
 
     @XmlElement(name = "ManagementRepository", nillable = false)
     public MobileDeviceManagementRepository getMobileDeviceMgtRepository() {
@@ -42,13 +39,4 @@ public final class MobileDeviceManagementConfig {
         this.mobileDeviceMgtRepository = mobileDeviceMgtRepository;
     }
 
-//    @XmlElement(name = "TaskConfiguration", required = true)
-//    public TaskConfiguration getTaskConfiguration() {
-//        return taskConfiguration;
-//    }
-//
-//    public void setTaskConfiguration(TaskConfiguration taskConfiguration) {
-//        this.taskConfiguration = taskConfiguration;
-//    }
-
 }