Tiny cleanup of Echomesh