diff --git a/classes/xml/xmlquery/QueryParser.class.php b/classes/xml/xmlquery/QueryParser.class.php
index c7a50717a..a446c38f9 100644
--- a/classes/xml/xmlquery/QueryParser.class.php
+++ b/classes/xml/xmlquery/QueryParser.class.php
@@ -118,15 +118,8 @@ class QueryParser {
 		$arguments = array_merge($arguments, $columns->getArguments());
 		$arguments = array_merge($arguments, $conditions->getArguments());
 		$arguments = array_merge($arguments, $navigation->getArguments());
-		//foreach($arguments as $argument){
-		//	var_dump($argument);
-		//	var_dump($this->column_type[$this->getQueryId()][$argument->getColumnName()]);	
-		//}	
 		
 		$prebuff = '';
-		//$prebuff .= $columns->getValidatorString();
-		//$prebuff .= $conditions->getValidatorString();
-		//$prebuff .= $navigation->getValidatorString();
 		foreach($arguments as $argument){
 			if($argument->getArgumentName()){
 			$prebuff .= $argument->toString();
diff --git a/classes/xml/xmlquery/queryargument/ConditionQueryArgument.class.php b/classes/xml/xmlquery/queryargument/ConditionQueryArgument.class.php
deleted file mode 100644
index 8c5743dc0..000000000
--- a/classes/xml/xmlquery/queryargument/ConditionQueryArgument.class.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php 
-	class ConditionQueryArgument extends QueryArgument{
-		var $argument_name;
-		var $argument_validator;
-		var $column_name;
-		
-		function ConditionQueryArgument($tag){
-			$this->argument_name = $tag->attrs->var;
-			
-			$name = $tag->attrs->column;
-			if(strpos($name, '.') === false) $this->column_name = $name;
-			else {
-            	list($prefix, $name) = explode('.', $name);
-            	$this->column_name = $name;
-			}			
-			
-			require_once(_XE_PATH_.'classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php');
-			require_once(_XE_PATH_.'classes/xml/xmlquery/queryargument/validator/ConditionQueryArgumentValidator.class.php');
-			$this->argument_validator = new ConditionQueryArgumentValidator($tag);
-		}	
-		
-		function getColumnName(){
-			return $this->column_name;
-		}
-	}
-?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/queryargument/validator/ConditionQueryArgumentValidator.class.php b/classes/xml/xmlquery/queryargument/validator/ConditionQueryArgumentValidator.class.php
deleted file mode 100644
index 4a74b809c..000000000
--- a/classes/xml/xmlquery/queryargument/validator/ConditionQueryArgumentValidator.class.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php 
-	class ConditionQueryArgumentValidator extends QueryArgumentValidator {
-		
-		function ConditionQueryArgumentValidator($tag){
-			parent::QueryArgumentValidator($tag);
-		}
-		
-		function toString(){
-			if(!$this->argument_name) return '';
-			if(!isset($this->validator_string)){
-				$validator = parent::toString();
-				require_once(_XE_PATH_.'classes/xml/xmlquery/queryargument/validator/EscapeCheck.class.php');
-				$v = new EscapeCheck($this->argument_name);
-				$validator .= $v->toString();
-				$this->validator_string = $validator;
-			}
-			return $this->validator_string;
-		}
-	}
-?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/queryargument/validator/DefaultCheck.class.php b/classes/xml/xmlquery/queryargument/validator/DefaultCheck.class.php
deleted file mode 100644
index e6048fc28..000000000
--- a/classes/xml/xmlquery/queryargument/validator/DefaultCheck.class.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php 
-
-	class DefaultCheck extends Validator {
-		var $argument_name;
-		var $value;
-		
-		function DefaultCheck($argument_name, $value) {
-			$this->argument_name = $argument_name;
-			$this->value = $value;
-		}
-		
-		function toString(){		
-			if(!isset($this->argument_name)) return '';
-			
-			$value = $this->value->toString();
-			
-	        if($this->value->isString()) {
-	        	$value = "'".$value."'";
-	        }
-			
-			return 'if(!isset($args->'.$this->argument_name.')) $args->'.$this->argument_name.' = '.$value.';'."\n";
-		}
-	}
-	
-?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/queryargument/validator/EscapeCheck.class.php b/classes/xml/xmlquery/queryargument/validator/EscapeCheck.class.php
deleted file mode 100644
index 1d37cb953..000000000
--- a/classes/xml/xmlquery/queryargument/validator/EscapeCheck.class.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php 
-	// TODO This is temporary for when column types will be
-	// used to prepare input
-	
-	class EscapeCheck {
-		var $argument_name;
-				
-		function EscapeCheck($argument_name){
-			$this->argument_name = $argument_name;
-		}
-			
-		function toString(){
-			return sprintf("if(is_string(\$args->%s) && !is_numeric(\$args->%s)) \$args->%s = \$dbParser->escapeString(\$args->%s);\n"
-					, $this->argument_name
-					, $this->argument_name
-					, $this->argument_name
-					, $this->argument_name); 	
-		}		
-	}
-
-?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/queryargument/validator/FilterValidator.class.php b/classes/xml/xmlquery/queryargument/validator/FilterValidator.class.php
deleted file mode 100644
index 29a8e9cbf..000000000
--- a/classes/xml/xmlquery/queryargument/validator/FilterValidator.class.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php 
-	class FilterValidator extends Validator {
-		var $argument_name;
-		var $filter;
-		
-		function FilterValidator($argument_name, $filter) {
-			$this->argument_name = $argument_name;
-			$this->filter = $filter;
-		}
-		
-		function toString(){		
-			return sprintf('if(isset($args->%s)) { unset($_output); $_output = $this->checkFilter("%s",$args->%s,"%s"); if(!$_output->toBool()) return $_output; } %s',$this->argument_name, $this->argument_name,$this->argument_name,$this->filter,"\n");
-		}
-	}
-
-?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/queryargument/validator/MaxLengthValidator.class.php b/classes/xml/xmlquery/queryargument/validator/MaxLengthValidator.class.php
deleted file mode 100644
index 3d94cd12e..000000000
--- a/classes/xml/xmlquery/queryargument/validator/MaxLengthValidator.class.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php 
-	
-	class MaxLengthValidator extends Validator {
-		var $argument_name;
-		var $value;
-		
-		function MaxLengthValidator($argument_name, $value) {
-			$this->argument_name = $argument_name;
-			$this->value = $value;
-		}
-		
-		function toString(){		
-			return 'if($args->'
-						.$this->argument_name
-						.'&&strlen($args->'.$this->argument_name.')>'.$this->value
-						.') return new Object(-1, sprintf($lang->filter->outofrange, $lang->'
-						.$this->argument_name.'?$lang->'
-						.$this->argument_name.':\''.$this->argument_name.'\'));'."\n";	
-		}
-	}
-
-?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/queryargument/validator/MinLengthValidator.class.php b/classes/xml/xmlquery/queryargument/validator/MinLengthValidator.class.php
deleted file mode 100644
index 2717f4487..000000000
--- a/classes/xml/xmlquery/queryargument/validator/MinLengthValidator.class.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php 
-	
-	class MinLengthValidator extends Validator{
-		var $argument_name;
-		var $value;
-		
-		function MinLengthValidator($argument_name, $value) {
-			$this->argument_name = $argument_name;
-			$this->value = $value;
-		}
-		
-		function toString(){
-			return 'if($args->'
-						.$this->argument_name
-						.'&&strlen($args->'.$this->argument_name.')<'.$this->value
-						.') return new Object(-1, sprintf($lang->filter->outofrange, $lang->'
-						.$this->argument_name.'?$lang->'
-						.$this->argument_name.':\''.$this->argument_name.'\'));'."\n";	
-		}
-	}
-
-?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/queryargument/validator/NotNullValidator.class.php b/classes/xml/xmlquery/queryargument/validator/NotNullValidator.class.php
deleted file mode 100644
index 4f87b0462..000000000
--- a/classes/xml/xmlquery/queryargument/validator/NotNullValidator.class.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php 
-	
-	class NotNullValidator extends Validator {
-		var $argument_name;
-		var $value;
-		
-		function NotNullValidator($argument_name, $value) {
-			$this->argument_name = $argument_name;
-			$this->value = $value;
-		}
-		
-		function toString(){		
-			return 'if(!isset($args->'.$this->argument_name.')) return new Object(-1, sprintf($lang->filter->isnull, $lang->'
-					.$this->argument_name.'?$lang->'.$this->argument_name.':\''.$this->argument_name.'\'));'."\n";
-		}
-	                    
-	}
-?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/column/DeleteColumnTag.class.php b/classes/xml/xmlquery/tags/column/DeleteColumnTag.class.php
index 0c2b1b6db..24c5d094c 100644
--- a/classes/xml/xmlquery/tags/column/DeleteColumnTag.class.php
+++ b/classes/xml/xmlquery/tags/column/DeleteColumnTag.class.php
@@ -16,15 +16,7 @@
 			require_once(_XE_PATH_.'classes/xml/xmlquery/queryargument/QueryArgument.class.php');
 			$this->argument = new QueryArgument($column);
 		}
-		function toString(){
-			$output_columns = 'array(' . PHP_EOL;
-			foreach($this->argument as $argument){
-				$output_columns .= $argument->getExpressionString() . PHP_EOL . ',';
-			}
-			$output_columns = substr($output_columns, 0, -1);
-			$output_columns .= ')';	
-			return $output_columns;			
-		}
+				
 		function getExpressionString(){
 			return sprintf('new DeleteExpression(\'%s\', $args->%s)'
 						, $this->name
@@ -33,11 +25,7 @@
 		
 		function getArgument(){
 			return $this->argument;
-		}
-		
-		function getValidatorString(){
-			return $this->argument->getValidatorString();
-		}			
+		}		
 		
 	}
 ?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/column/DeleteColumnsTag.class.php b/classes/xml/xmlquery/tags/column/DeleteColumnsTag.class.php
index b242d7ca0..662328479 100644
--- a/classes/xml/xmlquery/tags/column/DeleteColumnsTag.class.php
+++ b/classes/xml/xmlquery/tags/column/DeleteColumnsTag.class.php
@@ -27,6 +27,7 @@
 				$this->columns[] = new DeleteColumnTag($column, $this->dbParser);
 			}			
 		}
