diff --git a/OfficeUtils/src/ZipUtilsCP.cpp b/OfficeUtils/src/ZipUtilsCP.cpp
index b04b8bc7d4..5849708957 100644
--- a/OfficeUtils/src/ZipUtilsCP.cpp
+++ b/OfficeUtils/src/ZipUtilsCP.cpp
@@ -38,7 +38,6 @@
 #if !defined(_WIN32) && !defined (_WIN64)
 #include <unistd.h>
 #include <sys/stat.h>
-#include <iconv.h>
 #endif
 
 #define WRITEBUFFERSIZE 8192
@@ -158,34 +157,7 @@ namespace ZLibZipUtils
 #endif
 	static std::wstring ascii_to_unicode(const char *src)
 	{
-//		iconv_t cd;
-//		size_t len = strlen(src);
-//		size_t reserved = sizeof(wchar_t) * (len + 1);
-
-//		char* in = new char[len + 1];
-//		char* out = new char[reserved];
-
-//		for(int i = 0; i < len; i++)
-//			in[i] = src[i];
-//		in[len] = 0;
-
-//		memset(out, 0, reserved);
-//		cd = iconv_open("WCHAR_T", "CP866");
-
-//		size_t offset_in = len;
-//		size_t offset_out = reserved;
-//		size_t k = iconv(cd, &in, &offset_in, &out, &offset_out);
-//		out = out - reserved + offset_out;
-//		in = in - len + offset_in;
-//		wchar_t* wc = (wchar_t*)out;
-//		wc[len] = 0;
-//		std::wstring ws = std::wstring(wc);
-
-//		delete[] out;
-//		delete[] in;
-//		iconv_close(cd);
-//		return ws;
-
+		// TODO: check codepage of system (for "bad" archive)
 		std::string sAnsi(src);
 		return std::wstring(sAnsi.begin(), sAnsi.end());
 	}
diff --git a/OfficeUtils/tests/main.cpp b/OfficeUtils/tests/main.cpp
index 20f975ee4b..618e4a217b 100644
--- a/OfficeUtils/tests/main.cpp
+++ b/OfficeUtils/tests/main.cpp
@@ -133,101 +133,6 @@ public:
 	}
 };
 
-TEST_F(COfficeUtilsTest, general_win)
-{
-	std::wstring zip_filename = L"general_win";
-	std::wstring zip_path = zipDirectory + wsep + zip_filename;
-	std::wstring unzip_folder = unzipDirectory + wsep + zip_filename;
-
-	if(NSDirectory::Exists(unzip_folder))
-		NSDirectory::DeleteDirectory(unzip_folder);
-
-	NSDirectory::CreateDirectories(unzip_folder);
-
-	HRESULT error_code = utils.ExtractToDirectory(zip_path, unzip_folder, NULL, false);
-	ASSERT_EQ(error_code, S_OK);
-
-	std::vector<std::wstring> unzip_files = NSDirectory::GetFiles(unzip_folder, true);
-	std::vector<std::wstring> actual;
-
-	for(size_t i = 0; i < unzip_files.size(); ++i)
-	{
-		size_t subpath_n = unzip_files[i].size() - unzip_folder.size() - 1;
-		std::wstring subpath = unzip_files[i].substr(unzip_folder.size() + 1, subpath_n);
-		actual.push_back(subpath);
-	}
-
-	EXPECT_TRUE(IsFilesPathsEqual(actual, expected_general));
-
-	// data check
-	std::wstring data;
-	ASSERT_TRUE(NSFile::CFileBinary::ReadAllTextUtf8(unzip_folder + wsep + L"MF" + wsep + L"file.txt", data));
-	EXPECT_EQ(data, L"123 321");
-}
-
-TEST_F(COfficeUtilsTest, general_win_mem)
-{
-	std::wstring zip_filename = L"general_win";
-	std::wstring zip_path = zipDirectory + wsep + zip_filename;
-	std::wstring unzip_folder = unzipDirectory + wsep + L"general_win_mem";
-
-	if(NSDirectory::Exists(unzip_folder))
-		NSDirectory::DeleteDirectory(unzip_folder);
-
-	NSDirectory::CreateDirectories(unzip_folder);
-
-	DWORD len = 0;
-	BYTE* bytes = new BYTE[MAX_SIZE];
-	NSFile::CFileBinary::ReadAllBytes(zip_path, &bytes, len);
-
-	HRESULT error_code = utils.ExtractToDirectory(bytes, len, unzip_folder, NULL, false);
-	delete[] bytes;
-	ASSERT_EQ(error_code, S_OK);
-
-	std::vector<std::wstring> unzip_files = NSDirectory::GetFiles(unzip_folder, true);
-	std::vector<std::wstring> actual;
-
-	for(size_t i = 0; i < unzip_files.size(); ++i)
-	{
-		size_t subpath_n = unzip_files[i].size() - unzip_folder.size() - 1;
-		std::wstring subpath = unzip_files[i].substr(unzip_folder.size() + 1, subpath_n);
-		actual.push_back(subpath);
-	}
-
-	EXPECT_TRUE(IsFilesPathsEqual(actual, expected_general));
-
-	// data check
-	std::wstring data;
-	ASSERT_TRUE(NSFile::CFileBinary::ReadAllTextUtf8(unzip_folder + wsep + L"MF" + wsep + L"file.txt", data));
-	EXPECT_EQ(data, L"123 321");
-}
-
-TEST_F(COfficeUtilsTest, general_win_no_folder)
-{
-	std::wstring zip_filename = L"general_win";
-	std::wstring zip_path = zipDirectory + wsep + zip_filename;
-	std::wstring unzip_folder = unzipDirectory + wsep + L"general_win_no_folder";
-
-	if(NSDirectory::Exists(unzip_folder))
-		NSDirectory::DeleteDirectory(unzip_folder);
-
-	NSDirectory::CreateDirectories(unzip_folder);
-
-	HRESULT error_code = utils.ExtractToDirectory(zip_path, unzip_folder, NULL, true);
-	ASSERT_EQ(error_code, S_OK);
-
-	std::vector<std::wstring> unzip_files = NSDirectory::GetFiles(unzip_folder, true);
-	std::vector<std::wstring> actual;
-
-	for(size_t i = 0; i < unzip_files.size(); ++i)
-	{
-		size_t subpath_n = unzip_files[i].size() - unzip_folder.size() - 1;
-		std::wstring subpath = unzip_files[i].substr(unzip_folder.size() + 1, subpath_n);
-		actual.push_back(subpath);
-	}
-	EXPECT_TRUE(IsFilesPathsEqual(actual, expected_general_no_folder));
-}
-
 TEST_F(COfficeUtilsTest, general_linux)
 {
 	std::wstring zip_filename = L"general_linux";
@@ -429,7 +334,7 @@ TEST_F(COfficeUtilsTest, docx_like_linux)
 
 TEST_F(COfficeUtilsTest, other_win)
 {
-	std::wstring zip_filename = L"general_win";
+	std::wstring zip_filename = L"general_linux";
 	std::wstring zip_path = zipDirectory + wsep + zip_filename;
 
 	// IsArchive(...)
diff --git a/OfficeUtils/tests/zip/general_win b/OfficeUtils/tests/zip/general_win
deleted file mode 100644
index 9d957a0b9f..0000000000
Binary files a/OfficeUtils/tests/zip/general_win and /dev/null differ