remove more surrogate cruft