phpmyadmin
diff --git a/README.md b/README.md
@@ -34,26 +34,26 @@ The API documentation is available at
 Command line utility to syntax highlight SQL query:
 
 ```sh
-./vendor/bin/highlight-query --query "SELECT 1"
+./vendor/bin/sql-parser --highlight --query "SELECT 1"
 ```
 
 Command line utility to lint SQL query:
 
 ```sh
-./vendor/bin/lint-query --query "SELECT 1"
+./vendor/bin/sql-parser --lint --query "SELECT 1"
 ```
 
 Command line utility to tokenize SQL query:
 
 ```sh
-./vendor/bin/tokenize-query --query "SELECT 1"
+./vendor/bin/sql-parser --tokenize --query "SELECT 1"
 ```
 
 All commands are able to parse input from stdin (standard in), such as:
 
 ```sh
-echo "SELECT 1" | ./vendor/bin/highlight-query
-cat example.sql | ./vendor/bin/lint-query
+echo "SELECT 1" | ./vendor/bin/sql-parser --highlight
+cat example.sql | ./vendor/bin/sql-parser --lint
 ```
 
 ### Formatting SQL query
@@ -116,7 +116,7 @@ The locale is automatically detected from your environment, you can also set a d
 **From cli**:
 
 ```sh
-LC_ALL=pl ./vendor/bin/lint-query --query "SELECT 1"
+LC_ALL=pl ./vendor/bin/sql-parser --lint --query "SELECT 1"
 ```
 
 **From php**:

diff --git a/bin/highlight-query b/bin/highlight-query
diff --git a/bin/lint-query b/bin/lint-query
diff --git a/bin/tokenize-query b/bin/tokenize-query
diff --git a/composer.json b/composer.json
@@ -45,10 +45,7 @@
         "phpmyadmin/motranslator": "Translate messages to your favorite locale"
     },
     "bin": [
-        "bin/highlight-query",
-        "bin/lint-query",
-        "bin/sql-parser",
-        "bin/tokenize-query"
+        "bin/sql-parser"
     ],
     "autoload": {
         "psr-4": {

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -3,10 +3,7 @@ includes:
 parameters:
     level: max
     paths:
-        - bin/highlight-query
-        - bin/lint-query
         - bin/sql-parser
-        - bin/tokenize-query
         - src
         - tests
         - tools

diff --git a/psalm.xml b/psalm.xml
@@ -10,10 +10,7 @@
     findUnusedCode="true"
 >
     <projectFiles>
-        <file name="bin/highlight-query"/>
-        <file name="bin/lint-query"/>
         <file name="bin/sql-parser"/>
-        <file name="bin/tokenize-query"/>
         <directory name="src"/>
         <directory name="tests"/>
         <directory name="tools"/>

diff --git a/src/Utils/CLI.php b/src/Utils/CLI.php
@@ -33,21 +33,21 @@ public function run(): int
         $params = $this->getopt('', ['lint', 'highlight', 'tokenize']);
         if ($params !== false) {
             if (isset($params['lint'])) {
-                return $this->runLint(false);
+                return $this->runLint();
             }
 
             if (isset($params['highlight'])) {
-                return $this->runHighlight(false);
+                return $this->runHighlight();
             }
 
             if (isset($params['tokenize'])) {
-                return $this->runTokenize(false);
+                return $this->runTokenize();
             }
         }
 
-        $this->usageLint(false);
-        $this->usageHighlight(false);
-        $this->usageTokenize(false);
+        $this->usageLint();
+        $this->usageHighlight();
+        $this->usageTokenize();
 
         return 1;
     }
@@ -68,9 +68,9 @@ public function mergeLongOpts(array &$params, array &$longopts): void
         }
     }
 
-    public function usageHighlight(bool $isStandalone = true): void
+    public function usageHighlight(): void
     {
-        $command = $isStandalone ? 'highlight-query' : 'sql-parser --highlight';
+        $command = 'sql-parser --highlight';
 
         echo 'Usage: ' . $command . ' --query SQL [--format html|cli|text] [--ansi]' . "\n";
         echo '       cat file.sql | ' . $command . "\n";
@@ -114,15 +114,15 @@ public function parseHighlight(): array|false
         return $params;
     }
 
-    public function runHighlight(bool $isStandalone = true): int
+    public function runHighlight(): int
     {
         $params = $this->parseHighlight();
         if ($params === false) {
             return 1;
         }
 
         if (isset($params['h'])) {
-            $this->usageHighlight($isStandalone);
+            $this->usageHighlight();
 
             return 0;
         }
@@ -150,14 +150,14 @@ public function runHighlight(bool $isStandalone = true): int
         }
 
         echo "ERROR: Missing parameters!\n";
-        $this->usageHighlight($isStandalone);
+        $this->usageHighlight();
 
         return 1;
     }
 
-    public function usageLint(bool $isStandalone = true): void
+    public function usageLint(): void
     {
-        $command = $isStandalone ? 'lint-query' : 'sql-parser --lint';
+        $command = 'sql-parser --lint';
 
         echo 'Usage: ' . $command . ' --query SQL [--ansi]' . "\n";
         echo '       cat file.sql | ' . $command . "\n";
@@ -182,15 +182,15 @@ public function parseLint(): array|false
         return $params;
     }
 
-    public function runLint(bool $isStandalone = true): int
+    public function runLint(): int
     {
         $params = $this->parseLint();
         if ($params === false) {
             return 1;
         }
 
         if (isset($params['h'])) {
-            $this->usageLint($isStandalone);
+            $this->usageLint();
 
             return 0;
         }
@@ -227,14 +227,14 @@ public function runLint(bool $isStandalone = true): int
         }
 
         echo "ERROR: Missing parameters!\n";
-        $this->usageLint($isStandalone);
+        $this->usageLint();
 
         return 1;
     }
 
-    public function usageTokenize(bool $isStandalone = true): void
+    public function usageTokenize(): void
     {
-        $command = $isStandalone ? 'tokenize-query' : 'sql-parser --tokenize';
+        $command = 'sql-parser --tokenize';
 
         echo 'Usage: ' . $command . ' --query SQL [--ansi]' . "\n";
         echo '       cat file.sql | ' . $command . "\n";
@@ -258,15 +258,15 @@ public function parseTokenize(): array|false
         return $params;
     }
 
-    public function runTokenize(bool $isStandalone = true): int
+    public function runTokenize(): int
     {
         $params = $this->parseTokenize();
         if ($params === false) {
             return 1;
         }
 
         if (isset($params['h'])) {
-            $this->usageTokenize($isStandalone);
+            $this->usageTokenize();
 
             return 0;
         }
@@ -302,7 +302,7 @@ public function runTokenize(bool $isStandalone = true): int
         }
 
         echo "ERROR: Missing parameters!\n";
-        $this->usageTokenize($isStandalone);
+        $this->usageTokenize();
 
         return 1;
     }