Removed redundand Prado::using statements

54 files changed, 0 insertions, 102 deletions

diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php b/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php
index 3ff2d196..55a09baa 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php
@@ -17,7 +17,6 @@ namespace Prado\Data\ActiveRecord\Relations;
 use Prado\Data\ActiveRecord\Exceptions\TActiveRecordException;
 use Prado\Prado;
 
-Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelation');
 
 /**
  * Implements the foreign key relationship (TActiveRecord::BELONGS_TO) between
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php b/framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php
index 06c14950..8b93fcee 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php
@@ -16,7 +16,6 @@ namespace Prado\Data\ActiveRecord\Relations;
  */
 use Prado\Prado;
 
-Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelation');
 
 /**
  * Implements TActiveRecord::HAS_MANY relationship between the source object having zero or
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php b/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php
index f5d644be..2632fa83 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordHasManyAssociation.php
@@ -17,7 +17,6 @@ namespace Prado\Data\ActiveRecord\Relations;
 use Prado\Data\ActiveRecord\TActiveRecord;
 use Prado\Prado;
 
-Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelation');
 
 /**
  * Implements the M-N (many to many) relationship via association table.
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php b/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php
index 320cfc32..b0787f3a 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php
@@ -17,7 +17,6 @@ namespace Prado\Data\ActiveRecord\Relations;
 use Prado\Data\ActiveRecord\Exceptions\TActiveRecordException;
 use Prado\Prado;
 
-Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelation');
 
 /**
  * TActiveRecordHasOne models the object relationship that a record (the source object)
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php b/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
index d7f6d0a7..d9a0e9e2 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
@@ -18,7 +18,6 @@ use Prado\Data\ActiveRecord\Exceptions\TActiveRecordException;
 use Prado\Data\ActiveRecord\TActiveRecord;
 use Prado\Prado;
 
-Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelationContext');
 
 /**
  * Base class for active record relationships.
diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php b/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php
index 2af4ec7d..d3833d69 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php
@@ -183,16 +183,12 @@ class TActiveRecordRelationContext
 		switch($this->getRelationType())
 		{
 			case TActiveRecord::HAS_MANY:
-				Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordHasMany');
 				return new TActiveRecordHasMany($this, $criteria);
 			case TActiveRecord::MANY_TO_MANY:
-				Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordHasManyAssociation');
 				return new TActiveRecordHasManyAssociation($this, $criteria);
 			case TActiveRecord::HAS_ONE:
-				Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordHasOne');
 				return new TActiveRecordHasOne($this, $criteria);
 			case TActiveRecord::BELONGS_TO:
-				Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordBelongsTo');
 				return new TActiveRecordBelongsTo($this, $criteria);
 			default:
 				throw new TActiveRecordException('ar_invalid_relationship');
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php
index 7c55fa14..76344e65 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php
@@ -13,7 +13,6 @@ namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
 
 use Prado\Prado;
 
-Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
 
 class TIbmScaffoldInput extends TScaffoldInputCommon
 {
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php
index 41c50dad..8807840c 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMssqlScaffoldInput.php
@@ -12,7 +12,6 @@ namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
 
 use Prado\Prado;
 
-Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
 
 class TMssqlScaffoldInput extends TScaffoldInputCommon
 {
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php
index cd27fbab..decc1956 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TMysqlScaffoldInput.php
@@ -12,7 +12,6 @@ namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
 
 use Prado\Prado;
 
-Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
 
 class TMysqlScaffoldInput extends TScaffoldInputCommon
 {
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TPgsqlScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TPgsqlScaffoldInput.php
index 46da92e8..2575ab85 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TPgsqlScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TPgsqlScaffoldInput.php
@@ -12,7 +12,6 @@ namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
 
 use Prado\Prado;
 
-Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
 
 class TPgsqlScaffoldInput extends TScaffoldInputCommon
 {
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php
index f366d5eb..f538b10e 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php
@@ -27,7 +27,6 @@ use Prado\Web\UI\WebControls\TTextBoxMode;
 use Prado\Web\UI\WebControls\TValidationDataType;
 use Prado\Web\UI\WebControls\TValidatorDisplayStyle;
 
-Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputBase');
 
 class TScaffoldInputCommon extends TScaffoldInputBase
 {
diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php
index 38e37a18..04fe7457 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TSqliteScaffoldInput.php
@@ -12,7 +12,6 @@ namespace Prado\Data\ActiveRecord\Scaffold\InputBuilder;
 
 use Prado\Prado;
 
-Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputCommon');
 
 class TSqliteScaffoldInput extends TScaffoldInputCommon
 {
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php
index 8e044606..b67390b2 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php
@@ -20,7 +20,6 @@ use Prado\Prado;
 use Prado\TPropertyValue;
 use Prado\Web\UI\TTemplateControl;
 
-Prado::using('System.Data.ActiveRecord.TActiveRecord');
 
 /**
  * Base class for Active Record scaffold views.
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php
index df251efa..2eecf908 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php
@@ -20,7 +20,6 @@ use Prado\Prado;
 use Prado\TPropertyValue;
 use Prado\Web\UI\WebControls\TListItemType;
 
-Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldBase');
 
 /**
  * Template control for editing an Active Record instance.
@@ -276,7 +275,6 @@ class TScaffoldEditView extends TScaffoldBase
 		$class = get_class($record);
 		if(!isset($_builders[$class]))
 		{
-			Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputBase');
 			$_builders[$class] = TScaffoldInputBase::createInputBuilder($record);
 		}
 		return $_builders[$class];
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php
index e7e5ab9c..0303337e 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php
@@ -22,7 +22,6 @@ use Prado\Web\UI\WebControls\IItemDataRenderer;
 use Prado\Web\UI\WebControls\TListItemType;
 use Prado\Web\UI\WebControls\TRepeaterCommandEventParameter;
 
-Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldBase');
 
 /**
  * TScaffoldListView displays a list of Active Records.
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php
index 26b8e0b5..b7eb5c80 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldSearch.php
@@ -17,7 +17,6 @@ namespace Prado\Data\ActiveRecord\Scaffold;
 use Prado\Exceptions\TConfigurationException;
 use Prado\Prado;
 
-Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldBase');
 
 /**
  * TScaffoldSearch provide a simple textbox and a button that is used
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php
index 27adb544..32b3f233 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php
@@ -16,10 +16,6 @@ namespace Prado\Data\ActiveRecord\Scaffold;
  */
 use Prado\Prado;
 
-Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldBase');
-Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldListView');
-Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldEditView');
-Prado::using('System.Data.ActiveRecord.Scaffold.TScaffoldSearch');
 
 /**
  * TScaffoldView is a composite control consisting of TScaffoldListView
diff --git a/framework/Data/ActiveRecord/TActiveRecord.php b/framework/Data/ActiveRecord/TActiveRecord.php
index 27c51fcd..38f8ef29 100644
--- a/framework/Data/ActiveRecord/TActiveRecord.php
+++ b/framework/Data/ActiveRecord/TActiveRecord.php
@@ -21,9 +21,6 @@ use Prado\Prado;
 use Prado\TPropertyValue;
 use ReflectionClass;
 
-Prado::using('System.Data.ActiveRecord.TActiveRecordManager');
-Prado::using('System.Data.ActiveRecord.TActiveRecordCriteria');
-Prado::using('System.Data.ActiveRecord.Relations.TActiveRecordRelationContext');
 
 /**
  * Base class for active records.
diff --git a/framework/Data/ActiveRecord/TActiveRecordConfig.php b/framework/Data/ActiveRecord/TActiveRecordConfig.php
index 3975032a..fc9b5f89 100644
--- a/framework/Data/ActiveRecord/TActiveRecordConfig.php
+++ b/framework/Data/ActiveRecord/TActiveRecordConfig.php
@@ -15,8 +15,6 @@ use Prado\Data\TDataSourceConfig;
 use Prado\Prado;
 use Prado\TPropertyValue;
 
-Prado::using('System.Data.TDataSourceConfig');
-Prado::using('System.Data.ActiveRecord.TActiveRecordManager');
 
 /**
  * TActiveRecordConfig module configuration class.
diff --git a/framework/Data/ActiveRecord/TActiveRecordCriteria.php b/framework/Data/ActiveRecord/TActiveRecordCriteria.php
index 74b71511..00e36380 100644
--- a/framework/Data/ActiveRecord/TActiveRecordCriteria.php
+++ b/framework/Data/ActiveRecord/TActiveRecordCriteria.php
@@ -14,7 +14,6 @@ namespace Prado\Data\ActiveRecord;
 use Prado\Data\DataGateway\TSqlCriteria;
 use Prado\Prado;
 
-Prado::using('System.Data.DataGateway.TSqlCriteria');
 
 /**
  * Search criteria for Active Record.
diff --git a/framework/Data/ActiveRecord/TActiveRecordGateway.php b/framework/Data/ActiveRecord/TActiveRecordGateway.php
index 2c231f80..e70adceb 100644
--- a/framework/Data/ActiveRecord/TActiveRecordGateway.php
+++ b/framework/Data/ActiveRecord/TActiveRecordGateway.php
@@ -118,7 +118,6 @@ class TActiveRecordGateway extends \Prado\TComponent
 			//will find the correct driver dependent classes.
 			if(!isset($this->_meta[$connStr]))
 			{
-				Prado::using('System.Data.Common.TDbMetaData');
 				$this->_meta[$connStr] = TDbMetaData::getInstance($connection);
 			}
 
@@ -148,7 +147,6 @@ class TActiveRecordGateway extends \Prado\TComponent
 		if(!isset($this->_commandBuilders[$connStr]))
 		{
 			$builder = $tableInfo->createCommandBuilder($record->getDbConnection());
-			Prado::using('System.Data.DataGateway.TDataGatewayCommand');
 			$command = new TDataGatewayCommand($builder);
 			$command->OnCreateCommand[] = array($this, 'onCreateCommand');
 			$command->OnExecuteCommand[] = array($this, 'onExecuteCommand');
diff --git a/framework/Data/ActiveRecord/TActiveRecordManager.php b/framework/Data/ActiveRecord/TActiveRecordManager.php
index 3c21f432..11ffa047 100644
--- a/framework/Data/ActiveRecord/TActiveRecordManager.php
+++ b/framework/Data/ActiveRecord/TActiveRecordManager.php
@@ -14,10 +14,6 @@ namespace Prado\Data\ActiveRecord;
 use Prado\Prado;
 use Prado\TPropertyValue;
 
-Prado::using('System.Data.TDbConnection');
-Prado::using('System.Data.ActiveRecord.TActiveRecord');
-Prado::using('System.Data.ActiveRecord.Exceptions.TActiveRecordException');
-Prado::using('System.Data.ActiveRecord.TActiveRecordGateway');
 
 /**
  * TActiveRecordManager provides the default DB connection,
diff --git a/framework/Data/Common/Mssql/TMssqlCommandBuilder.php b/framework/Data/Common/Mssql/TMssqlCommandBuilder.php
index 498c8177..03f41552 100644
--- a/framework/Data/Common/Mssql/TMssqlCommandBuilder.php
+++ b/framework/Data/Common/Mssql/TMssqlCommandBuilder.php
@@ -14,7 +14,6 @@ namespace Prado\Data\Common\Mssql;
 use Prado\Data\Common\TDbCommandBuilder;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbCommandBuilder');
 
 /**
  * TMssqlCommandBuilder provides specifics methods to create limit/offset query commands
diff --git a/framework/Data/Common/Mssql/TMssqlMetaData.php b/framework/Data/Common/Mssql/TMssqlMetaData.php
index 5c4ec036..6899a604 100644
--- a/framework/Data/Common/Mssql/TMssqlMetaData.php
+++ b/framework/Data/Common/Mssql/TMssqlMetaData.php
@@ -18,8 +18,6 @@ use Prado\Data\Common\TDbMetaData;
 use Prado\Exceptions\TDbException;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbMetaData');
-Prado::using('System.Data.Common.Mssql.TMssqlTableInfo');
 
 /**
  * TMssqlMetaData loads MSSQL database table and column information.
diff --git a/framework/Data/Common/Mssql/TMssqlTableColumn.php b/framework/Data/Common/Mssql/TMssqlTableColumn.php
index 2f75b5be..fbaddedf 100644
--- a/framework/Data/Common/Mssql/TMssqlTableColumn.php
+++ b/framework/Data/Common/Mssql/TMssqlTableColumn.php
@@ -17,7 +17,6 @@ namespace Prado\Data\Common\Mssql;
 use Prado\Data\Common\TDbTableColumn;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbTableColumn');
 
 /**
  * Describes the column metadata of the schema for a Mssql database table.
diff --git a/framework/Data/Common/Mssql/TMssqlTableInfo.php b/framework/Data/Common/Mssql/TMssqlTableInfo.php
index 187eac78..93bef5bf 100644
--- a/framework/Data/Common/Mssql/TMssqlTableInfo.php
+++ b/framework/Data/Common/Mssql/TMssqlTableInfo.php
@@ -17,8 +17,6 @@ namespace Prado\Data\Common\Mssql;
 use Prado\Data\Common\TDbTableInfo;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbTableInfo');
-Prado::using('System.Data.Common.Mssql.TMssqlTableColumn');
 
 /**
  * TMssqlTableInfo class provides additional table information for Mssql database.
@@ -60,7 +58,6 @@ class TMssqlTableInfo extends TDbTableInfo
 	 */
 	public function createCommandBuilder($connection)
 	{
-		Prado::using('System.Data.Common.Mssql.TMssqlCommandBuilder');
 		return new TMssqlCommandBuilder($connection,$this);
 	}
 }
