===> Cleaning for starship-1.7.1