===> Cleaning for arti-1.8.0