More cleanup on welcome message!