Removed hard coded host urls