Remove bootstrap function, simplify __main__
Merge pull request #1598 from Ivoz/rmbootstrap

Remove bootstrap function, simplify __main__