diff --git a/framework/Data/Common/Mysql/TMysqlCommandBuilder.php b/framework/Data/Common/Mysql/TMysqlCommandBuilder.php
index a4f717e0..f2b00e37 100644
--- a/framework/Data/Common/Mysql/TMysqlCommandBuilder.php
+++ b/framework/Data/Common/Mysql/TMysqlCommandBuilder.php
@@ -14,7 +14,6 @@ namespace Prado\Data\Common\Mysql;
 use Prado\Data\Common\TDbCommandBuilder;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbCommandBuilder');
 
 /**
  * TMysqlCommandBuilder implements default TDbCommandBuilder
diff --git a/framework/Data/Common/Mysql/TMysqlMetaData.php b/framework/Data/Common/Mysql/TMysqlMetaData.php
index f2754181..55193a05 100644
--- a/framework/Data/Common/Mysql/TMysqlMetaData.php
+++ b/framework/Data/Common/Mysql/TMysqlMetaData.php
@@ -20,8 +20,6 @@ use Prado\Data\TDbColumnCaseMode;
 use Prado\Exceptions\TDbException;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbMetaData');
-Prado::using('System.Data.Common.Mysql.TMysqlTableInfo');
 
 /**
  * TMysqlMetaData loads Mysql version 4.1.x and 5.x database table and column information.
diff --git a/framework/Data/Common/Mysql/TMysqlTableColumn.php b/framework/Data/Common/Mysql/TMysqlTableColumn.php
index ef1e35c9..3158cacf 100644
--- a/framework/Data/Common/Mysql/TMysqlTableColumn.php
+++ b/framework/Data/Common/Mysql/TMysqlTableColumn.php
@@ -17,7 +17,6 @@ namespace Prado\Data\Common\Mysql;
 use Prado\Data\Common\TDbTableColumn;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbTableColumn');
 
 /**
  * Describes the column metadata of the schema for a Mysql database table.
diff --git a/framework/Data/Common/Mysql/TMysqlTableInfo.php b/framework/Data/Common/Mysql/TMysqlTableInfo.php
index 896f4e59..4be9fb62 100644
--- a/framework/Data/Common/Mysql/TMysqlTableInfo.php
+++ b/framework/Data/Common/Mysql/TMysqlTableInfo.php
@@ -17,8 +17,6 @@ namespace Prado\Data\Common\Mysql;
 use Prado\Data\Common\TDbTableInfo;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbTableInfo');
-Prado::using('System.Data.Common.Mysql.TMysqlTableColumn');
 
 /**
  * TMysqlTableInfo class provides additional table information for MySQL database.
@@ -54,7 +52,6 @@ class TMysqlTableInfo extends TDbTableInfo
 	 */
 	public function createCommandBuilder($connection)
 	{
-		Prado::using('System.Data.Common.Mysql.TMysqlCommandBuilder');
 		return new TMysqlCommandBuilder($connection,$this);
 	}
 }
