diff --git a/core/src/main/scala/org/apache/pekko/persistence/postgres/journal/dao/JournalDao.scala b/core/src/main/scala/org/apache/pekko/persistence/postgres/journal/dao/JournalDao.scala
index 6db4bc7e..3d6ae549 100644
--- a/core/src/main/scala/org/apache/pekko/persistence/postgres/journal/dao/JournalDao.scala
+++ b/core/src/main/scala/org/apache/pekko/persistence/postgres/journal/dao/JournalDao.scala
@@ -7,7 +7,6 @@ package org.apache.pekko.persistence.postgres.journal.dao
 
 import org.apache.pekko.persistence.AtomicWrite
 
-import scala.collection.immutable.Seq
 import scala.concurrent.Future
 import scala.util.Try
 
diff --git a/core/src/main/scala/org/apache/pekko/persistence/postgres/journal/dao/package.scala b/core/src/main/scala/org/apache/pekko/persistence/postgres/journal/dao/package.scala
index 5209e949..bfc21050 100644
--- a/core/src/main/scala/org/apache/pekko/persistence/postgres/journal/dao/package.scala
+++ b/core/src/main/scala/org/apache/pekko/persistence/postgres/journal/dao/package.scala
@@ -5,8 +5,6 @@
 
 package org.apache.pekko.persistence.postgres.journal
 
-import scala.collection.immutable.Set
-
 package object dao {
   def encodeTags(tags: Set[String], separator: String): Option[String] =
     if (tags.isEmpty) None else Option(tags.mkString(separator))
diff --git a/core/src/test/scala/org/apache/pekko/persistence/postgres/query/QueryTestSpec.scala b/core/src/test/scala/org/apache/pekko/persistence/postgres/query/QueryTestSpec.scala
index 29c91390..1796c629 100644
--- a/core/src/test/scala/org/apache/pekko/persistence/postgres/query/QueryTestSpec.scala
+++ b/core/src/test/scala/org/apache/pekko/persistence/postgres/query/QueryTestSpec.scala
@@ -8,23 +8,22 @@ package org.apache.pekko.persistence.postgres.query
 import com.typesafe.config.ConfigValue
 import org.apache.pekko.actor.{ActorRef, ActorSystem, Props, Stash, Status}
 import org.apache.pekko.event.LoggingReceive
-import org.apache.pekko.persistence.{DeleteMessagesFailure, DeleteMessagesSuccess, PersistentActor}
 import org.apache.pekko.persistence.journal.Tagged
 import org.apache.pekko.persistence.postgres.SingleActorSystemPerTestSpec
 import org.apache.pekko.persistence.postgres.query.EventAdapterTest.{Event, TaggedAsyncEvent, TaggedEvent}
-import org.apache.pekko.persistence.postgres.query.javadsl.{PostgresReadJournal as JavaPostgresReadJournal}
+import org.apache.pekko.persistence.postgres.query.javadsl.{PostgresReadJournal => JavaPostgresReadJournal}
 import org.apache.pekko.persistence.postgres.query.scaladsl.PostgresReadJournal
 import org.apache.pekko.persistence.postgres.util.Schema.SchemaType
 import org.apache.pekko.persistence.query.{EventEnvelope, Offset, PersistenceQuery}
-import org.apache.pekko.stream.{Materializer, SystemMaterializer}
+import org.apache.pekko.persistence.{DeleteMessagesFailure, DeleteMessagesSuccess, PersistentActor}
 import org.apache.pekko.stream.scaladsl.Sink
 import org.apache.pekko.stream.testkit.TestSubscriber
-import org.apache.pekko.stream.testkit.javadsl.{TestSink as JavaSink}
+import org.apache.pekko.stream.testkit.javadsl.{TestSink => JavaSink}
 import org.apache.pekko.stream.testkit.scaladsl.TestSink
-import slick.jdbc.PostgresProfile.api.*
+import org.apache.pekko.stream.{Materializer, SystemMaterializer}
 
 import scala.concurrent.Future
-import scala.concurrent.duration.{FiniteDuration, *}
+import scala.concurrent.duration.{FiniteDuration, _}
 
 trait ReadJournalOperations {
   def withCurrentPersistenceIds(within: FiniteDuration = 60.second)(f: TestSubscriber.Probe[String] => Unit): Unit