Update endpoint url
More cleanup