clean up
added incentive calculation support