remove witnesses, and add country