Reworked payment fees

Reworked the whole payment fee section.
Overrides are no longer needed.
The extra table for the fee is also no longer needed