Remove debug code
Final additions to discount system