Remove bad bootstrap logic