Removed manual bootstrapping as suggested by @es128 #42