Cleanup the echo mess