+		
 		function toString(){
 			$output_columns = 'array(' . PHP_EOL;
 			foreach($this->columns as $column){
@@ -43,15 +44,7 @@
 				$arguments[] = $column->getArgument();
 			}
 			return $arguments;
-		}
-		
-		function getValidatorString(){
-			$validator = '';
-			foreach($this->columns as $column){
-				$validator .= $column->getValidatorString();
-			}
-			return $validator;
-		}			
+		}		
 		
 	}
 
diff --git a/classes/xml/xmlquery/tags/column/InsertColumnTag.class.php b/classes/xml/xmlquery/tags/column/InsertColumnTag.class.php
index 9dfba9247..d18f95685 100644
--- a/classes/xml/xmlquery/tags/column/InsertColumnTag.class.php
+++ b/classes/xml/xmlquery/tags/column/InsertColumnTag.class.php
@@ -15,17 +15,7 @@
 			$this->name = $this->dbParser->parseColumnName($this->name);
 			require_once(_XE_PATH_.'classes/xml/xmlquery/queryargument/QueryArgument.class.php');
 			$this->argument = new QueryArgument($column);
-		}
-		
-		function toString(){
-			$output_columns = 'array(' . PHP_EOL;
-			foreach($this->argument as $argument){
-				$output_columns .= $argument->getExpressionString() . PHP_EOL . ',';
-			}
-			$output_columns = substr($output_columns, 0, -1);
-			$output_columns .= ')';	
-			return $output_columns;			
-		}
+		}		
 		
 		function getExpressionString(){
 			return sprintf('new InsertExpression(\'%s\', $%s_argument->getValue())'
@@ -35,11 +25,7 @@
 		
 		function getArgument(){
 			return $this->argument;
-		}
-		
-		function getValidatorString(){
-			return $this->argument->getValidatorString();
-		}			
+		}		
 		
 	}
 ?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php b/classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php
