working on envoy.
cleaning