remove make_uri function