Improved delete fees
Merge branch 'delete-fees'