remove iconv and fix s.files