Get rid of some unnecessary custom StyleBuilder code