Removed some dead code from the bootstrap