Clean and Fix

Cleaned up code and removed payment method fee options as this was
creating discrepancies in the order total