diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java
index 6874d4830..24da00cfb 100755
--- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java
@@ -14,7 +14,6 @@ import org.mifosplatform.accounting.common.AccountingConstants.CASH_ACCOUNTS_FOR
 import org.mifosplatform.accounting.common.AccountingConstants.FINANCIAL_ACTIVITY;
 import org.mifosplatform.accounting.journalentry.data.LoanDTO;
 import org.mifosplatform.accounting.journalentry.data.LoanTransactionDTO;
-import org.mifosplatform.infrastructure.core.exception.PlatformDataIntegrityException;
 import org.mifosplatform.organisation.office.domain.Office;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -37,13 +36,6 @@ public class AccrualBasedAccountingProcessorForLoan implements AccountingProcess
             final Date transactionDate = loanTransactionDTO.getTransactionDate();
             this.helper.checkForBranchClosures(latestGLClosure, transactionDate);
 
-            // FIXME Disable charge and Interest Waivers for Periodic accounting
-            if (loanDTO.isPeriodicAccrualBasedAccountingEnabled()
-                    || (loanTransactionDTO.getTransactionType().isWaiveCharges() && loanTransactionDTO.getTransactionType()
-                            .isWaiveInterest())) { throw new PlatformDataIntegrityException(
-                    "Restricted functionality with Periodic Accrual accounting...charge and interest waivers are not allowed",
-                    "Restricted functionality with Periodic Accrual accounting...charge and interest waivers are not allowed"); }
-
             /** Handle Disbursements **/
             if (loanTransactionDTO.getTransactionType().isDisbursement()) {
                 createJournalEntriesForDisbursements(loanDTO, loanTransactionDTO, office);