Remove extraneous 'echo's