diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderService.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderService.java
index b9ffa03340..67bb3dc4af 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderService.java
@@ -25,7 +25,6 @@ import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
 import org.wso2.carbon.device.mgt.common.group.mgt.GroupAlreadyEixistException;
 import org.wso2.carbon.device.mgt.common.group.mgt.GroupManagementException;
 import org.wso2.carbon.device.mgt.common.group.mgt.GroupUser;
-import org.wso2.carbon.device.mgt.core.group.mgt.DeviceGroupBuilder;
 
 import java.util.List;
 
@@ -77,6 +76,7 @@ public interface GroupManagementProviderService {
 
     /**
      * Get the device group provided the device group id.
+     *
      * @param groupId
      * @return
      * @throws GroupManagementException
@@ -97,7 +97,7 @@ public interface GroupManagementProviderService {
      * Get paginated device groups in tenant
      *
      * @param startIndex for pagination.
-     * @param rowCount for pagination.
+     * @param rowCount   for pagination.
      * @return paginated list of groups
      * @throws GroupManagementException
      */
@@ -106,9 +106,9 @@ public interface GroupManagementProviderService {
     /**
      * Get paginated device groups in tenant
      *
-     * @param username  of user.
+     * @param username   of user.
      * @param startIndex for pagination.
-     * @param rowCount for pagination.
+     * @param rowCount   for pagination.
      * @return paginated list of groups
      * @throws GroupManagementException
      */
@@ -183,9 +183,9 @@ public interface GroupManagementProviderService {
     /**
      * Remove existing sharing role for device group
      *
-     * @param groupName   of the group
-     * @param owner       of the group
-     * @param roleName    to remove
+     * @param groupName of the group
+     * @param owner     of the group
+     * @param roleName  to remove
      * @return is role removed
      * @throws GroupManagementException
      */
@@ -194,8 +194,8 @@ public interface GroupManagementProviderService {
     /**
      * Get all sharing roles for device group
      *
-     * @param groupName   of the group
-     * @param owner       of the group
+     * @param groupName of the group
+     * @param owner     of the group
      * @return list of roles
      * @throws GroupManagementException
      */
@@ -204,9 +204,9 @@ public interface GroupManagementProviderService {
     /**
      * Get specific device group sharing roles for user
      *
-     * @param userName    of the user
-     * @param groupName   of the group
-     * @param owner       of the group
+     * @param userName  of the user
+     * @param groupName of the group
+     * @param owner     of the group
      * @return list of roles
      * @throws GroupManagementException
      */
@@ -215,8 +215,8 @@ public interface GroupManagementProviderService {
     /**
      * Get device group users
      *
-     * @param groupName   of the group
-     * @param owner       of the group
+     * @param groupName of the group
+     * @param owner     of the group
      * @return list of group users
      * @throws GroupManagementException
      */
@@ -225,8 +225,8 @@ public interface GroupManagementProviderService {
     /**
      * Get all devices in device group.
      *
-     * @param groupName   of the group.
-     * @param owner       of the group.
+     * @param groupName of the group.
+     * @param owner     of the group.
      * @return list of group devices.
      * @throws GroupManagementException
      */
@@ -235,10 +235,10 @@ public interface GroupManagementProviderService {
     /**
      * Get all devices in device group as paginated result.
      *
-     * @param groupName   of the group.
-     * @param owner       of the group.
+     * @param groupName  of the group.
+     * @param owner      of the group.
      * @param startIndex for pagination.
-     * @param rowCount for pagination.
+     * @param rowCount   for pagination.
      * @return Paginated list of devices.
      * @throws GroupManagementException
      */
@@ -248,8 +248,8 @@ public interface GroupManagementProviderService {
     /**
      * This method is used to retrieve the device count of a given group.
      *
-     * @param groupName   of the group.
-     * @param owner       of the group.
+     * @param groupName of the group.
+     * @param owner     of the group.
      * @return returns the device count.
      * @throws GroupManagementException
      */
@@ -258,9 +258,9 @@ public interface GroupManagementProviderService {
     /**
      * Add device to device group.
      *
-     * @param deviceId of the device.
-     * @param groupName   of the group.
-     * @param owner       of the group.
+     * @param deviceId  of the device.
+     * @param groupName of the group.
+     * @param owner     of the group.
      * @return is device added.
      * @throws GroupManagementException
      */
@@ -269,9 +269,9 @@ public interface GroupManagementProviderService {
     /**
      * Remove device from device group.
      *
-     * @param deviceId of the device.
-     * @param groupName   of the group.
-     * @param owner       of the group.
+     * @param deviceId  of the device.
+     * @param groupName of the group.
+     * @param owner     of the group.
      * @return is device removed.
      * @throws GroupManagementException
      */
@@ -280,9 +280,9 @@ public interface GroupManagementProviderService {
     /**
      * Get device group permissions of user.
      *
-     * @param username of the user.
-     * @param groupName   of the group.
-     * @param owner       of the group.
+     * @param username  of the user.
+     * @param groupName of the group.
+     * @param owner     of the group.
      * @return array of permissions.
      * @throws GroupManagementException
      */
@@ -300,6 +300,7 @@ public interface GroupManagementProviderService {
 
     /**
      * Get the group of device.
+     *
      * @param deviceIdentifier
      * @return
      * @throws GroupManagementException