diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/loans/LoanApplicationTestBuilder.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/loans/LoanApplicationTestBuilder.java
index fbb1d8bee..b1b0de92a 100644
--- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/loans/LoanApplicationTestBuilder.java
+++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/loans/LoanApplicationTestBuilder.java
@@ -31,7 +31,7 @@ public class LoanApplicationTestBuilder {
     private final String transactionProcessingID = MIFOS_STANDARD_STRATEGY;
     private String expectedDisbursmentDate = "";
     private String submittedOnDate = "";
-    private String loanType = "individual"; //default it to individual
+    private String loanType = "individual";
 
     public String build(final String clientID, final String loanProductId) {
 
@@ -42,7 +42,7 @@ public class LoanApplicationTestBuilder {
         map.put("productId", loanProductId);
         map.put("principal", principal);
         map.put("loanTermFrequency", loanTermFrequency);
-        map.put("loanTermFrequencyType", loanTermFrequencyType); // FIXME - Should this be using
+        map.put("loanTermFrequencyType", loanTermFrequencyType);
         map.put("numberOfRepayments", numberOfRepayment);
         map.put("repaymentEvery", repaymentPeriod);
         map.put("repaymentFrequencyType", repaymentFrequencyType);
@@ -53,7 +53,7 @@ public class LoanApplicationTestBuilder {
         map.put("transactionProcessingStrategyId", transactionProcessingID);
         map.put("expectedDisbursementDate", expectedDisbursmentDate);
         map.put("submittedOnDate", submittedOnDate);
-        map.put("loanType", "individual");
+        map.put("loanType", loanType);
         return new Gson().toJson(map);
     }
 
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/rule/domain/AccountingTagRule.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/rule/domain/AccountingTagRule.java
index cdc845b28..18bc38349 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/rule/domain/AccountingTagRule.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/rule/domain/AccountingTagRule.java
@@ -18,10 +18,12 @@ import org.springframework.data.jpa.domain.AbstractPersistable;
 @Table(name = "acc_rule_tags")
 public class AccountingTagRule extends AbstractPersistable<Long> {
 
+    @SuppressWarnings("unused")
     @ManyToOne
     @JoinColumn(name = "acc_rule_id", nullable = false)
     private AccountingRule accountingRule;
 
+    @SuppressWarnings("unused")
     @ManyToOne
     @JoinColumn(name = "tag_id", nullable = false)
     private CodeValue tagId;
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/rule/serialization/AccountingRuleCommandFromApiJsonDeserializer.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/rule/serialization/AccountingRuleCommandFromApiJsonDeserializer.java
index d74429434..fb1101b94 100755
--- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/rule/serialization/AccountingRuleCommandFromApiJsonDeserializer.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/rule/serialization/AccountingRuleCommandFromApiJsonDeserializer.java
@@ -14,19 +14,13 @@ import org.mifosplatform.accounting.rule.api.AccountingRuleJsonInputParams;
 import org.mifosplatform.accounting.rule.command.AccountingRuleCommand;
 import org.mifosplatform.infrastructure.core.exception.InvalidJsonException;
 import org.mifosplatform.infrastructure.core.serialization.AbstractFromApiJsonDeserializer;
-import org.mifosplatform.infrastructure.core.serialization.FromApiJsonDeserializer;
 import org.mifosplatform.infrastructure.core.serialization.FromJsonHelper;
-import org.mifosplatform.portfolio.loanaccount.guarantor.command.GuarantorCommand;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.google.gson.JsonElement;
 import com.google.gson.reflect.TypeToken;
 
-/**
- * Implementation of {@link FromApiJsonDeserializer} for
- * {@link GuarantorCommand}'s.
- */
 @Component
 public final class AccountingRuleCommandFromApiJsonDeserializer extends AbstractFromApiJsonDeserializer<AccountingRuleCommand> {
 
@@ -55,8 +49,12 @@ public final class AccountingRuleCommandFromApiJsonDeserializer extends Abstract
                 element);
         final String name = this.fromApiJsonHelper.extractStringNamed(AccountingRuleJsonInputParams.NAME.getValue(), element);
         final String description = this.fromApiJsonHelper.extractStringNamed(AccountingRuleJsonInputParams.DESCRIPTION.getValue(), element);
-        final String[] creditTags = this.fromApiJsonHelper.extractArrayNamed(AccountingRuleJsonInputParams.CREDIT_ACCOUNT_TAGS.getValue(), element);
-        final String[] debitTags = this.fromApiJsonHelper.extractArrayNamed(AccountingRuleJsonInputParams.DEBIT_ACCOUNT_TAGS.getValue(), element);
+
+        // final String[] creditTags =
+        this.fromApiJsonHelper.extractArrayNamed(AccountingRuleJsonInputParams.CREDIT_ACCOUNT_TAGS.getValue(), element);
+        // final String[] debitTags =
+        this.fromApiJsonHelper.extractArrayNamed(AccountingRuleJsonInputParams.DEBIT_ACCOUNT_TAGS.getValue(), element);
+
         return new AccountingRuleCommand(id, officeId, accountToDebitId, accountToCreditId, name, description);
     }
 }
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/data/GroupAccountSummaryData.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/data/GroupAccountSummaryData.java
index 18493e3c7..d02c746fd 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/data/GroupAccountSummaryData.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/data/GroupAccountSummaryData.java
@@ -15,6 +15,7 @@ public class GroupAccountSummaryData {
     private final Long productId;
     private final String productName;
     private final Integer accountStatusId;
+    @SuppressWarnings("unused")
     private final String accountNo;
 
     public GroupAccountSummaryData(final Long id, final String externalId, final Long productId, final String productName,
@@ -46,4 +47,4 @@ public class GroupAccountSummaryData {
     public Integer getAccountStatusId() {
         return this.accountStatusId;
     }
-}
+}
\ No newline at end of file
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccount.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccount.java
index 15b487e54..cb0af6e76 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccount.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccount.java
@@ -163,6 +163,7 @@ public class SavingsAccount extends AbstractPersistable<Long> {
     @Column(name = "annual_fee_on_day", nullable = true)
     private Integer annualFeeOnDay;
 
+    @SuppressWarnings("unused")
     @Temporal(TemporalType.DATE)
     @Column(name = "annual_fee_next_due_date", nullable = true)
     private Date annualFeeNextDueDate;
@@ -276,8 +277,8 @@ public class SavingsAccount extends AbstractPersistable<Long> {
         return SavingsAccountStatusType.fromInt(this.status).isActive();
     }
 
-    public void activate(final DateTimeFormatter formatter, final LocalDate activationDate, List<Long> existingTransactionIds,
-            List<Long> existingReversedTransactionIds) {
+    public void activate(final DateTimeFormatter formatter, final LocalDate activationDate, final List<Long> existingTransactionIds,
+            final List<Long> existingReversedTransactionIds) {
 
         if (isActive()) {
             final String defaultUserMessage = "Cannot activate account. Account is already active.";
@@ -352,8 +353,8 @@ public class SavingsAccount extends AbstractPersistable<Long> {
         return lockedInUntilLocalDate;
     }
 
-    public void postInterest(final LocalDate interestPostingUpToDate, List<Long> existingTransactionIds,
-            List<Long> existingReversedTransactionIds) {
+    public void postInterest(final LocalDate interestPostingUpToDate, final List<Long> existingTransactionIds,
+            final List<Long> existingReversedTransactionIds) {
 
         final SavingsInterestPostingPeriodType postingPeriodType = SavingsInterestPostingPeriodType.fromInt(this.interestPostingPeriodType);
         final List<LocalDate> postingLocalDates = determineInterestPostingDates(getActivationLocalDate(), interestPostingUpToDate,
@@ -756,7 +757,7 @@ public class SavingsAccount extends AbstractPersistable<Long> {
     }
 
     public SavingsAccountTransaction deposit(final DateTimeFormatter formatter, final LocalDate transactionDate,
-            final BigDecimal transactionAmount, List<Long> existingTransactionIds, List<Long> existingReversedTransactionIds,
+            final BigDecimal transactionAmount, final List<Long> existingTransactionIds, final List<Long> existingReversedTransactionIds,
             final PaymentDetail paymentDetail) {
 
         if (isNotActive()) {
@@ -818,7 +819,7 @@ public class SavingsAccount extends AbstractPersistable<Long> {
     }
 
     public SavingsAccountTransaction withdraw(final DateTimeFormatter formatter, final LocalDate transactionDate,
-            final BigDecimal transactionAmount, List<Long> existingTransactionIds, List<Long> existingReversedTransactionIds,
+            final BigDecimal transactionAmount, final List<Long> existingTransactionIds, final List<Long> existingReversedTransactionIds,
             final PaymentDetail paymentDetail) {
 
         if (isNotActive()) {
@@ -915,7 +916,7 @@ public class SavingsAccount extends AbstractPersistable<Long> {
     }
 
     public SavingsAccountTransaction addAnnualFee(final DateTimeFormatter formatter, final LocalDate transactionDate,
-            List<Long> existingTransactionIds, List<Long> existingReversedTransactionIds) {
+            final List<Long> existingTransactionIds, final List<Long> existingReversedTransactionIds) {
 
         if (isNotActive()) {
 
diff --git a/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/DocumentStoreFactoryTest.java b/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/DocumentStoreFactoryTest.java
index 29a85f473..fd54df1db 100644
--- a/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/DocumentStoreFactoryTest.java
+++ b/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/DocumentStoreFactoryTest.java
@@ -1,18 +1,7 @@
 package org.mifosplatform.infrastructure.core.service;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mifosplatform.infrastructure.configuration.domain.ConfigurationDomainService;
-import org.mifosplatform.infrastructure.configuration.service.ExternalServicesReadPlatformServiceImpl;
-import org.mifosplatform.infrastructure.documentmanagement.contentrepository.ContentRepositoryFactory;
-import org.mifosplatform.infrastructure.documentmanagement.contentrepository.FileSystemContentRepository;
-import org.mifosplatform.infrastructure.documentmanagement.contentrepository.S3ContentRepository;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.springframework.context.ApplicationContext;
 
 @RunWith(MockitoJUnitRunner.class)
 public class DocumentStoreFactoryTest {
diff --git a/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/FileDocumentStoreTest.java b/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/FileDocumentStoreTest.java
index 22764aa94..37c8a367a 100644
--- a/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/FileDocumentStoreTest.java
+++ b/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/FileDocumentStoreTest.java
@@ -1,14 +1,6 @@
 package org.mifosplatform.infrastructure.core.service;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mifosplatform.infrastructure.documentmanagement.contentrepository.FileSystemContentRepository;
-import org.mifosplatform.infrastructure.documentmanagement.data.DocumentData;
-import org.mifosplatform.infrastructure.documentmanagement.data.FileData;
 import org.mockito.runners.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
diff --git a/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/S3DocumentStoreTest.java b/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/S3DocumentStoreTest.java
index 212f8c49a..8b6e4ab53 100644
--- a/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/S3DocumentStoreTest.java
+++ b/mifosng-provider/src/test/java/org/mifosplatform/infrastructure/core/service/S3DocumentStoreTest.java
@@ -1,34 +1,13 @@
 package org.mifosplatform.infrastructure.core.service;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
 import java.io.InputStream;
 
-import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mifosplatform.infrastructure.documentmanagement.command.DocumentCommand;
-import org.mifosplatform.infrastructure.documentmanagement.contentrepository.S3ContentRepository;
 import org.mifosplatform.infrastructure.documentmanagement.data.DocumentData;
-import org.mifosplatform.infrastructure.documentmanagement.data.FileData;
-import org.mifosplatform.infrastructure.documentmanagement.exception.ContentManagementException;
-import org.mifosplatform.infrastructure.documentmanagement.exception.DocumentNotFoundException;
-import org.mockito.Matchers;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import com.amazonaws.AmazonClientException;
-import com.amazonaws.AmazonServiceException;
 import com.amazonaws.services.s3.AmazonS3Client;
-import com.amazonaws.services.s3.model.DeleteObjectRequest;
-import com.amazonaws.services.s3.model.GetObjectRequest;
-import com.amazonaws.services.s3.model.PutObjectRequest;
-import com.amazonaws.services.s3.model.PutObjectResult;
-import com.amazonaws.services.s3.model.S3Object;
 
 @RunWith(MockitoJUnitRunner.class)
 public class S3DocumentStoreTest {