removed need for envoy