diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs
index 9130e73d..16ae57b6 100644
--- a/EDMarketConnector.wxs
+++ b/EDMarketConnector.wxs
@@ -322,242 +322,6 @@
 			                        <Component Id="word.tcl" Guid="*">
 			                            <File Id="word.tcl" KeyPath="yes" Source="SourceDir\lib\tcl\word.tcl" />
 			                        </Component>
-			                        <Directory Id="encoding" Name="encoding">
-			                            <Component Id="ascii.enc" Guid="*">
-			                                <File Id="ascii.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\ascii.enc" />
-			                            </Component>
-			                            <Component Id="big5.enc" Guid="*">
-			                                <File Id="big5.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\big5.enc" />
-			                            </Component>
-			                            <Component Id="cp1250.enc" Guid="*">
-			                                <File Id="cp1250.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp1250.enc" />
-			                            </Component>
-			                            <Component Id="cp1251.enc" Guid="*">
-			                                <File Id="cp1251.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp1251.enc" />
-			                            </Component>
-			                            <Component Id="cp1252.enc" Guid="*">
-			                                <File Id="cp1252.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp1252.enc" />
-			                            </Component>
-			                            <Component Id="cp1253.enc" Guid="*">
-			                                <File Id="cp1253.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp1253.enc" />
-			                            </Component>
-			                            <Component Id="cp1254.enc" Guid="*">
-			                                <File Id="cp1254.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp1254.enc" />
-			                            </Component>
-			                            <Component Id="cp1255.enc" Guid="*">
-			                                <File Id="cp1255.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp1255.enc" />
-			                            </Component>
-			                            <Component Id="cp1256.enc" Guid="*">
-			                                <File Id="cp1256.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp1256.enc" />
-			                            </Component>
-			                            <Component Id="cp1257.enc" Guid="*">
-			                                <File Id="cp1257.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp1257.enc" />
-			                            </Component>
-			                            <Component Id="cp1258.enc" Guid="*">
-			                                <File Id="cp1258.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp1258.enc" />
-			                            </Component>
-			                            <Component Id="cp437.enc" Guid="*">
-			                                <File Id="cp437.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp437.enc" />
-			                            </Component>
-			                            <Component Id="cp737.enc" Guid="*">
-			                                <File Id="cp737.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp737.enc" />
-			                            </Component>
-			                            <Component Id="cp775.enc" Guid="*">
-			                                <File Id="cp775.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp775.enc" />
-			                            </Component>
-			                            <Component Id="cp850.enc" Guid="*">
-			                                <File Id="cp850.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp850.enc" />
-			                            </Component>
-			                            <Component Id="cp852.enc" Guid="*">
-			                                <File Id="cp852.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp852.enc" />
-			                            </Component>
-			                            <Component Id="cp855.enc" Guid="*">
-			                                <File Id="cp855.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp855.enc" />
-			                            </Component>
-			                            <Component Id="cp857.enc" Guid="*">
-			                                <File Id="cp857.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp857.enc" />
-			                            </Component>
-			                            <Component Id="cp860.enc" Guid="*">
-			                                <File Id="cp860.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp860.enc" />
-			                            </Component>
-			                            <Component Id="cp861.enc" Guid="*">
-			                                <File Id="cp861.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp861.enc" />
-			                            </Component>
-			                            <Component Id="cp862.enc" Guid="*">
-			                                <File Id="cp862.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp862.enc" />
-			                            </Component>
-			                            <Component Id="cp863.enc" Guid="*">
-			                                <File Id="cp863.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp863.enc" />
-			                            </Component>
-			                            <Component Id="cp864.enc" Guid="*">
-			                                <File Id="cp864.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp864.enc" />
-			                            </Component>
-			                            <Component Id="cp865.enc" Guid="*">
-			                                <File Id="cp865.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp865.enc" />
-			                            </Component>
-			                            <Component Id="cp866.enc" Guid="*">
-			                                <File Id="cp866.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp866.enc" />
-			                            </Component>
-			                            <Component Id="cp869.enc" Guid="*">
-			                                <File Id="cp869.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp869.enc" />
-			                            </Component>
-			                            <Component Id="cp874.enc" Guid="*">
-			                                <File Id="cp874.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp874.enc" />
-			                            </Component>
-			                            <Component Id="cp932.enc" Guid="*">
-			                                <File Id="cp932.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp932.enc" />
-			                            </Component>
-			                            <Component Id="cp936.enc" Guid="*">
-			                                <File Id="cp936.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp936.enc" />
-			                            </Component>
-			                            <Component Id="cp949.enc" Guid="*">
-			                                <File Id="cp949.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp949.enc" />
-			                            </Component>
-			                            <Component Id="cp950.enc" Guid="*">
-			                                <File Id="cp950.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\cp950.enc" />
-			                            </Component>
-			                            <Component Id="dingbats.enc" Guid="*">
-			                                <File Id="dingbats.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\dingbats.enc" />
-			                            </Component>
-			                            <Component Id="ebcdic.enc" Guid="*">
-			                                <File Id="ebcdic.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\ebcdic.enc" />
-			                            </Component>
-			                            <Component Id="euc_cn.enc" Guid="*">
-			                                <File Id="euc_cn.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\euc-cn.enc" />
-			                            </Component>
-			                            <Component Id="euc_jp.enc" Guid="*">
-			                                <File Id="euc_jp.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\euc-jp.enc" />
-			                            </Component>
-			                            <Component Id="euc_kr.enc" Guid="*">
-			                                <File Id="euc_kr.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\euc-kr.enc" />
-			                            </Component>
-			                            <Component Id="gb12345.enc" Guid="*">
-			                                <File Id="gb12345.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\gb12345.enc" />
-			                            </Component>
-			                            <Component Id="gb1988.enc" Guid="*">
-			                                <File Id="gb1988.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\gb1988.enc" />
-			                            </Component>
-			                            <Component Id="gb2312_raw.enc" Guid="*">
-			                                <File Id="gb2312_raw.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\gb2312-raw.enc" />
-			                            </Component>
-			                            <Component Id="gb2312.enc" Guid="*">
-			                                <File Id="gb2312.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\gb2312.enc" />
-			                            </Component>
-			                            <Component Id="iso2022_jp.enc" Guid="*">
-			                                <File Id="iso2022_jp.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\iso2022-jp.enc" />
-			                            </Component>
-			                            <Component Id="iso2022_kr.enc" Guid="*">
-			                                <File Id="iso2022_kr.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\iso2022-kr.enc" />
-			                            </Component>
-			                            <Component Id="iso2022.enc" Guid="*">
-			                                <File Id="iso2022.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\iso2022.enc" />
-			                            </Component>
-			                            <Component Id="iso8859_1.enc" Guid="*">
-			                                <File Id="iso8859_1.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\iso8859-1.enc" />
-			                            </Component>
-			                            <Component Id="iso8859_10.enc" Guid="*">
-			                                <File Id="iso8859_10.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\iso8859-10.enc" />
-			                            </Component>
-			                            <Component Id="iso8859_13.enc" Guid="*">
-			                                <File Id="iso8859_13.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\iso8859-13.enc" />
-			                            </Component>
-			                            <Component Id="iso8859_14.enc" Guid="*">
-			                                <File Id="iso8859_14.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\iso8859-14.enc" />
-			                            </Component>
-			                            <Component Id="iso8859_15.enc" Guid="*">
-			                                <File Id="iso8859_15.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\iso8859-15.enc" />
-			                            </Component>
-			                            <Component Id="iso8859_16.enc" Guid="*">
-			                                <File Id="iso8859_16.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\iso8859-16.enc" />
-			                            </Component>
-			                            <Component Id="iso8859_2.enc" Guid="*">
-			                                <File Id="iso8859_2.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\iso8859-2.enc" />
-			                            </Component>
-			                            <Component Id="iso8859_3.enc" Guid="*">
-			                                <File Id="iso8859_3.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\iso8859-3.enc" />
-			                            </Component>
-			                            <Component Id="iso8859_4.enc" Guid="*">
-			                                <File Id="iso8859_4.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\iso8859-4.enc" />
-			                            </Component>
-			                            <Component Id="iso8859_5.enc" Guid="*">
-			                                <File Id="iso8859_5.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\iso8859-5.enc" />
-			                            </Component>
-			                            <Component Id="iso8859_6.enc" Guid="*">
-			                                <File Id="iso8859_6.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\iso8859-6.enc" />
-			                            </Component>
-			                            <Component Id="iso8859_7.enc" Guid="*">
-			                                <File Id="iso8859_7.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\iso8859-7.enc" />
-			                            </Component>
-			                            <Component Id="iso8859_8.enc" Guid="*">
-			                                <File Id="iso8859_8.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\iso8859-8.enc" />
-			                            </Component>
-			                            <Component Id="iso8859_9.enc" Guid="*">
-			                                <File Id="iso8859_9.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\iso8859-9.enc" />
-			                            </Component>
-			                            <Component Id="jis0201.enc" Guid="*">
-			                                <File Id="jis0201.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\jis0201.enc" />
-			                            </Component>
-			                            <Component Id="jis0208.enc" Guid="*">
-			                                <File Id="jis0208.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\jis0208.enc" />
-			                            </Component>
-			                            <Component Id="jis0212.enc" Guid="*">
-			                                <File Id="jis0212.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\jis0212.enc" />
-			                            </Component>
-			                            <Component Id="koi8_r.enc" Guid="*">
-			                                <File Id="koi8_r.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\koi8-r.enc" />
-			                            </Component>
-			                            <Component Id="koi8_u.enc" Guid="*">
-			                                <File Id="koi8_u.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\koi8-u.enc" />
-			                            </Component>
-			                            <Component Id="ksc5601.enc" Guid="*">
-			                                <File Id="ksc5601.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\ksc5601.enc" />
-			                            </Component>
-			                            <Component Id="macCentEuro.enc" Guid="*">
-			                                <File Id="macCentEuro.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\macCentEuro.enc" />
-			                            </Component>
-			                            <Component Id="macCroatian.enc" Guid="*">
-			                                <File Id="macCroatian.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\macCroatian.enc" />
-			                            </Component>
-			                            <Component Id="macCyrillic.enc" Guid="*">
-			                                <File Id="macCyrillic.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\macCyrillic.enc" />
-			                            </Component>
-			                            <Component Id="macDingbats.enc" Guid="*">
-			                                <File Id="macDingbats.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\macDingbats.enc" />
-			                            </Component>
-			                            <Component Id="macGreek.enc" Guid="*">
-			                                <File Id="macGreek.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\macGreek.enc" />
-			                            </Component>
-			                            <Component Id="macIceland.enc" Guid="*">
-			                                <File Id="macIceland.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\macIceland.enc" />
-			                            </Component>
-			                            <Component Id="macJapan.enc" Guid="*">
-			                                <File Id="macJapan.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\macJapan.enc" />
-			                            </Component>
-			                            <Component Id="macRoman.enc" Guid="*">
-			                                <File Id="macRoman.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\macRoman.enc" />
-			                            </Component>
-			                            <Component Id="macRomania.enc" Guid="*">
-			                                <File Id="macRomania.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\macRomania.enc" />
-			                            </Component>
-			                            <Component Id="macThai.enc" Guid="*">
-			                                <File Id="macThai.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\macThai.enc" />
-			                            </Component>
-			                            <Component Id="macTurkish.enc" Guid="*">
-			                                <File Id="macTurkish.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\macTurkish.enc" />
-			                            </Component>
-			                            <Component Id="macUkraine.enc" Guid="*">
-			                                <File Id="macUkraine.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\macUkraine.enc" />
-			                            </Component>
-			                            <Component Id="shiftjis.enc" Guid="*">
-			                                <File Id="shiftjis.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\shiftjis.enc" />
-			                            </Component>
-			                            <Component Id="symbol.enc" Guid="*">
-			                                <File Id="symbol.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\symbol.enc" />
-			                            </Component>
-			                            <Component Id="tis_620.enc" Guid="*">
-			                                <File Id="tis_620.enc" KeyPath="yes" Source="SourceDir\lib\tcl\encoding\tis-620.enc" />
-			                            </Component>
-			                        </Directory>
 			                        <Directory Id="http1.0" Name="http1.0">
 			                            <Component Id="http.tcl" Guid="*">
 			                                <File Id="http.tcl" KeyPath="yes" Source="SourceDir\lib\tcl\http1.0\http.tcl" />
