Simplify bootstrapping