Update script/bootstrap from upstream
Remove some unnecessary stuff in bin/