Further bootstrap crap removal