Remove references to Echo function
--HG-- extra : rebase_source : a305a420b0dc9f269649d9ff45f34f9eb8063483