===> Cleaning for arti-2.1.0