More bootstrap reference removal :D