get rid of some XXX's