Merge pull request #19730 from jfrazelle/update-tools-urls

update tools urls and remove things we dont use