diff --git a/swh/storage/cassandra/cql.py b/swh/storage/cassandra/cql.py
--- a/swh/storage/cassandra/cql.py
+++ b/swh/storage/cassandra/cql.py
@@ -658,34 +658,18 @@
     # 'origin_visit' table
     ##########################
 
-    @_prepared_select_statement(
-        OriginVisitRow, "WHERE origin = ? AND visit > ? ORDER BY visit ASC"
-    )
-    def _origin_visit_get_pagination_asc_no_limit(
-        self, origin_url: str, last_visit: int, *, statement
-    ) -> ResultSet:
-        return self._execute_with_retries(statement, [origin_url, last_visit])
-
     @_prepared_select_statement(
         OriginVisitRow, "WHERE origin = ? AND visit > ? ORDER BY visit ASC LIMIT ?"
     )
-    def _origin_visit_get_pagination_asc_limit(
+    def _origin_visit_get_pagination_asc(
         self, origin_url: str, last_visit: int, limit: int, *, statement
     ) -> ResultSet:
         return self._execute_with_retries(statement, [origin_url, last_visit, limit])
 
-    @_prepared_select_statement(
-        OriginVisitRow, "WHERE origin = ? AND visit < ? ORDER BY visit DESC"
-    )
-    def _origin_visit_get_pagination_desc_no_limit(
-        self, origin_url: str, last_visit: int, *, statement
-    ) -> ResultSet:
-        return self._execute_with_retries(statement, [origin_url, last_visit])
-
     @_prepared_select_statement(
         OriginVisitRow, "WHERE origin = ? AND visit < ? ORDER BY visit DESC LIMIT ?"
     )
-    def _origin_visit_get_pagination_desc_limit(
+    def _origin_visit_get_pagination_desc(
         self, origin_url: str, last_visit: int, limit: int, *, statement
     ) -> ResultSet:
         return self._execute_with_retries(statement, [origin_url, last_visit, limit])
@@ -693,37 +677,21 @@
     @_prepared_select_statement(
         OriginVisitRow, "WHERE origin = ? ORDER BY visit ASC LIMIT ?"
     )
-    def _origin_visit_get_no_pagination_asc_limit(
+    def _origin_visit_get_no_pagination_asc(
         self, origin_url: str, limit: int, *, statement
     ) -> ResultSet:
         return self._execute_with_retries(statement, [origin_url, limit])
 
-    @_prepared_select_statement(OriginVisitRow, "WHERE origin = ? ORDER BY visit ASC ")
-    def _origin_visit_get_no_pagination_asc_no_limit(
-        self, origin_url: str, *, statement
-    ) -> ResultSet:
-        return self._execute_with_retries(statement, [origin_url])
-
-    @_prepared_select_statement(OriginVisitRow, "WHERE origin = ? ORDER BY visit DESC")
-    def _origin_visit_get_no_pagination_desc_no_limit(
-        self, origin_url: str, *, statement
-    ) -> ResultSet:
-        return self._execute_with_retries(statement, [origin_url])
-
     @_prepared_select_statement(
         OriginVisitRow, "WHERE origin = ? ORDER BY visit DESC LIMIT ?"
     )
-    def _origin_visit_get_no_pagination_desc_limit(
+    def _origin_visit_get_no_pagination_desc(
         self, origin_url: str, limit: int, *, statement
     ) -> ResultSet:
         return self._execute_with_retries(statement, [origin_url, limit])
 
     def origin_visit_get(
-        self,
-        origin_url: str,
-        last_visit: Optional[int],
-        limit: Optional[int],
-        order: ListOrder,
+        self, origin_url: str, last_visit: Optional[int], limit: int, order: ListOrder,
     ) -> Iterable[OriginVisitRow]:
         args: List[Any] = [origin_url]
 
@@ -733,13 +701,9 @@
         else:
             page_name = "no_pagination"
 
-        if limit is not None:
-            limit_name = "limit"
-            args.append(limit)
-        else:
-            limit_name = "no_limit"
+        args.append(limit)
 
-        method_name = f"_origin_visit_get_{page_name}_{order.value}_{limit_name}"
+        method_name = f"_origin_visit_get_{page_name}_{order.value}"
         origin_visit_get_method = getattr(self, method_name)
         return map(OriginVisitRow.from_dict, origin_visit_get_method(*args))
 
diff --git a/swh/storage/in_memory.py b/swh/storage/in_memory.py
--- a/swh/storage/in_memory.py
+++ b/swh/storage/in_memory.py
@@ -453,11 +453,7 @@
     ##########################
 
     def origin_visit_get(
-        self,
-        origin_url: str,
-        last_visit: Optional[int],
-        limit: Optional[int],
-        order: ListOrder,
+        self, origin_url: str, last_visit: Optional[int], limit: int, order: ListOrder,
     ) -> Iterable[OriginVisitRow]:
         visits = list(self._origin_visits.get_from_partition_key((origin_url,)))
 
@@ -469,8 +465,7 @@
 
         visits.sort(key=lambda v: v.visit, reverse=order == ListOrder.DESC)
 
-        if limit is not None:
-            visits = visits[0:limit]
+        visits = visits[0:limit]
 
         return visits