diff --git a/framework/Data/Common/Oracle/TOracleCommandBuilder.php b/framework/Data/Common/Oracle/TOracleCommandBuilder.php
index d9b2b274..f307b46c 100644
--- a/framework/Data/Common/Oracle/TOracleCommandBuilder.php
+++ b/framework/Data/Common/Oracle/TOracleCommandBuilder.php
@@ -15,7 +15,6 @@ namespace Prado\Data\Common\Oracle;
 use Prado\Data\Common\TDbCommandBuilder;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbCommandBuilder');
 
 /**
  * TOracleCommandBuilder provides specifics methods to create limit/offset query commands
diff --git a/framework/Data/Common/Oracle/TOracleMetaData.php b/framework/Data/Common/Oracle/TOracleMetaData.php
index 043bf151..fe8b5333 100644
--- a/framework/Data/Common/Oracle/TOracleMetaData.php
+++ b/framework/Data/Common/Oracle/TOracleMetaData.php
@@ -19,9 +19,6 @@ use Prado\Data\Common\TDbMetaData;
 use Prado\Exceptions\TDbException;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbMetaData');
-Prado::using('System.Data.Common.Oracle.TOracleTableInfo');
-Prado::using('System.Data.Common.Oracle.TOracleTableColumn');
 
 /**
  * TOracleMetaData loads Oracle database table and column information.
diff --git a/framework/Data/Common/Oracle/TOracleTableColumn.php b/framework/Data/Common/Oracle/TOracleTableColumn.php
index 9b9c0ce0..4dc7e457 100644
--- a/framework/Data/Common/Oracle/TOracleTableColumn.php
+++ b/framework/Data/Common/Oracle/TOracleTableColumn.php
@@ -17,7 +17,6 @@ namespace Prado\Data\Common\Oracle;
 use Prado\Data\Common\TDbTableColumn;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbTableColumn');
 
 /**
  * Describes the column metadata of the schema for a PostgreSQL database table.
diff --git a/framework/Data/Common/Oracle/TOracleTableInfo.php b/framework/Data/Common/Oracle/TOracleTableInfo.php
index 4f163024..72aba2d6 100644
--- a/framework/Data/Common/Oracle/TOracleTableInfo.php
+++ b/framework/Data/Common/Oracle/TOracleTableInfo.php
@@ -51,7 +51,6 @@ class TOracleTableInfo extends \Prado\TComponent
 	 */
 	public function createCommandBuilder($connection)
 	{
-		Prado::using('System.Data.Common.Oracle.TOracleCommandBuilder');
 		return new TOracleCommandBuilder($connection,$this);
 	}
 