index 086cbba2d..d5aafd30a 100644
--- a/classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php
+++ b/classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php
@@ -27,6 +27,7 @@
 				$this->columns[] = new InsertColumnTag($column, $this->dbParser);
 			}			
 		}
+		
 		function toString(){
 			$output_columns = 'array(' . PHP_EOL;
 			foreach($this->columns as $column){
@@ -43,15 +44,7 @@
 				$arguments[] = $column->getArgument();
 			}
 			return $arguments;
-		}
-		
-		function getValidatorString(){
-			$validator = '';
-			foreach($this->columns as $column){
-				$validator .= $column->getValidatorString();
-			}
-			return $validator;
-		}			
+		}	
 		
 	}
 
diff --git a/classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php b/classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php
index 15102f130..ef0d952a2 100644
--- a/classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php
+++ b/classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php
@@ -36,10 +36,6 @@
 		
 		function getArguments(){
 			return array();
-		}
-		
-		function getValidatorString(){
-			return '';
-		}		
+		}	
 	}
 ?>	
diff --git a/classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php b/classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php
index d41905e59..90b44b0e9 100644
--- a/classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php
+++ b/classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php
@@ -19,15 +19,6 @@
 			$this->argument = new QueryArgument($column);
 		}
 		
-		function toString(){
-			$output_columns = 'array(' . PHP_EOL;
-			foreach($this->argument as $argument){
-				$output_columns .= $argument->getExpressionString() . PHP_EOL . ',';
-			}
-			$output_columns = substr($output_columns, 0, -1);
-			$output_columns .= ')';	
-			return $output_columns;			
-		}
 		function getExpressionString(){
 			return sprintf('new UpdateExpression(\'%s\', $%s_argument->getValue())'
 						, $this->name
@@ -36,11 +27,7 @@
 		
 		function getArgument(){
 			return $this->argument;
-		}
-		
-		function getValidatorString(){
-			return $this->argument->getValidatorString();
-		}			
+		}	
 	}
 
 ?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php b/classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php
