diff --git a/contracts/MintableController.sol b/contracts/MintableController.sol
index a409e6c..7214cda 100644
--- a/contracts/MintableController.sol
+++ b/contracts/MintableController.sol
@@ -43,9 +43,6 @@ contract MintableController is StandardController {
     mapping(address => uint256) internal mintAllowances;
     uint256 internal maxMintAllowance;
 
-    mapping(address => uint256) internal mintAllowances;
-    uint256 internal maxMintAllowance;
-
     /**
      * @dev Contract constructor.
      * @param storage_ Address of the token storage for the controller.
@@ -214,48 +211,4 @@ contract MintableController is StandardController {
     ) public view virtual returns (uint256) {
         return mintAllowances[account];
     }
-
-    /**
-     * @dev set maximum allowance for system accounts.
-     * @param amount The amount of allowance.
-     */
-    function setMaxMintAllowance(uint256 amount) public virtual onlyOwner {
-        maxMintAllowance = amount;
-    }
-
-    /**
-     * @dev get maximum allowance for system accounts.
-     * @return The amount of allowance.
-     */
-    function getMaxMintAllowance() public view virtual returns (uint256) {
-        return maxMintAllowance;
-    }
-
-    /**
-     * @dev set allowance for an account.
-     * @param account The address of the account.
-     * @param amount The amount of allowance.
-     */
-    function setMintAllowance(
-        address account,
-        uint256 amount
-    ) public virtual onlyAdminAccounts {
-        require(
-            amount <= maxMintAllowance,
-            "MintableController: allowance exceeds maximum setted by owner"
-        );
-        mintAllowances[account] = amount;
-        emit MintAllowanceSet(account, amount);
-    }
-
-    /**
-     * @dev get allowance for an account.
-     * @param account The address of the account.
-     * @return The amount of allowance.
-     */
-    function getMintAllowance(
-        address account
-    ) public view virtual returns (uint256) {
-        return mintAllowances[account];
-    }
 }
diff --git a/contracts/StandardController.sol b/contracts/StandardController.sol
index 4204d82..c7e8852 100644
--- a/contracts/StandardController.sol
+++ b/contracts/StandardController.sol
@@ -123,14 +123,6 @@ contract StandardController is ClaimableSystemRole {
         require(isFrontend(to) == false, "must not send to bridgeFrontends");
     }
 
-    /**
-     * @dev Returns the decimals of the token.
-     * @return The decimals of the token.
-     */
-    function decimals() external view returns (uint8) {
-        return token.decimals();
-    }
-
     /**
      * @dev Returns the current frontend.
      * @return Address of the frontend.
diff --git a/contracts/ownership/Claimable.sol b/contracts/ownership/Claimable.sol
index d93f2ae..b085ab2 100644
--- a/contracts/ownership/Claimable.sol
+++ b/contracts/ownership/Claimable.sol
@@ -10,13 +10,6 @@ import "./Ownable.sol";
  */
 abstract contract Claimable is Ownable {
     address public pendingOwner;
-    
-    /**
-      * @dev emitted when the pendingOwner address is changed 
-      * @param previousPendingOwner previous pendingOwner address
-      * @param newPendingOwner new pendingOwner address
-      */
-      event OwnershipPendingChanged(address indexed previousPendingOwner, address indexed newPendingOwner);
 
     /**
      * @dev emitted when the pendingOwner address is changed
@@ -43,11 +36,7 @@ abstract contract Claimable is Ownable {
     function transferOwnership(
         address newOwner
     ) public virtual override onlyOwner {
-<<<<<<< HEAD
         emit OwnershipTransferPending(pendingOwner, newOwner);
-=======
-        emit OwnershipPendingChanged(pendingOwner, newOwner);
->>>>>>> f2c706a (feat(Claimable): Adding new event for Pending state variable change)
         pendingOwner = newOwner;
     }