PaymentCalculator: Added possibility to remove options set from storage, SAVE functionality works