Clean up URIs