Remove bootstrap code
Merge pull request #906 from sexnothing/develop

Remove bootstrap code