===> Cleaning for discount-2.1.6