Added iconv CharsetProvider

Remove commented code