@@ -3445,84 +3209,6 @@
 			<ComponentRef Id="tclIndex" />
 			<ComponentRef Id="tm.tcl" />
 			<ComponentRef Id="word.tcl" />
-			<ComponentRef Id="ascii.enc" />
-			<ComponentRef Id="big5.enc" />
-			<ComponentRef Id="cp1250.enc" />
-			<ComponentRef Id="cp1251.enc" />
-			<ComponentRef Id="cp1252.enc" />
-			<ComponentRef Id="cp1253.enc" />
-			<ComponentRef Id="cp1254.enc" />
-			<ComponentRef Id="cp1255.enc" />
-			<ComponentRef Id="cp1256.enc" />
-			<ComponentRef Id="cp1257.enc" />
-			<ComponentRef Id="cp1258.enc" />
-			<ComponentRef Id="cp437.enc" />
-			<ComponentRef Id="cp737.enc" />
-			<ComponentRef Id="cp775.enc" />
-			<ComponentRef Id="cp850.enc" />
-			<ComponentRef Id="cp852.enc" />
-			<ComponentRef Id="cp855.enc" />
-			<ComponentRef Id="cp857.enc" />
-			<ComponentRef Id="cp860.enc" />
-			<ComponentRef Id="cp861.enc" />
-			<ComponentRef Id="cp862.enc" />
-			<ComponentRef Id="cp863.enc" />
-			<ComponentRef Id="cp864.enc" />
-			<ComponentRef Id="cp865.enc" />
-			<ComponentRef Id="cp866.enc" />
-			<ComponentRef Id="cp869.enc" />
-			<ComponentRef Id="cp874.enc" />
-			<ComponentRef Id="cp932.enc" />
-			<ComponentRef Id="cp936.enc" />
-			<ComponentRef Id="cp949.enc" />
-			<ComponentRef Id="cp950.enc" />
-			<ComponentRef Id="dingbats.enc" />
-			<ComponentRef Id="ebcdic.enc" />
-			<ComponentRef Id="euc_cn.enc" />
-			<ComponentRef Id="euc_jp.enc" />
-			<ComponentRef Id="euc_kr.enc" />
-			<ComponentRef Id="gb12345.enc" />
-			<ComponentRef Id="gb1988.enc" />
-			<ComponentRef Id="gb2312_raw.enc" />
-			<ComponentRef Id="gb2312.enc" />
-			<ComponentRef Id="iso2022_jp.enc" />
-			<ComponentRef Id="iso2022_kr.enc" />
-			<ComponentRef Id="iso2022.enc" />
-			<ComponentRef Id="iso8859_1.enc" />
-			<ComponentRef Id="iso8859_10.enc" />
-			<ComponentRef Id="iso8859_13.enc" />
-			<ComponentRef Id="iso8859_14.enc" />
-			<ComponentRef Id="iso8859_15.enc" />
-			<ComponentRef Id="iso8859_16.enc" />
-			<ComponentRef Id="iso8859_2.enc" />
-			<ComponentRef Id="iso8859_3.enc" />
-			<ComponentRef Id="iso8859_4.enc" />
-			<ComponentRef Id="iso8859_5.enc" />
-			<ComponentRef Id="iso8859_6.enc" />
-			<ComponentRef Id="iso8859_7.enc" />
-			<ComponentRef Id="iso8859_8.enc" />
-			<ComponentRef Id="iso8859_9.enc" />
-			<ComponentRef Id="jis0201.enc" />
-			<ComponentRef Id="jis0208.enc" />
-			<ComponentRef Id="jis0212.enc" />
-			<ComponentRef Id="koi8_r.enc" />
-			<ComponentRef Id="koi8_u.enc" />
-			<ComponentRef Id="ksc5601.enc" />
-			<ComponentRef Id="macCentEuro.enc" />
-			<ComponentRef Id="macCroatian.enc" />
-			<ComponentRef Id="macCyrillic.enc" />
-			<ComponentRef Id="macDingbats.enc" />
-			<ComponentRef Id="macGreek.enc" />
-			<ComponentRef Id="macIceland.enc" />
-			<ComponentRef Id="macJapan.enc" />
-			<ComponentRef Id="macRoman.enc" />
-			<ComponentRef Id="macRomania.enc" />
-			<ComponentRef Id="macThai.enc" />
-			<ComponentRef Id="macTurkish.enc" />
-			<ComponentRef Id="macUkraine.enc" />
-			<ComponentRef Id="shiftjis.enc" />
-			<ComponentRef Id="symbol.enc" />
-			<ComponentRef Id="tis_620.enc" />
 			<ComponentRef Id="http.tcl" />
 			<ComponentRef Id="pkgIndex.tcl" />
 			<ComponentRef Id="af.msg" />