Removed baseurl from all the places