Cleanup in package discount logic