diff --git a/framework/Data/Common/Pgsql/TPgsqlCommandBuilder.php b/framework/Data/Common/Pgsql/TPgsqlCommandBuilder.php
index 10905a4b..6c8ef7b9 100644
--- a/framework/Data/Common/Pgsql/TPgsqlCommandBuilder.php
+++ b/framework/Data/Common/Pgsql/TPgsqlCommandBuilder.php
@@ -14,7 +14,6 @@ namespace Prado\Data\Common\Pgsql;
 use Prado\Data\Common\TDbCommandBuilder;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbCommandBuilder');
 
 /**
  * TPgsqlCommandBuilder provides specifics methods to create limit/offset query commands
diff --git a/framework/Data/Common/Pgsql/TPgsqlMetaData.php b/framework/Data/Common/Pgsql/TPgsqlMetaData.php
index e848d6af..82b073d1 100644
--- a/framework/Data/Common/Pgsql/TPgsqlMetaData.php
+++ b/framework/Data/Common/Pgsql/TPgsqlMetaData.php
@@ -18,8 +18,6 @@ use Prado\Data\Common\TDbMetaData;
 use Prado\Exceptions\TDbException;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbMetaData');
-Prado::using('System.Data.Common.Pgsql.TPgsqlTableInfo');
 
 /**
  * TPgsqlMetaData loads PostgreSQL database table and column information.
diff --git a/framework/Data/Common/Pgsql/TPgsqlTableColumn.php b/framework/Data/Common/Pgsql/TPgsqlTableColumn.php
index 98b1f296..ab4497e5 100644
--- a/framework/Data/Common/Pgsql/TPgsqlTableColumn.php
+++ b/framework/Data/Common/Pgsql/TPgsqlTableColumn.php
@@ -17,7 +17,6 @@ namespace Prado\Data\Common\Pgsql;
 use Prado\Data\Common\TDbTableColumn;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbTableColumn');
 
 /**
  * Describes the column metadata of the schema for a PostgreSQL database table.
diff --git a/framework/Data/Common/Pgsql/TPgsqlTableInfo.php b/framework/Data/Common/Pgsql/TPgsqlTableInfo.php
index 475b737f..60f0ef55 100644
--- a/framework/Data/Common/Pgsql/TPgsqlTableInfo.php
+++ b/framework/Data/Common/Pgsql/TPgsqlTableInfo.php
@@ -17,8 +17,6 @@ namespace Prado\Data\Common\Pgsql;
 use Prado\Data\Common\TDbTableInfo;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbTableInfo');
-Prado::using('System.Data.Common.Pgsql.TPgsqlTableColumn');
 
 /**
  * TPgsqlTableInfo class provides additional table information for PostgreSQL database.
@@ -54,7 +52,6 @@ class TPgsqlTableInfo extends TDbTableInfo
 	 */
 	public function createCommandBuilder($connection)
 	{
-		Prado::using('System.Data.Common.Pgsql.TPgsqlCommandBuilder');
 		return new TPgsqlCommandBuilder($connection,$this);
 	}
 }
