Remove unwanted stuff, add bootstrap builders