diff --git a/src/Dibi/Drivers/MySqlReflector.php b/src/Dibi/Drivers/MySqlReflector.php
index 7886d92c..97c3280b 100644
--- a/src/Dibi/Drivers/MySqlReflector.php
+++ b/src/Dibi/Drivers/MySqlReflector.php
@@ -34,11 +34,6 @@ class MySqlReflector implements Dibi\Reflector
 	 */
 	public function getTables()
 	{
-		/*$this->query("
-			SELECT TABLE_NAME as name, TABLE_TYPE = 'VIEW' as view
-			FROM INFORMATION_SCHEMA.TABLES
-			WHERE TABLE_SCHEMA = DATABASE()
-		");*/
 		$res = $this->driver->query('SHOW FULL TABLES');
 		$tables = [];
 		while ($row = $res->fetch(FALSE)) {
@@ -58,12 +53,6 @@ class MySqlReflector implements Dibi\Reflector
 	 */
 	public function getColumns($table)
 	{
-		/*$table = $this->escapeText($table);
-		$this->query("
-			SELECT *
-			FROM INFORMATION_SCHEMA.COLUMNS
-			WHERE TABLE_NAME = $table AND TABLE_SCHEMA = DATABASE()
-		");*/
 		$res = $this->driver->query("SHOW FULL COLUMNS FROM {$this->driver->escapeIdentifier($table)}");
 		$columns = [];
 		while ($row = $res->fetch(TRUE)) {
@@ -91,13 +80,6 @@ class MySqlReflector implements Dibi\Reflector
 	 */
 	public function getIndexes($table)
 	{
-		/*$table = $this->escapeText($table);
-		$this->query("
-			SELECT *
-			FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE
-			WHERE TABLE_NAME = $table AND TABLE_SCHEMA = DATABASE()
-			AND REFERENCED_COLUMN_NAME IS NULL
-		");*/
 		$res = $this->driver->query("SHOW INDEX FROM {$this->driver->escapeIdentifier($table)}");
 		$indexes = [];
 		while ($row = $res->fetch(TRUE)) {
diff --git a/src/Dibi/Drivers/SqliteReflector.php b/src/Dibi/Drivers/SqliteReflector.php
index eeccea83..f1f9749f 100644
--- a/src/Dibi/Drivers/SqliteReflector.php
+++ b/src/Dibi/Drivers/SqliteReflector.php
@@ -55,12 +55,6 @@ class SqliteReflector implements Dibi\Reflector
 	 */
 	public function getColumns($table)
 	{
-		$meta = $this->driver->query("
-			SELECT sql FROM sqlite_master WHERE type = 'table' AND name = {$this->driver->escapeText($table)}
-			UNION ALL
-			SELECT sql FROM sqlite_temp_master WHERE type = 'table' AND name = {$this->driver->escapeText($table)}
-		")->fetch(TRUE);
-
 		$res = $this->driver->query("PRAGMA table_info({$this->driver->escapeIdentifier($table)})");
 		$columns = [];
 		while ($row = $res->fetch(TRUE)) {
diff --git a/src/Dibi/Translator.php b/src/Dibi/Translator.php
index 7bc541ca..4837d879 100644
--- a/src/Dibi/Translator.php
+++ b/src/Dibi/Translator.php
@@ -217,7 +217,7 @@ final class Translator
 								$v = $this->formatValue($v, FALSE);
 								$vx[] = $k . ($v === 'NULL' ? 'IS ' : '= ') . $v;
 
-							} elseif ($pair[1] === 'ex') { // TODO: this will be removed
+							} elseif ($pair[1] === 'ex') {
 								$vx[] = $k . $this->formatValue($v, 'ex');
 
 							} else {
diff --git a/src/Dibi/dibi.php b/src/Dibi/dibi.php
index 560d417b..f76d87c2 100644
--- a/src/Dibi/dibi.php
+++ b/src/Dibi/dibi.php
@@ -369,18 +369,6 @@ class dibi
 	}
 
 
-	/**
-	 * Replacement for majority of dibi::methods() in future.
-	 */
-	public static function __callStatic($name, $args)
-	{
-		//if ($name = 'select', 'update', ...') {
-		// return self::command()->$name($args);
-		//}
-		return call_user_func_array([self::getConnection(), $name], $args);
-	}
-
-
 	/********************* fluent SQL builders ****************d*g**/