diff --git a/framework/Data/Common/Sqlite/TSqliteCommandBuilder.php b/framework/Data/Common/Sqlite/TSqliteCommandBuilder.php
index 8b840207..7d7d931e 100644
--- a/framework/Data/Common/Sqlite/TSqliteCommandBuilder.php
+++ b/framework/Data/Common/Sqlite/TSqliteCommandBuilder.php
@@ -14,7 +14,6 @@ namespace Prado\Data\Common\Sqlite;
 use Prado\Data\Common\TDbCommandBuilder;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbCommandBuilder');
 
 /**
  * TSqliteCommandBuilder provides specifics methods to create limit/offset query commands
diff --git a/framework/Data/Common/Sqlite/TSqliteMetaData.php b/framework/Data/Common/Sqlite/TSqliteMetaData.php
index 4e0fdaed..ae1c043c 100644
--- a/framework/Data/Common/Sqlite/TSqliteMetaData.php
+++ b/framework/Data/Common/Sqlite/TSqliteMetaData.php
@@ -18,8 +18,6 @@ use Prado\Data\Common\TDbMetaData;
 use Prado\Exceptions\TDbException;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbMetaData');
-Prado::using('System.Data.Common.Sqlite.TSqliteTableInfo');
 
 /**
  * TSqliteMetaData loads SQLite database table and column information.
diff --git a/framework/Data/Common/Sqlite/TSqliteTableColumn.php b/framework/Data/Common/Sqlite/TSqliteTableColumn.php
index daf427f7..af6c4e91 100644
--- a/framework/Data/Common/Sqlite/TSqliteTableColumn.php
+++ b/framework/Data/Common/Sqlite/TSqliteTableColumn.php
@@ -17,7 +17,6 @@ namespace Prado\Data\Common\Sqlite;
 use Prado\Data\Common\TDbTableColumn;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbTableColumn');
 
 /**
  * Describes the column metadata of the schema for a PostgreSQL database table.
diff --git a/framework/Data/Common/Sqlite/TSqliteTableInfo.php b/framework/Data/Common/Sqlite/TSqliteTableInfo.php
index f0143810..aa2272af 100644
--- a/framework/Data/Common/Sqlite/TSqliteTableInfo.php
+++ b/framework/Data/Common/Sqlite/TSqliteTableInfo.php
@@ -17,8 +17,6 @@ namespace Prado\Data\Common\Sqlite;
 use Prado\Data\Common\TDbTableInfo;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbTableInfo');
-Prado::using('System.Data.Common.Sqlite.TSqliteTableColumn');
 
 /**
  * TSqliteTableInfo class provides additional table information for PostgreSQL database.
@@ -35,7 +33,6 @@ class TSqliteTableInfo extends TDbTableInfo
 	 */
 	public function createCommandBuilder($connection)
 	{
-		Prado::using('System.Data.Common.Sqlite.TSqliteCommandBuilder');
 		return new TSqliteCommandBuilder($connection,$this);
 	}
 
