removed dependency on envoy