diff --git a/lib/ldb/ldb_key_value/ldb_kv.c b/lib/ldb/ldb_key_value/ldb_kv.c
index d9b7b0af46a..09ed3f81674 100644
--- a/lib/ldb/ldb_key_value/ldb_kv.c
+++ b/lib/ldb/ldb_key_value/ldb_kv.c
@@ -106,8 +106,7 @@ bool ldb_kv_key_is_normal_record(struct ldb_val key)
   note that the key for a record can depend on whether the
   dn refers to a case sensitive index record or not
 */
-struct ldb_val ldb_kv_key_dn(struct ldb_module *module,
-			     TALLOC_CTX *mem_ctx,
+struct ldb_val ldb_kv_key_dn(TALLOC_CTX *mem_ctx,
 			     struct ldb_dn *dn)
 {
 	struct ldb_val key;
@@ -198,7 +197,7 @@ int ldb_kv_idx_to_key(struct ldb_module *module,
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
 	/* form the key */
-	*key = ldb_kv_key_dn(module, mem_ctx, dn);
+	*key = ldb_kv_key_dn(mem_ctx, dn);
 	TALLOC_FREE(dn);
 	if (!key->data) {
 		return ldb_module_oom(module);
@@ -226,11 +225,11 @@ struct ldb_val ldb_kv_key_msg(struct ldb_module *module,
 	int ret;
 
 	if (ldb_kv->cache->GUID_index_attribute == NULL) {
-		return ldb_kv_key_dn(module, mem_ctx, msg->dn);
+		return ldb_kv_key_dn(mem_ctx, msg->dn);
 	}
 
 	if (ldb_dn_is_special(msg->dn)) {
-		return ldb_kv_key_dn(module, mem_ctx, msg->dn);
+		return ldb_kv_key_dn(mem_ctx, msg->dn);
 	}
 
 	guid_val =
@@ -1312,13 +1311,13 @@ static int ldb_kv_rename(struct ldb_kv_context *ctx)
 	 * Even in GUID index mode we use ltdb_key_dn() as we are
 	 * trying to figure out if this is just a case rename
 	 */
-	key = ldb_kv_key_dn(module, msg, req->op.rename.newdn);
+	key = ldb_kv_key_dn(msg, req->op.rename.newdn);
 	if (!key.data) {
 		talloc_free(msg);
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
 
-	key_old = ldb_kv_key_dn(module, msg, req->op.rename.olddn);
+	key_old = ldb_kv_key_dn(msg, req->op.rename.olddn);
 	if (!key_old.data) {
 		talloc_free(msg);
 		talloc_free(key.data);
diff --git a/lib/ldb/ldb_key_value/ldb_kv.h b/lib/ldb/ldb_key_value/ldb_kv.h
index 8da970fd2f9..fa745184965 100644
--- a/lib/ldb/ldb_key_value/ldb_kv.h
+++ b/lib/ldb/ldb_key_value/ldb_kv.h
@@ -276,8 +276,7 @@ int ldb_kv_search(struct ldb_kv_context *ctx);
  * DN=@.
  */
 bool ldb_kv_key_is_normal_record(struct ldb_val key);
-struct ldb_val ldb_kv_key_dn(struct ldb_module *module,
-			     TALLOC_CTX *mem_ctx,
+struct ldb_val ldb_kv_key_dn(TALLOC_CTX *mem_ctx,
 			     struct ldb_dn *dn);
 struct ldb_val ldb_kv_key_msg(struct ldb_module *module,
 			     TALLOC_CTX *mem_ctx,
diff --git a/lib/ldb/ldb_key_value/ldb_kv_cache.c b/lib/ldb/ldb_key_value/ldb_kv_cache.c
index 3d8a09123e0..4a3c9f29020 100644
--- a/lib/ldb/ldb_key_value/ldb_kv_cache.c
+++ b/lib/ldb/ldb_key_value/ldb_kv_cache.c
@@ -444,7 +444,7 @@ int ldb_kv_cache_load(struct ldb_module *module)
 		goto failed;
 	}
 
-	key = ldb_kv_key_dn(module, baseinfo, baseinfo_dn);
+	key = ldb_kv_key_dn(baseinfo, baseinfo_dn);
 	if (!key.data) {
 		goto failed_and_unlock;
 	}
diff --git a/lib/ldb/ldb_key_value/ldb_kv_index.c b/lib/ldb/ldb_key_value/ldb_kv_index.c
index 5af248a1931..ae8f1101302 100644
--- a/lib/ldb/ldb_key_value/ldb_kv_index.c
+++ b/lib/ldb/ldb_key_value/ldb_kv_index.c
@@ -1850,7 +1850,7 @@ static int ldb_kv_index_dn_ordered(struct ldb_module *module,
 			  ldb_dn_get_linearized(key_dn));
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
-	ldb_key = ldb_kv_key_dn(module, tmp_ctx, key_dn);
+	ldb_key = ldb_kv_key_dn(tmp_ctx, key_dn);
 	talloc_free(key_dn);
 	if (ldb_key.data == NULL) {
 		return LDB_ERR_OPERATIONS_ERROR;
@@ -1868,7 +1868,7 @@ static int ldb_kv_index_dn_ordered(struct ldb_module *module,
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
 
-	ldb_key2 = ldb_kv_key_dn(module, tmp_ctx, key_dn);
+	ldb_key2 = ldb_kv_key_dn(tmp_ctx, key_dn);
 	talloc_free(key_dn);
 	if (ldb_key2.data == NULL) {
 		return LDB_ERR_OPERATIONS_ERROR;
diff --git a/lib/ldb/ldb_key_value/ldb_kv_search.c b/lib/ldb/ldb_key_value/ldb_kv_search.c
index ae576724426..bb63ed1ab60 100644
--- a/lib/ldb/ldb_key_value/ldb_kv_search.c
+++ b/lib/ldb/ldb_key_value/ldb_kv_search.c
@@ -250,7 +250,7 @@ int ldb_kv_search_dn1(struct ldb_module *module,
 		}
 
 		/* form the key */
-		key = ldb_kv_key_dn(module, tdb_key_ctx, dn);
+		key = ldb_kv_key_dn(tdb_key_ctx, dn);
 		if (!key.data) {
 			TALLOC_FREE(tdb_key_ctx);
 			return LDB_ERR_OPERATIONS_ERROR;