Get rid of hardcoded base url