removing bootstrapping hacks