Lots of code cleanup and starting work on a new unified real talk choose dialog