diff --git a/mifosng-db/patches/18-add_group_id_to_note_table.sql b/mifosng-db/patches/20-add_group_id_to_note_table.sql
similarity index 100%
rename from mifosng-db/patches/18-add_group_id_to_note_table.sql
rename to mifosng-db/patches/20-add_group_id_to_note_table.sql
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java
index 918db68d5..3faa5a07f 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java
@@ -28,7 +28,6 @@ import org.mifosplatform.portfolio.client.exception.ClientNotFoundException;
 import org.mifosplatform.portfolio.loanaccount.data.LoanStatusEnumData;
 import org.mifosplatform.portfolio.loanproduct.service.LoanEnumerations;
 import org.mifosplatform.useradministration.domain.AppUser;
-import org.mifosplatform.useradministration.service.AppUserReadPlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -41,14 +40,12 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
     private final JdbcTemplate jdbcTemplate;
     private final PlatformSecurityContext context;
     private final OfficeReadPlatformService officeReadPlatformService;
-    private final AppUserReadPlatformService appUserReadPlatformService;
 
     @Autowired
     public ClientReadPlatformServiceImpl(final PlatformSecurityContext context, final TenantAwareRoutingDataSource dataSource,
-            final OfficeReadPlatformService officeReadPlatformService, final AppUserReadPlatformService appUserReadPlatformService) {
+            final OfficeReadPlatformService officeReadPlatformService) {
         this.context = context;
         this.officeReadPlatformService = officeReadPlatformService;
-        this.appUserReadPlatformService = appUserReadPlatformService;
         this.jdbcTemplate = new JdbcTemplate(dataSource);
     }
 
@@ -162,8 +159,7 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
     private static final class ClientLookupMapper implements RowMapper<ClientLookup> {
 
         public String clientLookupSchema() {
-            return "c.id as id, c.display_name as displayName, " 
-                    + "c.office_id as officeId, o.name as officeName "
+            return "c.id as id, c.display_name as displayName, " + "c.office_id as officeId, o.name as officeName "
                     + "from m_client c join m_office o on o.id = c.office_id where c.is_deleted=0 ";
         }
 
@@ -350,7 +346,6 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
         }
     }
 
-    
     @Override
     public Collection<ClientIdentifierData> retrieveClientIdentifiers(final Long clientId) {
 
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/Group.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/Group.java
index f9db19429..00a995a7d 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/Group.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/Group.java
@@ -47,7 +47,6 @@ public class Group extends AbstractPersistable<Long> {
     @JoinColumn(name = "staff_id", nullable = true)
     private Staff staff;
     
-    @SuppressWarnings("unused")
     @Column(name = "level_id", nullable = false)
     private Long levelId;
 
@@ -116,7 +115,7 @@ public class Group extends AbstractPersistable<Long> {
     }
 
     
-    public void setStaff(Staff staff) {
+    public void setStaff(final Staff staff) {
         this.staff = staff;
     }
 
@@ -130,7 +129,7 @@ public class Group extends AbstractPersistable<Long> {
     }
 
     
-    public void setLevelId(Long levelId) {
+    public void setLevelId(final Long levelId) {
         this.levelId = levelId;
     }