===> Cleaning for sayaka-3.5.1