Remove various escape chars from the data, too.
This has been superseded