Remove XXX part, because we've already modified it.