===> Cleaning for arti-1.6.0