ENG-4686 remove oneself from agreement kill choice