Removed discount and payment options
Merge remote-tracking branch 'origin/Removed-discount/payment'