envoyd: more cleanups