Remove choices that were used by istgt.

Ticket: #5524