Code cleanup

Replace the routes pointing to the origin URLs and delete unused code. It is easier to do this after completing the deprecations.

---

Migrated from T3696 (view on Phabricator)