Leftover merge cleanup in WelcomeWindow