Remove the XXX since it is done.