Unify endpoint URIs and cleanup