Get rid of EnvelopeEndpoint (at least for now)