(URI Cleanup) Review followup