diff --git a/winixd/core/config.cpp b/winixd/core/config.cpp
index 72345d8..e1d300a 100644
--- a/winixd/core/config.cpp
+++ b/winixd/core/config.cpp
@@ -283,8 +283,6 @@ void Config::AssignValues(bool stdout_is_closed)
 	ezc_max_elements		= Size(L"ezc_max_elements", 50000);
 	ezc_max_loop_elements 	= Size(L"ezc_max_loop_elements", 5000);
 	ezc_out_streams_size	= Size(L"ezc_out_streams_size", 128);
-	ezc_error_prefix		= Text(L"ezc_error_prefix", L"<!-- ");
-	ezc_error_postfix		= Text(L"ezc_error_postfix", L" -->");
 
 	account_need_email_verification     = Bool(L"account_need_email_verification", true);
 	reset_password_code_expiration_time = Long(L"reset_password_code_expiration_time", 86400);
diff --git a/winixd/core/config.h b/winixd/core/config.h
index 55f1805..c7ffa8e 100644
--- a/winixd/core/config.h
+++ b/winixd/core/config.h
@@ -642,13 +642,6 @@ public:
  	// default: 128
  	size_t ezc_out_streams_size;
 
- 	// prefix and postfix used when there is an error in Ezc patterns
- 	// default:
- 	// prefix:  "<!-- "
- 	// postfix: " -->"
- 	std::wstring ezc_error_prefix;
-  	std::wstring ezc_error_postfix;
-
 	// when true then when a user want to create a new account
 	// he has to provide his email and a message will be sent back to him
 	// with a link to activate the account
diff --git a/winixd/templates/misc.cpp b/winixd/templates/misc.cpp
index 41df59f..4e55a64 100644
--- a/winixd/templates/misc.cpp
+++ b/winixd/templates/misc.cpp
@@ -98,7 +98,6 @@ void InitGenerator(EzcGen & gen, Ezc::Models & ezc_models)
 	gen.SkipNewLine(gen_skip_new_line);
 	gen.RecognizeSpecialChars(gen_use_special_chars);
 	gen.SetMax(config->ezc_max_elements, config->ezc_max_loop_elements);
-	gen.SetCommentary(config->ezc_error_prefix, config->ezc_error_postfix);
 
 	/*
 	 * although we have addresses to blocks and functions cached in patters
@@ -110,6 +109,7 @@ void InitGenerator(EzcGen & gen, Ezc::Models & ezc_models)
 	gen.SetVariables(ezc_vars);
 
 	gen.SetModels(ezc_models);
+	gen.SetLogger(log);
 }
 
 
diff --git a/winixd/templates/patterncacher.cpp b/winixd/templates/patterncacher.cpp
index 417f441..9296e9d 100644
--- a/winixd/templates/patterncacher.cpp
+++ b/winixd/templates/patterncacher.cpp
@@ -67,11 +67,6 @@ void PatternCacher::SetEzcObjects(Ezc::Objects<HtmlTextStream> * obj)
 }
 
 
-void PatternCacher::SetEzcCommentary(const std::wstring & start, const std::wstring & end)
-{
-	pattern_parser.SetCommentary(start, end);
-}
-
 void PatternCacher::SetWhenDelete(size_t when_delete, size_t how_many_del)
 {
 	when_delete_patterns = when_delete;
@@ -121,7 +116,6 @@ void PatternCacher::CreatePattern(const Item & item, Ezc::Pattern & pattern)
 	 * blocks cannot be created in patterns generated from virtual FS
 	 * but we can call other blocks (from normal templates)
 	 *
-	 * pattern_parser.SetCommentary() is set beforehand
 	 */
 	pattern_parser.AllowInclude(false);
 	pattern_parser.DeleteWhiteTextItems(false);
diff --git a/winixd/templates/patterncacher.h b/winixd/templates/patterncacher.h
index d02d35e..8653ca9 100644
--- a/winixd/templates/patterncacher.h
+++ b/winixd/templates/patterncacher.h
@@ -73,10 +73,6 @@ public:
 	// this blocks (pointers to them) will be cached in patterns
 	void SetEzcBlocks(Ezc::Blocks * blocks);
 
-	// commentary prefix/postfix used in pattern_parser
-	// (when there is an error)
-	void SetEzcCommentary(const std::wstring & start, const std::wstring & end);
-
 	// returning a pattern corresponding to the 'item'
 	Ezc::Pattern * GetPattern(const Item & item);
 
diff --git a/winixd/templates/patterns.cpp b/winixd/templates/patterns.cpp
index 0020ba0..1303a2f 100644
--- a/winixd/templates/patterns.cpp
+++ b/winixd/templates/patterns.cpp
@@ -98,12 +98,6 @@ void Patterns::SetEzcObjects(Ezc::Objects<HtmlTextStream> * obj)
 }
 
 
-void Patterns::SetEzcCommentary(const std::wstring & start, const std::wstring & end)
-{
-	pattern_parser.SetCommentary(start, end);
-}
-
-
 size_t Patterns::Add(const wchar_t * file_name, bool read_pattern)
 {
 	for(size_t i=0 ; i<pat_tab.size() ; ++i)
diff --git a/winixd/templates/patterns.h b/winixd/templates/patterns.h
index 3b1067e..bec50ef 100644
--- a/winixd/templates/patterns.h
+++ b/winixd/templates/patterns.h
@@ -87,12 +87,6 @@ public:
 	void SetEzcObjects(Ezc::Objects<HtmlTextStream> * obj);
 
 
-	/*
-		commentary prefix/postfix used in pattern_parser
-		(when there is an error)
-	*/
-	void SetEzcCommentary(const std::wstring & start, const std::wstring & end);
-
 	/*
 		adding a new pattern and returning its index
 		if the pattern already exists the method returns its index only
diff --git a/winixd/templates/templates.cpp b/winixd/templates/templates.cpp
index 9690c4b..2e12528 100644
--- a/winixd/templates/templates.cpp
+++ b/winixd/templates/templates.cpp
@@ -1009,10 +1009,7 @@ void Templates::Init()
 using namespace TemplatesFunctions;
 
 	patterns.SetDirectories(config->templates_dir, config->templates_dir_default);
-	patterns.SetEzcCommentary(config->ezc_error_prefix, config->ezc_error_postfix);
-
 	pattern_cacher.SetWhenDelete(config->pattern_cacher_when_delete, config->pattern_cacher_how_many_delete);
-	pattern_cacher.SetEzcCommentary(config->ezc_error_prefix, config->ezc_error_postfix);
 	CreateFunctions(); // create functions first (functions will be cached by patterns)
 	ReadTemplates();
 }