Remove more vestiges of full-uri stuff