More removal of URL duplication.