Add bootstrapping
Clean unnecessary bootstrapping