diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/MongoJdbcConnection.scala b/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/MongoJdbcConnection.scala
index bb56717e..3f69d997 100644
--- a/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/MongoJdbcConnection.scala
+++ b/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/MongoJdbcConnection.scala
@@ -5,7 +5,6 @@ import dev.mongocamp.driver.mongodb.bson.BsonConverter
 import dev.mongocamp.driver.mongodb.database.DatabaseProvider
 import dev.mongocamp.driver.mongodb.jdbc.statement.MongoPreparedStatement
 
-import java.{ sql, util }
 import java.sql.{
   Blob,
   CallableStatement,
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/resultSet/MongoDbResultSet.scala b/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/resultSet/MongoDbResultSet.scala
index adaa69a4..57a713a2 100644
--- a/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/resultSet/MongoDbResultSet.scala
+++ b/src/main/scala/dev/mongocamp/driver/mongodb/jdbc/resultSet/MongoDbResultSet.scala
@@ -10,13 +10,12 @@ import org.mongodb.scala.documentToUntypedDocument
 
 import java.io.{ InputStream, Reader }
 import java.net.{ URI, URL }
-import java.{ sql, util }
+import java.nio.charset.StandardCharsets
 import java.sql.{ Blob, Clob, Date, NClob, Ref, ResultSet, ResultSetMetaData, RowId, SQLException, SQLWarning, SQLXML, Statement, Time, Timestamp }
 import java.util.Calendar
 import java.{ sql, util }
 import javax.sql.rowset.serial.SerialBlob
 import scala.util.Try
-import java.nio.charset.StandardCharsets
 
 class MongoDbResultSet(collectionDao: MongoDAO[Document], data: List[Document], queryTimeOut: Int, keySet: List[String] = List.empty)
     extends ResultSet
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/lucene/LuceneQueryConverter.scala b/src/main/scala/dev/mongocamp/driver/mongodb/lucene/LuceneQueryConverter.scala
index df9fe8e5..b8e2355e 100644
--- a/src/main/scala/dev/mongocamp/driver/mongodb/lucene/LuceneQueryConverter.scala
+++ b/src/main/scala/dev/mongocamp/driver/mongodb/lucene/LuceneQueryConverter.scala
@@ -4,8 +4,8 @@ import com.typesafe.scalalogging.LazyLogging
 import dev.mongocamp.driver.mongodb._
 import dev.mongocamp.driver.mongodb.exception.NotSupportedException
 import org.apache.lucene.queryparser.classic.QueryParser
-import org.apache.lucene.search.BooleanClause.Occur
 import org.apache.lucene.search._
+import org.apache.lucene.search.BooleanClause.Occur
 import org.joda.time.DateTime
 import org.mongodb.scala.bson.conversions.Bson
 
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/operation/Search.scala b/src/main/scala/dev/mongocamp/driver/mongodb/operation/Search.scala
index be77392c..21dd281c 100644
--- a/src/main/scala/dev/mongocamp/driver/mongodb/operation/Search.scala
+++ b/src/main/scala/dev/mongocamp/driver/mongodb/operation/Search.scala
@@ -4,7 +4,6 @@ import dev.mongocamp.driver.mongodb._
 import dev.mongocamp.driver.mongodb.bson.BsonConverter._
 import dev.mongocamp.driver.mongodb.database.DatabaseProvider
 import io.circe.Decoder
-import net.sf.jsqlparser.statement.select.Skip
 import org.bson.BsonValue
 import org.mongodb.scala.bson.ObjectId
 import org.mongodb.scala.bson.conversions.Bson
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/pagination/MongoPaginatedFilter.scala b/src/main/scala/dev/mongocamp/driver/mongodb/pagination/MongoPaginatedFilter.scala
index 8f177847..9f5d1f04 100644
--- a/src/main/scala/dev/mongocamp/driver/mongodb/pagination/MongoPaginatedFilter.scala
+++ b/src/main/scala/dev/mongocamp/driver/mongodb/pagination/MongoPaginatedFilter.scala
@@ -1,7 +1,7 @@
 package dev.mongocamp.driver.mongodb.pagination
 
 import dev.mongocamp.driver.mongodb.exception.MongoCampPaginationException
-import dev.mongocamp.driver.mongodb.{ MongoDAO, _ }
+import dev.mongocamp.driver.mongodb.{ MongoDAO , _ }
 import io.circe.Decoder
 import io.circe.generic.auto._
 import org.mongodb.scala.bson.conversions.Bson
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/schema/SchemaExplorer.scala b/src/main/scala/dev/mongocamp/driver/mongodb/schema/SchemaExplorer.scala
index 2ae3dac1..57b8ea5e 100644
--- a/src/main/scala/dev/mongocamp/driver/mongodb/schema/SchemaExplorer.scala
+++ b/src/main/scala/dev/mongocamp/driver/mongodb/schema/SchemaExplorer.scala
@@ -1,11 +1,8 @@
 package dev.mongocamp.driver.mongodb.schema
 
-import better.files.Resource
 import dev.mongocamp.driver.mongodb._
 import dev.mongocamp.driver.mongodb.json._
 import io.circe.generic.auto._
-import io.circe.parser.decode
-import io.circe.syntax._
 import org.bson.conversions.Bson
 import org.mongodb.scala.{ documentToUntypedDocument, Document }
 
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/sync/MongoSyncOperation.scala b/src/main/scala/dev/mongocamp/driver/mongodb/sync/MongoSyncOperation.scala
index 75400907..5ae88670 100644
--- a/src/main/scala/dev/mongocamp/driver/mongodb/sync/MongoSyncOperation.scala
+++ b/src/main/scala/dev/mongocamp/driver/mongodb/sync/MongoSyncOperation.scala
@@ -3,16 +3,11 @@ package dev.mongocamp.driver.mongodb.sync
 import com.typesafe.scalalogging.LazyLogging
 import dev.mongocamp.driver.mongodb._
 import dev.mongocamp.driver.mongodb.database.{ ConfigHelper, DatabaseProvider }
-import dev.mongocamp.driver.mongodb.json._
 import dev.mongocamp.driver.mongodb.sync.SyncDirection.SyncDirection
 import dev.mongocamp.driver.mongodb.sync.SyncStrategy.SyncStrategy
-import io.circe.generic.auto._
-import io.circe.syntax._
 import org.mongodb.scala.bson.ObjectId
-import org.mongodb.scala.bson.conversions.Bson
-import org.mongodb.scala.{ documentToUntypedDocument, Document }
-import org.mongodb.scala.model.Projections._
 import org.mongodb.scala.model.Updates._
+import org.mongodb.scala.{ documentToUntypedDocument, Document }
 
 import java.util.Date
 
diff --git a/src/main/scala/dev/mongocamp/driver/mongodb/sync/MongoSyncer.scala b/src/main/scala/dev/mongocamp/driver/mongodb/sync/MongoSyncer.scala
index f59217c5..8fcf8ab7 100644
--- a/src/main/scala/dev/mongocamp/driver/mongodb/sync/MongoSyncer.scala
+++ b/src/main/scala/dev/mongocamp/driver/mongodb/sync/MongoSyncer.scala
@@ -2,8 +2,8 @@ package dev.mongocamp.driver.mongodb.sync
 
 import dev.mongocamp.driver.mongodb._
 import dev.mongocamp.driver.mongodb.database.{ DatabaseProvider, MongoConfig }
-import io.circe.HCursor
 import dev.mongocamp.driver.mongodb.json._
+import io.circe.HCursor
 import io.circe.generic.auto._
 
 import scala.collection.mutable
diff --git a/src/test/scala/dev/mongocamp/driver/mongodb/bson/DocumentHelperSuite.scala b/src/test/scala/dev/mongocamp/driver/mongodb/bson/DocumentHelperSuite.scala
index cbab1d5f..9785483b 100644
--- a/src/test/scala/dev/mongocamp/driver/mongodb/bson/DocumentHelperSuite.scala
+++ b/src/test/scala/dev/mongocamp/driver/mongodb/bson/DocumentHelperSuite.scala
@@ -1,6 +1,6 @@
 package dev.mongocamp.driver.mongodb.bson
 
-import better.files.{File, Resource}
+import better.files.{ File, Resource }
 
 /** Created by tom on 22.01.17.
   */
diff --git a/src/test/scala/dev/mongocamp/driver/mongodb/bson/JodaConverterPlugin.scala b/src/test/scala/dev/mongocamp/driver/mongodb/bson/JodaConverterPlugin.scala
index 8d435657..2ef66330 100644
--- a/src/test/scala/dev/mongocamp/driver/mongodb/bson/JodaConverterPlugin.scala
+++ b/src/test/scala/dev/mongocamp/driver/mongodb/bson/JodaConverterPlugin.scala
@@ -1,8 +1,8 @@
 package dev.mongocamp.driver.mongodb.bson
 
 import org.bson.BsonValue
-import org.joda.time.{DateTime, Duration}
-import org.mongodb.scala.bson.{BsonDateTime, BsonNull, BsonString}
+import org.joda.time.{ DateTime, Duration }
+import org.mongodb.scala.bson.{ BsonDateTime, BsonNull, BsonString }
 
 class JodaConverterPlugin extends AbstractConverterPlugin {
   override def customClassList: List[Class[_]] = List(classOf[DateTime], classOf[Duration])
diff --git a/src/test/scala/dev/mongocamp/driver/mongodb/dao/BookDAOSuite.scala b/src/test/scala/dev/mongocamp/driver/mongodb/dao/BookDAOSuite.scala
index dbb7736a..a270a598 100644
--- a/src/test/scala/dev/mongocamp/driver/mongodb/dao/BookDAOSuite.scala
+++ b/src/test/scala/dev/mongocamp/driver/mongodb/dao/BookDAOSuite.scala
@@ -1,8 +1,8 @@
 package dev.mongocamp.driver.mongodb.dao
 
 import better.files.{ File, Resource }
-import dev.mongocamp.driver.mongodb.Filter._
 import dev.mongocamp.driver.mongodb._
+import dev.mongocamp.driver.mongodb.Filter._
 import dev.mongocamp.driver.mongodb.database.DatabaseProvider
 import dev.mongocamp.driver.mongodb.test.TestDatabase.BookDAO
 import org.mongodb.scala.bson.conversions.Bson
diff --git a/src/test/scala/dev/mongocamp/driver/mongodb/dao/StudentDAOSuite.scala b/src/test/scala/dev/mongocamp/driver/mongodb/dao/StudentDAOSuite.scala
index edfacf34..b919525e 100644
--- a/src/test/scala/dev/mongocamp/driver/mongodb/dao/StudentDAOSuite.scala
+++ b/src/test/scala/dev/mongocamp/driver/mongodb/dao/StudentDAOSuite.scala
@@ -6,7 +6,6 @@ import dev.mongocamp.driver.mongodb.model.Student
 import dev.mongocamp.driver.mongodb.server.LocalServer
 import dev.mongocamp.driver.mongodb.test.UniversityDatabase
 import dev.mongocamp.driver.mongodb.test.UniversityDatabase.{ GradeDAO, StudentDAO }
-
 import munit.FunSuite
 
 class StudentDAOSuite extends FunSuite with MongoImplicits {
diff --git a/src/test/scala/dev/mongocamp/driver/mongodb/jdbc/LiquibaseJdbcSuite.scala b/src/test/scala/dev/mongocamp/driver/mongodb/jdbc/LiquibaseJdbcSuite.scala
index b43fa8cf..a80b5736 100644
--- a/src/test/scala/dev/mongocamp/driver/mongodb/jdbc/LiquibaseJdbcSuite.scala
+++ b/src/test/scala/dev/mongocamp/driver/mongodb/jdbc/LiquibaseJdbcSuite.scala
@@ -2,12 +2,12 @@ package dev.mongocamp.driver.mongodb.jdbc
 
 import com.typesafe.scalalogging.LazyLogging
 import dev.mongocamp.driver.mongodb.GenericObservable
+import dev.mongocamp.driver.mongodb.json._
 import dev.mongocamp.driver.mongodb.test.TestDatabase
 import liquibase.database.jvm.JdbcConnection
 import liquibase.exception.LiquibaseException
 import liquibase.resource.ClassLoaderResourceAccessor
-import liquibase.{Contexts, LabelExpression, Liquibase}
-import dev.mongocamp.driver.mongodb.json._
+import liquibase.{ Contexts, LabelExpression, Liquibase }
 
 import scala.concurrent.Future
 import scala.jdk.CollectionConverters._
diff --git a/src/test/scala/dev/mongocamp/driver/mongodb/operation/AggregationSuite.scala b/src/test/scala/dev/mongocamp/driver/mongodb/operation/AggregationSuite.scala
index dedd1716..2b3299af 100644
--- a/src/test/scala/dev/mongocamp/driver/mongodb/operation/AggregationSuite.scala
+++ b/src/test/scala/dev/mongocamp/driver/mongodb/operation/AggregationSuite.scala
@@ -1,8 +1,8 @@
 package dev.mongocamp.driver.mongodb.operation
 
 // #region agg_imports
-import dev.mongocamp.driver.mongodb.Aggregate._
 import dev.mongocamp.driver.mongodb._
+import dev.mongocamp.driver.mongodb.Aggregate._
 import dev.mongocamp.driver.mongodb.dao.BasePersonSuite
 // #endregion agg_imports
 
diff --git a/src/test/scala/dev/mongocamp/driver/mongodb/operation/SearchSuite.scala b/src/test/scala/dev/mongocamp/driver/mongodb/operation/SearchSuite.scala
index 04d3562c..5a5837e5 100644
--- a/src/test/scala/dev/mongocamp/driver/mongodb/operation/SearchSuite.scala
+++ b/src/test/scala/dev/mongocamp/driver/mongodb/operation/SearchSuite.scala
@@ -1,7 +1,7 @@
 package dev.mongocamp.driver.mongodb.operation
 import dev.mongocamp.driver.MongoImplicits
-import dev.mongocamp.driver.mongodb.Sort._
 import dev.mongocamp.driver.mongodb._
+import dev.mongocamp.driver.mongodb.Sort._
 import dev.mongocamp.driver.mongodb.dao.BasePersonSuite
 import dev.mongocamp.driver.mongodb.model.Person
 import dev.mongocamp.driver.mongodb.test.TestDatabase._
diff --git a/src/test/scala/dev/mongocamp/driver/mongodb/pagination/PaginationFilterSuite.scala b/src/test/scala/dev/mongocamp/driver/mongodb/pagination/PaginationFilterSuite.scala
index 3836830e..e493b4ec 100644
--- a/src/test/scala/dev/mongocamp/driver/mongodb/pagination/PaginationFilterSuite.scala
+++ b/src/test/scala/dev/mongocamp/driver/mongodb/pagination/PaginationFilterSuite.scala
@@ -1,7 +1,7 @@
 package dev.mongocamp.driver.mongodb.pagination
 import dev.mongocamp.driver.MongoImplicits
-import dev.mongocamp.driver.mongodb.Sort._
 import dev.mongocamp.driver.mongodb._
+import dev.mongocamp.driver.mongodb.Sort._
 import dev.mongocamp.driver.mongodb.dao.BasePersonSuite
 import dev.mongocamp.driver.mongodb.test.TestDatabase._
 
diff --git a/src/test/scala/dev/mongocamp/driver/mongodb/pagination/PaginationIterationSuite.scala b/src/test/scala/dev/mongocamp/driver/mongodb/pagination/PaginationIterationSuite.scala
index 4ef9c15c..1251cb18 100644
--- a/src/test/scala/dev/mongocamp/driver/mongodb/pagination/PaginationIterationSuite.scala
+++ b/src/test/scala/dev/mongocamp/driver/mongodb/pagination/PaginationIterationSuite.scala
@@ -2,8 +2,8 @@ package dev.mongocamp.driver.mongodb.pagination
 
 import com.typesafe.scalalogging.LazyLogging
 import dev.mongocamp.driver.MongoImplicits
-import dev.mongocamp.driver.mongodb.Aggregate._
 import dev.mongocamp.driver.mongodb._
+import dev.mongocamp.driver.mongodb.Aggregate._
 import dev.mongocamp.driver.mongodb.dao.BasePersonSuite
 import dev.mongocamp.driver.mongodb.model.Person
 import dev.mongocamp.driver.mongodb.test.TestDatabase._
diff --git a/src/test/scala/dev/mongocamp/driver/mongodb/relation/RelationDemoDatabase.scala b/src/test/scala/dev/mongocamp/driver/mongodb/relation/RelationDemoDatabase.scala
index 1d0750f1..0285cc18 100644
--- a/src/test/scala/dev/mongocamp/driver/mongodb/relation/RelationDemoDatabase.scala
+++ b/src/test/scala/dev/mongocamp/driver/mongodb/relation/RelationDemoDatabase.scala
@@ -1,14 +1,11 @@
 package dev.mongocamp.driver.mongodb.relation
 
-import dev.mongocamp.driver.mongodb.database.DatabaseProvider
 import dev.mongocamp.driver.mongodb._
-import org.bson.codecs.configuration.CodecRegistries.fromProviders
-import org.mongodb.scala.bson.ObjectId
-import org.mongodb.scala.bson.codecs.Macros._
-import org.mongodb.scala.result.UpdateResult
+import dev.mongocamp.driver.mongodb.database.DatabaseProvider
 import dev.mongocamp.driver.mongodb.json._
-import io.circe.syntax._
 import io.circe.generic.auto._
+import org.mongodb.scala.bson.ObjectId
+import org.mongodb.scala.result.UpdateResult
 
 object RelationDemoDatabase {
 
diff --git a/src/test/scala/dev/mongocamp/driver/mongodb/sql/DeleteSqlSuite.scala b/src/test/scala/dev/mongocamp/driver/mongodb/sql/DeleteSqlSuite.scala
index 0f949209..b1e3f112 100644
--- a/src/test/scala/dev/mongocamp/driver/mongodb/sql/DeleteSqlSuite.scala
+++ b/src/test/scala/dev/mongocamp/driver/mongodb/sql/DeleteSqlSuite.scala
@@ -1,7 +1,7 @@
 package dev.mongocamp.driver.mongodb.sql
 
 import dev.mongocamp.driver.mongodb.GenericObservable
-import dev.mongocamp.driver.mongodb.model.{Grade, Score}
+import dev.mongocamp.driver.mongodb.model.{ Grade, Score }
 import dev.mongocamp.driver.mongodb.test.TestDatabase
 import dev.mongocamp.driver.mongodb.test.UniversityDatabase.GradeDAO
 import org.bson.types.ObjectId
diff --git a/src/test/scala/dev/mongocamp/driver/mongodb/test/TestDatabase.scala b/src/test/scala/dev/mongocamp/driver/mongodb/test/TestDatabase.scala
index 3fadddcd..22b5b290 100644
--- a/src/test/scala/dev/mongocamp/driver/mongodb/test/TestDatabase.scala
+++ b/src/test/scala/dev/mongocamp/driver/mongodb/test/TestDatabase.scala
@@ -4,8 +4,8 @@ import better.files.File
 import com.mongodb.client.model.changestream.OperationType
 import com.typesafe.scalalogging.LazyLogging
 import dev.mongocamp.driver.mongodb.database.DatabaseProvider
-import dev.mongocamp.driver.mongodb.model._
 import dev.mongocamp.driver.mongodb.json._
+import dev.mongocamp.driver.mongodb.model._
 import dev.mongocamp.driver.mongodb.{ GridFSDAO, MongoDAO }
 import io.circe.generic.auto._
 import org.mongodb.scala.Document