(URI Cleanup) Followup from self review