Refactor remove WebUrl