Clean up bootstrapping