Improve reliability of bootstrapping and old bootstrap cleanup