===> Cleaning for star-1.7.0