Get rid of XXX-buis