update choiceUDT part: 2 (cleanup)