removing all the baseurl logic