Fix bootstrap, remove git clone