Revert "Included discount in the total calculations"

This reverts commit ac4c45f197ef960808173437a051a7f28a056132.