===> Cleaning for di-6.2.0