diff --git a/src/internal/m365/collection/groups/backup.go b/src/internal/m365/collection/groups/backup.go
index d734309da..48b6d4989 100644
--- a/src/internal/m365/collection/groups/backup.go
+++ b/src/internal/m365/collection/groups/backup.go
@@ -180,7 +180,6 @@ func populateCollections(
 
 		// ictx = clues.Add(ictx, "previous_path", prevPath)
 		// TODO: the handler should provide this implementation.
-		// TODO: if we doing this messages are items for us.
 		items, err := collectItems(
 			ctx,
 			bh.NewMessagePager(qp.ProtectedResource.ID(), ptr.Val(c.GetId())))
diff --git a/src/internal/m365/collection/groups/groups_handler.go b/src/internal/m365/collection/groups/channels_handler.go
similarity index 100%
rename from src/internal/m365/collection/groups/groups_handler.go
rename to src/internal/m365/collection/groups/channels_handler.go
diff --git a/src/internal/m365/service/groups/backup.go b/src/internal/m365/service/groups/backup.go
index c48d1587c..77a49e445 100644
--- a/src/internal/m365/service/groups/backup.go
+++ b/src/internal/m365/service/groups/backup.go
@@ -92,16 +92,9 @@ func ProduceBackupCollections(
 			}
 
 		case path.ChannelMessagesCategory:
-			mbpc := inject.BackupProducerConfig{
-				LastBackupVersion: bpc.LastBackupVersion,
-				Options:           bpc.Options,
-				ProtectedResource: bpc.ProtectedResource,
-				Selector:          bpc.Selector,
-			}
-
 			dbcs, err = groups.CreateCollections(
 				ctx,
-				mbpc,
+				bpc,
 				groups.NewGroupBackupHandler(bpc.ProtectedResource.ID(), ac.Channels(), scope),
 				creds.AzureTenantID,
 				scope,