cleanup baseurl usage