Get rid of remaining "XXX"s