More bootstrap.sh cleanup.