diff --git a/src/main/java/org/utplsql/cli/Cli.java b/src/main/java/org/utplsql/cli/Cli.java
index a2e9202..60bed1f 100644
--- a/src/main/java/org/utplsql/cli/Cli.java
+++ b/src/main/java/org/utplsql/cli/Cli.java
@@ -1,7 +1,6 @@
 package org.utplsql.cli;
 
 import com.beust.jcommander.JCommander;
-import com.beust.jcommander.Parameter;
 import com.beust.jcommander.ParameterException;
 
 public class Cli {
diff --git a/src/main/java/org/utplsql/cli/CliVersionInfo.java b/src/main/java/org/utplsql/cli/CliVersionInfo.java
index c7ab283..695bd91 100644
--- a/src/main/java/org/utplsql/cli/CliVersionInfo.java
+++ b/src/main/java/org/utplsql/cli/CliVersionInfo.java
@@ -6,7 +6,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.net.URISyntaxException;
 
 /** This class is getting updated automatically by the build process.
  * Please do not update its constants manually cause they will be overwritten.
diff --git a/src/main/java/org/utplsql/cli/DataSourceProvider.java b/src/main/java/org/utplsql/cli/DataSourceProvider.java
index 394b432..7fee23e 100644
--- a/src/main/java/org/utplsql/cli/DataSourceProvider.java
+++ b/src/main/java/org/utplsql/cli/DataSourceProvider.java
@@ -1,7 +1,6 @@
 package org.utplsql.cli;
 
 import com.zaxxer.hikari.HikariDataSource;
-import org.utplsql.api.EnvironmentVariableUtil;
 import org.utplsql.cli.datasource.TestedDataSourceProvider;
 
 import javax.sql.DataSource;
diff --git a/src/main/java/org/utplsql/cli/VersionInfoCommand.java b/src/main/java/org/utplsql/cli/VersionInfoCommand.java
index b391df8..22f70d4 100644
--- a/src/main/java/org/utplsql/cli/VersionInfoCommand.java
+++ b/src/main/java/org/utplsql/cli/VersionInfoCommand.java
@@ -3,10 +3,8 @@
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
-import org.utplsql.api.DBHelper;
 import org.utplsql.api.JavaApiVersionInfo;
 import org.utplsql.api.Version;
-import org.utplsql.api.db.DatabaseInformation;
 import org.utplsql.api.db.DefaultDatabaseInformation;
 import org.utplsql.api.exception.UtPLSQLNotInstalledException;
 
diff --git a/src/test/java/org/utplsql/cli/CliVersionInfoTest.java b/src/test/java/org/utplsql/cli/CliVersionInfoTest.java
index fc1957b..40fab0c 100644
--- a/src/test/java/org/utplsql/cli/CliVersionInfoTest.java
+++ b/src/test/java/org/utplsql/cli/CliVersionInfoTest.java
@@ -1,7 +1,6 @@
 package org.utplsql.cli;
 
 import org.junit.jupiter.api.Test;
-import org.utplsql.api.JavaApiVersionInfo;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
diff --git a/src/test/java/org/utplsql/cli/DataSourceProviderIT.java b/src/test/java/org/utplsql/cli/DataSourceProviderIT.java
index 2aab023..cfff041 100644
--- a/src/test/java/org/utplsql/cli/DataSourceProviderIT.java
+++ b/src/test/java/org/utplsql/cli/DataSourceProviderIT.java
@@ -4,15 +4,12 @@
 import org.utplsql.cli.datasource.TestedDataSourceProvider;
 
 import javax.sql.DataSource;
-import java.io.IOException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 class DataSourceProviderIT {