clean up NameEntryActual

Remove unused code, and add comments explaining why name entry is done
using two distinct screens.