remove the envoy stuff