MIFOSX-1313 : client incentive code cleanup