Removing reference to baseurl