===> Cleaning for arti-1.7.0