Cleaning up some echos