diff --git a/src/cli/utils/groups.go b/src/cli/utils/groups.go
index 258c9526e..ac08b1f32 100644
--- a/src/cli/utils/groups.go
+++ b/src/cli/utils/groups.go
@@ -138,8 +138,6 @@ func ValidateGroupsRestoreFlags(backupID string, opts GroupsOpts) error {
 		return clues.New("invalid time format for " + flags.MessageLastReplyBeforeFN)
 	}
 
-	// TODO(meain): selectors (refer sharepoint)
-
 	return validateRestoreConfigFlags(flags.CollisionsFV, opts.RestoreCfg)
 }
 
diff --git a/src/internal/archive/zip.go b/src/internal/archive/zip.go
index 778eaf748..a1ee8b725 100644
--- a/src/internal/archive/zip.go
+++ b/src/internal/archive/zip.go
@@ -15,7 +15,6 @@ import (
 const (
 	// ZipCopyBufferSize is the size of the copy buffer for zip
 	// write operations
-	// TODO(meain): tweak this value
 	ZipCopyBufferSize = 5 * 1024 * 1024
 )
 
diff --git a/src/internal/m365/collection/drive/collection.go b/src/internal/m365/collection/drive/collection.go
index 60010bc8a..ecf254f80 100644
--- a/src/internal/m365/collection/drive/collection.go
+++ b/src/internal/m365/collection/drive/collection.go
@@ -198,7 +198,6 @@ func (oc *Collection) Remove(itemID string) bool {
 }
 
 // IsEmpty check if a collection does not contain any items
-// TODO(meain): Should we just have function that returns driveItems?
 func (oc *Collection) IsEmpty() bool {
 	return len(oc.driveItems) == 0
 }
diff --git a/src/internal/m365/collection/drive/collections_test.go b/src/internal/m365/collection/drive/collections_test.go
index ef3bef5ff..88a8f9a62 100644
--- a/src/internal/m365/collection/drive/collections_test.go
+++ b/src/internal/m365/collection/drive/collections_test.go
@@ -2492,7 +2492,7 @@ func delItem(
 }
 
 func getDeltaError() error {
-	syncStateNotFound := "SyncStateNotFound" // TODO(meain): export graph.errCodeSyncStateNotFound
+	syncStateNotFound := "SyncStateNotFound"
 	me := odataerrors.NewMainError()
 	me.SetCode(&syncStateNotFound)
 
diff --git a/src/internal/m365/export.go b/src/internal/m365/export.go
index b73b16996..94e00f295 100644
--- a/src/internal/m365/export.go
+++ b/src/internal/m365/export.go
@@ -33,7 +33,7 @@ func (ctrl *Controller) ProduceExportCollections(
 	defer end()
 
 	ctx = graph.BindRateLimiterConfig(ctx, graph.LimiterCfg{Service: sels.PathService()})
-	ctx = clues.Add(ctx, "export_config", exportCfg) // TODO(meain): needs PII control
+	ctx = clues.Add(ctx, "export_config", exportCfg)
 
 	var (
 		expCollections []export.Collectioner
diff --git a/src/internal/operations/export.go b/src/internal/operations/export.go
index 76e51b47f..6f09b8c5d 100644
--- a/src/internal/operations/export.go
+++ b/src/internal/operations/export.go
@@ -34,7 +34,6 @@ import (
 const (
 	// CopyBufferSize is the size of the copy buffer for disk
 	// write operations
-	// TODO(meain): tweak this value
 	CopyBufferSize = 5 * 1024 * 1024
 )