Staging: echo: remove dead code