diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java
index 40e3996cbc..07a2882b3d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java
@@ -914,11 +914,6 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl {
             deviceIds.stream().map(ignored -> "?").forEach(joiner::add);
             String query = joiner.toString();
 
-//            if (status != null && !status.isEmpty()) {
-//                query = query + " AND DM_ENROLMENT.STATUS=?";
-//                isStatusProvided = true;
-//            }
-
             if (status != null && !status.isEmpty()) {
                 query += buildStatusQuery(status);
                 isStatusProvided = true;
@@ -974,10 +969,6 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl {
             deviceIds.stream().map(ignored -> "?").forEach(joiner::add);
             String query = joiner.toString();
 
-//            if (!StringUtils.isBlank(status)) {
-//                query = query + " AND e.STATUS = ?";
-//            }
-
             if (status != null && !status.isEmpty()) {
                 query += buildStatusQuery(status);
             }