Cleanup final merge issues

aka some dependency gunk in WelcomeWindow