diff --git a/storage/storage.go b/storage/storage.go
index cb43cb4..1b8a182 100644
--- a/storage/storage.go
+++ b/storage/storage.go
@@ -113,8 +113,6 @@ type Device struct {
 	model     string
 
 	// Partitioning Information
-	// TODO (b/151981913) This remains a string for now to retain compatibility
-	// with main. It will eventually be moved to type 'partition'.
 	partStyle  glstor.PartitionStyle
 	partitions []Partition
 }
diff --git a/storage/storage_linux.go b/storage/storage_linux.go
index 72097c6..8c1b06f 100644
--- a/storage/storage_linux.go
+++ b/storage/storage_linux.go
@@ -345,7 +345,6 @@ func (part *Partition) Mount(base string) error {
 		return nil
 	}
 	// Skip partitions that cannot be mounted.
-	// TODO(b/130833261) Revisit not throwing an error here during OSS.
 	if part.fileSystem == UnknownFS {
 		return nil
 	}
diff --git a/storage/storage_windows.go b/storage/storage_windows.go
index daf01fa..690b4bd 100644
--- a/storage/storage_windows.go
+++ b/storage/storage_windows.go
@@ -374,7 +374,6 @@ func (part *Partition) Mount(letter string) error {
 	if part.fileSystem == UnknownFS {
 		return nil
 	}
-	// TODO(b/130833261) We need to check for Admin here and skip if we are not.
 
 	// Assign partitions to everything else.
 	available, err := freeDrive(letter)