Cleanup echo commands