index 2f1feba0f..9ead8811a 100644
--- a/classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php
+++ b/classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php
@@ -48,14 +48,7 @@
 			}
 			return $arguments;
 		}
-		
-		function getValidatorString(){
-			$validator = '';
-			foreach($this->columns as $column){
-				$validator .= $column->getValidatorString();
-			}
-			return $validator;
-		}		
+	
 	}
 
 ?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php b/classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php
index 93de1dde9..58546f761 100644
--- a/classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php
+++ b/classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php
@@ -39,14 +39,6 @@
 			}
 			return $arguments;
 		}
-		
-		function getValidatorString(){
-			$validator = '';
-			foreach($this->conditions as $condition){
-				$validator .= $condition->getValidatorString();
-			}
-			return $validator;
-		}	
 				
 	}
 ?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/condition/ConditionTag.class.php b/classes/xml/xmlquery/tags/condition/ConditionTag.class.php
index 626a4a0b0..ae5eb08d2 100644
--- a/classes/xml/xmlquery/tags/condition/ConditionTag.class.php
+++ b/classes/xml/xmlquery/tags/condition/ConditionTag.class.php
@@ -44,10 +44,6 @@
 									, '"'.$this->operation.'"'
 									, $this->pipe ? ", '" . $this->pipe . "'" : ''
 									);
-		}
-		
-		function getValidatorString(){
-			return $this->argument->getValidatorString();
-		}			
+		}		
 	}
 ?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/condition/ConditionsTag.class.php b/classes/xml/xmlquery/tags/condition/ConditionsTag.class.php
index ef174bc2e..fec1063cd 100644
--- a/classes/xml/xmlquery/tags/condition/ConditionsTag.class.php
+++ b/classes/xml/xmlquery/tags/condition/ConditionsTag.class.php
@@ -39,14 +39,6 @@
 				$arguments = array_merge($arguments, $condition->getArguments());
 			}
 			return $arguments;
-		}		
-		
-		function getValidatorString(){
-			$validator = '';
-			foreach($this->condition_groups as $condition){
-				$validator .= $condition->getValidatorString();
-			}
-			return $validator;
-		}				
+		}					
 	}
 ?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/navigation/IndexTag.class.php b/classes/xml/xmlquery/tags/navigation/IndexTag.class.php
index febb8628f..ed2d79e54 100644
--- a/classes/xml/xmlquery/tags/navigation/IndexTag.class.php
+++ b/classes/xml/xmlquery/tags/navigation/IndexTag.class.php
@@ -36,14 +36,7 @@
 			if($this->sort_order_argument)
 				$arguments[] = $this->sort_order_argument;
 			return $arguments;
-		}		
-		
-		function getValidatorString(){
-			$validator = $this->argument->getValidatorString();
-			if($this->sort_order_argument)
-				$validator .= $this->sort_order_argument->getValidatorString();
-			return $validator;
-		}			
+		}				
 	}
 
 ?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/navigation/NavigationTag.class.php b/classes/xml/xmlquery/tags/navigation/NavigationTag.class.php
index 98824592b..c8dba8b94 100644
--- a/classes/xml/xmlquery/tags/navigation/NavigationTag.class.php
+++ b/classes/xml/xmlquery/tags/navigation/NavigationTag.class.php
@@ -46,14 +46,6 @@
 				$arguments = array_merge($order->getArguments(), $arguments);
 			}
 			return $arguments;
-		}
-		
-		function getValidatorString(){
-			$validator = '';
-			foreach ($this->order as $order){
-				$validator .= $order->getValidatorString();
-			}
-			return $validator;
 		}				
 	}