Remove the last of the non-Unicode stuff