===> Cleaning for samurai-1.3