diff --git a/framework/Data/Common/TDbMetaData.php b/framework/Data/Common/TDbMetaData.php
index 4f20397c..13839728 100644
--- a/framework/Data/Common/TDbMetaData.php
+++ b/framework/Data/Common/TDbMetaData.php
@@ -66,26 +66,20 @@ abstract class TDbMetaData extends \Prado\TComponent
 		switch(strtolower($driver))
 		{
 			case 'pgsql':
-				Prado::using('System.Data.Common.Pgsql.TPgsqlMetaData');
 				return new TPgsqlMetaData($conn);
 			case 'mysqli':
 			case 'mysql':
-				Prado::using('System.Data.Common.Mysql.TMysqlMetaData');
 				return new TMysqlMetaData($conn);
 			case 'sqlite': //sqlite 3
 			case 'sqlite2': //sqlite 2
-				Prado::using('System.Data.Common.Sqlite.TSqliteMetaData');
 				return new TSqliteMetaData($conn);
 			case 'mssql': // Mssql driver on windows hosts
 			case 'sqlsrv': // sqlsrv driver on windows hosts
 			case 'dblib': // dblib drivers on linux (and maybe others os) hosts
-				Prado::using('System.Data.Common.Mssql.TMssqlMetaData');
 				return new TMssqlMetaData($conn);
 			case 'oci':
-				Prado::using('System.Data.Common.Oracle.TOracleMetaData');
 				return new TOracleMetaData($conn);
 //			case 'ibm':
-//				Prado::using('System.Data.Common.IbmDb2.TIbmDb2MetaData');
 //				return new TIbmDb2MetaData($conn);
 			default:
 				throw new TDbException('ar_invalid_database_driver',$driver);
diff --git a/framework/Data/Common/TDbTableInfo.php b/framework/Data/Common/TDbTableInfo.php
index 69fa50f0..e9a16a65 100644
--- a/framework/Data/Common/TDbTableInfo.php
+++ b/framework/Data/Common/TDbTableInfo.php
@@ -56,7 +56,6 @@ class TDbTableInfo extends \Prado\TComponent
 	 */
 	public function createCommandBuilder($connection)
 	{
-		Prado::using('System.Data.Common.TDbCommandBuilder');
 		return new TDbCommandBuilder($connection,$this);
 	}
 
diff --git a/framework/Data/DataGateway/TTableGateway.php b/framework/Data/DataGateway/TTableGateway.php
index db299a1d..41cab6fd 100644
--- a/framework/Data/DataGateway/TTableGateway.php
+++ b/framework/Data/DataGateway/TTableGateway.php
@@ -19,8 +19,6 @@ use Prado\Data\Common\TDbTableInfo;
 use Prado\Exceptions\TDbException;
 use Prado\Prado;
 
-Prado::using('System.Data.DataGateway.TSqlCriteria');
-Prado::using('System.Data.DataGateway.TDataGatewayCommand');
 
 /**
  * TTableGateway class provides several find methods to get data from the database
@@ -118,7 +116,6 @@ class TTableGateway extends \Prado\TComponent
 	 */
 	protected function setTableName($tableName)
 	{
-		Prado::using('System.Data.Common.TDbMetaData');
 		$meta = TDbMetaData::getInstance($this->getDbConnection());
 		$this->initCommandBuilder($meta->createCommandBuilder($tableName));
 	}
diff --git a/framework/Data/SqlMap/Configuration/TSqlMapXmlConfigBuilder.php b/framework/Data/SqlMap/Configuration/TSqlMapXmlConfigBuilder.php
index 765e0d9f..bc6f9f4b 100644
--- a/framework/Data/SqlMap/Configuration/TSqlMapXmlConfigBuilder.php
+++ b/framework/Data/SqlMap/Configuration/TSqlMapXmlConfigBuilder.php
@@ -14,7 +14,6 @@ namespace Prado\Data\SqlMap\Configuration;
 use Prado\Data\SqlMap\DataMapper\TSqlMapConfigurationException;
 use Prado\Prado;
 
-Prado::using('System.Data.SqlMap.Configuration.TSqlMapStatement');
 
 /**
  * TSqlMapXmlConfig class file.
diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php b/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php
index 248aaa9b..d54e41d7 100644
--- a/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php
+++ b/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php
@@ -16,7 +16,6 @@ use Prado\Collections\TPagedList;
 use Prado\Data\SqlMap\Statements\IMappedStatement;
 use Prado\Prado;
 
-Prado::using('System.Collections.TPagedList');
 
 /**
  * TSqlMapPagedList implements a list with paging functionality that retrieves
diff --git a/framework/Data/SqlMap/Statements/TPreparedCommand.php b/framework/Data/SqlMap/Statements/TPreparedCommand.php
index 9ddfc67e..cee5dd70 100644
--- a/framework/Data/SqlMap/Statements/TPreparedCommand.php
+++ b/framework/Data/SqlMap/Statements/TPreparedCommand.php
@@ -16,8 +16,6 @@ use Prado\Data\Common\TDbMetaData;
 use Prado\Data\SqlMap\TSqlMapManager;
 use Prado\Prado;
 
-Prado::using('System.Data.Common.TDbMetaData');
-Prado::using('System.Data.Common.TDbCommandBuilder');
 
 /**
  * TPreparedCommand class.
diff --git a/framework/Data/SqlMap/TSqlMapConfig.php b/framework/Data/SqlMap/TSqlMapConfig.php
index 299c57ff..6f422291 100644
--- a/framework/Data/SqlMap/TSqlMapConfig.php
+++ b/framework/Data/SqlMap/TSqlMapConfig.php
@@ -17,7 +17,6 @@ use Prado\Prado;
 use Prado\TApplicationMode;
 use Prado\TPropertyValue;
 
-Prado::using('System.Data.TDataSourceConfig');
 
 /**
  * TSqlMapConfig module configuration class.
@@ -67,7 +66,6 @@ class TSqlMapConfig extends TDataSourceConfig
 	 * @since 3.1.7
 	 */
 	public function getSqlMapManager() {
-		Prado::using('System.Data.SqlMap.TSqlMapManager');
 		if(($manager = $this->loadCachedSqlMapManager())===null)
 		{
 			$manager = new TSqlMapManager($this->getDbConnection());
diff --git a/framework/Data/SqlMap/TSqlMapGateway.php b/framework/Data/SqlMap/TSqlMapGateway.php
index b52fda86..18927488 100644
--- a/framework/Data/SqlMap/TSqlMapGateway.php
+++ b/framework/Data/SqlMap/TSqlMapGateway.php
@@ -14,7 +14,6 @@ namespace Prado\Data\SqlMap;
 use Prado\Data\SqlMap\DataMapper\TSqlMapPagedList;
 use Prado\Prado;
 
-Prado::using('System.Data.SqlMap.TSqlMapManager');
 
 /**
  * DataMapper client, a fascade to provide access the rest of the DataMapper
diff --git a/framework/Data/SqlMap/TSqlMapManager.php b/framework/Data/SqlMap/TSqlMapManager.php
index e1331bef..f55afe14 100644
--- a/framework/Data/SqlMap/TSqlMapManager.php
+++ b/framework/Data/SqlMap/TSqlMapManager.php
@@ -24,15 +24,6 @@ use Prado\Data\SqlMap\DataMapper\TSqlMapUndefinedException;
 use Prado\Data\SqlMap\Statements\IMappedStatement;
 use Prado\Prado;
 
-Prado::using('System.Data.SqlMap.TSqlMapGateway');
-Prado::using('System.Data.SqlMap.DataMapper.TSqlMapException');
-Prado::using('System.Data.SqlMap.DataMapper.TSqlMapTypeHandlerRegistry');
-Prado::using('System.Data.SqlMap.DataMapper.TSqlMapCache');
-Prado::using('System.Data.SqlMap.Configuration.TSqlMapStatement');
-Prado::using('System.Data.SqlMap.Configuration.*');
-Prado::using('System.Data.SqlMap.DataMapper.*');
-Prado::using('System.Data.SqlMap.Statements.*');
-Prado::using('System.Caching.TCache');
 
 
 /**
diff --git a/framework/Data/TDataSourceConfig.php b/framework/Data/TDataSourceConfig.php
index b9c11b54..c29dfd9e 100644
--- a/framework/Data/TDataSourceConfig.php
+++ b/framework/Data/TDataSourceConfig.php
@@ -15,8 +15,6 @@ use Prado\Exceptions\TConfigurationException;
 use Prado\Prado;
 use Prado\TApplication;
 
-Prado::using('System.Data.TDbConnection');
-
 /**
  * TDataSourceConfig module class provides <module> configuration for database connections.
  *
diff --git a/framework/Data/TDbConnection.php b/framework/Data/TDbConnection.php
index e807d618..4a46daa3 100644
--- a/framework/Data/TDbConnection.php
+++ b/framework/Data/TDbConnection.php
@@ -18,8 +18,6 @@ use Prado\Exceptions\TDbException;
 use Prado\Prado;
 use Prado\TPropertyValue;
 
-Prado::using('System.Data.TDbTransaction');
-Prado::using('System.Data.TDbCommand');
 
 /**
  * TDbConnection class
@@ -441,7 +439,6 @@ class TDbConnection extends \Prado\TComponent
 	{
 		if($this->_dbMeta===null)
 		{
-			Prado::using('System.Data.Common.TDbMetaData');
 			$this->_dbMeta = TDbMetaData::getInstance($this);
 		}
 		return $this->_dbMeta;
diff --git a/framework/Data/TDbTransaction.php b/framework/Data/TDbTransaction.php
index 0226b4ba..bc66c1c9 100644
--- a/framework/Data/TDbTransaction.php
+++ b/framework/Data/TDbTransaction.php
@@ -15,7 +15,6 @@ use Prado\Exceptions\TDbException;
 use Prado\Prado;
 use Prado\TPropertyValue;
 
-Prado::using('System.Data.TDbDataReader');
 
 /**
  * TDbTransaction class.