diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/data/JournalEntryData.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/data/JournalEntryData.java
index f3abde4a0..bbfe83d77 100755
--- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/data/JournalEntryData.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/data/JournalEntryData.java
@@ -12,7 +12,7 @@ import org.mifosplatform.infrastructure.core.data.EnumOptionData;
 
 /**
  * Immutable object representing a General Ledger Account
- * 
+ *
  * Note: no getter/setters required as google will produce json from fields of
  * object.
  */
@@ -59,6 +59,7 @@ public class JournalEntryData {
     @SuppressWarnings("unused")
     private final Boolean runningBalanceComputed;
 
+    @SuppressWarnings("unused")
     private final PaymentDetails paymentDetails;
 
     public JournalEntryData(final Long id, final Long officeId, final String officeName, final String glAccountName,
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/data/PaymentDetails.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/data/PaymentDetails.java
index 285b8126a..41e8af0d8 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/data/PaymentDetails.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/data/PaymentDetails.java
@@ -2,26 +2,26 @@ package org.mifosplatform.accounting.journalentry.data;
 
 public class PaymentDetails {
 
+    @SuppressWarnings("unused")
     private final String accountNumber;
+    @SuppressWarnings("unused")
     private final String checkNumber;
+    @SuppressWarnings("unused")
     private final String receiptNumber;
+    @SuppressWarnings("unused")
     private final String bankNumber;
+    @SuppressWarnings("unused")
     private final String routineCode;
+    @SuppressWarnings("unused")
     private final String paymentType;
 
-    public PaymentDetails(final String accountNumber,
-                          final String checkNumber,
-                          final String receiptNumber,
-                          final String bankNumber,
-                          final String routineCode,
-                          final String paymentType)
-    {
+    public PaymentDetails(final String accountNumber, final String checkNumber, final String receiptNumber, final String bankNumber,
+            final String routineCode, final String paymentType) {
         this.accountNumber = accountNumber;
         this.checkNumber = checkNumber;
         this.receiptNumber = receiptNumber;
         this.bankNumber = bankNumber;
-        this.routineCode = routineCode ;
+        this.routineCode = routineCode;
         this.paymentType = paymentType;
-
     }
-}
+}
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoansApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoansApiResource.java
index a23bdff51..a13933a32 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoansApiResource.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoansApiResource.java
@@ -207,7 +207,7 @@ public class LoansApiResource {
 
                 officeId = loanAccountClientDetails.officeId();
 
-                newLoanAccount = (newLoanAccount == null) ? loanAccountClientDetails : LoanAccountData.populateClientDefaults(
+                newLoanAccount = newLoanAccount == null ? loanAccountClientDetails : LoanAccountData.populateClientDefaults(
                         newLoanAccount, loanAccountClientDetails);
 
                 // if it's JLG loan add group details
@@ -222,7 +222,7 @@ public class LoansApiResource {
                 final LoanAccountData loanAccountGroupData = this.loanReadPlatformService.retrieveGroupDetailsTemplate(groupId);
                 officeId = loanAccountGroupData.groupOfficeId();
                 calendarOptions = this.loanReadPlatformService.retrieveCalendars(groupId);
-                newLoanAccount = (newLoanAccount == null) ? loanAccountGroupData : LoanAccountData.populateGroupDefaults(newLoanAccount,
+                newLoanAccount = newLoanAccount == null ? loanAccountGroupData : LoanAccountData.populateGroupDefaults(newLoanAccount,
                         loanAccountGroupData);
 
             } else if (templateType.equals("jlgbulk")) {
@@ -230,7 +230,7 @@ public class LoansApiResource {
                 final LoanAccountData loanAccountGroupData = this.loanReadPlatformService.retrieveGroupAndMembersDetailsTemplate(groupId);
                 officeId = loanAccountGroupData.groupOfficeId();
                 calendarOptions = this.loanReadPlatformService.retrieveCalendars(groupId);
-                newLoanAccount = (newLoanAccount == null) ? loanAccountGroupData : LoanAccountData.populateGroupDefaults(newLoanAccount,
+                newLoanAccount = newLoanAccount == null ? loanAccountGroupData : LoanAccountData.populateGroupDefaults(newLoanAccount,
                         loanAccountGroupData);
             } else {
                 final String errorMsg = "Loan template type '" + templateType + "' is not supported";
@@ -422,7 +422,8 @@ public class LoansApiResource {
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     public String retrieveAll(@Context final UriInfo uriInfo, @QueryParam("sqlSearch") final String sqlSearch,
-            @QueryParam("externalId") final String externalId, @QueryParam("underHierarchy") final String hierarchy,
+            @QueryParam("externalId") final String externalId,
+//            @QueryParam("underHierarchy") final String hierarchy,
             @QueryParam("offset") final Integer offset, @QueryParam("limit") final Integer limit,
             @QueryParam("orderBy") final String orderBy, @QueryParam("sortOrder") final String sortOrder) {
 
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanCharge.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanCharge.java
index 0a865f903..2e348d1f3 100755
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanCharge.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanCharge.java
@@ -72,7 +72,6 @@ public class LoanCharge extends AbstractPersistable<Long> {
     @Column(name = "calculation_on_amount", scale = 6, precision = 19, nullable = true)
     private BigDecimal amountPercentageAppliedTo;
 
-    @SuppressWarnings("unused")
     @Column(name = "charge_amount_or_percentage", scale = 6, precision = 19, nullable = false)
     private BigDecimal amountOrPercentage;
 
@@ -368,19 +367,19 @@ public class LoanCharge extends AbstractPersistable<Long> {
             }
         }
     }
-    
-    public void update(final BigDecimal amount, final LocalDate dueDate, Integer numberOfRepayments){
+
+    public void update(final BigDecimal amount, final LocalDate dueDate, final Integer numberOfRepayments){
         BigDecimal amountPercentageAppliedTo = BigDecimal.ZERO;
         if(this.loan!=null){
             switch (ChargeCalculationType.fromInt(this.chargeCalculation)) {
                 case PERCENT_OF_AMOUNT:
-                    amountPercentageAppliedTo = loan.getPrincpal().getAmount();
+                    amountPercentageAppliedTo = this.loan.getPrincpal().getAmount();
                     break;
                 case PERCENT_OF_AMOUNT_AND_INTEREST:
-                    amountPercentageAppliedTo = loan.getPrincpal().getAmount().add(loan.getTotalInterest());
+                    amountPercentageAppliedTo = this.loan.getPrincpal().getAmount().add(this.loan.getTotalInterest());
                     break;
                 case PERCENT_OF_INTEREST:
-                    amountPercentageAppliedTo = loan.getTotalInterest();
+                    amountPercentageAppliedTo = this.loan.getTotalInterest();
                 break;
                 default:
                    break;
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/SavingsAccountsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/SavingsAccountsApiResource.java
index a98d147b6..2cbdb21c9 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/SavingsAccountsApiResource.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/SavingsAccountsApiResource.java
@@ -96,7 +96,8 @@ public class SavingsAccountsApiResource {
     @Consumes({ MediaType.APPLICATION_JSON })
     @Produces({ MediaType.APPLICATION_JSON })
     public String retrieveAll(@Context final UriInfo uriInfo, @QueryParam("sqlSearch") final String sqlSearch,
-            @QueryParam("externalId") final String externalId, @QueryParam("underHierarchy") final String hierarchy,
+            @QueryParam("externalId") final String externalId,
+//            @QueryParam("underHierarchy") final String hierarchy,
             @QueryParam("offset") final Integer offset, @QueryParam("limit") final Integer limit,
             @QueryParam("orderBy") final String orderBy, @QueryParam("sortOrder") final String sortOrder) {