BaseUrl cleanup