remove welcome and john doe