diff --git a/src/Dibi/DataSource.php b/src/Dibi/DataSource.php
index 7951de8e..15365796 100644
--- a/src/Dibi/DataSource.php
+++ b/src/Dibi/DataSource.php
@@ -224,7 +224,7 @@ class DataSource implements IDataSource
 	/**
 	 * Returns this data source wrapped in DataSource object.
 	 */
-	public function toDataSource(): DataSource
+	public function toDataSource(): self
 	{
 		return new self($this->__toString(), $this->connection);
 	}
diff --git a/src/Dibi/Drivers/SqlsrvDriver.php b/src/Dibi/Drivers/SqlsrvDriver.php
index 0a2588c8..e2703777 100644
--- a/src/Dibi/Drivers/SqlsrvDriver.php
+++ b/src/Dibi/Drivers/SqlsrvDriver.php
@@ -10,7 +10,6 @@ declare(strict_types=1);
 namespace Dibi\Drivers;
 
 use Dibi;
-use Dibi\Connection;
 use Dibi\Helpers;
 
 
diff --git a/src/Dibi/Reflection/Column.php b/src/Dibi/Reflection/Column.php
index e2e963e2..10a4de56 100644
--- a/src/Dibi/Reflection/Column.php
+++ b/src/Dibi/Reflection/Column.php
@@ -10,7 +10,6 @@ declare(strict_types=1);
 namespace Dibi\Reflection;
 
 use Dibi;
-use Dibi\Type;
 
 
 /**