Get rid of some extras