diff --git a/core/src/main/scala/akka/persistence/postgres/journal/dao/BaseByteArrayJournalDao.scala b/core/src/main/scala/akka/persistence/postgres/journal/dao/BaseByteArrayJournalDao.scala
index e776619a..41a61845 100644
--- a/core/src/main/scala/akka/persistence/postgres/journal/dao/BaseByteArrayJournalDao.scala
+++ b/core/src/main/scala/akka/persistence/postgres/journal/dao/BaseByteArrayJournalDao.scala
@@ -139,7 +139,7 @@ trait BaseByteArrayJournalDao extends JournalDaoWithUpdates with BaseJournalDaoW
 
   override def highestSequenceNr(persistenceId: String, fromSequenceNr: Long): Future[Long] =
     for {
-      maybeHighestSeqNo <- db.run(queries.highestSequenceNrForPersistenceId(persistenceId).result) //.headOption)
+      maybeHighestSeqNo <- db.run(queries.highestSequenceNrForPersistenceId(persistenceId).result)
     } yield maybeHighestSeqNo.getOrElse(0L)
 
   override def messages(
diff --git a/core/src/main/scala/akka/persistence/postgres/journal/dao/JournalQueries.scala b/core/src/main/scala/akka/persistence/postgres/journal/dao/JournalQueries.scala
index f7a90e95..518892c5 100644
--- a/core/src/main/scala/akka/persistence/postgres/journal/dao/JournalQueries.scala
+++ b/core/src/main/scala/akka/persistence/postgres/journal/dao/JournalQueries.scala
@@ -49,7 +49,6 @@ class JournalQueries(
 
   private def _highestSequenceNrForPersistenceId(persistenceId: Rep[String]) = {
     journalTable.filter(_.persistenceId === persistenceId).map(_.sequenceNumber).max
-    // journalPersistenceIdsTable.filter(_.persistenceId === persistenceId).map(_.maxSequenceNumber).take(1)
   }
 
   private def _highestMarkedSequenceNrForPersistenceId(persistenceId: Rep[String]): Rep[Option[Long]] =
diff --git a/scripts/migration-0.6.0/1-create-journal-persistence-ids-table.sql b/scripts/migration-0.6.0/1-create-journal-persistence-ids-table.sql
index 0f8fe4aa..a2fe869c 100644
--- a/scripts/migration-0.6.0/1-create-journal-persistence-ids-table.sql
+++ b/scripts/migration-0.6.0/1-create-journal-persistence-ids-table.sql
@@ -1,3 +1,4 @@
+-- Depending on your use case consider partitioning this table.
 DO $$
 DECLARE
   -- replace with appropriate values