diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManager.java
index ebb225ae4f..5a2259fe40 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManager.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManager.java
@@ -14,6 +14,23 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ *
+ * Copyright (c) 2019, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+ *
+ * Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.wso2.carbon.device.mgt.common;
 
@@ -79,6 +96,15 @@ public interface DeviceManager {
      */
     boolean disenrollDevice(DeviceIdentifier deviceId) throws DeviceManagementException;
 
+    /**
+     * Method to delete a particular device from CDM.
+     *
+     * @param deviceId Fully qualified device identifier
+     * @return A boolean indicating the status of the operation.
+     * @throws DeviceManagementException If some unusual behaviour is observed while deleting a device
+     */
+    boolean deleteDevice(DeviceIdentifier deviceId, Device device) throws DeviceManagementException;
+
     /**
      * Method to retrieve the status of the registration process of a particular device.
      *
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java
index aa07aba8b4..866b230ed2 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java
@@ -1409,91 +1409,97 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
     }
     
     public void deleteDevice(DeviceIdentifier deviceIdentifier, int tenantId) throws DeviceManagementDAOException {
+        String deviceIdentifierId = deviceIdentifier.getId();
+        String deviceType = deviceIdentifier.getType();
         Connection conn;
         try {
             conn = this.getConnection();
             int deviceId = getDeviceId(conn, deviceIdentifier, tenantId);
             if (deviceId == -1) {
-                String msg = "Device " + deviceIdentifier.getId() + " of type " + deviceIdentifier.getType() +
-                             " is not found";
+                String msg = "Device " + deviceIdentifierId + " of type " + deviceType + " is not found";
                 log.error(msg);
                 throw new DeviceManagementDAOException(msg);
             } else {
-                int enrollmentId = getEnrollmentId(conn, deviceId, tenantId);
-                if (enrollmentId == -1) {
-                    String msg = "Enrollment not found for the device " + deviceIdentifier.getId() + " of type " +
-                                 deviceIdentifier.getType();
+                List<Integer> enrollmentIds = getEnrollmentIds(conn, deviceId, tenantId);
+                if (enrollmentIds == null || enrollmentIds.isEmpty()) {
+                    String msg = "Enrollments not found for the device " + deviceIdentifierId + " of type "
+                                 + deviceType;
                     log.error(msg);
                     throw new DeviceManagementDAOException(msg);
                 } else {
                     removeDeviceDetail(conn, deviceId);
                     if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed device detail data");
+                        log.debug("Successfully removed device detail data of device " + deviceIdentifierId
+                                  + " of type " + deviceType);
                     }
                     removeDeviceLocation(conn, deviceId);
                     if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed device location data");
+                        log.debug("Successfully removed device location data of device " + deviceIdentifierId
+                                  + " of type " + deviceType);
                     }
                     removeDeviceInfo(conn, deviceId);
                     if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed device info data");
+                        log.debug("Successfully removed device info data of device " + deviceIdentifierId
+                                  + " of type " + deviceType);
                     }
                     removeDeviceNotification(conn, deviceId);
                     if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed device notification data");
+                        log.debug("Successfully removed device notification data of device " + deviceIdentifierId
+                                  + " of type " + deviceType);
                     }
                     removeDeviceApplicationMapping(conn, deviceId);
                     if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed device application mapping data");
+                        log.debug("Successfully removed device application mapping data of device "
+                                  + deviceIdentifierId + " of type " + deviceType);
                     }
                     removeDevicePolicyApplied(conn, deviceId);
                     if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed device applied policy data");
+                        log.debug("Successfully removed device applied policy data of device " + deviceIdentifierId
+                                  + " of type " + deviceType);
                     }
                     removeDevicePolicy(conn, deviceId);
                     if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed device policy data");
+                        log.debug("Successfully removed device policy data of device " + deviceIdentifierId
+                                  + " of type " + deviceType);
                     }
-                    removeEnrollmentDeviceDetail(conn, enrollmentId);
                     if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed enrollment device detail data");
+                        log.debug("Starting to remove " + enrollmentIds.size() + " enrollment data of device "
+                                  + deviceIdentifierId + " of type " + deviceType);
                     }
-                    removeEnrollmentDeviceLocation(conn, enrollmentId);
-                    if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed enrollment device location data");
-                    }
-                    removeEnrollmentDeviceInfo(conn, enrollmentId);
-                    if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed enrollment device info data");
-                    }
-                    removeEnrollmentDeviceApplicationMapping(conn, enrollmentId);
-                    if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed enrollment device application mapping data");
-                    }
-                    removeDeviceOperationResponse(conn, enrollmentId);
-                    if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed device operation response data");
+                    for (Integer enrollmentId : enrollmentIds) {
+                        removeEnrollmentDeviceDetail(conn, enrollmentId);
+                        removeEnrollmentDeviceLocation(conn, enrollmentId);
+                        removeEnrollmentDeviceInfo(conn, enrollmentId);
+                        removeEnrollmentDeviceApplicationMapping(conn, enrollmentId);
+                        removeDeviceOperationResponse(conn, enrollmentId);
+                        removeEnrollmentOperationMapping(conn, enrollmentId);
                     }
-                    removeEnrollmentOperationMapping(conn, enrollmentId);
                     if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed enrollment operation mapping data");
+                        log.debug("Successfully removed enrollment device details, enrollment device location, " +
+                                  "enrollment device info, enrollment device application mapping, " +
+                                  "enrollment device operation response, enrollment operation mapping data of device "
+                                  + deviceIdentifierId + " of type " + deviceType);
                     }
                     removeDeviceEnrollment(conn, deviceId);
                     if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed device enrollment data");
+                        log.debug("Successfully removed device enrollment data of device " + deviceIdentifierId
+                                  + " of type " + deviceType);
                     }
                     removeDeviceGroupMapping(conn, deviceId);
                     if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed device group mapping data");
+                        log.debug("Successfully removed device group mapping data of device " + deviceIdentifierId
+                                  + " of type " + deviceType);
                     }
                     removeDevice(conn, deviceId);
                     if (log.isDebugEnabled()) {
-                        log.debug("Successfully permanently deleted the device");
+                        log.debug("Successfully permanently deleted the device of device " + deviceIdentifierId
+                                  + " of type " + deviceType);
                     }
                 }
             }
         } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while deleting the device", e);
+            throw new DeviceManagementDAOException("Error occurred while deleting the device " + deviceIdentifierId
+                                                   + " of type " + deviceType, e);
         }
     }
 
@@ -1519,30 +1525,29 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         return deviceId;
     }
 
-    private int getEnrollmentId(Connection conn, int deviceId, int tenantId) throws DeviceManagementDAOException {
+    private List<Integer> getEnrollmentIds(Connection conn, int deviceId, int tenantId) throws DeviceManagementDAOException {
         PreparedStatement stmt = null;
         ResultSet rs = null;
-        int enrollmentId = -1;
+        List<Integer> enrollmentIds = new ArrayList<>();
         try {
             String sql = "SELECT ID FROM DM_ENROLMENT WHERE DEVICE_ID = ? AND TENANT_ID = ?";
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, deviceId);
             stmt.setInt(2, tenantId);
             rs = stmt.executeQuery();
-            if (rs.next()) {
-                enrollmentId = rs.getInt("ID");
+            while (rs.next()) {
+                enrollmentIds.add(rs.getInt("ID"));
             }
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while retrieving enrollment id of the device", e);
         } finally {
             DeviceManagementDAOUtil.cleanupResources(stmt, rs);
         }
-        return enrollmentId;
+        return enrollmentIds;
     }
 
     private void removeDeviceDetail(Connection conn, int deviceId) throws DeviceManagementDAOException {
         PreparedStatement stmt = null;
-        ResultSet rs = null;
         try {
             String sql = "DELETE FROM DM_DEVICE_DETAIL WHERE DEVICE_ID = ?";
             stmt = conn.prepareStatement(sql);
@@ -1551,13 +1556,12 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while removing device detail", e);
         } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+            DeviceManagementDAOUtil.cleanupResources(stmt, null);
         }
     }
 
     private void removeDeviceLocation(Connection conn, int deviceId) throws DeviceManagementDAOException {
         PreparedStatement stmt = null;
-        ResultSet rs = null;
         try {
             String sql = "DELETE FROM DM_DEVICE_LOCATION WHERE DEVICE_ID = ?";
             stmt = conn.prepareStatement(sql);
@@ -1566,13 +1570,12 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while removing device location", e);
         } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+            DeviceManagementDAOUtil.cleanupResources(stmt, null);
         }
     }
 
     private void removeDeviceInfo(Connection conn, int deviceId) throws DeviceManagementDAOException {
         PreparedStatement stmt = null;
-        ResultSet rs = null;
         try {
             String sql = "DELETE FROM DM_DEVICE_INFO WHERE DEVICE_ID = ?";
             stmt = conn.prepareStatement(sql);
@@ -1581,13 +1584,12 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while removing device info", e);
         } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+            DeviceManagementDAOUtil.cleanupResources(stmt, null);
         }
     }
 
     private void removeDeviceNotification(Connection conn, int deviceId) throws DeviceManagementDAOException {
         PreparedStatement stmt = null;
-        ResultSet rs = null;
         try {
             String sql = "DELETE FROM DM_NOTIFICATION WHERE DEVICE_ID = ?";
             stmt = conn.prepareStatement(sql);
@@ -1596,13 +1598,12 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while removing device notification", e);
         } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+            DeviceManagementDAOUtil.cleanupResources(stmt, null);
         }
     }
 
     private void removeDeviceApplicationMapping(Connection conn, int deviceId) throws DeviceManagementDAOException {
         PreparedStatement stmt = null;
-        ResultSet rs = null;
         try {
             String sql = "DELETE FROM DM_DEVICE_APPLICATION_MAPPING WHERE DEVICE_ID = ?";
             stmt = conn.prepareStatement(sql);
@@ -1611,13 +1612,12 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while removing device application mapping", e);
         } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+            DeviceManagementDAOUtil.cleanupResources(stmt, null);
         }
     }
 
     private void removeDevicePolicyApplied(Connection conn, int deviceId) throws DeviceManagementDAOException {
         PreparedStatement stmt = null;
-        ResultSet rs = null;
         try {
             String sql = "DELETE FROM DM_DEVICE_POLICY_APPLIED WHERE DEVICE_ID = ?";
             stmt = conn.prepareStatement(sql);
@@ -1626,13 +1626,12 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while removing device policy applied", e);
         } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+            DeviceManagementDAOUtil.cleanupResources(stmt, null);
         }
     }
 
     private void removeDevicePolicy(Connection conn, int deviceId) throws DeviceManagementDAOException {
         PreparedStatement stmt = null;
-        ResultSet rs = null;
         try {
             String sql = "DELETE FROM DM_DEVICE_POLICY WHERE DEVICE_ID = ?";
             stmt = conn.prepareStatement(sql);
@@ -1641,13 +1640,12 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while removing device policy", e);
         } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+            DeviceManagementDAOUtil.cleanupResources(stmt, null);
         }
     }
 
     private void removeEnrollmentDeviceDetail(Connection conn, int enrollmentId) throws DeviceManagementDAOException {
         PreparedStatement stmt = null;
-        ResultSet rs = null;
         try {
             String sql = "DELETE FROM DM_DEVICE_DETAIL WHERE ENROLMENT_ID = ?";
             stmt = conn.prepareStatement(sql);
@@ -1656,13 +1654,12 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while removing enrollment device detail", e);
         } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+            DeviceManagementDAOUtil.cleanupResources(stmt, null);
         }
     }
 
     private void removeEnrollmentDeviceLocation(Connection conn, int enrollmentId) throws DeviceManagementDAOException {
         PreparedStatement stmt = null;
-        ResultSet rs = null;
         try {
             String sql = "DELETE FROM DM_DEVICE_LOCATION WHERE ENROLMENT_ID = ?";
             stmt = conn.prepareStatement(sql);
@@ -1671,13 +1668,12 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while removing enrollment device location", e);
         } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+            DeviceManagementDAOUtil.cleanupResources(stmt, null);
         }
     }
 
     private void removeEnrollmentDeviceInfo(Connection conn, int enrollmentId) throws DeviceManagementDAOException {
         PreparedStatement stmt = null;
-        ResultSet rs = null;
         try {
             String sql = "DELETE FROM DM_DEVICE_INFO WHERE ENROLMENT_ID = ?";
             stmt = conn.prepareStatement(sql);
@@ -1686,14 +1682,13 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while removing enrollment device info", e);
         } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+            DeviceManagementDAOUtil.cleanupResources(stmt, null);
         }
     }
 
     private void removeEnrollmentDeviceApplicationMapping(Connection conn, int enrollmentId)
             throws DeviceManagementDAOException {
         PreparedStatement stmt = null;
-        ResultSet rs = null;
         try {
             String sql = "DELETE FROM DM_DEVICE_APPLICATION_MAPPING WHERE ENROLMENT_ID = ?";
             stmt = conn.prepareStatement(sql);
@@ -1703,13 +1698,12 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
             throw new DeviceManagementDAOException("Error occurred while removing enrollment device application " +
                                                    "mapping", e);
         } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+            DeviceManagementDAOUtil.cleanupResources(stmt, null);
         }
     }
 
     private void removeDeviceOperationResponse(Connection conn, int enrollmentId) throws DeviceManagementDAOException {
         PreparedStatement stmt = null;
-        ResultSet rs = null;
         try {
             String sql = "DELETE FROM DM_DEVICE_OPERATION_RESPONSE WHERE ENROLMENT_ID = ?";
             stmt = conn.prepareStatement(sql);
@@ -1718,14 +1712,13 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while removing device operation response", e);
         } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+            DeviceManagementDAOUtil.cleanupResources(stmt, null);
         }
     }
 
     private void removeEnrollmentOperationMapping(Connection conn, int enrollmentId)
             throws DeviceManagementDAOException {
         PreparedStatement stmt = null;
-        ResultSet rs = null;
         try {
             String sql = "DELETE FROM DM_ENROLMENT_OP_MAPPING WHERE ENROLMENT_ID = ?";
             stmt = conn.prepareStatement(sql);
@@ -1734,13 +1727,12 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while removing enrollment operation mapping", e);
         } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+            DeviceManagementDAOUtil.cleanupResources(stmt, null);
         }
     }
 
     private void removeDeviceEnrollment(Connection conn, int deviceId) throws DeviceManagementDAOException {
         PreparedStatement stmt = null;
-        ResultSet rs = null;
         try {
             String sql = "DELETE FROM DM_ENROLMENT WHERE DEVICE_ID = ?";
             stmt = conn.prepareStatement(sql);
@@ -1749,13 +1741,12 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while removing device enrollment", e);
         } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+            DeviceManagementDAOUtil.cleanupResources(stmt, null);
         }
     }
 
     private void removeDeviceGroupMapping(Connection conn, int deviceId) throws DeviceManagementDAOException {
         PreparedStatement stmt = null;
-        ResultSet rs = null;
         try {
             String sql = "DELETE FROM DM_DEVICE_GROUP_MAP WHERE DEVICE_ID = ?";
             stmt = conn.prepareStatement(sql);
@@ -1764,13 +1755,12 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while removing device group mapping", e);
         } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+            DeviceManagementDAOUtil.cleanupResources(stmt, null);
         }
     }
 
     private void removeDevice(Connection conn, int deviceId) throws DeviceManagementDAOException {
         PreparedStatement stmt = null;
-        ResultSet rs = null;
         try {
             String sql = "DELETE FROM DM_DEVICE WHERE ID = ?";
             stmt = conn.prepareStatement(sql);
@@ -1779,7 +1769,7 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while removing device", e);
         } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+            DeviceManagementDAOUtil.cleanupResources(stmt, null);
         }
     }
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
index 621cc966e3..76e86420d3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
@@ -14,23 +14,23 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
- */
-/*
- *   Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
  *
- *   Entgra (pvt) Ltd. licenses this file to you under the Apache License,
- *   Version 2.0 (the "License"); you may not use this file except
- *   in compliance with the License.
- *   You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Copyright (c) 2019, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+ *
+ * Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing,
- *   software distributed under the License is distributed on an
- *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *   KIND, either express or implied. See the License for the
- *   specific language governing permissions and limitations
- *   under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.wso2.carbon.device.mgt.core.service;
 
@@ -550,6 +550,14 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
             try {
                 DeviceManagementDAOFactory.beginTransaction();
                 deviceDAO.deleteDevice(deviceId, tenantId);
+                try {
+                    deviceManager.deleteDevice(deviceId, device);
+                } catch (DeviceManagementException e) {
+                    String msg = "Error occurred while permanently deleting '" + deviceId.getType() +
+                                 "' device with the identifier '" + deviceId.getId() + "' in plugin.";
+                    log.error(msg, e);
+                    throw new DeviceManagementDAOException(msg, e);
+                }
                 DeviceManagementDAOFactory.commitTransaction();
                 this.removeDeviceFromCache(deviceId);
             } catch (DeviceManagementDAOException e) {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManager.java
index 47a01c9e59..8675858f8b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManager.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManager.java
@@ -59,6 +59,11 @@ public class TestDeviceManager implements DeviceManager {
         return true;
     }
 
+    @Override
+    public boolean deleteDevice(DeviceIdentifier deviceId, Device device) throws DeviceManagementException {
+        return true;
+    }
+
     @Override
     public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException {
         return true;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/DeviceTypeManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/DeviceTypeManager.java
index b84d165814..948e5a5ff6 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/DeviceTypeManager.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/DeviceTypeManager.java
@@ -15,6 +15,22 @@
  *   specific language governing permissions and limitations
  *   under the License.
  *
+ *
+ *   Copyright (c) 2019, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+ *
+ *   Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied. See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
  */
 package org.wso2.carbon.device.mgt.extensions.device.type.template;
 
@@ -568,4 +584,35 @@ public class DeviceTypeManager implements DeviceManager {
         return null;
     }
 
+    @Override
+    public boolean deleteDevice(DeviceIdentifier deviceIdentifier, Device device) throws DeviceManagementException {
+        if (propertiesExist) {
+            boolean status;
+            Device existingDevice = this.getDevice(deviceIdentifier);
+            if (existingDevice == null) {
+                return false;
+            }
+            try {
+                if (log.isDebugEnabled()) {
+                    log.debug("Deleting the details of " + deviceType + " device : " + device.getDeviceIdentifier());
+                }
+                deviceTypePluginDAOManager.getDeviceTypeDAOHandler().beginTransaction();
+                status = deviceTypePluginDAOManager.getDeviceDAO().deleteDevice(existingDevice);
+                deviceTypePluginDAOManager.getDeviceTypeDAOHandler().commitTransaction();
+            } catch (DeviceTypeMgtPluginException e) {
+                try {
+                    deviceTypePluginDAOManager.getDeviceTypeDAOHandler().rollbackTransaction();
+                } catch (DeviceTypeMgtPluginException e1) {
+                    log.warn("Error occurred while roll back the delete device info transaction : '" +
+                             device.toString() + "'", e1);
+                }
+                throw new DeviceManagementException(
+                        "Error occurred while deleting the " + deviceType + " device: '" +
+                        device.getDeviceIdentifier() + "'", e);
+            }
+            return status;
+        }
+        return true;
+    }
+
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/DeviceTypePluginDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/DeviceTypePluginDAOImpl.java
index 755cb0397b..00c9e4ff40 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/DeviceTypePluginDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/DeviceTypePluginDAOImpl.java
@@ -14,6 +14,23 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ *
+ * Copyright (c) 2019, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+ *
+ * Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.wso2.carbon.device.mgt.extensions.device.type.template.dao;
@@ -45,6 +62,7 @@ public class DeviceTypePluginDAOImpl implements PluginDAO {
     private String createDBqueryForAddDevice;
     private String updateDBQueryForUpdateDevice;
     private String selectDBQueryToGetAllDevice;
+    private String deleteDBQueryForDeleteDevice;
 
     public DeviceTypePluginDAOImpl(DeviceDAODefinition deviceDAODefinition,
                                    DeviceTypeDAOHandler deviceTypeDAOHandler) {
@@ -196,6 +214,33 @@ public class DeviceTypePluginDAOImpl implements PluginDAO {
         }
     }
 
+    @Override
+    public boolean deleteDevice(Device device) throws DeviceTypeMgtPluginException {
+        boolean status = false;
+        Connection conn;
+        PreparedStatement stmt = null;
+        try {
+            conn = deviceTypeDAOHandler.getConnection();
+            stmt = conn.prepareStatement(deleteDBQueryForDeleteDevice);
+            stmt.setString(1, device.getDeviceIdentifier());
+            int rows = stmt.executeUpdate();
+            if (rows > 0) {
+                status = true;
+                if (log.isDebugEnabled()) {
+                    log.debug("Device " + device.getDeviceIdentifier() + " data has been deleted.");
+                }
+            }
+        } catch (SQLException e) {
+            String msg = "Error occurred while deleting the device '" + device.getDeviceIdentifier() + "' data in "
+                         + deviceDAODefinition.getDeviceTableName();
+            log.error(msg, e);
+            throw new DeviceTypeMgtPluginException(msg, e);
+        } finally {
+            DeviceTypeUtils.cleanupResources(stmt, null);
+        }
+        return status;
+    }
+
     private String getDeviceTableColumnNames() {
         return StringUtils.join(deviceDAODefinition.getColumnNames(), ", ");
     }
@@ -239,5 +284,8 @@ public class DeviceTypePluginDAOImpl implements PluginDAO {
         selectDBQueryToGetAllDevice =
                 "SELECT " + getDeviceTableColumnNames() + "," + deviceDAODefinition.getPrimaryKey() + " FROM "
                         + deviceDAODefinition.getDeviceTableName();
+
+        deleteDBQueryForDeleteDevice = "DELETE FROM " + deviceDAODefinition.getDeviceTableName() + " WHERE "
+                                       + deviceDAODefinition.getPrimaryKey() + " = ?";
     }
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/PluginDAO.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/PluginDAO.java
index 47606fe6a6..bd1747d454 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/PluginDAO.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/PluginDAO.java
@@ -14,6 +14,23 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ *
+ * Copyright (c) 2019, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+ *
+ * Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.wso2.carbon.device.mgt.extensions.device.type.template.dao;
@@ -31,4 +48,6 @@ public interface PluginDAO {
     boolean updateDevice(Device device) throws DeviceTypeMgtPluginException;
 
     List<Device> getAllDevices() throws DeviceTypeMgtPluginException;
+
+    boolean deleteDevice(Device device) throws DeviceTypeMgtPluginException;
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/PropertyBasedPluginDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/PropertyBasedPluginDAOImpl.java
index ac90fb1052..1c38884ca7 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/PropertyBasedPluginDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/PropertyBasedPluginDAOImpl.java
@@ -14,6 +14,23 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ *
+ * Copyright (c) 2019, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+ *
+ * Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.wso2.carbon.device.mgt.extensions.device.type.template.dao;
@@ -201,6 +218,27 @@ public class PropertyBasedPluginDAOImpl implements PluginDAO {
         }
     }
 
+    @Override
+    public boolean deleteDevice(Device device) throws DeviceTypeMgtPluginException {
+        Connection conn;
+        PreparedStatement stmt = null;
+        try {
+            conn = deviceTypeDAOHandler.getConnection();
+            stmt = conn.prepareStatement("DELETE FROM DM_DEVICE_PROPERTIES WHERE DEVICE_IDENTIFICATION = ?");
+            stmt.setString(1, device.getDeviceIdentifier());
+            stmt.executeUpdate();
+            return true;
+        } catch (SQLException e) {
+            String msg = "Error occurred while deleting the device '" + device.getDeviceIdentifier() + "' data on"
+                         + deviceType;
+            log.error(msg, e);
+            throw new DeviceTypeMgtPluginException(msg, e);
+        } finally {
+            DeviceTypeUtils.cleanupResources(stmt, null);
+        }
+    }
+
+
     private String getPropertyValue(List<Device.Property> properties, String propertyName) {
         for (Device.Property property : properties) {
             if (property.getName() != null && property.getName().equals(propertyName)) {
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/mock/TypeXDeviceManager.java b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/mock/TypeXDeviceManager.java
index d9477b5119..f303b15c7f 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/mock/TypeXDeviceManager.java
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/mock/TypeXDeviceManager.java
@@ -14,6 +14,23 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ *
+ * Copyright (c) 2019, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+ *
+ * Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.wso2.carbon.policy.mgt.core.mock;
 
@@ -61,6 +78,11 @@ public class TypeXDeviceManager implements DeviceManager {
         return false;
     }
 
+    @Override
+    public boolean deleteDevice(DeviceIdentifier deviceId, Device device) throws DeviceManagementException {
+        return false;
+    }
+
     @Override
     public boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException {
         return false;