===> Cleaning for arti-1.9.0