===> Cleaning for shine-3.1.1