Finally getting back to this — for future reference, if you just leave last lines blank no songs will be added, so you don't have to write in/select "No other encores". To remove songs after they've been added, you can can select the blank option at the top of the select list. (And I realize this isn't super intuitive.) I went ahead and deleted the extra songs.