diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/FeatureManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/FeatureManager.java
index 41f4211d41..16d2f4063f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/FeatureManager.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/FeatureManager.java
@@ -24,7 +24,7 @@ public interface FeatureManager {
 
     boolean addFeature(Feature feature) throws DeviceManagementException;
 
-    boolean getFeature(String name) throws DeviceManagementException;
+    Feature getFeature(String name) throws DeviceManagementException;
 
     List<Feature> getFeatures() throws DeviceManagementException;
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/OperationManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/OperationManager.java
index 3f134c69ad..a804eaa514 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/OperationManager.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/OperationManager.java
@@ -35,8 +35,8 @@ public interface OperationManager {
 	 * @throws OperationManagementException If some unusual behaviour is observed while adding the
 	 * operation
 	 */
-	public boolean addOperation(Operation operation, List<DeviceIdentifier> devices)
-			throws OperationManagementException;
+	public boolean addOperation(Operation operation,
+                                List<DeviceIdentifier> devices) throws OperationManagementException;
 
 	/**
 	 * Method to retrieve the list of all operations to a device.
@@ -45,8 +45,7 @@ public interface OperationManager {
 	 * @throws OperationManagementException If some unusual behaviour is observed while fetching the
 	 * operation list.
 	 */
-	public List<Operation> getOperations(DeviceIdentifier deviceId)
-			throws OperationManagementException;
+	public List<Operation> getOperations(DeviceIdentifier deviceId) throws OperationManagementException;
 
 	/**
 	 * Method to retrieve the list of available operations to a device.
@@ -55,15 +54,6 @@ public interface OperationManager {
 	 * @throws OperationManagementException If some unusual behaviour is observed while fetching the
 	 * operation list.
 	 */
-	public List<Operation> getPendingOperations(DeviceIdentifier deviceId)
-			throws OperationManagementException;
-
-	/**
-	 * TODO: Move this into a separate FeatureManager
-	 * @param deviceType - Device type
-	 * @return a list of Feature objects.
-	 * @throws org.wso2.carbon.device.mgt.common.FeatureManagementException
-	 */
-	public List<Feature> getFeatures(String deviceType) throws FeatureManagementException;
+	public List<Operation> getPendingOperations(DeviceIdentifier deviceId) throws OperationManagementException;
 
 }
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java
index 79b628349b..7cabd1002b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java
@@ -247,9 +247,4 @@ public class DeviceManagementServiceProviderImpl implements DeviceManagementServ
         return operationManager.getPendingOperations(deviceId);
     }
 
-    @Override
-    public List<Feature> getFeatures(String deviceType) throws FeatureManagementException {
-        return operationManager.getFeatures(deviceType);
-    }
-
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
index 2dd3b844f7..398cd8f131 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
@@ -85,11 +85,6 @@ public class OperationManagerImpl implements OperationManager {
         return null;
     }
 
-    @Override
-    public List<Feature> getFeatures(String deviceType) throws FeatureManagementException {
-        return null;
-    }
-
     private OperationDAO lookupOperationDAO(Operation operation) {
         if (operation instanceof CommandOperation) {
             return commandOperationDAO;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementServiceImpl.java
index c7b6937031..6cbe38b6eb 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementServiceImpl.java
@@ -127,9 +127,4 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
         return DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().getPendingOperations(deviceId);
     }
 
-    @Override
-    public List<Feature> getFeatures(String deviceType) throws FeatureManagementException {
-        return DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().getFeatures(deviceType);
-    }
-
 }