Removed unused modifiers
Removed unnecessary override method
Removed singular fields
Removed duplicated string literals
Merge branch 'feature/pay_debt' into develop