Remove usage of site.baseurl