Remove references to baseurl