cleanup + baseurl