Revert FeeStructure changes except compile-time constants
Prevent integer overflow in some gas calculations
Remove unused stuff