Index: src/ch/ch.cpp
===================================================================
diff -u -N -r95764b8eb7e72b89dcb51abc267a6324762c9108 -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f
--- src/ch/ch.cpp	(.../ch.cpp)	(revision 95764b8eb7e72b89dcb51abc267a6324762c9108)
+++ src/ch/ch.cpp	(.../ch.cpp)	(revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f)
@@ -32,15 +32,8 @@
 #include "../common/version.h"
 #include "TCommandLineParser.h"
 #include "../libchcore/TStringSet.h"
-#include "../libchcore/TSimpleTimer.h"
 #include "../libchcore/SerializerTrace.h"
-#include "../libchcore/TSQLiteTaskSchema.h"
-#include "../libchcore/TSQLiteSerializer.h"
-#include "../libchcore/ISerializerContainer.h"
-#include "../libchcore/ISerializerRowData.h"
-#include "../libchcore/TFileInfo.h"
 #include "TMsgBox.h"
-#include "../libchcore/TWin32ErrorFormatter.h"
 #include "resource.h"
 #include "../liblogger/TLogger.h"
 #include "../liblogger/TAsyncMultiLogger.h"
@@ -99,9 +92,9 @@
 }
 
 CCopyHandlerApp::CCopyHandlerApp() :
-	m_pMainWindow(nullptr),
 	m_spAppLoggerConfig(std::make_shared<logger::TMultiLoggerConfig>()),
-	m_spEngineLoggerConfig(std::make_shared<logger::TMultiLoggerConfig>())
+	m_spEngineLoggerConfig(std::make_shared<logger::TMultiLoggerConfig>()),
+	m_pMainWindow(nullptr)
 {
 #ifdef _DEBUG
 	AfxEnableMemoryLeakDump(FALSE);
@@ -217,66 +210,6 @@
 
 BOOL CCopyHandlerApp::InitInstance()
 {
-#ifdef DO_TEST
-	using namespace chcore;
-
-	DeleteFile(_T("C:\\Users\\ixen\\AppData\\Local\\Copy Handler\\Tasks\\test.sqlite"));
-	TSQLiteTaskSchemaPtr spTaskSchema(new TSQLiteTaskSchema);
-
-	TSQLiteSerializer serializer(PathFromString(_T("C:\\Users\\ixen\\AppData\\Local\\Copy Handler\\Tasks\\test.sqlite")), spTaskSchema);
-	//TSQLiteSerializer serializer(PathFromString(_T(":memory:")), spTaskSchema);
-
-	TSimpleTimer timer(true);
-
-	{
-		ISerializerContainerPtr spContainer = serializer.GetContainer(_T("scanned_files"));
-
-		IColumnsDefinition& rColumns = spContainer->GetColumnsDefinition();
-		TFileInfo::InitColumns(rColumns);
-
-		const size_t rel_path = rColumns.GetColumnIndex(_T("rel_path"));
-		const size_t base_path_id = rColumns.GetColumnIndex(_T("base_path_id"));
-		const size_t attr = rColumns.GetColumnIndex(_T("attr"));
-		const size_t size = rColumns.GetColumnIndex(_T("size"));
-		const size_t time_created = rColumns.GetColumnIndex(_T("time_created"));
-		const size_t time_last_write = rColumns.GetColumnIndex(_T("time_last_write"));
-		const size_t time_last_access = rColumns.GetColumnIndex(_T("time_last_access"));
-		const size_t flags = rColumns.GetColumnIndex(_T("flags"));
-
-		TString strPath(_T("C:\\Users\\ixen\\AppData\\Local\\Copy Handler\\Tasks\\sometask.xxx"));
-		TSmartPath path(PathFromString(_T("C:\\Users\\ixen\\AppData\\Local\\Copy Handler\\Tasks\\sometask.xxx")));
-
-		for(object_id_t oidIndex = 0; oidIndex < 200000; ++oidIndex)
-		{
-			ISerializerRowData& rRow = spContainer->GetRow(oidIndex, true);
-			rRow.SetValue(rel_path, path);	//C:\\Users\\ixen\\AppData\\Local\\Copy Handler\\Tasks\\sometask.xxx
-			rRow.SetValue(base_path_id, 24735275ull);
-			rRow.SetValue(attr, 0x56533234ul);
-			rRow.SetValue(size, 0x565332340897ff12ull);
-			rRow.SetValue(time_created, 0x565332340897ff12ull);
-			rRow.SetValue(time_last_write, 0x565122340897ff12ull);
-			rRow.SetValue(time_last_access, 0x565517840897ff12ull);
-			rRow.SetValue(flags, 0x56551114u);
-		}
-
-		unsigned long long ullFillTime = timer.Checkpoint(); ullFillTime;
-		GTRACE1(_T("***** [FillTime]: %I64u ms\n"), ullFillTime);
-
-		serializer.Flush();
-		unsigned long long ullFlushTime = timer.Checkpoint(); ullFlushTime;
-		GTRACE1(_T("***** [FlushTime]: %I64u ms\n"), ullFlushTime);
-
-		spContainer.reset();
-		unsigned long long ullDeleteContainerTime = timer.Checkpoint(); ullDeleteContainerTime;
-		GTRACE1(_T("***** [DeleteContainer]: %I64u ms\n"), ullDeleteContainerTime);
-	}
-
-	unsigned long long ullDestructTime = timer.Checkpoint(); ullDestructTime;
-	GTRACE1(_T("***** [DestructTime]: %I64u ms\n"), ullDestructTime);
-
-	return FALSE;
-#else
-
 	// ================================= Crash handling =======================================
 	SetUnhandledExceptionFilter(&MyUnhandledExceptionFilter);
 
@@ -510,7 +443,6 @@
 	LOG_INFO(m_spLog) << _T("Copy Handler initialized successfully");
 
 	return TRUE;
-#endif
 }
 
 bool CCopyHandlerApp::ParseCommandLine()