remove more uses of default charset