Remove charset calls