===> Cleaning for samurai-1.2