Get rid of some XXX's