===> Cleaning for mdd-20180824