If you are going to remove URL_ROOT, *please* do it in another separate PR, this PR is too long and dated as it is.