Update bootstrap.py wiht known working version
Cleanup all potential problems