Remove vestiges of attempts at handling Unicode