Remove remaining references to 'delegate chooser'

Clean up some leftover references and simplify

Change-Id: Id21b66953bb3b7c810e9d67809a673862a7ea821
1 file changed